* [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
@ 2020-12-25 5:21 kernel test robot
2020-12-25 5:21 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kernel test robot
0 siblings, 1 reply; 8+ messages in thread
From: kernel test robot @ 2020-12-25 5:21 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: 44cdfba60e00fb12583fb922a00288fd5a82df33
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/586] KVM: nVMX: Refactor IO bitmap checks into helper function
config: x86_64-randconfig-c002-20201222 (attached as .config)
compiler: gcc-5 (Ubuntu 5.5.0-12ubuntu1) 5.5.0 20171010
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
"coccinelle warnings: (new ones prefixed by >>)"
>> arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 22325 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] KVM: nVMX: fix boolreturn.cocci warnings
2020-12-25 5:21 [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kernel test robot
@ 2020-12-25 5:21 ` kernel test robot
0 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2020-12-25 5:21 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 8318 bytes --]
From: kernel test robot <lkp@intel.com>
arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Return statements in functions returning bool should use
true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci
Fixes: 738e997121b6 ("KVM: nVMX: Refactor IO bitmap checks into helper function")
CC: Oliver Upton <oupton@google.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
---
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: 44cdfba60e00fb12583fb922a00288fd5a82df33
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/586] KVM: nVMX: Refactor IO bitmap checks into helper function
vmx.c | 80 +++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6433,25 +6433,25 @@ static inline bool vmcs12_read_any(struc
char *p;
if (offset < 0)
- return 0;
+ return false;
p = ((char *)(get_vmcs12(vcpu))) + offset;
switch (vmcs_field_type(field)) {
case VMCS_FIELD_TYPE_NATURAL_WIDTH:
*ret = *((natural_width *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U16:
*ret = *((u16 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U32:
*ret = *((u32 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U64:
*ret = *((u64 *)p);
- return 1;
+ return true;
default:
- return 0; /* can never happen. */
+ return false; /* can never happen. */
}
}
@@ -6899,21 +6899,21 @@ bool nested_vmx_check_io_bitmaps(struct
else if (port < 0x10000)
bitmap = vmcs12->io_bitmap_b;
else
- return 1;
+ return true;
bitmap += (port & 0x7fff) / 8;
if (last_bitmap != bitmap)
if (kvm_read_guest(vcpu->kvm, bitmap, &b, 1))
- return 1;
+ return true;
if (b & (1 << (port & 7)))
- return 1;
+ return true;
port++;
size--;
last_bitmap = bitmap;
}
- return 0;
+ return false;
}
/*
@@ -6929,7 +6929,7 @@ static bool nested_vmx_exit_handled_msr(
gpa_t bitmap;
if (!nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS))
- return 1;
+ return true;
/*
* The MSR_BITMAP page is divided into four 1024-byte bitmaps,
@@ -6948,10 +6948,10 @@ static bool nested_vmx_exit_handled_msr(
if (msr_index < 1024*8) {
unsigned char b;
if (kvm_read_guest(vcpu->kvm, bitmap + msr_index/8, &b, 1))
- return 1;
+ return true;
return 1 & (b >> (msr_index & 7));
} else
- return 1; /* let L1 handle the wrong parameter */
+ return true; /* let L1 handle the wrong parameter */
}
/*
@@ -6975,7 +6975,7 @@ static bool nested_vmx_exit_handled_cr(s
case 0:
if (vmcs12->cr0_guest_host_mask &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
break;
case 3:
if ((vmcs12->cr3_target_count >= 1 &&
@@ -6986,37 +6986,37 @@ static bool nested_vmx_exit_handled_cr(s
vmcs12->cr3_target_value2 == val) ||
(vmcs12->cr3_target_count >= 4 &&
vmcs12->cr3_target_value3 == val))
- return 0;
+ return false;
if (nested_cpu_has(vmcs12, CPU_BASED_CR3_LOAD_EXITING))
- return 1;
+ return true;
break;
case 4:
if (vmcs12->cr4_guest_host_mask &
(vmcs12->cr4_read_shadow ^ val))
- return 1;
+ return true;
break;
case 8:
if (nested_cpu_has(vmcs12, CPU_BASED_CR8_LOAD_EXITING))
- return 1;
+ return true;
break;
}
break;
case 2: /* clts */
if ((vmcs12->cr0_guest_host_mask & X86_CR0_TS) &&
(vmcs12->cr0_read_shadow & X86_CR0_TS))
- return 1;
+ return true;
break;
case 1: /* mov from cr */
switch (cr) {
case 3:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR3_STORE_EXITING)
- return 1;
+ return true;
break;
case 8:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR8_STORE_EXITING)
- return 1;
+ return true;
break;
}
break;
@@ -7028,14 +7028,14 @@ static bool nested_vmx_exit_handled_cr(s
val = (exit_qualification >> LMSW_SOURCE_DATA_SHIFT) & 0x0f;
if (vmcs12->cr0_guest_host_mask & 0xe &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
if ((vmcs12->cr0_guest_host_mask & 0x1) &&
!(vmcs12->cr0_read_shadow & 0x1) &&
(val & 0x1))
- return 1;
+ return true;
break;
}
- return 0;
+ return false;
}
/*
@@ -7058,41 +7058,41 @@ static bool nested_vmx_exit_handled(stru
KVM_ISA_VMX);
if (vmx->nested.nested_run_pending)
- return 0;
+ return false;
if (unlikely(vmx->fail)) {
pr_info_ratelimited("%s failed vm entry %x\n", __func__,
vmcs_read32(VM_INSTRUCTION_ERROR));
- return 1;
+ return true;
}
switch (exit_reason) {
case EXIT_REASON_EXCEPTION_NMI:
if (!is_exception(intr_info))
- return 0;
+ return false;
else if (is_page_fault(intr_info))
return enable_ept;
else if (is_no_device(intr_info) &&
!(vmcs12->guest_cr0 & X86_CR0_TS))
- return 0;
+ return false;
return vmcs12->exception_bitmap &
(1u << (intr_info & INTR_INFO_VECTOR_MASK));
case EXIT_REASON_EXTERNAL_INTERRUPT:
- return 0;
+ return false;
case EXIT_REASON_TRIPLE_FAULT:
- return 1;
+ return true;
case EXIT_REASON_PENDING_INTERRUPT:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_INTR_PENDING);
case EXIT_REASON_NMI_WINDOW:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING);
case EXIT_REASON_TASK_SWITCH:
- return 1;
+ return true;
case EXIT_REASON_CPUID:
- return 1;
+ return true;
case EXIT_REASON_HLT:
return nested_cpu_has(vmcs12, CPU_BASED_HLT_EXITING);
case EXIT_REASON_INVD:
- return 1;
+ return true;
case EXIT_REASON_INVLPG:
return nested_cpu_has(vmcs12, CPU_BASED_INVLPG_EXITING);
case EXIT_REASON_RDPMC:
@@ -7109,7 +7109,7 @@ static bool nested_vmx_exit_handled(stru
* VMX instructions trap unconditionally. This allows L1 to
* emulate them for its L2 guest, i.e., allows 3-level nesting!
*/
- return 1;
+ return true;
case EXIT_REASON_CR_ACCESS:
return nested_vmx_exit_handled_cr(vcpu, vmcs12);
case EXIT_REASON_DR_ACCESS:
@@ -7120,7 +7120,7 @@ static bool nested_vmx_exit_handled(stru
case EXIT_REASON_MSR_WRITE:
return nested_vmx_exit_handled_msr(vcpu, vmcs12, exit_reason);
case EXIT_REASON_INVALID_STATE:
- return 1;
+ return true;
case EXIT_REASON_MWAIT_INSTRUCTION:
return nested_cpu_has(vmcs12, CPU_BASED_MWAIT_EXITING);
case EXIT_REASON_MONITOR_INSTRUCTION:
@@ -7130,7 +7130,7 @@ static bool nested_vmx_exit_handled(stru
nested_cpu_has2(vmcs12,
SECONDARY_EXEC_PAUSE_LOOP_EXITING);
case EXIT_REASON_MCE_DURING_VMENTRY:
- return 0;
+ return false;
case EXIT_REASON_TPR_BELOW_THRESHOLD:
return nested_cpu_has(vmcs12, CPU_BASED_TPR_SHADOW);
case EXIT_REASON_APIC_ACCESS:
@@ -7143,7 +7143,7 @@ static bool nested_vmx_exit_handled(stru
* missing in the guest EPT table (EPT12), the EPT violation
* will be injected with nested_ept_inject_page_fault()
*/
- return 0;
+ return false;
case EXIT_REASON_EPT_MISCONFIG:
/*
* L2 never uses directly L1's EPT, but rather L0's own EPT
@@ -7151,13 +7151,13 @@ static bool nested_vmx_exit_handled(stru
* (EPT on EPT). So any problems with the structure of the
* table is L0's fault.
*/
- return 0;
+ return false;
case EXIT_REASON_WBINVD:
return nested_cpu_has2(vmcs12, SECONDARY_EXEC_WBINVD_EXITING);
case EXIT_REASON_XSETBV:
- return 1;
+ return true;
default:
- return 1;
+ return true;
}
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
@ 2020-12-25 12:34 kernel test robot
2020-12-25 12:34 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kernel test robot
0 siblings, 1 reply; 8+ messages in thread
From: kernel test robot @ 2020-12-25 12:34 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: 44cdfba60e00fb12583fb922a00288fd5a82df33
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/586] KVM: nVMX: Refactor IO bitmap checks into helper function
config: x86_64-randconfig-c002-20201222 (attached as .config)
compiler: gcc-5 (Ubuntu 5.5.0-12ubuntu1) 5.5.0 20171010
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
"coccinelle warnings: (new ones prefixed by >>)"
>> arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 22325 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] KVM: nVMX: fix boolreturn.cocci warnings
2020-12-25 12:34 [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kernel test robot
@ 2020-12-25 12:34 ` kernel test robot
0 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2020-12-25 12:34 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 8318 bytes --]
From: kernel test robot <lkp@intel.com>
arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Return statements in functions returning bool should use
true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci
Fixes: 738e997121b6 ("KVM: nVMX: Refactor IO bitmap checks into helper function")
CC: Oliver Upton <oupton@google.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
---
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: 44cdfba60e00fb12583fb922a00288fd5a82df33
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/586] KVM: nVMX: Refactor IO bitmap checks into helper function
vmx.c | 80 +++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6433,25 +6433,25 @@ static inline bool vmcs12_read_any(struc
char *p;
if (offset < 0)
- return 0;
+ return false;
p = ((char *)(get_vmcs12(vcpu))) + offset;
switch (vmcs_field_type(field)) {
case VMCS_FIELD_TYPE_NATURAL_WIDTH:
*ret = *((natural_width *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U16:
*ret = *((u16 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U32:
*ret = *((u32 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U64:
*ret = *((u64 *)p);
- return 1;
+ return true;
default:
- return 0; /* can never happen. */
+ return false; /* can never happen. */
}
}
@@ -6899,21 +6899,21 @@ bool nested_vmx_check_io_bitmaps(struct
else if (port < 0x10000)
bitmap = vmcs12->io_bitmap_b;
else
- return 1;
+ return true;
bitmap += (port & 0x7fff) / 8;
if (last_bitmap != bitmap)
if (kvm_read_guest(vcpu->kvm, bitmap, &b, 1))
- return 1;
+ return true;
if (b & (1 << (port & 7)))
- return 1;
+ return true;
port++;
size--;
last_bitmap = bitmap;
}
- return 0;
+ return false;
}
/*
@@ -6929,7 +6929,7 @@ static bool nested_vmx_exit_handled_msr(
gpa_t bitmap;
if (!nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS))
- return 1;
+ return true;
/*
* The MSR_BITMAP page is divided into four 1024-byte bitmaps,
@@ -6948,10 +6948,10 @@ static bool nested_vmx_exit_handled_msr(
if (msr_index < 1024*8) {
unsigned char b;
if (kvm_read_guest(vcpu->kvm, bitmap + msr_index/8, &b, 1))
- return 1;
+ return true;
return 1 & (b >> (msr_index & 7));
} else
- return 1; /* let L1 handle the wrong parameter */
+ return true; /* let L1 handle the wrong parameter */
}
/*
@@ -6975,7 +6975,7 @@ static bool nested_vmx_exit_handled_cr(s
case 0:
if (vmcs12->cr0_guest_host_mask &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
break;
case 3:
if ((vmcs12->cr3_target_count >= 1 &&
@@ -6986,37 +6986,37 @@ static bool nested_vmx_exit_handled_cr(s
vmcs12->cr3_target_value2 == val) ||
(vmcs12->cr3_target_count >= 4 &&
vmcs12->cr3_target_value3 == val))
- return 0;
+ return false;
if (nested_cpu_has(vmcs12, CPU_BASED_CR3_LOAD_EXITING))
- return 1;
+ return true;
break;
case 4:
if (vmcs12->cr4_guest_host_mask &
(vmcs12->cr4_read_shadow ^ val))
- return 1;
+ return true;
break;
case 8:
if (nested_cpu_has(vmcs12, CPU_BASED_CR8_LOAD_EXITING))
- return 1;
+ return true;
break;
}
break;
case 2: /* clts */
if ((vmcs12->cr0_guest_host_mask & X86_CR0_TS) &&
(vmcs12->cr0_read_shadow & X86_CR0_TS))
- return 1;
+ return true;
break;
case 1: /* mov from cr */
switch (cr) {
case 3:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR3_STORE_EXITING)
- return 1;
+ return true;
break;
case 8:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR8_STORE_EXITING)
- return 1;
+ return true;
break;
}
break;
@@ -7028,14 +7028,14 @@ static bool nested_vmx_exit_handled_cr(s
val = (exit_qualification >> LMSW_SOURCE_DATA_SHIFT) & 0x0f;
if (vmcs12->cr0_guest_host_mask & 0xe &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
if ((vmcs12->cr0_guest_host_mask & 0x1) &&
!(vmcs12->cr0_read_shadow & 0x1) &&
(val & 0x1))
- return 1;
+ return true;
break;
}
- return 0;
+ return false;
}
/*
@@ -7058,41 +7058,41 @@ static bool nested_vmx_exit_handled(stru
KVM_ISA_VMX);
if (vmx->nested.nested_run_pending)
- return 0;
+ return false;
if (unlikely(vmx->fail)) {
pr_info_ratelimited("%s failed vm entry %x\n", __func__,
vmcs_read32(VM_INSTRUCTION_ERROR));
- return 1;
+ return true;
}
switch (exit_reason) {
case EXIT_REASON_EXCEPTION_NMI:
if (!is_exception(intr_info))
- return 0;
+ return false;
else if (is_page_fault(intr_info))
return enable_ept;
else if (is_no_device(intr_info) &&
!(vmcs12->guest_cr0 & X86_CR0_TS))
- return 0;
+ return false;
return vmcs12->exception_bitmap &
(1u << (intr_info & INTR_INFO_VECTOR_MASK));
case EXIT_REASON_EXTERNAL_INTERRUPT:
- return 0;
+ return false;
case EXIT_REASON_TRIPLE_FAULT:
- return 1;
+ return true;
case EXIT_REASON_PENDING_INTERRUPT:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_INTR_PENDING);
case EXIT_REASON_NMI_WINDOW:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING);
case EXIT_REASON_TASK_SWITCH:
- return 1;
+ return true;
case EXIT_REASON_CPUID:
- return 1;
+ return true;
case EXIT_REASON_HLT:
return nested_cpu_has(vmcs12, CPU_BASED_HLT_EXITING);
case EXIT_REASON_INVD:
- return 1;
+ return true;
case EXIT_REASON_INVLPG:
return nested_cpu_has(vmcs12, CPU_BASED_INVLPG_EXITING);
case EXIT_REASON_RDPMC:
@@ -7109,7 +7109,7 @@ static bool nested_vmx_exit_handled(stru
* VMX instructions trap unconditionally. This allows L1 to
* emulate them for its L2 guest, i.e., allows 3-level nesting!
*/
- return 1;
+ return true;
case EXIT_REASON_CR_ACCESS:
return nested_vmx_exit_handled_cr(vcpu, vmcs12);
case EXIT_REASON_DR_ACCESS:
@@ -7120,7 +7120,7 @@ static bool nested_vmx_exit_handled(stru
case EXIT_REASON_MSR_WRITE:
return nested_vmx_exit_handled_msr(vcpu, vmcs12, exit_reason);
case EXIT_REASON_INVALID_STATE:
- return 1;
+ return true;
case EXIT_REASON_MWAIT_INSTRUCTION:
return nested_cpu_has(vmcs12, CPU_BASED_MWAIT_EXITING);
case EXIT_REASON_MONITOR_INSTRUCTION:
@@ -7130,7 +7130,7 @@ static bool nested_vmx_exit_handled(stru
nested_cpu_has2(vmcs12,
SECONDARY_EXEC_PAUSE_LOOP_EXITING);
case EXIT_REASON_MCE_DURING_VMENTRY:
- return 0;
+ return false;
case EXIT_REASON_TPR_BELOW_THRESHOLD:
return nested_cpu_has(vmcs12, CPU_BASED_TPR_SHADOW);
case EXIT_REASON_APIC_ACCESS:
@@ -7143,7 +7143,7 @@ static bool nested_vmx_exit_handled(stru
* missing in the guest EPT table (EPT12), the EPT violation
* will be injected with nested_ept_inject_page_fault()
*/
- return 0;
+ return false;
case EXIT_REASON_EPT_MISCONFIG:
/*
* L2 never uses directly L1's EPT, but rather L0's own EPT
@@ -7151,13 +7151,13 @@ static bool nested_vmx_exit_handled(stru
* (EPT on EPT). So any problems with the structure of the
* table is L0's fault.
*/
- return 0;
+ return false;
case EXIT_REASON_WBINVD:
return nested_cpu_has2(vmcs12, SECONDARY_EXEC_WBINVD_EXITING);
case EXIT_REASON_XSETBV:
- return 1;
+ return true;
default:
- return 1;
+ return true;
}
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
@ 2020-12-25 5:00 kernel test robot
2020-12-25 5:00 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kernel test robot
0 siblings, 1 reply; 8+ messages in thread
From: kernel test robot @ 2020-12-25 5:00 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: 44cdfba60e00fb12583fb922a00288fd5a82df33
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/586] KVM: nVMX: Refactor IO bitmap checks into helper function
config: x86_64-randconfig-c002-20201222 (attached as .config)
compiler: gcc-5 (Ubuntu 5.5.0-12ubuntu1) 5.5.0 20171010
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
"coccinelle warnings: (new ones prefixed by >>)"
>> arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 22325 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] KVM: nVMX: fix boolreturn.cocci warnings
2020-12-25 5:00 [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kernel test robot
@ 2020-12-25 5:00 ` kernel test robot
0 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2020-12-25 5:00 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 8318 bytes --]
From: kernel test robot <lkp@intel.com>
arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Return statements in functions returning bool should use
true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci
Fixes: 738e997121b6 ("KVM: nVMX: Refactor IO bitmap checks into helper function")
CC: Oliver Upton <oupton@google.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
---
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: 44cdfba60e00fb12583fb922a00288fd5a82df33
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/586] KVM: nVMX: Refactor IO bitmap checks into helper function
vmx.c | 80 +++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6433,25 +6433,25 @@ static inline bool vmcs12_read_any(struc
char *p;
if (offset < 0)
- return 0;
+ return false;
p = ((char *)(get_vmcs12(vcpu))) + offset;
switch (vmcs_field_type(field)) {
case VMCS_FIELD_TYPE_NATURAL_WIDTH:
*ret = *((natural_width *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U16:
*ret = *((u16 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U32:
*ret = *((u32 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U64:
*ret = *((u64 *)p);
- return 1;
+ return true;
default:
- return 0; /* can never happen. */
+ return false; /* can never happen. */
}
}
@@ -6899,21 +6899,21 @@ bool nested_vmx_check_io_bitmaps(struct
else if (port < 0x10000)
bitmap = vmcs12->io_bitmap_b;
else
- return 1;
+ return true;
bitmap += (port & 0x7fff) / 8;
if (last_bitmap != bitmap)
if (kvm_read_guest(vcpu->kvm, bitmap, &b, 1))
- return 1;
+ return true;
if (b & (1 << (port & 7)))
- return 1;
+ return true;
port++;
size--;
last_bitmap = bitmap;
}
- return 0;
+ return false;
}
/*
@@ -6929,7 +6929,7 @@ static bool nested_vmx_exit_handled_msr(
gpa_t bitmap;
if (!nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS))
- return 1;
+ return true;
/*
* The MSR_BITMAP page is divided into four 1024-byte bitmaps,
@@ -6948,10 +6948,10 @@ static bool nested_vmx_exit_handled_msr(
if (msr_index < 1024*8) {
unsigned char b;
if (kvm_read_guest(vcpu->kvm, bitmap + msr_index/8, &b, 1))
- return 1;
+ return true;
return 1 & (b >> (msr_index & 7));
} else
- return 1; /* let L1 handle the wrong parameter */
+ return true; /* let L1 handle the wrong parameter */
}
/*
@@ -6975,7 +6975,7 @@ static bool nested_vmx_exit_handled_cr(s
case 0:
if (vmcs12->cr0_guest_host_mask &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
break;
case 3:
if ((vmcs12->cr3_target_count >= 1 &&
@@ -6986,37 +6986,37 @@ static bool nested_vmx_exit_handled_cr(s
vmcs12->cr3_target_value2 == val) ||
(vmcs12->cr3_target_count >= 4 &&
vmcs12->cr3_target_value3 == val))
- return 0;
+ return false;
if (nested_cpu_has(vmcs12, CPU_BASED_CR3_LOAD_EXITING))
- return 1;
+ return true;
break;
case 4:
if (vmcs12->cr4_guest_host_mask &
(vmcs12->cr4_read_shadow ^ val))
- return 1;
+ return true;
break;
case 8:
if (nested_cpu_has(vmcs12, CPU_BASED_CR8_LOAD_EXITING))
- return 1;
+ return true;
break;
}
break;
case 2: /* clts */
if ((vmcs12->cr0_guest_host_mask & X86_CR0_TS) &&
(vmcs12->cr0_read_shadow & X86_CR0_TS))
- return 1;
+ return true;
break;
case 1: /* mov from cr */
switch (cr) {
case 3:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR3_STORE_EXITING)
- return 1;
+ return true;
break;
case 8:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR8_STORE_EXITING)
- return 1;
+ return true;
break;
}
break;
@@ -7028,14 +7028,14 @@ static bool nested_vmx_exit_handled_cr(s
val = (exit_qualification >> LMSW_SOURCE_DATA_SHIFT) & 0x0f;
if (vmcs12->cr0_guest_host_mask & 0xe &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
if ((vmcs12->cr0_guest_host_mask & 0x1) &&
!(vmcs12->cr0_read_shadow & 0x1) &&
(val & 0x1))
- return 1;
+ return true;
break;
}
- return 0;
+ return false;
}
/*
@@ -7058,41 +7058,41 @@ static bool nested_vmx_exit_handled(stru
KVM_ISA_VMX);
if (vmx->nested.nested_run_pending)
- return 0;
+ return false;
if (unlikely(vmx->fail)) {
pr_info_ratelimited("%s failed vm entry %x\n", __func__,
vmcs_read32(VM_INSTRUCTION_ERROR));
- return 1;
+ return true;
}
switch (exit_reason) {
case EXIT_REASON_EXCEPTION_NMI:
if (!is_exception(intr_info))
- return 0;
+ return false;
else if (is_page_fault(intr_info))
return enable_ept;
else if (is_no_device(intr_info) &&
!(vmcs12->guest_cr0 & X86_CR0_TS))
- return 0;
+ return false;
return vmcs12->exception_bitmap &
(1u << (intr_info & INTR_INFO_VECTOR_MASK));
case EXIT_REASON_EXTERNAL_INTERRUPT:
- return 0;
+ return false;
case EXIT_REASON_TRIPLE_FAULT:
- return 1;
+ return true;
case EXIT_REASON_PENDING_INTERRUPT:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_INTR_PENDING);
case EXIT_REASON_NMI_WINDOW:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING);
case EXIT_REASON_TASK_SWITCH:
- return 1;
+ return true;
case EXIT_REASON_CPUID:
- return 1;
+ return true;
case EXIT_REASON_HLT:
return nested_cpu_has(vmcs12, CPU_BASED_HLT_EXITING);
case EXIT_REASON_INVD:
- return 1;
+ return true;
case EXIT_REASON_INVLPG:
return nested_cpu_has(vmcs12, CPU_BASED_INVLPG_EXITING);
case EXIT_REASON_RDPMC:
@@ -7109,7 +7109,7 @@ static bool nested_vmx_exit_handled(stru
* VMX instructions trap unconditionally. This allows L1 to
* emulate them for its L2 guest, i.e., allows 3-level nesting!
*/
- return 1;
+ return true;
case EXIT_REASON_CR_ACCESS:
return nested_vmx_exit_handled_cr(vcpu, vmcs12);
case EXIT_REASON_DR_ACCESS:
@@ -7120,7 +7120,7 @@ static bool nested_vmx_exit_handled(stru
case EXIT_REASON_MSR_WRITE:
return nested_vmx_exit_handled_msr(vcpu, vmcs12, exit_reason);
case EXIT_REASON_INVALID_STATE:
- return 1;
+ return true;
case EXIT_REASON_MWAIT_INSTRUCTION:
return nested_cpu_has(vmcs12, CPU_BASED_MWAIT_EXITING);
case EXIT_REASON_MONITOR_INSTRUCTION:
@@ -7130,7 +7130,7 @@ static bool nested_vmx_exit_handled(stru
nested_cpu_has2(vmcs12,
SECONDARY_EXEC_PAUSE_LOOP_EXITING);
case EXIT_REASON_MCE_DURING_VMENTRY:
- return 0;
+ return false;
case EXIT_REASON_TPR_BELOW_THRESHOLD:
return nested_cpu_has(vmcs12, CPU_BASED_TPR_SHADOW);
case EXIT_REASON_APIC_ACCESS:
@@ -7143,7 +7143,7 @@ static bool nested_vmx_exit_handled(stru
* missing in the guest EPT table (EPT12), the EPT violation
* will be injected with nested_ept_inject_page_fault()
*/
- return 0;
+ return false;
case EXIT_REASON_EPT_MISCONFIG:
/*
* L2 never uses directly L1's EPT, but rather L0's own EPT
@@ -7151,13 +7151,13 @@ static bool nested_vmx_exit_handled(stru
* (EPT on EPT). So any problems with the structure of the
* table is L0's fault.
*/
- return 0;
+ return false;
case EXIT_REASON_WBINVD:
return nested_cpu_has2(vmcs12, SECONDARY_EXEC_WBINVD_EXITING);
case EXIT_REASON_XSETBV:
- return 1;
+ return true;
default:
- return 1;
+ return true;
}
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
@ 2020-12-23 23:25 kernel test robot
2020-12-23 23:25 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kernel test robot
0 siblings, 1 reply; 8+ messages in thread
From: kernel test robot @ 2020-12-23 23:25 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: 44cdfba60e00fb12583fb922a00288fd5a82df33
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/586] KVM: nVMX: Refactor IO bitmap checks into helper function
config: x86_64-randconfig-c002-20201222 (attached as .config)
compiler: gcc-5 (Ubuntu 5.5.0-12ubuntu1) 5.5.0 20171010
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
"coccinelle warnings: (new ones prefixed by >>)"
>> arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 22325 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] KVM: nVMX: fix boolreturn.cocci warnings
2020-12-23 23:25 [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kernel test robot
@ 2020-12-23 23:25 ` kernel test robot
0 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2020-12-23 23:25 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 8318 bytes --]
From: kernel test robot <lkp@intel.com>
arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Return statements in functions returning bool should use
true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci
Fixes: 738e997121b6 ("KVM: nVMX: Refactor IO bitmap checks into helper function")
CC: Oliver Upton <oupton@google.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
---
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: 44cdfba60e00fb12583fb922a00288fd5a82df33
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/586] KVM: nVMX: Refactor IO bitmap checks into helper function
vmx.c | 80 +++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6433,25 +6433,25 @@ static inline bool vmcs12_read_any(struc
char *p;
if (offset < 0)
- return 0;
+ return false;
p = ((char *)(get_vmcs12(vcpu))) + offset;
switch (vmcs_field_type(field)) {
case VMCS_FIELD_TYPE_NATURAL_WIDTH:
*ret = *((natural_width *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U16:
*ret = *((u16 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U32:
*ret = *((u32 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U64:
*ret = *((u64 *)p);
- return 1;
+ return true;
default:
- return 0; /* can never happen. */
+ return false; /* can never happen. */
}
}
@@ -6899,21 +6899,21 @@ bool nested_vmx_check_io_bitmaps(struct
else if (port < 0x10000)
bitmap = vmcs12->io_bitmap_b;
else
- return 1;
+ return true;
bitmap += (port & 0x7fff) / 8;
if (last_bitmap != bitmap)
if (kvm_read_guest(vcpu->kvm, bitmap, &b, 1))
- return 1;
+ return true;
if (b & (1 << (port & 7)))
- return 1;
+ return true;
port++;
size--;
last_bitmap = bitmap;
}
- return 0;
+ return false;
}
/*
@@ -6929,7 +6929,7 @@ static bool nested_vmx_exit_handled_msr(
gpa_t bitmap;
if (!nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS))
- return 1;
+ return true;
/*
* The MSR_BITMAP page is divided into four 1024-byte bitmaps,
@@ -6948,10 +6948,10 @@ static bool nested_vmx_exit_handled_msr(
if (msr_index < 1024*8) {
unsigned char b;
if (kvm_read_guest(vcpu->kvm, bitmap + msr_index/8, &b, 1))
- return 1;
+ return true;
return 1 & (b >> (msr_index & 7));
} else
- return 1; /* let L1 handle the wrong parameter */
+ return true; /* let L1 handle the wrong parameter */
}
/*
@@ -6975,7 +6975,7 @@ static bool nested_vmx_exit_handled_cr(s
case 0:
if (vmcs12->cr0_guest_host_mask &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
break;
case 3:
if ((vmcs12->cr3_target_count >= 1 &&
@@ -6986,37 +6986,37 @@ static bool nested_vmx_exit_handled_cr(s
vmcs12->cr3_target_value2 == val) ||
(vmcs12->cr3_target_count >= 4 &&
vmcs12->cr3_target_value3 == val))
- return 0;
+ return false;
if (nested_cpu_has(vmcs12, CPU_BASED_CR3_LOAD_EXITING))
- return 1;
+ return true;
break;
case 4:
if (vmcs12->cr4_guest_host_mask &
(vmcs12->cr4_read_shadow ^ val))
- return 1;
+ return true;
break;
case 8:
if (nested_cpu_has(vmcs12, CPU_BASED_CR8_LOAD_EXITING))
- return 1;
+ return true;
break;
}
break;
case 2: /* clts */
if ((vmcs12->cr0_guest_host_mask & X86_CR0_TS) &&
(vmcs12->cr0_read_shadow & X86_CR0_TS))
- return 1;
+ return true;
break;
case 1: /* mov from cr */
switch (cr) {
case 3:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR3_STORE_EXITING)
- return 1;
+ return true;
break;
case 8:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR8_STORE_EXITING)
- return 1;
+ return true;
break;
}
break;
@@ -7028,14 +7028,14 @@ static bool nested_vmx_exit_handled_cr(s
val = (exit_qualification >> LMSW_SOURCE_DATA_SHIFT) & 0x0f;
if (vmcs12->cr0_guest_host_mask & 0xe &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
if ((vmcs12->cr0_guest_host_mask & 0x1) &&
!(vmcs12->cr0_read_shadow & 0x1) &&
(val & 0x1))
- return 1;
+ return true;
break;
}
- return 0;
+ return false;
}
/*
@@ -7058,41 +7058,41 @@ static bool nested_vmx_exit_handled(stru
KVM_ISA_VMX);
if (vmx->nested.nested_run_pending)
- return 0;
+ return false;
if (unlikely(vmx->fail)) {
pr_info_ratelimited("%s failed vm entry %x\n", __func__,
vmcs_read32(VM_INSTRUCTION_ERROR));
- return 1;
+ return true;
}
switch (exit_reason) {
case EXIT_REASON_EXCEPTION_NMI:
if (!is_exception(intr_info))
- return 0;
+ return false;
else if (is_page_fault(intr_info))
return enable_ept;
else if (is_no_device(intr_info) &&
!(vmcs12->guest_cr0 & X86_CR0_TS))
- return 0;
+ return false;
return vmcs12->exception_bitmap &
(1u << (intr_info & INTR_INFO_VECTOR_MASK));
case EXIT_REASON_EXTERNAL_INTERRUPT:
- return 0;
+ return false;
case EXIT_REASON_TRIPLE_FAULT:
- return 1;
+ return true;
case EXIT_REASON_PENDING_INTERRUPT:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_INTR_PENDING);
case EXIT_REASON_NMI_WINDOW:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING);
case EXIT_REASON_TASK_SWITCH:
- return 1;
+ return true;
case EXIT_REASON_CPUID:
- return 1;
+ return true;
case EXIT_REASON_HLT:
return nested_cpu_has(vmcs12, CPU_BASED_HLT_EXITING);
case EXIT_REASON_INVD:
- return 1;
+ return true;
case EXIT_REASON_INVLPG:
return nested_cpu_has(vmcs12, CPU_BASED_INVLPG_EXITING);
case EXIT_REASON_RDPMC:
@@ -7109,7 +7109,7 @@ static bool nested_vmx_exit_handled(stru
* VMX instructions trap unconditionally. This allows L1 to
* emulate them for its L2 guest, i.e., allows 3-level nesting!
*/
- return 1;
+ return true;
case EXIT_REASON_CR_ACCESS:
return nested_vmx_exit_handled_cr(vcpu, vmcs12);
case EXIT_REASON_DR_ACCESS:
@@ -7120,7 +7120,7 @@ static bool nested_vmx_exit_handled(stru
case EXIT_REASON_MSR_WRITE:
return nested_vmx_exit_handled_msr(vcpu, vmcs12, exit_reason);
case EXIT_REASON_INVALID_STATE:
- return 1;
+ return true;
case EXIT_REASON_MWAIT_INSTRUCTION:
return nested_cpu_has(vmcs12, CPU_BASED_MWAIT_EXITING);
case EXIT_REASON_MONITOR_INSTRUCTION:
@@ -7130,7 +7130,7 @@ static bool nested_vmx_exit_handled(stru
nested_cpu_has2(vmcs12,
SECONDARY_EXEC_PAUSE_LOOP_EXITING);
case EXIT_REASON_MCE_DURING_VMENTRY:
- return 0;
+ return false;
case EXIT_REASON_TPR_BELOW_THRESHOLD:
return nested_cpu_has(vmcs12, CPU_BASED_TPR_SHADOW);
case EXIT_REASON_APIC_ACCESS:
@@ -7143,7 +7143,7 @@ static bool nested_vmx_exit_handled(stru
* missing in the guest EPT table (EPT12), the EPT violation
* will be injected with nested_ept_inject_page_fault()
*/
- return 0;
+ return false;
case EXIT_REASON_EPT_MISCONFIG:
/*
* L2 never uses directly L1's EPT, but rather L0's own EPT
@@ -7151,13 +7151,13 @@ static bool nested_vmx_exit_handled(stru
* (EPT on EPT). So any problems with the structure of the
* table is L0's fault.
*/
- return 0;
+ return false;
case EXIT_REASON_WBINVD:
return nested_cpu_has2(vmcs12, SECONDARY_EXEC_WBINVD_EXITING);
case EXIT_REASON_XSETBV:
- return 1;
+ return true;
default:
- return 1;
+ return true;
}
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [android-goldfish:android-3.18 567/572] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
@ 2020-03-10 23:10 kbuild test robot
2020-03-10 23:10 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kbuild test robot
0 siblings, 1 reply; 8+ messages in thread
From: kbuild test robot @ 2020-03-10 23:10 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 1154 bytes --]
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: d5e29ac4d03e975a178326ff06de9bc85b603d03
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/572] KVM: nVMX: Refactor IO bitmap checks into helper function
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
coccinelle warnings: (new ones prefixed by >>)
>> arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] KVM: nVMX: fix boolreturn.cocci warnings
2020-03-10 23:10 [android-goldfish:android-3.18 567/572] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kbuild test robot
@ 2020-03-10 23:10 ` kbuild test robot
0 siblings, 0 replies; 8+ messages in thread
From: kbuild test robot @ 2020-03-10 23:10 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 8270 bytes --]
From: kbuild test robot <lkp@intel.com>
arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool
arch/x86/kvm/vmx.c:7061:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled' with return type bool
arch/x86/kvm/vmx.c:6978:11-12: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_cr' with return type bool
arch/x86/kvm/vmx.c:6932:9-10: WARNING: return of 0/1 in function 'nested_vmx_exit_handled_msr' with return type bool
arch/x86/kvm/vmx.c:6436:9-10: WARNING: return of 0/1 in function 'vmcs12_read_any' with return type bool
Return statements in functions returning bool should use
true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci
Fixes: 738e997121b6 ("KVM: nVMX: Refactor IO bitmap checks into helper function")
CC: Oliver Upton <oupton@google.com>
Signed-off-by: kbuild test robot <lkp@intel.com>
---
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: d5e29ac4d03e975a178326ff06de9bc85b603d03
commit: 738e997121b65e50c1d4681bfea0f288b6d89df2 [567/572] KVM: nVMX: Refactor IO bitmap checks into helper function
vmx.c | 80 +++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -6433,25 +6433,25 @@ static inline bool vmcs12_read_any(struc
char *p;
if (offset < 0)
- return 0;
+ return false;
p = ((char *)(get_vmcs12(vcpu))) + offset;
switch (vmcs_field_type(field)) {
case VMCS_FIELD_TYPE_NATURAL_WIDTH:
*ret = *((natural_width *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U16:
*ret = *((u16 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U32:
*ret = *((u32 *)p);
- return 1;
+ return true;
case VMCS_FIELD_TYPE_U64:
*ret = *((u64 *)p);
- return 1;
+ return true;
default:
- return 0; /* can never happen. */
+ return false; /* can never happen. */
}
}
@@ -6899,21 +6899,21 @@ bool nested_vmx_check_io_bitmaps(struct
else if (port < 0x10000)
bitmap = vmcs12->io_bitmap_b;
else
- return 1;
+ return true;
bitmap += (port & 0x7fff) / 8;
if (last_bitmap != bitmap)
if (kvm_read_guest(vcpu->kvm, bitmap, &b, 1))
- return 1;
+ return true;
if (b & (1 << (port & 7)))
- return 1;
+ return true;
port++;
size--;
last_bitmap = bitmap;
}
- return 0;
+ return false;
}
/*
@@ -6929,7 +6929,7 @@ static bool nested_vmx_exit_handled_msr(
gpa_t bitmap;
if (!nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS))
- return 1;
+ return true;
/*
* The MSR_BITMAP page is divided into four 1024-byte bitmaps,
@@ -6948,10 +6948,10 @@ static bool nested_vmx_exit_handled_msr(
if (msr_index < 1024*8) {
unsigned char b;
if (kvm_read_guest(vcpu->kvm, bitmap + msr_index/8, &b, 1))
- return 1;
+ return true;
return 1 & (b >> (msr_index & 7));
} else
- return 1; /* let L1 handle the wrong parameter */
+ return true; /* let L1 handle the wrong parameter */
}
/*
@@ -6975,7 +6975,7 @@ static bool nested_vmx_exit_handled_cr(s
case 0:
if (vmcs12->cr0_guest_host_mask &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
break;
case 3:
if ((vmcs12->cr3_target_count >= 1 &&
@@ -6986,37 +6986,37 @@ static bool nested_vmx_exit_handled_cr(s
vmcs12->cr3_target_value2 == val) ||
(vmcs12->cr3_target_count >= 4 &&
vmcs12->cr3_target_value3 == val))
- return 0;
+ return false;
if (nested_cpu_has(vmcs12, CPU_BASED_CR3_LOAD_EXITING))
- return 1;
+ return true;
break;
case 4:
if (vmcs12->cr4_guest_host_mask &
(vmcs12->cr4_read_shadow ^ val))
- return 1;
+ return true;
break;
case 8:
if (nested_cpu_has(vmcs12, CPU_BASED_CR8_LOAD_EXITING))
- return 1;
+ return true;
break;
}
break;
case 2: /* clts */
if ((vmcs12->cr0_guest_host_mask & X86_CR0_TS) &&
(vmcs12->cr0_read_shadow & X86_CR0_TS))
- return 1;
+ return true;
break;
case 1: /* mov from cr */
switch (cr) {
case 3:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR3_STORE_EXITING)
- return 1;
+ return true;
break;
case 8:
if (vmcs12->cpu_based_vm_exec_control &
CPU_BASED_CR8_STORE_EXITING)
- return 1;
+ return true;
break;
}
break;
@@ -7028,14 +7028,14 @@ static bool nested_vmx_exit_handled_cr(s
val = (exit_qualification >> LMSW_SOURCE_DATA_SHIFT) & 0x0f;
if (vmcs12->cr0_guest_host_mask & 0xe &
(val ^ vmcs12->cr0_read_shadow))
- return 1;
+ return true;
if ((vmcs12->cr0_guest_host_mask & 0x1) &&
!(vmcs12->cr0_read_shadow & 0x1) &&
(val & 0x1))
- return 1;
+ return true;
break;
}
- return 0;
+ return false;
}
/*
@@ -7058,41 +7058,41 @@ static bool nested_vmx_exit_handled(stru
KVM_ISA_VMX);
if (vmx->nested.nested_run_pending)
- return 0;
+ return false;
if (unlikely(vmx->fail)) {
pr_info_ratelimited("%s failed vm entry %x\n", __func__,
vmcs_read32(VM_INSTRUCTION_ERROR));
- return 1;
+ return true;
}
switch (exit_reason) {
case EXIT_REASON_EXCEPTION_NMI:
if (!is_exception(intr_info))
- return 0;
+ return false;
else if (is_page_fault(intr_info))
return enable_ept;
else if (is_no_device(intr_info) &&
!(vmcs12->guest_cr0 & X86_CR0_TS))
- return 0;
+ return false;
return vmcs12->exception_bitmap &
(1u << (intr_info & INTR_INFO_VECTOR_MASK));
case EXIT_REASON_EXTERNAL_INTERRUPT:
- return 0;
+ return false;
case EXIT_REASON_TRIPLE_FAULT:
- return 1;
+ return true;
case EXIT_REASON_PENDING_INTERRUPT:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_INTR_PENDING);
case EXIT_REASON_NMI_WINDOW:
return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING);
case EXIT_REASON_TASK_SWITCH:
- return 1;
+ return true;
case EXIT_REASON_CPUID:
- return 1;
+ return true;
case EXIT_REASON_HLT:
return nested_cpu_has(vmcs12, CPU_BASED_HLT_EXITING);
case EXIT_REASON_INVD:
- return 1;
+ return true;
case EXIT_REASON_INVLPG:
return nested_cpu_has(vmcs12, CPU_BASED_INVLPG_EXITING);
case EXIT_REASON_RDPMC:
@@ -7109,7 +7109,7 @@ static bool nested_vmx_exit_handled(stru
* VMX instructions trap unconditionally. This allows L1 to
* emulate them for its L2 guest, i.e., allows 3-level nesting!
*/
- return 1;
+ return true;
case EXIT_REASON_CR_ACCESS:
return nested_vmx_exit_handled_cr(vcpu, vmcs12);
case EXIT_REASON_DR_ACCESS:
@@ -7120,7 +7120,7 @@ static bool nested_vmx_exit_handled(stru
case EXIT_REASON_MSR_WRITE:
return nested_vmx_exit_handled_msr(vcpu, vmcs12, exit_reason);
case EXIT_REASON_INVALID_STATE:
- return 1;
+ return true;
case EXIT_REASON_MWAIT_INSTRUCTION:
return nested_cpu_has(vmcs12, CPU_BASED_MWAIT_EXITING);
case EXIT_REASON_MONITOR_INSTRUCTION:
@@ -7130,7 +7130,7 @@ static bool nested_vmx_exit_handled(stru
nested_cpu_has2(vmcs12,
SECONDARY_EXEC_PAUSE_LOOP_EXITING);
case EXIT_REASON_MCE_DURING_VMENTRY:
- return 0;
+ return false;
case EXIT_REASON_TPR_BELOW_THRESHOLD:
return nested_cpu_has(vmcs12, CPU_BASED_TPR_SHADOW);
case EXIT_REASON_APIC_ACCESS:
@@ -7143,7 +7143,7 @@ static bool nested_vmx_exit_handled(stru
* missing in the guest EPT table (EPT12), the EPT violation
* will be injected with nested_ept_inject_page_fault()
*/
- return 0;
+ return false;
case EXIT_REASON_EPT_MISCONFIG:
/*
* L2 never uses directly L1's EPT, but rather L0's own EPT
@@ -7151,13 +7151,13 @@ static bool nested_vmx_exit_handled(stru
* (EPT on EPT). So any problems with the structure of the
* table is L0's fault.
*/
- return 0;
+ return false;
case EXIT_REASON_WBINVD:
return nested_cpu_has2(vmcs12, SECONDARY_EXEC_WBINVD_EXITING);
case EXIT_REASON_XSETBV:
- return 1;
+ return true;
default:
- return 1;
+ return true;
}
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [kvm:queue 12/16] arch/x86/kvm/vmx.c:8192:8-9: WARNING: return of 0/1 in function 'nested_vmx_reflect_vmexit' with return type bool
@ 2017-07-27 22:03 kbuild test robot
2017-07-27 22:03 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kbuild test robot
0 siblings, 1 reply; 8+ messages in thread
From: kbuild test robot @ 2017-07-27 22:03 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kbuild-all, kvm, Robert Hu, Farrah Chen
tree: https://git.kernel.org/pub/scm/virt/kvm/kvm.git queue
head: 85ad25fe73f7a8c7f60465316b877a3b2d95eae6
commit: fef40abd18fd5192c6e68d3c47062f455aa6c511 [12/16] KVM: nVMX: do not fill vm_exit_intr_error_code in prepare_vmcs12
coccinelle warnings: (new ones prefixed by >>)
>> arch/x86/kvm/vmx.c:8192:8-9: WARNING: return of 0/1 in function 'nested_vmx_reflect_vmexit' with return type bool
Please review and possibly fold the followup patch.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] KVM: nVMX: fix boolreturn.cocci warnings
2017-07-27 22:03 [kvm:queue 12/16] arch/x86/kvm/vmx.c:8192:8-9: WARNING: return of 0/1 in function 'nested_vmx_reflect_vmexit' with return type bool kbuild test robot
@ 2017-07-27 22:03 ` kbuild test robot
2017-08-01 20:39 ` Radim Krčmář
0 siblings, 1 reply; 8+ messages in thread
From: kbuild test robot @ 2017-07-27 22:03 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: kbuild-all, kvm, Robert Hu, Farrah Chen
arch/x86/kvm/vmx.c:8192:8-9: WARNING: return of 0/1 in function 'nested_vmx_reflect_vmexit' with return type bool
Return statements in functions returning bool should use
true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci
Fixes: fef40abd18fd ("KVM: nVMX: do not fill vm_exit_intr_error_code in prepare_vmcs12")
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---
vmx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -8189,7 +8189,7 @@ static bool nested_vmx_reflect_vmexit(st
nested_vmx_vmexit(vcpu, exit_reason, exit_intr_info,
vmcs_readl(EXIT_QUALIFICATION));
- return 1;
+ return true;
}
static void vmx_get_exit_info(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2)
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] KVM: nVMX: fix boolreturn.cocci warnings
2017-07-27 22:03 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kbuild test robot
@ 2017-08-01 20:39 ` Radim Krčmář
0 siblings, 0 replies; 8+ messages in thread
From: Radim Krčmář @ 2017-08-01 20:39 UTC (permalink / raw)
To: kbuild test robot; +Cc: Paolo Bonzini, kbuild-all, kvm, Robert Hu, Farrah Chen
2017-07-28 06:03+0800, kbuild test robot:
> arch/x86/kvm/vmx.c:8192:8-9: WARNING: return of 0/1 in function 'nested_vmx_reflect_vmexit' with return type bool
>
> Return statements in functions returning bool should use
> true/false instead of 1/0.
> Generated by: scripts/coccinelle/misc/boolreturn.cocci
>
> Fixes: fef40abd18fd ("KVM: nVMX: do not fill vm_exit_intr_error_code in prepare_vmcs12")
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> ---
>
> vmx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -8189,7 +8189,7 @@ static bool nested_vmx_reflect_vmexit(st
>
> nested_vmx_vmexit(vcpu, exit_reason, exit_intr_info,
> vmcs_readl(EXIT_QUALIFICATION));
> - return 1;
> + return true;
We actually wanted to return 1, which means "do not exit to user-space",
so I've changed the return type to int instead and pushed to kvm/queue.
Thanks for the report!
> }
>
> static void vmx_get_exit_info(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2)
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-12-25 12:34 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-25 5:21 [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kernel test robot
2020-12-25 5:21 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2020-12-25 12:34 [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kernel test robot
2020-12-25 12:34 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kernel test robot
2020-12-25 5:00 [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kernel test robot
2020-12-25 5:00 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kernel test robot
2020-12-23 23:25 [android-goldfish:android-3.18 567/586] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kernel test robot
2020-12-23 23:25 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kernel test robot
2020-03-10 23:10 [android-goldfish:android-3.18 567/572] arch/x86/kvm/vmx.c:6902:10-11: WARNING: return of 0/1 in function 'nested_vmx_check_io_bitmaps' with return type bool kbuild test robot
2020-03-10 23:10 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kbuild test robot
2017-07-27 22:03 [kvm:queue 12/16] arch/x86/kvm/vmx.c:8192:8-9: WARNING: return of 0/1 in function 'nested_vmx_reflect_vmexit' with return type bool kbuild test robot
2017-07-27 22:03 ` [PATCH] KVM: nVMX: fix boolreturn.cocci warnings kbuild test robot
2017-08-01 20:39 ` Radim Krčmář
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.