xen: address violations of MISRA C:2012 Rule 7.2
cover xen: address violations of MISRA C:2012 Rule 7.2
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".
These violations are caused by the missing "u" or "U" suffix in unsigned integer constants, such as:
xen/arch/x86/hvm/hypercall.c:132.17-132.26
if ( (eax & 0x80000000) && is_viridian_domain(currd) )
If a rule is not met, changes are needed in order to achieve compliance. The patches in this series achieve compliance for MISRA C:2012 Rule 7.2 by adding the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
Gianluca Luparini (4):
x86/vmx: address violations of MISRA C:2012 Rule 7.2 xen/vpci: address violations of MISRA C:2012 Rule 7.2 x86/viridian: address violations of MISRA C:2012 Rule 7.2 xen/x86: address violations of MISRA C:2012 Rule 7.2
xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpu-policy.c | 18 +- xen/arch/x86/cpu/mcheck/mce-apei.c | 4 +- xen/arch/x86/cpu/vpmu_intel.c | 2 +- xen/arch/x86/cpuid.c | 8 +- xen/arch/x86/efi/efi-boot.h | 6 +- xen/arch/x86/extable.c | 2 +- xen/arch/x86/hvm/hypercall.c | 2 +- xen/arch/x86/hvm/pmtimer.c | 4 +- xen/arch/x86/hvm/stdvga.c | 50 +++--- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/arch/x86/hvm/vlapic.c | 6 +- xen/arch/x86/hvm/vmx/vmcs.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 8 +- xen/arch/x86/include/asm/apicdef.h | 2 +- xen/arch/x86/include/asm/config.h | 2 +- xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 +-- xen/arch/x86/include/asm/hpet.h | 2 +- xen/arch/x86/include/asm/hvm/trace.h | 4 +- xen/arch/x86/include/asm/hvm/vioapic.h | 2 +- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 84 ++++----- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 16 +- xen/arch/x86/include/asm/msi.h | 2 +- xen/arch/x86/include/asm/msr-index.h | 180 +++++++++---------- xen/arch/x86/include/asm/pci.h | 8 +- xen/arch/x86/include/asm/x86-defns.h | 24 +-- xen/arch/x86/percpu.c | 2 +- xen/arch/x86/psr.c | 2 +- xen/arch/x86/spec_ctrl.c | 8 +- xen/arch/x86/x86_64/pci.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.h | 2 +- xen/drivers/vpci/msi.c | 2 +- xen/drivers/vpci/msix.c | 2 +- xen/drivers/vpci/vpci.c | 6 +- xen/lib/x86/cpuid.c | 8 +- xen/lib/x86/policy.c | 2 +- 36 files changed, 255 insertions(+), 255 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/4 x86/vmx: address violations of MISRA C:2012 Rule 7.2
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".
Add the 'U' suffix to integers literals with unsigned type.
For the sake of uniformity, the following changes are made:
- add the 'U' suffix to macros near 'CPU_BASED_ACTIVATE_SECONDARY_CONTROLS' and 'SECONDARY_EXEC_NOTIFY_VM_EXITING' macros in 'vmcs.h'
- add the 'U' suffix to macros near 'INTR_INFO_VALID_MASK' macro in 'vmx.h'
---
Changes in v4:
- change commit headline
Changes in v3:
- change 'Signed-off-by' ordering
- change commit message
- remove unnecessary changes in 'vvmx.c'
- add 'uint32_t' casts in 'vvmx.c'
- add missing 'U' in 'vmcs.h' macros
- change macro to '(1u << 31)' in 'vmx.h'
- remove unnecessary changes to 'vmx.h'
Changes in v2:
- minor change to commit title
- change commit message
- remove unnecessary changes in 'vpmu_intel.c' and 'vmx.h'
- add 'ULL' suffix in 'vpmu_intel.c'
- add zero-padding to constants in 'vmx.h'
- add missing 'U' in 'vmx.h'
--- xen/arch/x86/cpu/vpmu_intel.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 8 +-- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 84 ++++++++++++------------- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 16 ++--- 5 files changed, 58 insertions(+), 58 deletions(-)
xen/arch/x86/cpu/vpmu_intel.c +1 -1
@@ -945,7 +945,7 @@ const struct arch_vpmu_ops *__init core2_vpmu_init(void) fixed_counters_mask = ~((1ull <<core2_get_bitwidth_fix_count ()) -1 ); global_ctrl_mask = ~((((1ULL << fixed_pmc_cnt) -1 ) <<32 ) | ((1ULL << arch_pmc_cnt) -1 )); - global_ovf_ctrl_mask = ~(0xC000000000000000 | + global_ovf_ctrl_mask = ~(0xC000000000000000ULL | (((1ULL << fixed_pmc_cnt) -1 ) <<32 ) | ((1ULL << arch_pmc_cnt) -1 ));if ( version >2 )
xen/arch/x86/hvm/vmx/vmcs.c +3 -3
@@ -911,7 +911,7 @@ void vmx_clear_msr_intercept(struct vcpu *v, unsigned int msr,if ( type &VMX_MSR_W )clear_bit (msr, msr_bitmap->write_low); } -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) ) { msr &=0x1fff ;if ( type &VMX_MSR_R )
@@ -939,7 +939,7 @@ void vmx_set_msr_intercept(struct vcpu *v, unsigned int msr,if ( type &VMX_MSR_W )set_bit (msr, msr_bitmap->write_low); } -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) ) { msr &=0x1fff ;if ( type &VMX_MSR_R )
@@ -957,7 +957,7 @@ bool vmx_msr_is_intercepted(struct vmx_msr_bitmap *msr_bitmap,if ( msr <=0x1fff )return test_bit (msr, is_write ? msr_bitmap->write_low : msr_bitmap->read_low); -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) )return test_bit (msr &0x1fff , is_write ? msr_bitmap->write_high : msr_bitmap->read_high);else
xen/arch/x86/hvm/vmx/vvmx.c +4 -4
@@ -263,7 +263,7 @@ uint64_t get_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding) res >>=32 ;break ;case VVMCS_WIDTH_32 : - res &=0xffffffff ; + res = (uint32_t )res;break ;case VVMCS_WIDTH_NATURAL :default :
@@ -315,14 +315,14 @@ void set_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding, uint64_t val)case VVMCS_WIDTH_64 :if ( enc.access_type ) { - res &=0xffffffff ; + res = (uint32_t )res; res |= val <<32 ; }else res = val;break ;case VVMCS_WIDTH_32 : - res = val &0xffffffff ; + res = (uint32_t )val;break ;case VVMCS_WIDTH_NATURAL :default :
@@ -2306,7 +2306,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)break ;case MSR_IA32_VMX_CR0_FIXED1 :/* allow 0-settings for all bits */ - data =0xffffffff ; + data =0xffffffffU ;break ;case MSR_IA32_VMX_CR4_FIXED0 :/* VMXE bit must be 1 in VMX operation */
xen/arch/x86/include/asm/hvm/vmx/vmcs.h +42 -42
102 lines not on this page · raw message
xen/arch/x86/include/asm/hvm/vmx/vmx.h +8 -8
@@ -137,7 +137,7 @@ static inline void pi_clear_sn(struct pi_desc *pi_desc)/* * Exit Reasons */ -#define VMX_EXIT_REASONS_FAILED_VMENTRY 0x80000000 +#define VMX_EXIT_REASONS_FAILED_VMENTRY (1u << 31)#define VMX_EXIT_REASONS_BUS_LOCK (1u << 26)#define EXIT_REASON_EXCEPTION_NMI 0
@@ -209,12 +209,12 @@ static inline void pi_clear_sn(struct pi_desc *pi_desc)* Note INTR_INFO_NMI_UNBLOCKED_BY_IRET is also used with Exit Qualification * field for EPT violations, PML full and SPP-related event vmexits. */ -#define INTR_INFO_VECTOR_MASK 0xff/* 7:0 */ -#define INTR_INFO_INTR_TYPE_MASK 0x700/* 10:8 */ -#define INTR_INFO_DELIVER_CODE_MASK 0x800/* 11 */ -#define INTR_INFO_NMI_UNBLOCKED_BY_IRET 0x1000/* 12 */ -#define INTR_INFO_VALID_MASK 0x80000000/* 31 */ -#define INTR_INFO_RESVD_BITS_MASK 0x7ffff000 +#define INTR_INFO_VECTOR_MASK 0x000000ffU/* 7:0 */ +#define INTR_INFO_INTR_TYPE_MASK 0x00000700U/* 10:8 */ +#define INTR_INFO_DELIVER_CODE_MASK 0x00000800U/* 11 */ +#define INTR_INFO_NMI_UNBLOCKED_BY_IRET 0x00001000U/* 12 */ +#define INTR_INFO_VALID_MASK 0x80000000U/* 31 */ +#define INTR_INFO_RESVD_BITS_MASK 0x7ffff000U/* * Exit Qualifications for NOTIFY VM EXIT
@@ -607,7 +607,7 @@ static inline void vmx_pi_hooks_assign(struct domain *d) {}static inline void vmx_pi_hooks_deassign (struct domain *d) {}#endif -#define APIC_INVALID_DEST 0xffffffff +#define APIC_INVALID_DEST 0xffffffffU/* EPT violation qualifications definitions */ typedef union ept_qual {
Signature · 1 line
2.34.1
Re: [XEN PATCH v4 1/4] x86/vmx: address violations of MISRA C:2012 Rule 7.2
Quoted 297 lines · Simone Ballarin
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".Add the 'U' suffix to integers literals with unsigned type.
For the sake of uniformity, the following changes are made:
- add the 'U' suffix to macros near 'CPU_BASED_ACTIVATE_SECONDARY_CONTROLS' and 'SECONDARY_EXEC_NOTIFY_VM_EXITING' macros in 'vmcs.h'
- add the 'U' suffix to macros near 'INTR_INFO_VALID_MASK' macro in 'vmx.h'Signed-off-by Gianluca Luparini <[email protected]>Signed-off-by Simone Ballarin <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>Reviewed-by Jan Beulich <[email protected]>---
Changes in v4:
- change commit headlineChanges in v3:
- change 'Signed-off-by' ordering
- change commit message
- remove unnecessary changes in 'vvmx.c'
- add 'uint32_t' casts in 'vvmx.c'
- add missing 'U' in 'vmcs.h' macros
- change macro to '(1u << 31)' in 'vmx.h'
- remove unnecessary changes to 'vmx.h'Changes in v2:
- minor change to commit title
- change commit message
- remove unnecessary changes in 'vpmu_intel.c' and 'vmx.h'
- add 'ULL' suffix in 'vpmu_intel.c'
- add zero-padding to constants in 'vmx.h'
- add missing 'U' in 'vmx.h'--- xen/arch/x86/cpu/vpmu_intel.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 8 +-- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 84 ++++++++++++------------- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 16 ++--- 5 files changed, 58 insertions(+), 58 deletions(-)xen/arch/x86/cpu/vpmu_intel.c +1
-1@@ -945,7 +945,7 @@ const struct arch_vpmu_ops *__initcore2_vpmu_init (void ) fixed_counters_mask = ~((1ull <<core2_get_bitwidth_fix_count ()) -1 ); global_ctrl_mask = ~((((1ULL << fixed_pmc_cnt) -1 ) <<32 ) | ((1ULL << arch_pmc_cnt) -1 )); - global_ovf_ctrl_mask = ~(0xC000000000000000 | + global_ovf_ctrl_mask = ~(0xC000000000000000ULL | (((1ULL << fixed_pmc_cnt) - 1) << 32) |((1ULL <<
arch_pmc_cnt) - 1));
if ( version > 2 )xen/arch/x86/hvm/vmx/vmcs.c +1
-1@@ -911,7 +911,7 @@ void vmx_clear_msr_intercept(struct vcpu *v, unsigned int msr, if ( type & VMX_MSR_W ) clear_bit(msr, msr_bitmap->write_low); } -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) ) { msr &=0x1fff ;if ( type &
VMX_MSR_R)xen/arch/x86/hvm/vmx/vmcs.c +1
-1@@ -939,7 +939,7 @@ void vmx_set_msr_intercept(struct vcpu *v, unsigned int msr, if ( type & VMX_MSR_W ) set_bit(msr, msr_bitmap->write_low); } -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) ) { msr &=0x1fff ;if ( type &
VMX_MSR_R)xen/arch/x86/hvm/vmx/vmcs.c +1
-1@@ -957,7 +957,7 @@ bool vmx_msr_is_intercepted(struct vmx_msr_bitmap *msr_bitmap,if ( msr <=0x1fff )return test_bit (msr, is_write ? msr_bitmap->write_low : msr_bitmap->read_low); -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) ) return test_bit(msr & 0x1fff, is_write ?
msr_bitmap->write_high:
msr_bitmap->read_high);
elsexen/arch/x86/hvm/vmx/vvmx.c +1
-1@@ -263,7 +263,7 @@ uint64_t get_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding) res >>= 32;break ;case VVMCS_WIDTH_32 : - res &=0xffffffff ; + res = (uint32_t )res;break ;case VVMCS_WIDTH_NATURAL :default:
xen/arch/x86/hvm/vmx/vvmx.c +2
-2@@ -315,14 +315,14 @@ void set_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding, uint64_t val)case VVMCS_WIDTH_64 :if ( enc.access_type ) { - res &=0xffffffff ; + res = (uint32_t )res; res |= val <<32 ; }else res = val;break ;case VVMCS_WIDTH_32 : - res = val &0xffffffff ; + res = (uint32_t )val;break ;case VVMCS_WIDTH_NATURAL :default:
xen/arch/x86/hvm/vmx/vvmx.c +1
-1@@ -2306,7 +2306,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) break;case MSR_IA32_VMX_CR0_FIXED1 :/* allow 0-settings for all bits */ - data =0xffffffff ; + data =0xffffffffU ;break ;case MSR_IA32_VMX_CR4_FIXED0 :/* VMXE bit must be 1 in VMX operation */xen/arch/x86/include/asm/hvm/vmx/vmcs.h +21
-21@@ -187,27 +187,27 @@ bool_t __must_check vmx_vmcs_try_enter(struct vcpu *v);void vmx_vmcs_exit (struct vcpu *v);void vmx_vmcs_reload (struct vcpu *v); -#define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 -#define CPU_BASED_USE_TSC_OFFSETING 0x00000008 -#define CPU_BASED_HLT_EXITING 0x00000080 -#define CPU_BASED_INVLPG_EXITING 0x00000200 -#define CPU_BASED_MWAIT_EXITING 0x00000400 -#define CPU_BASED_RDPMC_EXITING 0x00000800 -#define CPU_BASED_RDTSC_EXITING 0x00001000 -#define CPU_BASED_CR3_LOAD_EXITING 0x00008000 -#define CPU_BASED_CR3_STORE_EXITING 0x00010000 -#define CPU_BASED_CR8_LOAD_EXITING 0x00080000 -#define CPU_BASED_CR8_STORE_EXITING 0x00100000 -#define CPU_BASED_TPR_SHADOW 0x00200000 -#define CPU_BASED_VIRTUAL_NMI_PENDING 0x00400000 -#define CPU_BASED_MOV_DR_EXITING 0x00800000 -#define CPU_BASED_UNCOND_IO_EXITING 0x01000000 -#define CPU_BASED_ACTIVATE_IO_BITMAP 0x02000000 -#define CPU_BASED_MONITOR_TRAP_FLAG 0x08000000 -#define CPU_BASED_ACTIVATE_MSR_BITMAP 0x10000000 -#define CPU_BASED_MONITOR_EXITING 0x20000000 -#define CPU_BASED_PAUSE_EXITING 0x40000000 -#define CPU_BASED_ACTIVATE_SECONDARY_CONTROLS 0x80000000 +#define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004U +#define CPU_BASED_USE_TSC_OFFSETING 0x00000008U +#define CPU_BASED_HLT_EXITING 0x00000080U +#define CPU_BASED_INVLPG_EXITING 0x00000200U +#define CPU_BASED_MWAIT_EXITING 0x00000400U +#define CPU_BASED_RDPMC_EXITING 0x00000800U +#define CPU_BASED_RDTSC_EXITING 0x00001000U +#define CPU_BASED_CR3_LOAD_EXITING 0x00008000U +#define CPU_BASED_CR3_STORE_EXITING 0x00010000U +#define CPU_BASED_CR8_LOAD_EXITING 0x00080000U +#define CPU_BASED_CR8_STORE_EXITING 0x00100000U +#define CPU_BASED_TPR_SHADOW 0x00200000U +#define CPU_BASED_VIRTUAL_NMI_PENDING 0x00400000U +#define CPU_BASED_MOV_DR_EXITING 0x00800000U +#define CPU_BASED_UNCOND_IO_EXITING 0x01000000U +#define CPU_BASED_ACTIVATE_IO_BITMAP 0x02000000U +#define CPU_BASED_MONITOR_TRAP_FLAG 0x08000000U +#define CPU_BASED_ACTIVATE_MSR_BITMAP 0x10000000U +#define CPU_BASED_MONITOR_EXITING 0x20000000U +#define CPU_BASED_PAUSE_EXITING 0x40000000U +#define CPU_BASED_ACTIVATE_SECONDARY_CONTROLS 0x80000000Uextern u32 vmx_cpu_based_exec_control;#define
PIN_BASED_EXT_INTR_MASK0x00000001xen/arch/x86/include/asm/hvm/vmx/vmcs.h +21
-21@@ -238,26 +238,26 @@ extern u32 vmx_vmexit_control;#define VM_ENTRY_LOAD_BNDCFGS 0x00010000extern u32 vmx_vmentry_control; -#define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 -#define SECONDARY_EXEC_ENABLE_EPT 0x00000002 -#define SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING 0x00000004 -#define SECONDARY_EXEC_ENABLE_RDTSCP 0x00000008 -#define SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE 0x00000010 -#define SECONDARY_EXEC_ENABLE_VPID 0x00000020 -#define SECONDARY_EXEC_WBINVD_EXITING 0x00000040 -#define SECONDARY_EXEC_UNRESTRICTED_GUEST 0x00000080 -#define SECONDARY_EXEC_APIC_REGISTER_VIRT 0x00000100 -#define SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY 0x00000200 -#define SECONDARY_EXEC_PAUSE_LOOP_EXITING 0x00000400 -#define SECONDARY_EXEC_ENABLE_INVPCID 0x00001000 -#define SECONDARY_EXEC_ENABLE_VM_FUNCTIONS 0x00002000 -#define SECONDARY_EXEC_ENABLE_VMCS_SHADOWING 0x00004000 -#define SECONDARY_EXEC_ENABLE_PML 0x00020000 -#define SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS 0x00040000 -#define SECONDARY_EXEC_XSAVES 0x00100000 -#define SECONDARY_EXEC_TSC_SCALING 0x02000000 -#define SECONDARY_EXEC_BUS_LOCK_DETECTION 0x40000000 -#define SECONDARY_EXEC_NOTIFY_VM_EXITING 0x80000000 +#define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001U +#define SECONDARY_EXEC_ENABLE_EPT 0x00000002U +#define SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING 0x00000004U +#define SECONDARY_EXEC_ENABLE_RDTSCP 0x00000008U +#define SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE 0x00000010U +#define SECONDARY_EXEC_ENABLE_VPID 0x00000020U +#define SECONDARY_EXEC_WBINVD_EXITING 0x00000040U +#define SECONDARY_EXEC_UNRESTRICTED_GUEST 0x00000080U +#define SECONDARY_EXEC_APIC_REGISTER_VIRT 0x00000100U +#define SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY 0x00000200U +#define SECONDARY_EXEC_PAUSE_LOOP_EXITING 0x00000400U +#define SECONDARY_EXEC_ENABLE_INVPCID 0x00001000U +#define SECONDARY_EXEC_ENABLE_VM_FUNCTIONS 0x00002000U +#define SECONDARY_EXEC_ENABLE_VMCS_SHADOWING 0x00004000U +#define SECONDARY_EXEC_ENABLE_PML 0x00020000U +#define SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS 0x00040000U +#define SECONDARY_EXEC_XSAVES 0x00100000U +#define SECONDARY_EXEC_TSC_SCALING 0x02000000U +#define SECONDARY_EXEC_BUS_LOCK_DETECTION 0x40000000U +#define SECONDARY_EXEC_NOTIFY_VM_EXITING 0x80000000Uextern u32 vmx_secondary_exec_control;#define VMX_EPT_EXEC_ONLY_SUPPORTED 0x00000001@@ -346,7 +346,7 @@ extern u64 vmx_ept_vpid_cap;#define cpu_has_vmx_notify_vm_exiting \ (vmx_secondary_exec_control & SECONDARY_EXEC_NOTIFY_VM_EXITING) -#define VMCS_RID_TYPE_MASK 0x80000000 +#define VMCS_RID_TYPE_MASK 0x80000000U/* GUEST_INTERRUPTIBILITY_INFO flags. */ #define VMX_INTR_SHADOW_STI 0x00000001xen/arch/x86/include/asm/hvm/vmx/vmx.h +1
-1@@ -137,7 +137,7 @@ static inline void pi_clear_sn(struct pi_desc *pi_desc)/* * Exit Reasons */ -#define VMX_EXIT_REASONS_FAILED_VMENTRY 0x80000000 +#define VMX_EXIT_REASONS_FAILED_VMENTRY (1u << 31)#define VMX_EXIT_REASONS_BUS_LOCK (1u << 26)#define
EXIT_REASON_EXCEPTION_NMI0xen/arch/x86/include/asm/hvm/vmx/vmx.h +0
-0@@ -209,12 +209,12 @@ static inline void pi_clear_sn(struct pi_desc *pi_desc) * Note INTR_INFO_NMI_UNBLOCKED_BY_IRET is also used with ExitQualification
* field for EPT violations, PML full and SPP-related event vmexits. */xen/arch/x86/include/asm/hvm/vmx/vmx.h +7
-7-#define INTR_INFO_VECTOR_MASK 0xff/* 7:0 */ -#define INTR_INFO_INTR_TYPE_MASK 0x700/* 10:8 */ -#define INTR_INFO_DELIVER_CODE_MASK 0x800/* 11 */ -#define INTR_INFO_NMI_UNBLOCKED_BY_IRET 0x1000/* 12 */ -#define INTR_INFO_VALID_MASK 0x80000000/* 31 */ -#define INTR_INFO_RESVD_BITS_MASK 0x7ffff000 +#define INTR_INFO_VECTOR_MASK 0x000000ffU/* 7:0 */ +#define INTR_INFO_INTR_TYPE_MASK 0x00000700U/* 10:8 */ +#define INTR_INFO_DELIVER_CODE_MASK 0x00000800U/* 11 */ +#define INTR_INFO_NMI_UNBLOCKED_BY_IRET 0x00001000U/* 12 */ +#define INTR_INFO_VALID_MASK 0x80000000U/* 31 */ +#define INTR_INFO_RESVD_BITS_MASK 0x7ffff000U/* * Exit Qualifications for NOTIFY VM EXIT @@ -607,7 +607,7 @@ static inline void vmx_pi_hooks_assign(struct domain *d) {}static inline void vmx_pi_hooks_deassign (struct domain *d) {}#endif -#define APIC_INVALID_DEST 0xffffffff +#define APIC_INVALID_DEST 0xffffffffU/* EPT violation qualifications definitions */
Quoted 1 line
typedef union
ept_qual{
I checked that this patch still applies cleanly on the current staging branch. Can this get an ack from the VT-X maintainer(s)?
Signature · 2 lines
Nicola Vetrini, BSc Software Engineer, BUGSENG srl (https://bugseng.com)
Re: [XEN PATCH v4 1/4] x86/vmx: address violations of MISRA C:2012 Rule 7.2
Quoted 289 lines · Nicola Vetrini
Quoted 288 lines · Simone Ballarin
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".Add the 'U' suffix to integers literals with unsigned type.
For the sake of uniformity, the following changes are made:
- add the 'U' suffix to macros near 'CPU_BASED_ACTIVATE_SECONDARY_CONTROLS' and 'SECONDARY_EXEC_NOTIFY_VM_EXITING' macros in 'vmcs.h'
- add the 'U' suffix to macros near 'INTR_INFO_VALID_MASK' macro in 'vmx.h'Signed-off-by Gianluca Luparini <[email protected]>Signed-off-by Simone Ballarin <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>Reviewed-by Jan Beulich <[email protected]>---
Changes in v4:
- change commit headlineChanges in v3:
- change 'Signed-off-by' ordering
- change commit message
- remove unnecessary changes in 'vvmx.c'
- add 'uint32_t' casts in 'vvmx.c'
- add missing 'U' in 'vmcs.h' macros
- change macro to '(1u << 31)' in 'vmx.h'
- remove unnecessary changes to 'vmx.h'Changes in v2:
- minor change to commit title
- change commit message
- remove unnecessary changes in 'vpmu_intel.c' and 'vmx.h'
- add 'ULL' suffix in 'vpmu_intel.c'
- add zero-padding to constants in 'vmx.h'
- add missing 'U' in 'vmx.h'--- xen/arch/x86/cpu/vpmu_intel.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 8 +-- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 84 ++++++++++++------------- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 16 ++--- 5 files changed, 58 insertions(+), 58 deletions(-)xen/arch/x86/cpu/vpmu_intel.c +1
-1@@ -945,7 +945,7 @@ const struct arch_vpmu_ops *__init core2_vpmu_init(void) fixed_counters_mask = ~((1ull <<core2_get_bitwidth_fix_count ()) -1 ); global_ctrl_mask = ~((((1ULL << fixed_pmc_cnt) -1 ) <<32 ) | ((1ULL << arch_pmc_cnt) -1 )); - global_ovf_ctrl_mask = ~(0xC000000000000000 | + global_ovf_ctrl_mask = ~(0xC000000000000000ULL | (((1ULL << fixed_pmc_cnt) -1 ) <<32 ) | ((1ULL << arch_pmc_cnt) -1 ));if ( version >2 )xen/arch/x86/hvm/vmx/vmcs.c +1
-1@@ -911,7 +911,7 @@ void vmx_clear_msr_intercept(struct vcpu *v, unsigned int msr, if ( type & VMX_MSR_W ) clear_bit(msr, msr_bitmap->write_low); } -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) ) { msr &=0x1fff ;if ( type &
VMX_MSR_R)xen/arch/x86/hvm/vmx/vmcs.c +1
-1@@ -939,7 +939,7 @@ void vmx_set_msr_intercept(struct vcpu *v, unsigned int msr, if ( type & VMX_MSR_W )set_bit (msr, msr_bitmap->write_low); } -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) ) { msr &=0x1fff ;if ( type &
VMX_MSR_R)xen/arch/x86/hvm/vmx/vmcs.c +1
-1@@ -957,7 +957,7 @@ bool vmx_msr_is_intercepted(struct vmx_msr_bitmap *msr_bitmap,if ( msr <=0x1fff )return test_bit (msr, is_write ? msr_bitmap->write_low : msr_bitmap->read_low); -else if ( (msr >=0xc0000000 ) && (msr <=0xc0001fff ) ) +else if ( (msr >=0xc0000000U ) && (msr <=0xc0001fffU ) )return test_bit (msr &0x1fff , is_write ? msr_bitmap->write_high : msr_bitmap->read_high);else
xen/arch/x86/hvm/vmx/vvmx.c +1
-1@@ -263,7 +263,7 @@ uint64_t get_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding) res >>= 32;break ;case VVMCS_WIDTH_32 : - res &=0xffffffff ; + res = (uint32_t )res;break ;case VVMCS_WIDTH_NATURAL :default:
xen/arch/x86/hvm/vmx/vvmx.c +2
-2@@ -315,14 +315,14 @@ void set_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding, uint64_t val)case VVMCS_WIDTH_64 :if ( enc.access_type ) { - res &=0xffffffff ; + res = (uint32_t )res; res |= val <<32 ; }else res = val;break ;case VVMCS_WIDTH_32 : - res = val &0xffffffff ; + res = (uint32_t )val;break ;case VVMCS_WIDTH_NATURAL :default:
xen/arch/x86/hvm/vmx/vvmx.c +1
-1@@ -2306,7 +2306,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) break;case MSR_IA32_VMX_CR0_FIXED1 :/* allow 0-settings for all bits */ - data =0xffffffff ; + data =0xffffffffU ;break ;case MSR_IA32_VMX_CR4_FIXED0 :/* VMXE bit must be 1 in VMX operation */xen/arch/x86/include/asm/hvm/vmx/vmcs.h +21
-21@@ -187,27 +187,27 @@ bool_t __must_check vmx_vmcs_try_enter(struct vcpu *v);void vmx_vmcs_exit (struct vcpu *v);void vmx_vmcs_reload (struct vcpu *v); -#define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 -#define CPU_BASED_USE_TSC_OFFSETING 0x00000008 -#define CPU_BASED_HLT_EXITING 0x00000080 -#define CPU_BASED_INVLPG_EXITING 0x00000200 -#define CPU_BASED_MWAIT_EXITING 0x00000400 -#define CPU_BASED_RDPMC_EXITING 0x00000800 -#define CPU_BASED_RDTSC_EXITING 0x00001000 -#define CPU_BASED_CR3_LOAD_EXITING 0x00008000 -#define CPU_BASED_CR3_STORE_EXITING 0x00010000 -#define CPU_BASED_CR8_LOAD_EXITING 0x00080000 -#define CPU_BASED_CR8_STORE_EXITING 0x00100000 -#define CPU_BASED_TPR_SHADOW 0x00200000 -#define CPU_BASED_VIRTUAL_NMI_PENDING 0x00400000 -#define CPU_BASED_MOV_DR_EXITING 0x00800000 -#define CPU_BASED_UNCOND_IO_EXITING 0x01000000 -#define CPU_BASED_ACTIVATE_IO_BITMAP 0x02000000 -#define CPU_BASED_MONITOR_TRAP_FLAG 0x08000000 -#define CPU_BASED_ACTIVATE_MSR_BITMAP 0x10000000 -#define CPU_BASED_MONITOR_EXITING 0x20000000 -#define CPU_BASED_PAUSE_EXITING 0x40000000 -#define CPU_BASED_ACTIVATE_SECONDARY_CONTROLS 0x80000000 +#define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004U +#define CPU_BASED_USE_TSC_OFFSETING 0x00000008U +#define CPU_BASED_HLT_EXITING 0x00000080U +#define CPU_BASED_INVLPG_EXITING 0x00000200U +#define CPU_BASED_MWAIT_EXITING 0x00000400U +#define CPU_BASED_RDPMC_EXITING 0x00000800U +#define CPU_BASED_RDTSC_EXITING 0x00001000U +#define CPU_BASED_CR3_LOAD_EXITING 0x00008000U +#define CPU_BASED_CR3_STORE_EXITING 0x00010000U +#define CPU_BASED_CR8_LOAD_EXITING 0x00080000U +#define CPU_BASED_CR8_STORE_EXITING 0x00100000U +#define CPU_BASED_TPR_SHADOW 0x00200000U +#define CPU_BASED_VIRTUAL_NMI_PENDING 0x00400000U +#define CPU_BASED_MOV_DR_EXITING 0x00800000U +#define CPU_BASED_UNCOND_IO_EXITING 0x01000000U +#define CPU_BASED_ACTIVATE_IO_BITMAP 0x02000000U +#define CPU_BASED_MONITOR_TRAP_FLAG 0x08000000U +#define CPU_BASED_ACTIVATE_MSR_BITMAP 0x10000000U +#define CPU_BASED_MONITOR_EXITING 0x20000000U +#define CPU_BASED_PAUSE_EXITING 0x40000000U +#define CPU_BASED_ACTIVATE_SECONDARY_CONTROLS 0x80000000Uextern u32 vmx_cpu_based_exec_control;#define
PIN_BASED_EXT_INTR_MASK0x00000001xen/arch/x86/include/asm/hvm/vmx/vmcs.h +21
-21@@ -238,26 +238,26 @@ extern u32 vmx_vmexit_control;#define VM_ENTRY_LOAD_BNDCFGS 0x00010000extern u32 vmx_vmentry_control; -#define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 -#define SECONDARY_EXEC_ENABLE_EPT 0x00000002 -#define SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING 0x00000004 -#define SECONDARY_EXEC_ENABLE_RDTSCP 0x00000008 -#define SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE 0x00000010 -#define SECONDARY_EXEC_ENABLE_VPID 0x00000020 -#define SECONDARY_EXEC_WBINVD_EXITING 0x00000040 -#define SECONDARY_EXEC_UNRESTRICTED_GUEST 0x00000080 -#define SECONDARY_EXEC_APIC_REGISTER_VIRT 0x00000100 -#define SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY 0x00000200 -#define SECONDARY_EXEC_PAUSE_LOOP_EXITING 0x00000400 -#define SECONDARY_EXEC_ENABLE_INVPCID 0x00001000 -#define SECONDARY_EXEC_ENABLE_VM_FUNCTIONS 0x00002000 -#define SECONDARY_EXEC_ENABLE_VMCS_SHADOWING 0x00004000 -#define SECONDARY_EXEC_ENABLE_PML 0x00020000 -#define SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS 0x00040000 -#define SECONDARY_EXEC_XSAVES 0x00100000 -#define SECONDARY_EXEC_TSC_SCALING 0x02000000 -#define SECONDARY_EXEC_BUS_LOCK_DETECTION 0x40000000 -#define SECONDARY_EXEC_NOTIFY_VM_EXITING 0x80000000 +#define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001U +#define SECONDARY_EXEC_ENABLE_EPT 0x00000002U +#define SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING 0x00000004U +#define SECONDARY_EXEC_ENABLE_RDTSCP 0x00000008U +#define SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE 0x00000010U +#define SECONDARY_EXEC_ENABLE_VPID 0x00000020U +#define SECONDARY_EXEC_WBINVD_EXITING 0x00000040U +#define SECONDARY_EXEC_UNRESTRICTED_GUEST 0x00000080U +#define SECONDARY_EXEC_APIC_REGISTER_VIRT 0x00000100U +#define SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY 0x00000200U +#define SECONDARY_EXEC_PAUSE_LOOP_EXITING 0x00000400U +#define SECONDARY_EXEC_ENABLE_INVPCID 0x00001000U +#define SECONDARY_EXEC_ENABLE_VM_FUNCTIONS 0x00002000U +#define SECONDARY_EXEC_ENABLE_VMCS_SHADOWING 0x00004000U +#define SECONDARY_EXEC_ENABLE_PML 0x00020000U +#define SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS 0x00040000U +#define SECONDARY_EXEC_XSAVES 0x00100000U +#define SECONDARY_EXEC_TSC_SCALING 0x02000000U +#define SECONDARY_EXEC_BUS_LOCK_DETECTION 0x40000000U +#define SECONDARY_EXEC_NOTIFY_VM_EXITING 0x80000000Uextern u32 vmx_secondary_exec_control;#define VMX_EPT_EXEC_ONLY_SUPPORTED 0x00000001@@ -346,7 +346,7 @@ extern u64 vmx_ept_vpid_cap;#define cpu_has_vmx_notify_vm_exiting \ (vmx_secondary_exec_control & SECONDARY_EXEC_NOTIFY_VM_EXITING) -#define VMCS_RID_TYPE_MASK 0x80000000 +#define VMCS_RID_TYPE_MASK 0x80000000U/* GUEST_INTERRUPTIBILITY_INFO flags. */ #define VMX_INTR_SHADOW_STI 0x00000001xen/arch/x86/include/asm/hvm/vmx/vmx.h +1
-1@@ -137,7 +137,7 @@ static inline void pi_clear_sn(struct pi_desc *pi_desc)/* * Exit Reasons */ -#define VMX_EXIT_REASONS_FAILED_VMENTRY 0x80000000 +#define VMX_EXIT_REASONS_FAILED_VMENTRY (1u << 31)#define VMX_EXIT_REASONS_BUS_LOCK (1u << 26)#define EXIT_REASON_EXCEPTION_NMI 0@@ -209,12 +209,12 @@ static inline void pi_clear_sn(struct pi_desc *pi_desc) * Note INTR_INFO_NMI_UNBLOCKED_BY_IRET is also used with ExitQualification
* field for EPT violations, PML full and SPP-related event vmexits. */xen/arch/x86/include/asm/hvm/vmx/vmx.h +6
-6-#define INTR_INFO_VECTOR_MASK 0xff/* 7:0 */ -#define INTR_INFO_INTR_TYPE_MASK 0x700/* 10:8 */ -#define INTR_INFO_DELIVER_CODE_MASK 0x800/* 11 */ -#define INTR_INFO_NMI_UNBLOCKED_BY_IRET 0x1000/* 12 */ -#define INTR_INFO_VALID_MASK 0x80000000/* 31 */ -#define INTR_INFO_RESVD_BITS_MASK 0x7ffff000 +#define INTR_INFO_VECTOR_MASK 0x000000ffU/* 7:0 */ +#define INTR_INFO_INTR_TYPE_MASK 0x00000700U/* 10:8 */ +#define INTR_INFO_DELIVER_CODE_MASK 0x00000800U/* 11 */ +#define INTR_INFO_NMI_UNBLOCKED_BY_IRET 0x00001000U/* 12 */ +#define INTR_INFO_VALID_MASK 0x80000000U/* 31 */ +#define INTR_INFO_RESVD_BITS_MASK 0x7ffff000U/* * Exit Qualifications for NOTIFY VM EXIT @@ -607,7 +607,7 @@ static inline void vmx_pi_hooks_assign(struct domain *d) {}static inline void vmx_pi_hooks_deassign (struct domain *d) {}#endif
Quoted 8 lines
Quoted 5 lines
xen/arch/x86/include/asm/hvm/vmx/vmx.h +1
-1-#define APIC_INVALID_DEST 0xffffffff +#define APIC_INVALID_DEST 0xffffffffU/* EPT violation qualifications definitions */ typedef union
ept_qual{I checked that this patch still applies cleanly on the current staging branch. Can this get an ack from the VT-X maintainer(s)?
Jan having acked this patch already, and the VT-X maintainers being not always fast in reviews, I imagine Jan will commit the patch on his own in a few days if nobody speaks up.
Re: [XEN PATCH v4 1/4] x86/vmx: address violations of MISRA C:2012 Rule 7.2
In reply to Simone BallarinOn 27 Jul 2023, Jan Beulich wrote:
Quoted 73 lines · Simone Ballarin
Quoted 22 lines
* @@ -70,15 +70,15 @@ static const
uint8_tsr_mask[8] = {*
* };** static const
uint8_tgr_mask[9] = {** - (uint8_t)~0xf0, /* 0x00 */* * - (uint8_t)~0xf0, /* 0x01 */* * - (uint8_t)~0xf0, /* 0x02 */* * - (uint8_t)~0xe0, /* 0x03 */* * - (uint8_t)~0xfc, /* 0x04 */* * - (uint8_t)~0x84, /* 0x05 */* * - (uint8_t)~0xf0, /* 0x06 */* * - (uint8_t)~0xf0, /* 0x07 */* * - (uint8_t)~0x00, /* 0x08 */* * + (uint8_t)~0xf0,* * + (uint8_t)~0xf0,* * + (uint8_t)~0xf0,* * + (uint8_t)~0xe0,* * + (uint8_t)~0xfc,* * + (uint8_t)~0x84,* * + (uint8_t)~0xf0,* * + (uint8_t)~0xf0,* * + (uint8_t)~0x00,*Quoted 1 line
* };*
Hmm, this stray change is _still_ there.
Ok. Sorry for that.
Quoted 8 lines
* --- a/xen/arch/x86/include/asm/hvm/trace.h*
* +++ b/xen/arch/x86/include/asm/hvm/trace.h*
* @@ -58,7 +58,7 @@*
* #defineDO_TRC_HVM_VLAPICDEFAULT_HVM_MISC** -#define
TRC_PAR_LONG(par)((par)&0xFFFFFFFF),((par)>>32)*
* +#defineTRC_PAR_LONG(par)((uint32_t)par), ((par) >> 32)*You've lost parentheses around "par".
Quoted 6 lines
* @@ -93,7 +93,7 @@*
*HVMTRACE_ND(evt, 0, 0)** #define
HVMTRACE_LONG_1D(evt, d1)\*
* -HVMTRACE_2D(evt ## 64, (d1) & 0xFFFFFFFF, (d1) >> 32)*
* +HVMTRACE_2D(evt ## 64, (uint32_t)d1, (d1) >> 32)*Same for "d1" here.
Both of these are, btw., indications that you should have dropped Stefano's R-b.
Ok.
Quoted 15 lines
* --- a/xen/arch/x86/include/asm/msr-index.h*
* +++ b/xen/arch/x86/include/asm/msr-index.h*
* @@ -30,7 +30,7 @@** #define MSR_INTEL_CORE_THREAD_COUNT 0x00000035* * #define MSR_CTC_THREAD_MASK 0x0000ffff* * -#define MSR_CTC_CORE_MASK 0xffff0000* * +#define MSR_CTC_CORE_MASK 0xffff0000U** #define MSR_SPEC_CTRL 0x00000048* * #define SPEC_CTRL_IBRS (_AC(1, ULL) << 0)* * @@ -168,7 +168,7 @@* * #define MSR_UARCH_MISC_CTRL 0x00001b01* * #define UARCH_CTRL_DOITM (_AC(1, ULL) << 0)*Quoted 4 lines
* -#define
MSR_EFER0xc0000080/* Extended Feature *
* Enable Register */*
* +#defineMSR_EFER_AC(0xc0000080, U)/* Extended *
* Feature Enable Register */*
Quoted 6 lines
I understand you use
_AC()here because the constant is used in assembly code. But I don't understand why you use it only here, and not throughout at least the "modern" portion of the file. I wonder what other x86 maintainers think about this.I've used
_AConly when strictly required to avoid errors.
In v5 I will use _AC on all constants in the "modern" part of the file.
Quoted 4 lines
As a minor aspect, I also don't really see why you insert a 2nd blank ahead of the comment.
To align the comment with the others below.
I see that comment aligning is not done in this file, so I will drop the change in v5.
Quoted 79 lines
Quoted 65 lines
* #define
EFER_SCE(_AC(1, ULL)<< 0) /* SYSCALL *
* Enable */*
* #defineEFER_LME(_AC(1, ULL)<< 8) /* Long Mode *
* Enable */*
* #defineEFER_LMA(_AC(1, ULL)<< 10) /* Long Mode *
* Active */*
* @@ -181,35 +181,35 @@*
* (EFER_SCE|EFER_LME|EFER_LMA|EFER_NXE|EFER_SVME|EFER_FFXSE| \*
* EFER_AIBRSE)** -#define
MSR_STAR0xc0000081/* legacy mode *
* SYSCALL target */*
* -#defineMSR_LSTAR0xc0000082/* long mode SYSCALL *
* target */*
* -#defineMSR_CSTAR0xc0000083/* compat mode *
* SYSCALL target */*
* -#defineMSR_SYSCALL_MASK0xc0000084/* EFLAGS mask for *
* syscall */** -#define MSR_FS_BASE 0xc0000100 /* 64bit FS base */* * -#define MSR_GS_BASE 0xc0000101 /* 64bit GS base */* * -#define MSR_SHADOW_GS_BASE 0xc0000102 /* SwapGS GS shadow */* * -#define MSR_TSC_AUX 0xc0000103 /* Auxiliary TSC */* * +#define MSR_STAR 0xc0000081U /* legacy mode ** SYSCALL target */*
* +#defineMSR_LSTAR0xc0000082U/* long mode SYSCALL *
* target */*
* +#defineMSR_CSTAR0xc0000083U/* compat mode *
* SYSCALL target */*
* +#defineMSR_SYSCALL_MASK0xc0000084U/* EFLAGS mask for *
* syscall */** +#define MSR_FS_BASE 0xc0000100U /* 64bit FS base */* * +#define MSR_GS_BASE 0xc0000101U /* 64bit GS base */* * +#define MSR_SHADOW_GS_BASE 0xc0000102U /* SwapGS GS shadow ** */*
* +#defineMSR_TSC_AUX0xc0000103U/* Auxiliary TSC */** -#define MSR_K8_SYSCFG 0xc0010010* * +#define MSR_K8_SYSCFG 0xc0010010U* * #define SYSCFG_MTRR_FIX_DRAM_EN (_AC(1, ULL) << 18)* * #define SYSCFG_MTRR_FIX_DRAM_MOD_EN (_AC(1, ULL) << 19)* * #define SYSCFG_MTRR_VAR_DRAM_EN (_AC(1, ULL) << 20)* * #define SYSCFG_MTRR_TOM2_EN (_AC(1, ULL) << 21)* * #define SYSCFG_TOM2_FORCE_WB (_AC(1, ULL) << 22)** -#define MSR_K8_IORR_BASE0 0xc0010016* * -#define MSR_K8_IORR_MASK0 0xc0010017* * -#define MSR_K8_IORR_BASE1 0xc0010018* * -#define MSR_K8_IORR_MASK1 0xc0010019* * +#define MSR_K8_IORR_BASE0 0xc0010016U* * +#define MSR_K8_IORR_MASK0 0xc0010017U* * +#define MSR_K8_IORR_BASE1 0xc0010018U* * +#define MSR_K8_IORR_MASK1 0xc0010019U** -#define MSR_K8_TSEG_BASE 0xc0010112 /* AMD doc: SMMAddr */* * -#define MSR_K8_TSEG_MASK 0xc0010113 /* AMD doc: SMMMask */* * +#define MSR_K8_TSEG_BASE 0xc0010112U /* AMD doc: SMMAddr ** */*
* +#defineMSR_K8_TSEG_MASK0xc0010113U/* AMD doc: SMMMask *
* */** -#define MSR_K8_VM_CR 0xc0010114* * +#define MSR_K8_VM_CR 0xc0010114U* * #define VM_CR_INIT_REDIRECTION (_AC(1, ULL) << 1)* * #define VM_CR_SVM_DISABLE (_AC(1, ULL) << 4)*Quoted 7 lines
* -#define
MSR_VIRT_SPEC_CTRL0xc001011f/* Layout matches *
*MSR_SPEC_CTRL*/*
* +#defineMSR_VIRT_SPEC_CTRL0xc001011fU/* Layout matches *
*MSR_SPEC_CTRL*/** /**
* * Legacy MSR constants in need of cleanup. No new MSRs below this comment.*(As to above remark: This is the separator between "modern" [above] and "historic" [below].)
Jan
Signature · 4 lines
Simone Ballarin, M.Sc. Field Application Engineer, BUGSENG (https://bugseng.com <http://bugseng.com>)
PATCH v4 2/4 xen/vpci: address violations of MISRA C:2012 Rule 7.2
In reply to Simone BallarinFrom: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".
Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
---
Changes in v4:
- change commit headline
Changes in v3:
- change 'Signed-off-by' ordering
- add 'uint32_t' casts in 'msi.c' and 'msix.c'
Changes in v2:
- minor change to commit title
- change commit message
--- xen/drivers/vpci/msi.c | 2 +- xen/drivers/vpci/msix.c | 2 +- xen/drivers/vpci/vpci.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)
xen/drivers/vpci/msi.c +1 -1
@@ -124,7 +124,7 @@ static void cf_check address_hi_write(struct vpci_msi *msi = data;/* Clear and update high part. */ - msi->address &=0xffffffff ; + msi->address = (uint32_t )msi->address; msi->address |= (uint64_t )val <<32 ;update_msi (pdev, msi);
xen/drivers/vpci/msix.c +1 -1
@@ -531,7 +531,7 @@ static int cf_check msix_write(case PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET : entry->updated = true; - entry->addr &=0xffffffff ; + entry->addr = (uint32_t )entry->addr; entry->addr |= (uint64_t )data <<32 ;break ;
xen/drivers/vpci/vpci.c +3 -3
@@ -319,7 +319,7 @@ static void vpci_write_hw(pci_sbdf_t sbdf, unsigned int reg, unsigned int size,static uint32_t merge_result (uint32_t data,uint32_t new,unsigned int size,unsigned int offset) { -uint32_t mask =0xffffffff >> (32 -8 * size); +uint32_t mask =0xffffffffU >> (32 -8 * size);return (data & ~(mask << (offset *8 ))) | ((new & mask) << (offset *8 )); }
@@ -402,7 +402,7 @@ uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, unsigned int size) data =merge_result (data, tmp_data, size - data_offset, data_offset); } -return data & (0xffffffff >> (32 -8 * size)); +return data & (0xffffffffU >> (32 -8 * size)); }/*
@@ -427,7 +427,7 @@ static void vpci_write_helper(const struct pci_dev *pdev, data =merge_result (val, data, size, offset); } - r->write (pdev, r->offset, data & (0xffffffff >> (32 -8 * r->size)), + r->write (pdev, r->offset, data & (0xffffffffU >> (32 -8 * r->size)), r->private); }
Signature · 1 line
2.34.1
Re: [XEN PATCH v4 2/4] xen/vpci: address violations of MISRA C:2012 Rule 7.2
Quoted 23 lines · Simone Ballarin
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
Signed-off-by Gianluca Luparini <[email protected]>Signed-off-by Simone Ballarin <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>---
Changes in v4:
- change commit headlineChanges in v3:
- change 'Signed-off-by' ordering
- add 'uint32_t' casts in 'msi.c' and 'msix.c'
Quoted 9 lines
Changes in v2:
- minor change to commit title
- change commit message--- xen/drivers/vpci/msi.c | 2 +- xen/drivers/vpci/msix.c | 2 +- xen/drivers/vpci/vpci.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)
Like other patches in this series, this one could also benefit from an ack from VPCI maintainers to get committed, as it does apply cleanly on staging.
Signature · 2 lines
Nicola Vetrini, BSc Software Engineer, BUGSENG srl (https://bugseng.com)
Need Ack, Re: [XEN PATCH v4 2/4] xen/vpci: address violations of MISRA C:2012 Rule 7.2
Please ack
Quoted 42 lines · Nicola Vetrini
Quoted 23 lines · Simone Ballarin
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
Signed-off-by Gianluca Luparini <[email protected]>Signed-off-by Simone Ballarin <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>---
Changes in v4:
- change commit headlineChanges in v3:
- change 'Signed-off-by' ordering
- add 'uint32_t' casts in 'msi.c' and 'msix.c'Quoted 9 lines
Changes in v2:
- minor change to commit title
- change commit message--- xen/drivers/vpci/msi.c | 2 +- xen/drivers/vpci/msix.c | 2 +- xen/drivers/vpci/vpci.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)Like other patches in this series, this one could also benefit from an ack from
VPCI maintainers to get committed, as it does apply cleanly on staging.Signature · 2 lines
Nicola Vetrini, BSc Software Engineer, BUGSENG srl (https://bugseng.com)
Re: [XEN PATCH v4 2/4] xen/vpci: address violations of MISRA C:2012 Rule 7.2
In reply to Simone BallarinQuoted 7 lines · Simone Ballarin
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".
Quoted 8 lines
Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
Signed-off-by Gianluca Luparini <[email protected]>Signed-off-by Simone Ballarin <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>
Thanks, Roger.
Re: [XEN PATCH v4 2/4] xen/vpci: address violations of MISRA C:2012 Rule 7.2
Quoted 13 lines · Roger Pau Monné
Quoted 12 lines · Simone Ballarin
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
Quoted 5 lines
Quoted 3 lines
Signed-off-by Gianluca Luparini <[email protected]>Signed-off-by Simone Ballarin <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>Acked-by Roger Pau Monné <[email protected]>
Thanks! I saw too late :-)
PATCH v4 3/4 x86/viridian: address violations of MISRA C:2012 Rule 7.2
In reply to Simone BallarinFrom: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".
Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
---
Changes in v4:
- change commit headline
- add Reviewed-by
Changes in v3:
- create this commit for 'viridian.c' and 'hyperv-tlfs.h'
--- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-)
xen/arch/x86/hvm/viridian/viridian.c +1 -1
@@ -291,7 +291,7 @@ static void enable_hypercall_page(struct domain *d)* calling convention) to differentiate Xen and Viridian hypercalls. */ *(u8 *)(p +0 ) =0x0d ;/* orl $0x80000000, %eax */ - *(u32 *)(p +1 ) =0x80000000 ; + *(u32 *)(p +1 ) =0x80000000U ; *(u8 *)(p +5 ) =0x0f ;/* vmcall/vmmcall */ *(u8 *)(p +6 ) =0x01 ; *(u8 *)(p +7 ) = (cpu_has_vmx ?0xc1 :0xd9 );
xen/arch/x86/include/asm/guest/hyperv-tlfs.h +14 -14
@@ -471,30 +471,30 @@ typedef struct _HV_REFERENCE_TSC_PAGE {/* Define hypervisor message types. */ enum hv_message_type { -HVMSG_NONE =0x00000000 , +HVMSG_NONE =0x00000000U ,/* Memory access messages. */ -HVMSG_UNMAPPED_GPA =0x80000000 , -HVMSG_GPA_INTERCEPT =0x80000001 , +HVMSG_UNMAPPED_GPA =0x80000000U , +HVMSG_GPA_INTERCEPT =0x80000001U ,/* Timer notification messages. */ -HVMSG_TIMER_EXPIRED =0x80000010 , +HVMSG_TIMER_EXPIRED =0x80000010U ,/* Error messages. */ -HVMSG_INVALID_VP_REGISTER_VALUE =0x80000020 , -HVMSG_UNRECOVERABLE_EXCEPTION =0x80000021 , -HVMSG_UNSUPPORTED_FEATURE =0x80000022 , +HVMSG_INVALID_VP_REGISTER_VALUE =0x80000020U , +HVMSG_UNRECOVERABLE_EXCEPTION =0x80000021U , +HVMSG_UNSUPPORTED_FEATURE =0x80000022U ,/* Trace buffer complete messages. */ -HVMSG_EVENTLOG_BUFFERCOMPLETE =0x80000040 , +HVMSG_EVENTLOG_BUFFERCOMPLETE =0x80000040U ,/* Platform-specific processor intercept messages. */ -HVMSG_X64_IOPORT_INTERCEPT =0x80010000 , -HVMSG_X64_MSR_INTERCEPT =0x80010001 , -HVMSG_X64_CPUID_INTERCEPT =0x80010002 , -HVMSG_X64_EXCEPTION_INTERCEPT =0x80010003 , -HVMSG_X64_APIC_EOI =0x80010004 , -HVMSG_X64_LEGACY_FP_ERROR =0x80010005 +HVMSG_X64_IOPORT_INTERCEPT =0x80010000U , +HVMSG_X64_MSR_INTERCEPT =0x80010001U , +HVMSG_X64_CPUID_INTERCEPT =0x80010002U , +HVMSG_X64_EXCEPTION_INTERCEPT =0x80010003U , +HVMSG_X64_APIC_EOI =0x80010004U , +HVMSG_X64_LEGACY_FP_ERROR =0x80010005U };/* Define synthetic interrupt controller message flags. */
Signature · 1 line
2.34.1
Re: [XEN PATCH v4 3/4] x86/viridian: address violations of MISRA C:2012 Rule 7.2
Quoted 20 lines · Simone Ballarin
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
Signed-off-by Gianluca Luparini <[email protected]>Signed-off-by Simone Ballarin <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>---
Changes in v4:
- change commit headline
- add Reviewed-by
Quoted 7 lines
Changes in v3:
- create this commit for 'viridian.c' and 'hyperv-tlfs.h'--- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-)
This patch has perhaps slipped by since its submission. As it can be applied on top of staging without conflicts, then it probably needs an ack from the x86 viridian maintainers.
Signature · 2 lines
Nicola Vetrini, BSc Software Engineer, BUGSENG srl (https://bugseng.com)
Need Ack, Re: [XEN PATCH v4 3/4] x86/viridian: address violations of MISRA C:2012 Rule 7.2
Paul, Wei, can we have an ack?
Quoted 38 lines · Nicola Vetrini
Quoted 20 lines · Simone Ballarin
From: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".Add the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
Signed-off-by Gianluca Luparini <[email protected]>Signed-off-by Simone Ballarin <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>---
Changes in v4:
- change commit headline
- add Reviewed-byQuoted 7 lines
Changes in v3:
- create this commit for 'viridian.c' and 'hyperv-tlfs.h'--- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-)This patch has perhaps slipped by since its submission. As it can be applied on top of
staging without conflicts, then it probably needs an ack from the x86 viridian maintainers.Signature · 2 lines
Nicola Vetrini, BSc Software Engineer, BUGSENG srl (https://bugseng.com)
PATCH v4 4/4 xen/x86: address violations of MISRA C:2012 Rule 7.2
In reply to Simone BallarinFrom: Gianluca Luparini <[email protected]>
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".
Add the 'U' suffix to integers literals with unsigned type. Use _AC() for macro costants that are used also in assembly files.
For the sake of uniformity, the following changes are made:
- add the 'U' suffix to all first macro's arguments in 'mce-apei.c'
- add the 'U' suffix to switch cases in 'cpuid.c'
- add 'U' suffixes to 'mask16' in 'stdvga.c'
- add the 'U' suffix to macros in 'pci.h'
- use _AC() for macros near 'X86_CR0_PG'
---
Changes in v4:
- change commit headline
- remove 'U' suffix from '0xffff' in 'cpu-policy.c'
- remove some changes in 'msr-index.h'
- remove changes in 'irq.c' and 'acpi_mmcfg.c'
Changes in v3:
- change 'Signed-off-by' ordering
- change commit message
- add 'UL' in 'extable.c'
- fix indentation in 'cpu-policy.c'
- remove excessive suffixes in 'mce-apei.c'
- add 'UL' in 'x86-defns.h'
- remove changes to 'sr_mask' in 'stdvga.c'
- remove comments to 'gr_mask' in 'stdvga.c'
- move 'viridian.c' and 'hyperv-tlfs.h' in a separate commit
Changes in v2:
- minor change to commit title
- change commit message
- remove comments from 'gr_mask' in 'stdvga.c'
- correct code style in 'trace.h'
- add fix in 'extable.c'
- remove changes in 'x86-defns.h', 'msr-index.h' and 'xen-x86_64.h'
--- xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpu-policy.c | 18 +-- xen/arch/x86/cpu/mcheck/mce-apei.c | 4 +- xen/arch/x86/cpuid.c | 8 +- xen/arch/x86/efi/efi-boot.h | 6 +- xen/arch/x86/extable.c | 2 +- xen/arch/x86/hvm/hypercall.c | 2 +- xen/arch/x86/hvm/pmtimer.c | 4 +- xen/arch/x86/hvm/stdvga.c | 50 +++---- xen/arch/x86/hvm/vlapic.c | 6 +- xen/arch/x86/include/asm/apicdef.h | 2 +- xen/arch/x86/include/asm/config.h | 2 +- xen/arch/x86/include/asm/hpet.h | 2 +- xen/arch/x86/include/asm/hvm/trace.h | 4 +- xen/arch/x86/include/asm/hvm/vioapic.h | 2 +- xen/arch/x86/include/asm/msi.h | 2 +- xen/arch/x86/include/asm/msr-index.h | 180 ++++++++++++------------- xen/arch/x86/include/asm/pci.h | 8 +- xen/arch/x86/include/asm/x86-defns.h | 24 ++-- xen/arch/x86/percpu.c | 2 +- xen/arch/x86/psr.c | 2 +- xen/arch/x86/spec_ctrl.c | 8 +- xen/arch/x86/x86_64/pci.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.h | 2 +- xen/lib/x86/cpuid.c | 8 +- xen/lib/x86/policy.c | 2 +- 26 files changed, 177 insertions(+), 177 deletions(-)
xen/arch/x86/apic.c +1 -1
@@ -1211,7 +1211,7 @@ static void __init calibrate_APIC_clock(void)* Setup the APIC counter to maximum. There is no way the lapic * can underflow in the 100ms detection time frame. */ -__setup_APIC_LVTT (0xffffffff ); +__setup_APIC_LVTT (0xffffffffU ); bus_freq =calibrate_apic_timer ();if ( !bus_freq )
xen/arch/x86/cpu-policy.c +9 -9
@@ -321,7 +321,7 @@ static void recalculate_misc(struct cpu_policy *p) p->extd.vendor_edx = p->basic.vendor_edx; p->extd.raw_fms = p->basic.raw_fms; - p->extd.raw[0x1 ].b &=0xff00ffff ; + p->extd.raw[0x1 ].b &=0xff00ffffU ; p->extd.e1d |= p->basic._1d &CPUID_COMMON_1D_FEATURES ; p->extd.raw[0x8 ].a &=0x0000ffff ;/* GuestMaxPhysAddr hidden. */
@@ -378,10 +378,10 @@ static void __init calculate_host_policy(void)* this information. */ if ( cpu_has_lfence_dispatch ) - max_extd_leaf =max (max_extd_leaf,0x80000021 ); + max_extd_leaf =max (max_extd_leaf,0x80000021U ); - p->extd.max_leaf =0x80000000 |min_t (uint32_t, max_extd_leaf &0xffff , -ARRAY_SIZE (p->extd.raw) -1 ); + p->extd.max_leaf =0x80000000U |min_t (uint32_t, max_extd_leaf &0xffff , +ARRAY_SIZE (p->extd.raw) -1 );x86_cpu_featureset_to_policy (boot_cpu_data.x86_capability, p);recalculate_xstate (p);
@@ -768,11 +768,11 @@ void recalculate_cpuid_policy(struct domain *d) p->basic.max_leaf =min (p->basic.max_leaf, max->basic.max_leaf); p->feat.max_subleaf =min (p->feat.max_subleaf, max->feat.max_subleaf); - p->extd.max_leaf =0x80000000 |min (p->extd.max_leaf &0xffff , - ((p->x86_vendor & (X86_VENDOR_AMD | -X86_VENDOR_HYGON )) - ?CPUID_GUEST_NR_EXTD_AMD - :CPUID_GUEST_NR_EXTD_INTEL ) -1 ); + p->extd.max_leaf =0x80000000U |min (p->extd.max_leaf &0xffff , + ((p->x86_vendor & (X86_VENDOR_AMD | +X86_VENDOR_HYGON )) + ?CPUID_GUEST_NR_EXTD_AMD + :CPUID_GUEST_NR_EXTD_INTEL ) -1 );x86_cpu_policy_to_featureset (p, fs);x86_cpu_policy_to_featureset (max, max_fs);
xen/arch/x86/cpu/mcheck/mce-apei.c +2 -2
@@ -37,10 +37,10 @@#include "mce.h" #define CPER_CREATOR_MCE \ - UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \ + UUID_LE(0x75a574e3U, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \ 0x64, 0x90, 0xb8, 0x9d)#define CPER_SECTION_TYPE_MCE \ - UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ + UUID_LE(0xfe08ffbeU, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \ 0x04, 0x4a, 0x38, 0xfc)/*
xen/arch/x86/cpuid.c +4 -4
@@ -93,7 +93,7 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, }break ; - case 0x40000000 ... 0x400000ff: + case 0x40000000U ... 0x400000ffU:if (is_viridian_domain (d) )return cpuid_viridian_leaves (v, leaf, subleaf, res);
@@ -103,10 +103,10 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf,* Intel reserve up until 0x4fffffff for hypervisor use. AMD reserve * only until 0x400000ff, but we already use double that. */ - case 0x40000100 ... 0x400001ff: + case 0x40000100U ... 0x400001ffU:return cpuid_hypervisor_leaves (v, leaf, subleaf, res); - case 0x80000000 ... 0x80000000 + CPUID_GUEST_NR_EXTD - 1: + case 0x80000000U ... 0x80000000U + CPUID_GUEST_NR_EXTD - 1:ASSERT ((p->extd.max_leaf &0xffff ) <ARRAY_SIZE (p->extd.raw));if ( (leaf &0xffff ) >min_t (uint32_t, p->extd.max_leaf &0xffff ,ARRAY_SIZE (p->extd.raw) -1 ) )
@@ -352,7 +352,7 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, }break ; -case 0x80000001 : +case 0x80000001U :/* SYSCALL is hidden outside of long mode on Intel. */ if ( p->x86_vendor ==X86_VENDOR_INTEL &&is_hvm_domain (d) && !hvm_long_mode_active (v) )
xen/arch/x86/efi/efi-boot.h +3 -3
@@ -740,16 +740,16 @@ static void __init efi_arch_handle_module(const struct file *file,static void __init efi_arch_cpu (void ) { -uint32_t eax =cpuid_eax (0x80000000 ); +uint32_t eax =cpuid_eax (0x80000000U );uint32_t *caps = boot_cpu_data.x86_capability; boot_tsc_stamp =rdtsc (); caps[FEATURESET_1c] =cpuid_ecx (1 ); -if ( (eax >>16 ) ==0x8000 && eax >0x80000000 ) +if ( (eax >>16 ) ==0x8000 && eax >0x80000000U ) { - caps[FEATURESET_e1d] =cpuid_edx (0x80000001 ); + caps[FEATURESET_e1d] =cpuid_edx (0x80000001U );/* * This check purposefully doesn't use cpu_has_nx because
xen/arch/x86/extable.c +1 -1
@@ -141,7 +141,7 @@ static int __init cf_check stub_selftest(void) .rax = 0x0123456789abcdef, .res.fields.trapnr = X86_EXC_GP }, { .opc = { endbr64, 0x02, 0x04, 0x04, 0xc3 }, /* add (%rsp,%rax),%al */ - .rax = 0xfedcba9876543210, + .rax = 0xfedcba9876543210UL, .res.fields.trapnr = X86_EXC_SS }, { .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */ .res.fields.trapnr = X86_EXC_BP },
xen/arch/x86/hvm/hypercall.c +1 -1
@@ -129,7 +129,7 @@ int hvm_hypercall(struct cpu_user_regs *regs)break ; } -if ( (eax &0x80000000 ) &&is_viridian_domain (currd) ) +if ( (eax &0x80000000U ) &&is_viridian_domain (currd) ) {int ret;
xen/arch/x86/hvm/pmtimer.c +2 -2
@@ -40,8 +40,8 @@#define SCI_IRQ 9/* We provide a 32-bit counter (must match the TMR_VAL_EXT bit in the FADT) */ -#define TMR_VAL_MASK (0xffffffff) -#define TMR_VAL_MSB (0x80000000) +#define TMR_VAL_MASK (0xffffffffU) +#define TMR_VAL_MSB (0x80000000U)/* Dispatch SCIs based on the PM1a_STS and PM1a_EN registers */ static void pmt_update_sci (PMTState *s)
xen/arch/x86/hvm/stdvga.c +25 -25
62 lines not on this page · raw message
xen/arch/x86/hvm/vlapic.c +3 -3
@@ -237,7 +237,7 @@ bool_t vlapic_match_dest(case APIC_DEST_NOSHORT :if ( dest_mode )return vlapic_match_logical_addr (target, dest); -return (dest ==_VLAPIC_ID (target,0xffffffff )) || +return (dest ==_VLAPIC_ID (target,0xffffffffU )) || (dest ==VLAPIC_ID (target));case APIC_DEST_SELF :
@@ -467,7 +467,7 @@ static bool_t is_multicast_dest(struct vlapic *vlapic, unsigned int short_hand,return short_hand !=APIC_DEST_SELF ;if (vlapic_x2apic_mode (vlapic) ) -return dest_mode ?hweight16 (dest) >1 : dest ==0xffffffff ; +return dest_mode ?hweight16 (dest) >1 : dest ==0xffffffffU ;if ( dest_mode ) return hweight8(dest &
@@ -831,7 +831,7 @@ void vlapic_reg_write(struct vcpu *v, unsigned int reg, uint32_t val)break ;case APIC_ICR2 : -vlapic_set_reg (vlapic,APIC_ICR2 , val &0xff000000 ); +vlapic_set_reg (vlapic,APIC_ICR2 , val &0xff000000U );break ;case APIC_LVTT :/* LVT Timer Reg */
xen/arch/x86/include/asm/apicdef.h +1 -1
@@ -8,7 +8,7 @@* Ingo Molnar <[email protected]>, 1999, 2000 */ -#define APIC_DEFAULT_PHYS_BASE 0xfee00000 +#define APIC_DEFAULT_PHYS_BASE 0xfee00000U#define APIC_ID 0x20#define APIC_ID_MASK (0xFFu<<24)
xen/arch/x86/include/asm/config.h +1 -1
@@ -257,7 +257,7 @@ extern unsigned char boot_edid_info[128];#endif /* CONFIG_PV32 */ #define MACH2PHYS_COMPAT_VIRT_START HYPERVISOR_COMPAT_VIRT_START -#define MACH2PHYS_COMPAT_VIRT_END 0xFFE00000 +#define MACH2PHYS_COMPAT_VIRT_END 0xFFE00000U#define MACH2PHYS_COMPAT_NR_ENTRIES (d) \ ((MACH2PHYS_COMPAT_VIRT_END-MACH2PHYS_COMPAT_VIRT_START(d))>>2)
xen/arch/x86/include/asm/hpet.h +1 -1
@@ -41,7 +41,7 @@#define HPET_TN_ROUTE 0x3e00#define HPET_TN_FSB 0x4000#define HPET_TN_FSB_CAP 0x8000 -#define HPET_TN_RESERVED 0xffff0081 +#define HPET_TN_RESERVED 0xffff0081U#define HPET_TN_INT_ROUTE_CAP (0xffffffffULL << 32)
xen/arch/x86/include/asm/hvm/trace.h +2 -2
@@ -58,7 +58,7 @@#define DO_TRC_HVM_VLAPIC DEFAULT_HVM_MISC -#define TRC_PAR_LONG (par) ((par)&0xFFFFFFFF),((par)>>32) +#define TRC_PAR_LONG (par) ((uint32_t)par), ((par) >> 32)#define TRACE_2_LONG_2D (_e, d1, d2, ...) \ TRACE_4D(_e, d1, d2)
@@ -93,7 +93,7 @@ HVMTRACE_ND(evt, 0, 0)#define HVMTRACE_LONG_1D (evt, d1) \ - HVMTRACE_2D(evt ## 64, (d1) & 0xFFFFFFFF, (d1) >> 32) + HVMTRACE_2D(evt ## 64, (uint32_t)d1, (d1) >> 32)#define HVMTRACE_LONG_2D (evt, d1, d2, ...) \ HVMTRACE_3D(evt ## 64, d1, d2)#define HVMTRACE_LONG_3D (evt, d1, d2, d3, ...) \
xen/arch/x86/include/asm/hvm/vioapic.h +1 -1
@@ -32,7 +32,7 @@#define VIOAPIC_EDGE_TRIG 0#define VIOAPIC_LEVEL_TRIG 1 -#define VIOAPIC_DEFAULT_BASE_ADDRESS 0xfec00000 +#define VIOAPIC_DEFAULT_BASE_ADDRESS 0xfec00000U#define VIOAPIC_MEM_LENGTH 0x100/* Direct registers. */
xen/arch/x86/include/asm/msi.h +1 -1
@@ -37,7 +37,7 @@*/ #define MSI_ADDR_BASE_HI 0 -#define MSI_ADDR_BASE_LO 0xfee00000 +#define MSI_ADDR_BASE_LO 0xfee00000U#define MSI_ADDR_BASE_MASK (~0xfffff)#define MSI_ADDR_HEADER MSI_ADDR_BASE_LO
xen/arch/x86/include/asm/msr-index.h +90 -90
250 lines not on this page · raw message
xen/arch/x86/include/asm/pci.h +4 -4
@@ -3,10 +3,10 @@#include <xen/mm.h> -#define CF8_BDF (cf8) ( ((cf8) & 0x00ffff00) >> 8) -#define CF8_ADDR_LO (cf8) ( (cf8) & 0x000000fc) -#define CF8_ADDR_HI (cf8) ( ((cf8) & 0x0f000000) >> 16) -#define CF8_ENABLED (cf8) (!!((cf8) & 0x80000000)) +#define CF8_BDF (cf8) ( ((cf8) & 0x00ffff00U) >> 8) +#define CF8_ADDR_LO (cf8) ( (cf8) & 0x000000fcU) +#define CF8_ADDR_HI (cf8) ( ((cf8) & 0x0f000000U) >> 16) +#define CF8_ENABLED (cf8) (!!((cf8) & 0x80000000U))#define IS_SNB_GFX (id) (id == 0x01068086 || id == 0x01168086 \ || id == 0x01268086 || id == 0x01028086 \
xen/arch/x86/include/asm/x86-defns.h +12 -12
@@ -30,17 +30,17 @@/* * Intel CPU flags in CR0 */ -#define X86_CR0_PE 0x00000001/* Enable Protected Mode (RW) */ -#define X86_CR0_MP 0x00000002/* Monitor Coprocessor (RW) */ -#define X86_CR0_EM 0x00000004/* Require FPU Emulation (RO) */ -#define X86_CR0_TS 0x00000008/* Task Switched (RW) */ -#define X86_CR0_ET 0x00000010/* Extension type (RO) */ -#define X86_CR0_NE 0x00000020/* Numeric Error Reporting (RW) */ -#define X86_CR0_WP 0x00010000/* Supervisor Write Protect (RW) */ -#define X86_CR0_AM 0x00040000/* Alignment Checking (RW) */ -#define X86_CR0_NW 0x20000000/* Not Write-Through (RW) */ -#define X86_CR0_CD 0x40000000/* Cache Disable (RW) */ -#define X86_CR0_PG 0x80000000/* Paging (RW) */ +#define X86_CR0_PE _AC(0x00000001, U)/* Enable Protected Mode (RW) */ +#define X86_CR0_MP _AC(0x00000002, U)/* Monitor Coprocessor (RW) */ +#define X86_CR0_EM _AC(0x00000004, U)/* Require FPU Emulation (RO) */ +#define X86_CR0_TS _AC(0x00000008, U)/* Task Switched (RW) */ +#define X86_CR0_ET _AC(0x00000010, U)/* Extension type (RO) */ +#define X86_CR0_NE _AC(0x00000020, U)/* Numeric Error Reporting (RW) */ +#define X86_CR0_WP _AC(0x00010000, U)/* Supervisor Write Protect (RW) */ +#define X86_CR0_AM _AC(0x00040000, U)/* Alignment Checking (RW) */ +#define X86_CR0_NW _AC(0x20000000, U)/* Not Write-Through (RW) */ +#define X86_CR0_CD _AC(0x40000000, U)/* Cache Disable (RW) */ +#define X86_CR0_PG _AC(0x80000000, U)/* Paging (RW) */ /* * Intel CPU flags in CR3
@@ -103,7 +103,7 @@/* * Debug status flags in DR6. */ -#define X86_DR6_DEFAULT 0xffff0ff0/* Default %dr6 value. */ +#define X86_DR6_DEFAULT 0xffff0ff0UL/* Default %dr6 value. */ /* * Debug control flags in DR7.
xen/arch/x86/percpu.c +1 -1
@@ -12,7 +12,7 @@ unsigned long __per_cpu_offset[NR_CPUS];* possible #PF at (NULL + a little) which has security implications in the * context of PV guests. */ -#define INVALID_PERCPU_AREA (0x8000000000000000L - (long)__per_cpu_start) +#define INVALID_PERCPU_AREA (0x8000000000000000UL - (long)__per_cpu_start)#define PERCPU_ORDER get_order_from_bytes(__per_cpu_data_end - __per_cpu_start)void __init percpu_init_areas (void )
xen/arch/x86/psr.c +1 -1
@@ -191,7 +191,7 @@ static struct feat_node *feat_l2_cat;static struct feat_node *feat_mba;/* Common functions */ -#define cat_default_val (len) (0xffffffff >> (32 - (len))) +#define cat_default_val (len) (0xffffffffU >> (32 - (len)))/* * get_cdp_data - get DATA COS register value from input COS ID.
xen/arch/x86/spec_ctrl.c +4 -4
@@ -398,8 +398,8 @@ static void __init print_details(enum ind_thunk thunk)cpuid_count (7 ,0 , &max, &tmp, &tmp, &_7d0);if ( max >=2 )cpuid_count (7 ,2 , &tmp, &tmp, &tmp, &_7d2); -if ( boot_cpu_data.extended_cpuid_level >=0x80000008 ) -cpuid (0x80000008 , &tmp, &e8b, &tmp, &tmp); +if ( boot_cpu_data.extended_cpuid_level >=0x80000008U ) +cpuid (0x80000008U , &tmp, &e8b, &tmp, &tmp);if ( cpu_has_arch_caps )rdmsrl (MSR_ARCH_CAPABILITIES , caps);
@@ -1337,8 +1337,8 @@ void __init init_speculation_mitigations(void)* TODO: Adjust cpu_has_svm_spec_ctrl to be usable earlier on boot. */ if ( opt_msr_sc_hvm && - (boot_cpu_data.extended_cpuid_level >=0x8000000a ) && - (cpuid_edx (0x8000000a ) & (1u <<SVM_FEATURE_SPEC_CTRL )) ) + (boot_cpu_data.extended_cpuid_level >=0x8000000aU ) && + (cpuid_edx (0x8000000aU ) & (1u <<SVM_FEATURE_SPEC_CTRL )) )setup_force_cpu_cap (X86_FEATURE_SC_MSR_HVM ); }
xen/arch/x86/x86_64/pci.c +1 -1
@@ -9,7 +9,7 @@#include <asm/io.h> #define PCI_CONF_ADDRESS (sbdf, reg) \ - (0x80000000 | ((sbdf).bdf << 8) | ((reg) & ~3)) + (0x80000000U | ((sbdf).bdf << 8) | ((reg) & ~3))uint8_t pci_conf_read8 (pci_sbdf_t sbdf,unsigned int reg) {
xen/arch/x86/x86_emulate/x86_emulate.h +1 -1
@@ -620,7 +620,7 @@ struct x86_emulate_ctxt* below). * Hence no separate #define-s get added. */ -#define X86EMUL_OPC_EXT_MASK 0xffff0000 +#define X86EMUL_OPC_EXT_MASK 0xffff0000U#define X86EMUL_OPC (ext, byte) ((uint8_t)(byte) | \ MASK_INSR((ext), X86EMUL_OPC_EXT_MASK))/*
xen/lib/x86/cpuid.c +4 -4
@@ -217,10 +217,10 @@ void x86_cpu_policy_fill_native(struct cpu_policy *p) }/* Extended leaves. */ -cpuid_leaf (0x80000000 , &p->extd.raw[0 ]); +cpuid_leaf (0x80000000U , &p->extd.raw[0 ]);for ( i =1 ; i <=MIN (p->extd.max_leaf &0xffffU ,ARRAY_SIZE (p->extd.raw) -1 ); ++i ) -cpuid_leaf (0x80000000 + i, &p->extd.raw[i]); +cpuid_leaf (0x80000000U + i, &p->extd.raw[i]);/* Don't report leaves from possible lower level hypervisor, for now. */ p->hv_limit =0 ;
@@ -421,7 +421,7 @@ int x86_cpuid_copy_to_buffer(const struct cpu_policy *p,/* Extended leaves. */ for ( leaf =0 ; leaf <=MIN (p->extd.max_leaf &0xfffful ,ARRAY_SIZE (p->extd.raw) -1 ); ++leaf ) -COPY_LEAF (0x80000000 | leaf,XEN_CPUID_NO_SUBLEAF , &p->extd.raw[leaf]); +COPY_LEAF (0x80000000U | leaf,XEN_CPUID_NO_SUBLEAF , &p->extd.raw[leaf]);#undef COPY_LEAF
@@ -521,7 +521,7 @@ int x86_cpuid_copy_from_buffer(struct cpu_policy *p, p->hv2_limit = l.a;break ; - case 0x80000000 ... 0x80000000 + ARRAY_SIZE(p->extd.raw) - 1: + case 0x80000000U ... 0x80000000U + ARRAY_SIZE(p->extd.raw) - 1:if ( data.subleaf !=XEN_CPUID_NO_SUBLEAF ) goto out_of_range;
xen/lib/x86/policy.c +1 -1
@@ -22,7 +22,7 @@ int x86_cpu_policies_are_compatible(const struct cpu_policy *host,FAIL_CPUID (7 ,0 );if ( guest->extd.max_leaf > host->extd.max_leaf ) -FAIL_CPUID (0x80000000 ,NA ); +FAIL_CPUID (0x80000000U ,NA );/* TODO: Audit more CPUID data. */
Signature · 1 line
2.34.1
Re: [XEN PATCH v4 4/4] xen/x86: address violations of MISRA C:2012 Rule 7.2
Quoted 13 lines · Simone Ballarin
xen/arch/x86/hvm/stdvga.c +0
-9@@ -70,15 +70,15 @@ static const uint8_t sr_mask[8] = { };static const uint8_t gr_mask[9 ] = { - (uint8_t )~0xf0 ,/* 0x00 */ - (uint8_t )~0xf0 ,/* 0x01 */ - (uint8_t )~0xf0 ,/* 0x02 */ - (uint8_t )~0xe0 ,/* 0x03 */ - (uint8_t )~0xfc ,/* 0x04 */ - (uint8_t )~0x84 ,/* 0x05 */ - (uint8_t )~0xf0 ,/* 0x06 */ - (uint8_t )~0xf0 ,/* 0x07 */ - (uint8_t )~0x00 ,/* 0x08 */
xen/arch/x86/hvm/stdvga.c static const uint8_t sr_mask[8] = { · line 82
Quoted 10 lines
xen/arch/x86/hvm/stdvga.c +9
-0+ (uint8_t )~0xf0 , + (uint8_t )~0xf0 , + (uint8_t )~0xf0 , + (uint8_t )~0xe0 , + (uint8_t )~0xfc , + (uint8_t )~0x84 , + (uint8_t )~0xf0 , + (uint8_t )~0xf0 , + (uint8_t)~0x00, };
Hmm, this stray change is _still_ there.
xen/arch/x86/include/asm/hvm/trace.h line 61
Quoted 8 lines
xen/arch/x86/include/asm/hvm/trace.h +1
-1@@ -58,7 +58,7 @@#define DO_TRC_HVM_VLAPIC DEFAULT_HVM_MISC -#define TRC_PAR_LONG (par) ((par)&0xFFFFFFFF),((par)>>32) +#define TRC_PAR_LONG (par) ((uint32_t)par), ((par) >> 32)
You've lost parentheses around "par".
xen/arch/x86/include/asm/hvm/trace.h line 96
Quoted 6 lines
xen/arch/x86/include/asm/hvm/trace.h +1
-1@@ -93,7 +93,7 @@ HVMTRACE_ND(evt, 0, 0)#define HVMTRACE_LONG_1D (evt, d1) \ - HVMTRACE_2D(evt ## 64, (d1) & 0xFFFFFFFF, (d1) >> 32) + HVMTRACE_2D(evt ## 64, (uint32_t)d1, (d1) >> 32)
Same for "d1" here.
Both of these are, btw., indications that you should have dropped Stefano's R-b.
Quoted 12 lines
xen/arch/x86/include/asm/msr-index.h +1
-1@@ -30,7 +30,7 @@#define MSR_INTEL_CORE_THREAD_COUNT 0x00000035#define MSR_CTC_THREAD_MASK 0x0000ffff -#define MSR_CTC_CORE_MASK 0xffff0000 +#define MSR_CTC_CORE_MASK 0xffff0000U#define MSR_SPEC_CTRL 0x00000048#define SPEC_CTRL_IBRS (_AC(1, ULL) << 0)
xen/arch/x86/include/asm/msr-index.h line 171
Quoted 5 lines
xen/arch/x86/include/asm/msr-index.h +1
-1@@ -168,7 +168,7 @@#define MSR_UARCH_MISC_CTRL 0x00001b01#define UARCH_CTRL_DOITM (_AC(1, ULL) << 0) -#define MSR_EFER 0xc0000080/* Extended Feature Enable Register */ +#define MSR_EFER _AC(0xc0000080, U)/* Extended Feature Enable Register */
I understand you use _AC() here because the constant is used in assembly code. But I don't understand why you use it only here, and not throughout at least the "modern" portion of the file. I wonder what other x86 maintainers think about this.
As a minor aspect, I also don't really see why you insert a 2nd blank ahead of the comment.
Quoted 46 lines
xen/arch/x86/include/asm/msr-index.h +15
-15#define EFER_SCE (_AC(1, ULL) << 0)/* SYSCALL Enable */ #define EFER_LME (_AC(1, ULL) << 8)/* Long Mode Enable */ #define EFER_LMA (_AC(1, ULL) << 10)/* Long Mode Active */ @@ -181,35 +181,35 @@ (EFER_SCE |EFER_LME |EFER_LMA |EFER_NXE |EFER_SVME |EFER_FFXSE | \ EFER_AIBRSE) -#define MSR_STAR 0xc0000081/* legacy mode SYSCALL target */ -#define MSR_LSTAR 0xc0000082/* long mode SYSCALL target */ -#define MSR_CSTAR 0xc0000083/* compat mode SYSCALL target */ -#define MSR_SYSCALL_MASK 0xc0000084/* EFLAGS mask for syscall */ -#define MSR_FS_BASE 0xc0000100/* 64bit FS base */ -#define MSR_GS_BASE 0xc0000101/* 64bit GS base */ -#define MSR_SHADOW_GS_BASE 0xc0000102/* SwapGS GS shadow */ -#define MSR_TSC_AUX 0xc0000103/* Auxiliary TSC */ +#define MSR_STAR 0xc0000081U/* legacy mode SYSCALL target */ +#define MSR_LSTAR 0xc0000082U/* long mode SYSCALL target */ +#define MSR_CSTAR 0xc0000083U/* compat mode SYSCALL target */ +#define MSR_SYSCALL_MASK 0xc0000084U/* EFLAGS mask for syscall */ +#define MSR_FS_BASE 0xc0000100U/* 64bit FS base */ +#define MSR_GS_BASE 0xc0000101U/* 64bit GS base */ +#define MSR_SHADOW_GS_BASE 0xc0000102U/* SwapGS GS shadow */ +#define MSR_TSC_AUX 0xc0000103U/* Auxiliary TSC */ -#define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_SYSCFG 0xc0010010U#define SYSCFG_MTRR_FIX_DRAM_EN (_AC(1, ULL) << 18)#define SYSCFG_MTRR_FIX_DRAM_MOD_EN (_AC(1, ULL) << 19)#define SYSCFG_MTRR_VAR_DRAM_EN (_AC(1, ULL) << 20)#define SYSCFG_MTRR_TOM2_EN (_AC(1, ULL) << 21)#define SYSCFG_TOM2_FORCE_WB (_AC(1, ULL) << 22) -#define MSR_K8_IORR_BASE0 0xc0010016 -#define MSR_K8_IORR_MASK0 0xc0010017 -#define MSR_K8_IORR_BASE1 0xc0010018 -#define MSR_K8_IORR_MASK1 0xc0010019 +#define MSR_K8_IORR_BASE0 0xc0010016U +#define MSR_K8_IORR_MASK0 0xc0010017U +#define MSR_K8_IORR_BASE1 0xc0010018U +#define MSR_K8_IORR_MASK1 0xc0010019U -#define MSR_K8_TSEG_BASE 0xc0010112/* AMD doc: SMMAddr */ -#define MSR_K8_TSEG_MASK 0xc0010113/* AMD doc: SMMMask */ +#define MSR_K8_TSEG_BASE 0xc0010112U/* AMD doc: SMMAddr */ +#define MSR_K8_TSEG_MASK 0xc0010113U/* AMD doc: SMMMask */
xen/arch/x86/include/asm/msr-index.h line 215
Quoted 10 lines
xen/arch/x86/include/asm/msr-index.h +2
-2-#define MSR_K8_VM_CR 0xc0010114 +#define MSR_K8_VM_CR 0xc0010114U#define VM_CR_INIT_REDIRECTION (_AC(1, ULL) << 1)#define VM_CR_SVM_DISABLE (_AC(1, ULL) << 4) -#define MSR_VIRT_SPEC_CTRL 0xc001011f/* Layout matches MSR_SPEC_CTRL */ +#define MSR_VIRT_SPEC_CTRL 0xc001011fU/* Layout matches MSR_SPEC_CTRL */ /* * Legacy MSR constants in need of cleanup. No new MSRs below this comment.
(As to above remark: This is the separator between "modern" [above] and "historic" [below].)
Jan
Quoted 18 lines · Simone Ballarin
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".These violations are caused by the missing "u" or "U" suffix in unsigned integer constants, such as:
xen/arch/x86/hvm/hypercall.c:132.17-132.26
if ( (eax &0x80000000) &&is_viridian_domain(currd))If a rule is not met, changes are needed in order to achieve compliance. The patches in this series achieve compliance for MISRA C:2012 Rule 7.2 by adding the 'U' suffix to integers literals with unsigned type and also to other literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.
Quoted 5 lines
Gianluca Luparini (4):
x86/vmx: address violations of MISRA C:2012 Rule 7.2 xen/vpci: address violations of MISRA C:2012 Rule 7.2 x86/viridian: address violations of MISRA C:2012 Rule 7.2 xen/x86: address violations of MISRA C:2012 Rule 7.2
Looks like this is v4 of a previously larger series, where fair parts have gone in already?
Jan
Il giorno mer 26 lug 2023 alle ore 14:02 Jan Beulich <[email protected]> ha scritto:
Quoted 29 lines · Simone Ballarin
Quoted 1 line
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose
headline
Quoted 4 lines
states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".Quoted 8 lines
These violations are caused by the missing "u" or "U" suffix in unsigned integer constants, such as:
xen/arch/x86/hvm/hypercall.c:132.17-132.26
if ( (eax &0x80000000) &&is_viridian_domain(currd))If a rule is not met, changes are needed in order to achieve compliance. The patches in this series achieve compliance for MISRA C:2012 Rule 7.2
by
Quoted 1 line
adding the 'U' suffix to integers literals with unsigned type and also
to other
Quoted 1 line
literals used in the same contexts or near violations, when their
positive
Quoted 8 lines
nature is immediately clear. The latter changes are done for the sake of uniformity.
Gianluca Luparini (4):
x86/vmx: address violations of MISRA C:2012 Rule 7.2 xen/vpci: address violations of MISRA C:2012 Rule 7.2 x86/viridian: address violations of MISRA C:2012 Rule 7.2 xen/x86: address violations of MISRA C:2012 Rule 7.2
Quoted 5 lines
Looks like this is v4 of a previously larger series, where fair parts have gone in already?
Jan
Yes, it is. I accidentally removed the v4 from the object. In this submission, I've dropped the commits that have been already merged.
Signature · 4 lines
Simone Ballarin, M.Sc. Field Application Engineer, BUGSENG (https://bugseng.com <http://bugseng.com>)
Il giorno mer 26 lug 2023 alle ore 13:04 Simone Ballarin < [email protected]> ha scritto:
Quoted 63 lines
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".These violations are caused by the missing "u" or "U" suffix in unsigned integer constants, such as:
xen/arch/x86/hvm/hypercall.c:132.17-132.26
if ( (eax &0x80000000) &&is_viridian_domain(currd))If a rule is not met, changes are needed in order to achieve compliance. The patches in this series achieve compliance for MISRA C:2012 Rule 7.2 by adding the 'U' suffix to integers literals with unsigned type and also to other
literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.Gianluca Luparini (4):
x86/vmx: address violations of MISRA C:2012 Rule 7.2 xen/vpci: address violations of MISRA C:2012 Rule 7.2 x86/viridian: address violations of MISRA C:2012 Rule 7.2 xen/x86: address violations of MISRA C:2012 Rule 7.2xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpu-policy.c | 18 +- xen/arch/x86/cpu/mcheck/mce-apei.c | 4 +- xen/arch/x86/cpu/vpmu_intel.c | 2 +- xen/arch/x86/cpuid.c | 8 +- xen/arch/x86/efi/efi-boot.h | 6 +- xen/arch/x86/extable.c | 2 +- xen/arch/x86/hvm/hypercall.c | 2 +- xen/arch/x86/hvm/pmtimer.c | 4 +- xen/arch/x86/hvm/stdvga.c | 50 +++--- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/arch/x86/hvm/vlapic.c | 6 +- xen/arch/x86/hvm/vmx/vmcs.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 8 +- xen/arch/x86/include/asm/apicdef.h | 2 +- xen/arch/x86/include/asm/config.h | 2 +- xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 +-- xen/arch/x86/include/asm/hpet.h | 2 +- xen/arch/x86/include/asm/hvm/trace.h | 4 +- xen/arch/x86/include/asm/hvm/vioapic.h | 2 +- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 84 ++++----- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 16 +- xen/arch/x86/include/asm/msi.h | 2 +- xen/arch/x86/include/asm/msr-index.h | 180 +++++++++---------- xen/arch/x86/include/asm/pci.h | 8 +- xen/arch/x86/include/asm/x86-defns.h | 24 +-- xen/arch/x86/percpu.c | 2 +- xen/arch/x86/psr.c | 2 +- xen/arch/x86/spec_ctrl.c | 8 +- xen/arch/x86/x86_64/pci.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.h | 2 +- xen/drivers/vpci/msi.c | 2 +- xen/drivers/vpci/msix.c | 2 +- xen/drivers/vpci/vpci.c | 6 +- xen/lib/x86/cpuid.c | 8 +- xen/lib/x86/policy.c | 2 +- 36 files changed, 255 insertions(+), 255 deletions(-)
Quoted 4 lines
--
2.34.1
Hi all,
the entire series has not received yet any feedback or Acked-by. I would kindly ask if it is possible to have at least some feedback
Signature · 4 lines
Simone Ballarin, M.Sc. Field Application Engineer, BUGSENG (https://bugseng.com <http://bugseng.com>)
Quoted 66 lines · Simone Ballarin
Il giorno mer 26 lug 2023 alle ore 13:04 Simone Ballarin < [email protected]> ha scritto:
Quoted 63 lines
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".These violations are caused by the missing "u" or "U" suffix in unsigned integer constants, such as:
xen/arch/x86/hvm/hypercall.c:132.17-132.26
if ( (eax &0x80000000) &&is_viridian_domain(currd))If a rule is not met, changes are needed in order to achieve compliance. The patches in this series achieve compliance for MISRA C:2012 Rule 7.2 by adding the 'U' suffix to integers literals with unsigned type and also to other
literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.Gianluca Luparini (4):
x86/vmx: address violations of MISRA C:2012 Rule 7.2 xen/vpci: address violations of MISRA C:2012 Rule 7.2 x86/viridian: address violations of MISRA C:2012 Rule 7.2 xen/x86: address violations of MISRA C:2012 Rule 7.2xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpu-policy.c | 18 +- xen/arch/x86/cpu/mcheck/mce-apei.c | 4 +- xen/arch/x86/cpu/vpmu_intel.c | 2 +- xen/arch/x86/cpuid.c | 8 +- xen/arch/x86/efi/efi-boot.h | 6 +- xen/arch/x86/extable.c | 2 +- xen/arch/x86/hvm/hypercall.c | 2 +- xen/arch/x86/hvm/pmtimer.c | 4 +- xen/arch/x86/hvm/stdvga.c | 50 +++--- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/arch/x86/hvm/vlapic.c | 6 +- xen/arch/x86/hvm/vmx/vmcs.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 8 +- xen/arch/x86/include/asm/apicdef.h | 2 +- xen/arch/x86/include/asm/config.h | 2 +- xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 +-- xen/arch/x86/include/asm/hpet.h | 2 +- xen/arch/x86/include/asm/hvm/trace.h | 4 +- xen/arch/x86/include/asm/hvm/vioapic.h | 2 +- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 84 ++++----- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 16 +- xen/arch/x86/include/asm/msi.h | 2 +- xen/arch/x86/include/asm/msr-index.h | 180 +++++++++---------- xen/arch/x86/include/asm/pci.h | 8 +- xen/arch/x86/include/asm/x86-defns.h | 24 +-- xen/arch/x86/percpu.c | 2 +- xen/arch/x86/psr.c | 2 +- xen/arch/x86/spec_ctrl.c | 8 +- xen/arch/x86/x86_64/pci.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.h | 2 +- xen/drivers/vpci/msi.c | 2 +- xen/drivers/vpci/msix.c | 2 +- xen/drivers/vpci/vpci.c | 6 +- xen/lib/x86/cpuid.c | 8 +- xen/lib/x86/policy.c | 2 +- 36 files changed, 255 insertions(+), 255 deletions(-)
Quoted 7 lines
Quoted 4 lines
--
2.34.1Hi all,
the entire series has not received yet any feedback or Acked-by. I would kindly ask if it is possible to have at least some feedback
I did reply to patch 4 on July 27th. For patch 2, Roger is on PTO for another week and a half.
Jan
Quoted 72 lines · Jan Beulich
Quoted 71 lines · Simone Ballarin
Il giorno mer 26 lug 2023 alle ore 13:04 Simone Ballarin < [email protected]> ha scritto:
Quoted 68 lines
The xen sources contains violations of MISRA C:2012 Rule 7.2 whose headline states:
"A 'u' or 'U' suffix shall be applied to all integer constants that are represented in an unsigned type".These violations are caused by the missing "u" or "U" suffix in unsigned integer constants, such as:
xen/arch/x86/hvm/hypercall.c:132.17-132.26
if ( (eax &0x80000000) &&is_viridian_domain(currd))If a rule is not met, changes are needed in order to achieve compliance. The patches in this series achieve compliance for MISRA C:2012 Rule 7.2 by adding the 'U' suffix to integers literals with unsigned type and also to other
literals used in the same contexts or near violations, when their positive nature is immediately clear. The latter changes are done for the sake of uniformity.Gianluca Luparini (4):
x86/vmx: address violations of MISRA C:2012 Rule 7.2 xen/vpci: address violations of MISRA C:2012 Rule 7.2 x86/viridian: address violations of MISRA C:2012 Rule 7.2 xen/x86: address violations of MISRA C:2012 Rule 7.2xen/arch/x86/apic.c | 2 +- xen/arch/x86/cpu-policy.c | 18 +- xen/arch/x86/cpu/mcheck/mce-apei.c | 4 +- xen/arch/x86/cpu/vpmu_intel.c | 2 +- xen/arch/x86/cpuid.c | 8 +- xen/arch/x86/efi/efi-boot.h | 6 +- xen/arch/x86/extable.c | 2 +- xen/arch/x86/hvm/hypercall.c | 2 +- xen/arch/x86/hvm/pmtimer.c | 4 +- xen/arch/x86/hvm/stdvga.c | 50 +++--- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/arch/x86/hvm/vlapic.c | 6 +- xen/arch/x86/hvm/vmx/vmcs.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 8 +- xen/arch/x86/include/asm/apicdef.h | 2 +- xen/arch/x86/include/asm/config.h | 2 +- xen/arch/x86/include/asm/guest/hyperv-tlfs.h | 28 +-- xen/arch/x86/include/asm/hpet.h | 2 +- xen/arch/x86/include/asm/hvm/trace.h | 4 +- xen/arch/x86/include/asm/hvm/vioapic.h | 2 +- xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 84 ++++----- xen/arch/x86/include/asm/hvm/vmx/vmx.h | 16 +- xen/arch/x86/include/asm/msi.h | 2 +- xen/arch/x86/include/asm/msr-index.h | 180 +++++++++---------- xen/arch/x86/include/asm/pci.h | 8 +- xen/arch/x86/include/asm/x86-defns.h | 24 +-- xen/arch/x86/percpu.c | 2 +- xen/arch/x86/psr.c | 2 +- xen/arch/x86/spec_ctrl.c | 8 +- xen/arch/x86/x86_64/pci.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.h | 2 +- xen/drivers/vpci/msi.c | 2 +- xen/drivers/vpci/msix.c | 2 +- xen/drivers/vpci/vpci.c | 6 +- xen/lib/x86/cpuid.c | 8 +- xen/lib/x86/policy.c | 2 +- 36 files changed, 255 insertions(+), 255 deletions(-)--
2.34.1
Quoted 8 lines
Quoted 3 lines
Hi all,
the entire series has not received yet any feedback or Acked-by. I would kindly ask if it is possible to have at least some feedbackI did reply to patch 4 on July 27th. For patch 2, Roger is on PTO for another week and a half.
Jan
Thanks for the information.
Signature · 3 lines
Simone Ballarin, M.Sc. Field Application Engineer, BUGSENG (https://bugseng.com)