* [XEN PATCH v2 01/13] x86/cpufreq: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 23:29 ` Stefano Stabellini
2023-07-05 15:26 ` [XEN PATCH v2 02/13] AMD/IOMMU: " Simone Ballarin
` (11 subsequent siblings)
12 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Jan Beulich, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
Changes in v2:
- change commit title to make it unique
- change commit message
---
xen/arch/x86/acpi/cpufreq/powernow.c | 14 +++++++-------
xen/include/acpi/cpufreq/processor_perf.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c
index d4c7dcd5d9..8e0784b69c 100644
--- a/xen/arch/x86/acpi/cpufreq/powernow.c
+++ b/xen/arch/x86/acpi/cpufreq/powernow.c
@@ -32,14 +32,14 @@
#include <acpi/acpi.h>
#include <acpi/cpufreq/cpufreq.h>
-#define HW_PSTATE_MASK 0x00000007
-#define HW_PSTATE_VALID_MASK 0x80000000
-#define HW_PSTATE_MAX_MASK 0x000000f0
+#define HW_PSTATE_MASK 0x00000007U
+#define HW_PSTATE_VALID_MASK 0x80000000U
+#define HW_PSTATE_MAX_MASK 0x000000f0U
#define HW_PSTATE_MAX_SHIFT 4
-#define MSR_PSTATE_DEF_BASE 0xc0010064 /* base of Pstate MSRs */
-#define MSR_PSTATE_STATUS 0xc0010063 /* Pstate Status MSR */
-#define MSR_PSTATE_CTRL 0xc0010062 /* Pstate control MSR */
-#define MSR_PSTATE_CUR_LIMIT 0xc0010061 /* pstate current limit MSR */
+#define MSR_PSTATE_DEF_BASE 0xc0010064U /* base of Pstate MSRs */
+#define MSR_PSTATE_STATUS 0xc0010063U /* Pstate Status MSR */
+#define MSR_PSTATE_CTRL 0xc0010062U /* Pstate control MSR */
+#define MSR_PSTATE_CUR_LIMIT 0xc0010061U /* pstate current limit MSR */
#define MSR_HWCR_CPBDIS_MASK 0x02000000ULL
#define ARCH_CPU_FLAG_RESUME 1
diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h
index d8a1ba68a6..8b5a1b9bde 100644
--- a/xen/include/acpi/cpufreq/processor_perf.h
+++ b/xen/include/acpi/cpufreq/processor_perf.h
@@ -5,7 +5,7 @@
#include <public/sysctl.h>
#include <xen/acpi.h>
-#define XEN_PX_INIT 0x80000000
+#define XEN_PX_INIT 0x80000000U
int powernow_cpufreq_init(void);
unsigned int powernow_register_driver(void);
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 01/13] x86/cpufreq: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 01/13] x86/cpufreq: " Simone Ballarin
@ 2023-07-05 23:29 ` Stefano Stabellini
2023-07-06 7:44 ` Jan Beulich
0 siblings, 1 reply; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-05 23:29 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Jan Beulich,
Andrew Cooper, Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder
On Wed, 5 Jul 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> Changes in v2:
> - change commit title to make it unique
> - change commit message
> ---
> xen/arch/x86/acpi/cpufreq/powernow.c | 14 +++++++-------
> xen/include/acpi/cpufreq/processor_perf.h | 2 +-
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c
> index d4c7dcd5d9..8e0784b69c 100644
> --- a/xen/arch/x86/acpi/cpufreq/powernow.c
> +++ b/xen/arch/x86/acpi/cpufreq/powernow.c
> @@ -32,14 +32,14 @@
> #include <acpi/acpi.h>
> #include <acpi/cpufreq/cpufreq.h>
>
> -#define HW_PSTATE_MASK 0x00000007
> -#define HW_PSTATE_VALID_MASK 0x80000000
> -#define HW_PSTATE_MAX_MASK 0x000000f0
> +#define HW_PSTATE_MASK 0x00000007U
> +#define HW_PSTATE_VALID_MASK 0x80000000U
> +#define HW_PSTATE_MAX_MASK 0x000000f0U
> #define HW_PSTATE_MAX_SHIFT 4
> -#define MSR_PSTATE_DEF_BASE 0xc0010064 /* base of Pstate MSRs */
> -#define MSR_PSTATE_STATUS 0xc0010063 /* Pstate Status MSR */
> -#define MSR_PSTATE_CTRL 0xc0010062 /* Pstate control MSR */
> -#define MSR_PSTATE_CUR_LIMIT 0xc0010061 /* pstate current limit MSR */
> +#define MSR_PSTATE_DEF_BASE 0xc0010064U /* base of Pstate MSRs */
> +#define MSR_PSTATE_STATUS 0xc0010063U /* Pstate Status MSR */
> +#define MSR_PSTATE_CTRL 0xc0010062U /* Pstate control MSR */
> +#define MSR_PSTATE_CUR_LIMIT 0xc0010061U /* pstate current limit MSR */
> #define MSR_HWCR_CPBDIS_MASK 0x02000000ULL
>
> #define ARCH_CPU_FLAG_RESUME 1
> diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h
> index d8a1ba68a6..8b5a1b9bde 100644
> --- a/xen/include/acpi/cpufreq/processor_perf.h
> +++ b/xen/include/acpi/cpufreq/processor_perf.h
> @@ -5,7 +5,7 @@
> #include <public/sysctl.h>
> #include <xen/acpi.h>
>
> -#define XEN_PX_INIT 0x80000000
> +#define XEN_PX_INIT 0x80000000U
>
> int powernow_cpufreq_init(void);
> unsigned int powernow_register_driver(void);
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 01/13] x86/cpufreq: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 23:29 ` Stefano Stabellini
@ 2023-07-06 7:44 ` Jan Beulich
0 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 7:44 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder,
Stefano Stabellini
On 06.07.2023 01:29, Stefano Stabellini wrote:
> On Wed, 5 Jul 2023, Simone Ballarin wrote:
>> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>
>> 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: Simone Ballarin <simone.ballarin@bugseng.com>
>> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 02/13] AMD/IOMMU: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
2023-07-05 15:26 ` [XEN PATCH v2 01/13] x86/cpufreq: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 23:31 ` Stefano Stabellini
2023-07-05 15:26 ` [XEN PATCH v2 03/13] x86/svm: " Simone Ballarin
` (10 subsequent siblings)
12 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Jan Beulich, Andrew Cooper,
Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
---
Changes in v2:
- minor change to commit title
- change commit message
---
xen/drivers/passthrough/amd/iommu-defs.h | 122 +++++++++++------------
1 file changed, 61 insertions(+), 61 deletions(-)
diff --git a/xen/drivers/passthrough/amd/iommu-defs.h b/xen/drivers/passthrough/amd/iommu-defs.h
index 35de548e3a..c145248f9a 100644
--- a/xen/drivers/passthrough/amd/iommu-defs.h
+++ b/xen/drivers/passthrough/amd/iommu-defs.h
@@ -38,49 +38,49 @@
((uint64_t)(offset) << (12 + (PTE_PER_TABLE_SHIFT * ((level) - 1))))
/* IOMMU Capability */
-#define PCI_CAP_ID_MASK 0x000000FF
+#define PCI_CAP_ID_MASK 0x000000FFU
#define PCI_CAP_ID_SHIFT 0
-#define PCI_CAP_NEXT_PTR_MASK 0x0000FF00
+#define PCI_CAP_NEXT_PTR_MASK 0x0000FF00U
#define PCI_CAP_NEXT_PTR_SHIFT 8
-#define PCI_CAP_TYPE_MASK 0x00070000
+#define PCI_CAP_TYPE_MASK 0x00070000U
#define PCI_CAP_TYPE_SHIFT 16
-#define PCI_CAP_REV_MASK 0x00F80000
+#define PCI_CAP_REV_MASK 0x00F80000U
#define PCI_CAP_REV_SHIFT 19
-#define PCI_CAP_IOTLB_MASK 0x01000000
+#define PCI_CAP_IOTLB_MASK 0x01000000U
#define PCI_CAP_IOTLB_SHIFT 24
-#define PCI_CAP_HT_TUNNEL_MASK 0x02000000
+#define PCI_CAP_HT_TUNNEL_MASK 0x02000000U
#define PCI_CAP_HT_TUNNEL_SHIFT 25
-#define PCI_CAP_NP_CACHE_MASK 0x04000000
+#define PCI_CAP_NP_CACHE_MASK 0x04000000U
#define PCI_CAP_NP_CACHE_SHIFT 26
#define PCI_CAP_EFRSUP_SHIFT 27
-#define PCI_CAP_RESET_MASK 0x80000000
+#define PCI_CAP_RESET_MASK 0x80000000U
#define PCI_CAP_RESET_SHIFT 31
#define PCI_CAP_TYPE_IOMMU 0x3
#define PCI_CAP_MMIO_BAR_LOW_OFFSET 0x04
#define PCI_CAP_MMIO_BAR_HIGH_OFFSET 0x08
-#define PCI_CAP_MMIO_BAR_LOW_MASK 0xFFFFC000
+#define PCI_CAP_MMIO_BAR_LOW_MASK 0xFFFFC000U
#define IOMMU_MMIO_REGION_LENGTH 0x4000
#define PCI_CAP_RANGE_OFFSET 0x0C
-#define PCI_CAP_BUS_NUMBER_MASK 0x0000FF00
+#define PCI_CAP_BUS_NUMBER_MASK 0x0000FF00U
#define PCI_CAP_BUS_NUMBER_SHIFT 8
-#define PCI_CAP_FIRST_DEVICE_MASK 0x00FF0000
+#define PCI_CAP_FIRST_DEVICE_MASK 0x00FF0000U
#define PCI_CAP_FIRST_DEVICE_SHIFT 16
-#define PCI_CAP_LAST_DEVICE_MASK 0xFF000000
+#define PCI_CAP_LAST_DEVICE_MASK 0xFF000000U
#define PCI_CAP_LAST_DEVICE_SHIFT 24
-#define PCI_CAP_UNIT_ID_MASK 0x0000001F
+#define PCI_CAP_UNIT_ID_MASK 0x0000001FU
#define PCI_CAP_UNIT_ID_SHIFT 0
#define PCI_CAP_MISC_INFO_OFFSET 0x10
-#define PCI_CAP_MSI_NUMBER_MASK 0x0000001F
+#define PCI_CAP_MSI_NUMBER_MASK 0x0000001FU
#define PCI_CAP_MSI_NUMBER_SHIFT 0
/* Device Table */
#define IOMMU_DEV_TABLE_BASE_LOW_OFFSET 0x00
#define IOMMU_DEV_TABLE_BASE_HIGH_OFFSET 0x04
-#define IOMMU_DEV_TABLE_SIZE_MASK 0x000001FF
+#define IOMMU_DEV_TABLE_SIZE_MASK 0x000001FFU
#define IOMMU_DEV_TABLE_SIZE_SHIFT 0
#define IOMMU_DEV_TABLE_ENTRIES_PER_BUS 256
@@ -159,13 +159,13 @@ struct amd_iommu_dte {
#define IOMMU_CMD_BUFFER_BASE_HIGH_OFFSET 0x0C
#define IOMMU_CMD_BUFFER_HEAD_OFFSET 0x2000
#define IOMMU_CMD_BUFFER_TAIL_OFFSET 0x2008
-#define IOMMU_CMD_BUFFER_LENGTH_MASK 0x0F000000
+#define IOMMU_CMD_BUFFER_LENGTH_MASK 0x0F000000U
#define IOMMU_CMD_BUFFER_LENGTH_SHIFT 24
#define IOMMU_CMD_BUFFER_ENTRY_ORDER 4
#define IOMMU_CMD_BUFFER_MAX_ENTRIES (1u << 15)
-#define IOMMU_CMD_OPCODE_MASK 0xF0000000
+#define IOMMU_CMD_OPCODE_MASK 0xF0000000U
#define IOMMU_CMD_OPCODE_SHIFT 28
#define IOMMU_CMD_COMPLETION_WAIT 0x1
#define IOMMU_CMD_INVALIDATE_DEVTAB_ENTRY 0x2
@@ -178,50 +178,50 @@ struct amd_iommu_dte {
/* COMPLETION_WAIT command */
#define IOMMU_COMP_WAIT_DATA_BUFFER_SIZE 8
#define IOMMU_COMP_WAIT_DATA_BUFFER_ALIGNMENT 8
-#define IOMMU_COMP_WAIT_S_FLAG_MASK 0x00000001
-#define IOMMU_COMP_WAIT_I_FLAG_MASK 0x00000002
-#define IOMMU_COMP_WAIT_F_FLAG_MASK 0x00000004
-#define IOMMU_COMP_WAIT_ADDR_LOW_MASK 0xFFFFFFF8
+#define IOMMU_COMP_WAIT_S_FLAG_MASK 0x00000001U
+#define IOMMU_COMP_WAIT_I_FLAG_MASK 0x00000002U
+#define IOMMU_COMP_WAIT_F_FLAG_MASK 0x00000004U
+#define IOMMU_COMP_WAIT_ADDR_LOW_MASK 0xFFFFFFF8U
#define IOMMU_COMP_WAIT_ADDR_LOW_SHIFT 3
-#define IOMMU_COMP_WAIT_ADDR_HIGH_MASK 0x000FFFFF
+#define IOMMU_COMP_WAIT_ADDR_HIGH_MASK 0x000FFFFFU
#define IOMMU_COMP_WAIT_ADDR_HIGH_SHIFT 0
/* INVALIDATE_IOMMU_PAGES command */
-#define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_MASK 0x0000FFFF
+#define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_MASK 0x0000FFFFU
#define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_SHIFT 0
-#define IOMMU_INV_IOMMU_PAGES_S_FLAG_MASK 0x00000001
+#define IOMMU_INV_IOMMU_PAGES_S_FLAG_MASK 0x00000001U
#define IOMMU_INV_IOMMU_PAGES_S_FLAG_SHIFT 0
-#define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_MASK 0x00000002
+#define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_MASK 0x00000002U
#define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_SHIFT 1
-#define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_MASK 0xFFFFF000
+#define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_MASK 0xFFFFF000U
#define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_SHIFT 12
-#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_MASK 0xFFFFFFFF
+#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_MASK 0xFFFFFFFFU
#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_SHIFT 0
/* INVALIDATE_DEVTAB_ENTRY command */
-#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_MASK 0x0000FFFF
+#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_MASK 0x0000FFFFU
#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_SHIFT 0
/* INVALIDATE_INTERRUPT_TABLE command */
-#define IOMMU_INV_INT_TABLE_DEVICE_ID_MASK 0x0000FFFF
+#define IOMMU_INV_INT_TABLE_DEVICE_ID_MASK 0x0000FFFFU
#define IOMMU_INV_INT_TABLE_DEVICE_ID_SHIFT 0
/* INVALIDATE_IOTLB_PAGES command */
-#define IOMMU_INV_IOTLB_PAGES_MAXPEND_MASK 0xff000000
+#define IOMMU_INV_IOTLB_PAGES_MAXPEND_MASK 0xff000000U
#define IOMMU_INV_IOTLB_PAGES_MAXPEND_SHIFT 24
-#define IOMMU_INV_IOTLB_PAGES_PASID1_MASK 0x00ff0000
+#define IOMMU_INV_IOTLB_PAGES_PASID1_MASK 0x00ff0000U
#define IOMMU_INV_IOTLB_PAGES_PASID1_SHIFT 16
-#define IOMMU_INV_IOTLB_PAGES_PASID2_MASK 0x0fff0000
+#define IOMMU_INV_IOTLB_PAGES_PASID2_MASK 0x0fff0000U
#define IOMMU_INV_IOTLB_PAGES_PASID2_SHIFT 16
-#define IOMMU_INV_IOTLB_PAGES_QUEUEID_MASK 0x0000ffff
+#define IOMMU_INV_IOTLB_PAGES_QUEUEID_MASK 0x0000ffffU
#define IOMMU_INV_IOTLB_PAGES_QUEUEID_SHIFT 0
-#define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_MASK 0x0000FFFF
+#define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_MASK 0x0000FFFFU
#define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_SHIFT 0
-#define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_MASK 0xFFFFF000
+#define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_MASK 0xFFFFF000U
#define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_SHIFT 12
-#define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_MASK 0xFFFFFFFF
+#define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_MASK 0xFFFFFFFFU
#define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_SHIFT 0
-#define IOMMU_INV_IOTLB_PAGES_S_FLAG_MASK 0x00000001
+#define IOMMU_INV_IOTLB_PAGES_S_FLAG_MASK 0x00000001U
#define IOMMU_INV_IOTLB_PAGES_S_FLAG_SHIFT 0
/* Event Log */
@@ -229,18 +229,18 @@ struct amd_iommu_dte {
#define IOMMU_EVENT_LOG_BASE_HIGH_OFFSET 0x14
#define IOMMU_EVENT_LOG_HEAD_OFFSET 0x2010
#define IOMMU_EVENT_LOG_TAIL_OFFSET 0x2018
-#define IOMMU_EVENT_LOG_LENGTH_MASK 0x0F000000
+#define IOMMU_EVENT_LOG_LENGTH_MASK 0x0F000000U
#define IOMMU_EVENT_LOG_LENGTH_SHIFT 24
-#define IOMMU_EVENT_LOG_HEAD_MASK 0x0007FFF0
+#define IOMMU_EVENT_LOG_HEAD_MASK 0x0007FFF0U
#define IOMMU_EVENT_LOG_HEAD_SHIFT 4
-#define IOMMU_EVENT_LOG_TAIL_MASK 0x0007FFF0
+#define IOMMU_EVENT_LOG_TAIL_MASK 0x0007FFF0U
#define IOMMU_EVENT_LOG_TAIL_SHIFT 4
#define IOMMU_EVENT_LOG_ENTRY_SIZE 16
#define IOMMU_EVENT_LOG_POWER_OF2_ENTRIES_PER_PAGE 8
#define IOMMU_EVENT_LOG_U32_PER_ENTRY (IOMMU_EVENT_LOG_ENTRY_SIZE / 4)
-#define IOMMU_EVENT_CODE_MASK 0xF0000000
+#define IOMMU_EVENT_CODE_MASK 0xF0000000U
#define IOMMU_EVENT_CODE_SHIFT 28
#define IOMMU_EVENT_ILLEGAL_DEV_TABLE_ENTRY 0x1
#define IOMMU_EVENT_IO_PAGE_FAULT 0x2
@@ -251,12 +251,12 @@ struct amd_iommu_dte {
#define IOMMU_EVENT_IOTLB_INV_TIMEOUT 0x7
#define IOMMU_EVENT_INVALID_DEV_REQUEST 0x8
-#define IOMMU_EVENT_DOMAIN_ID_MASK 0x0000FFFF
+#define IOMMU_EVENT_DOMAIN_ID_MASK 0x0000FFFFU
#define IOMMU_EVENT_DOMAIN_ID_SHIFT 0
-#define IOMMU_EVENT_DEVICE_ID_MASK 0x0000FFFF
+#define IOMMU_EVENT_DEVICE_ID_MASK 0x0000FFFFU
#define IOMMU_EVENT_DEVICE_ID_SHIFT 0
#define IOMMU_EVENT_FLAGS_SHIFT 16
-#define IOMMU_EVENT_FLAGS_MASK 0x0FFF0000
+#define IOMMU_EVENT_FLAGS_MASK 0x0FFF0000U
/* PPR Log */
#define IOMMU_PPR_LOG_ENTRY_SIZE 16
@@ -265,21 +265,21 @@ struct amd_iommu_dte {
#define IOMMU_PPR_LOG_BASE_LOW_OFFSET 0x0038
#define IOMMU_PPR_LOG_BASE_HIGH_OFFSET 0x003C
-#define IOMMU_PPR_LOG_BASE_LOW_MASK 0xFFFFF000
+#define IOMMU_PPR_LOG_BASE_LOW_MASK 0xFFFFF000U
#define IOMMU_PPR_LOG_BASE_LOW_SHIFT 12
-#define IOMMU_PPR_LOG_BASE_HIGH_MASK 0x000FFFFF
+#define IOMMU_PPR_LOG_BASE_HIGH_MASK 0x000FFFFFU
#define IOMMU_PPR_LOG_BASE_HIGH_SHIFT 0
-#define IOMMU_PPR_LOG_LENGTH_MASK 0x0F000000
+#define IOMMU_PPR_LOG_LENGTH_MASK 0x0F000000U
#define IOMMU_PPR_LOG_LENGTH_SHIFT 24
-#define IOMMU_PPR_LOG_HEAD_MASK 0x0007FFF0
+#define IOMMU_PPR_LOG_HEAD_MASK 0x0007FFF0U
#define IOMMU_PPR_LOG_HEAD_SHIFT 4
-#define IOMMU_PPR_LOG_TAIL_MASK 0x0007FFF0
+#define IOMMU_PPR_LOG_TAIL_MASK 0x0007FFF0U
#define IOMMU_PPR_LOG_TAIL_SHIFT 4
#define IOMMU_PPR_LOG_HEAD_OFFSET 0x2030
#define IOMMU_PPR_LOG_TAIL_OFFSET 0x2038
-#define IOMMU_PPR_LOG_DEVICE_ID_MASK 0x0000FFFF
+#define IOMMU_PPR_LOG_DEVICE_ID_MASK 0x0000FFFFU
#define IOMMU_PPR_LOG_DEVICE_ID_SHIFT 0
-#define IOMMU_PPR_LOG_CODE_MASK 0xF0000000
+#define IOMMU_PPR_LOG_CODE_MASK 0xF0000000U
#define IOMMU_PPR_LOG_CODE_SHIFT 28
#define IOMMU_LOG_ENTRY_TIMEOUT 1000
@@ -342,17 +342,17 @@ union amd_iommu_control {
#define IOMMU_EXCLUSION_BASE_HIGH_OFFSET 0x24
#define IOMMU_EXCLUSION_LIMIT_LOW_OFFSET 0x28
#define IOMMU_EXCLUSION_LIMIT_HIGH_OFFSET 0x2C
-#define IOMMU_EXCLUSION_BASE_LOW_MASK 0xFFFFF000
+#define IOMMU_EXCLUSION_BASE_LOW_MASK 0xFFFFF000U
#define IOMMU_EXCLUSION_BASE_LOW_SHIFT 12
-#define IOMMU_EXCLUSION_BASE_HIGH_MASK 0xFFFFFFFF
+#define IOMMU_EXCLUSION_BASE_HIGH_MASK 0xFFFFFFFFU
#define IOMMU_EXCLUSION_BASE_HIGH_SHIFT 0
-#define IOMMU_EXCLUSION_RANGE_ENABLE_MASK 0x00000001
+#define IOMMU_EXCLUSION_RANGE_ENABLE_MASK 0x00000001U
#define IOMMU_EXCLUSION_RANGE_ENABLE_SHIFT 0
-#define IOMMU_EXCLUSION_ALLOW_ALL_MASK 0x00000002
+#define IOMMU_EXCLUSION_ALLOW_ALL_MASK 0x00000002U
#define IOMMU_EXCLUSION_ALLOW_ALL_SHIFT 1
-#define IOMMU_EXCLUSION_LIMIT_LOW_MASK 0xFFFFF000
+#define IOMMU_EXCLUSION_LIMIT_LOW_MASK 0xFFFFF000U
#define IOMMU_EXCLUSION_LIMIT_LOW_SHIFT 12
-#define IOMMU_EXCLUSION_LIMIT_HIGH_MASK 0xFFFFFFFF
+#define IOMMU_EXCLUSION_LIMIT_HIGH_MASK 0xFFFFFFFFU
#define IOMMU_EXCLUSION_LIMIT_HIGH_SHIFT 0
/* Extended Feature Register */
@@ -476,14 +476,14 @@ union amd_iommu_pte {
#define INV_IOMMU_ALL_PAGES_ADDRESS ((1ULL << 63) - 1)
-#define IOMMU_RING_BUFFER_PTR_MASK 0x0007FFF0
+#define IOMMU_RING_BUFFER_PTR_MASK 0x0007FFF0U
-#define IOMMU_CMD_DEVICE_ID_MASK 0x0000FFFF
+#define IOMMU_CMD_DEVICE_ID_MASK 0x0000FFFFU
#define IOMMU_CMD_DEVICE_ID_SHIFT 0
-#define IOMMU_REG_BASE_ADDR_LOW_MASK 0xFFFFF000
+#define IOMMU_REG_BASE_ADDR_LOW_MASK 0xFFFFF000U
#define IOMMU_REG_BASE_ADDR_LOW_SHIFT 12
-#define IOMMU_REG_BASE_ADDR_HIGH_MASK 0x000FFFFF
+#define IOMMU_REG_BASE_ADDR_HIGH_MASK 0x000FFFFFU
#define IOMMU_REG_BASE_ADDR_HIGH_SHIFT 0
#endif /* AMD_IOMMU_DEFS_H */
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 02/13] AMD/IOMMU: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 02/13] AMD/IOMMU: " Simone Ballarin
@ 2023-07-05 23:31 ` Stefano Stabellini
2023-07-06 7:48 ` Jan Beulich
0 siblings, 1 reply; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-05 23:31 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Jan Beulich,
Andrew Cooper, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder
On Wed, 5 Jul 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
> Acked-by: Stefano Stabellini <sstabellini@kernel.org>
I reviewed this again and I also the tag should be Reviewed-by (sorry it
was my mistake last time):
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> Changes in v2:
> - minor change to commit title
> - change commit message
> ---
> xen/drivers/passthrough/amd/iommu-defs.h | 122 +++++++++++------------
> 1 file changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/xen/drivers/passthrough/amd/iommu-defs.h b/xen/drivers/passthrough/amd/iommu-defs.h
> index 35de548e3a..c145248f9a 100644
> --- a/xen/drivers/passthrough/amd/iommu-defs.h
> +++ b/xen/drivers/passthrough/amd/iommu-defs.h
> @@ -38,49 +38,49 @@
> ((uint64_t)(offset) << (12 + (PTE_PER_TABLE_SHIFT * ((level) - 1))))
>
> /* IOMMU Capability */
> -#define PCI_CAP_ID_MASK 0x000000FF
> +#define PCI_CAP_ID_MASK 0x000000FFU
> #define PCI_CAP_ID_SHIFT 0
> -#define PCI_CAP_NEXT_PTR_MASK 0x0000FF00
> +#define PCI_CAP_NEXT_PTR_MASK 0x0000FF00U
> #define PCI_CAP_NEXT_PTR_SHIFT 8
> -#define PCI_CAP_TYPE_MASK 0x00070000
> +#define PCI_CAP_TYPE_MASK 0x00070000U
> #define PCI_CAP_TYPE_SHIFT 16
> -#define PCI_CAP_REV_MASK 0x00F80000
> +#define PCI_CAP_REV_MASK 0x00F80000U
> #define PCI_CAP_REV_SHIFT 19
> -#define PCI_CAP_IOTLB_MASK 0x01000000
> +#define PCI_CAP_IOTLB_MASK 0x01000000U
> #define PCI_CAP_IOTLB_SHIFT 24
> -#define PCI_CAP_HT_TUNNEL_MASK 0x02000000
> +#define PCI_CAP_HT_TUNNEL_MASK 0x02000000U
> #define PCI_CAP_HT_TUNNEL_SHIFT 25
> -#define PCI_CAP_NP_CACHE_MASK 0x04000000
> +#define PCI_CAP_NP_CACHE_MASK 0x04000000U
> #define PCI_CAP_NP_CACHE_SHIFT 26
> #define PCI_CAP_EFRSUP_SHIFT 27
> -#define PCI_CAP_RESET_MASK 0x80000000
> +#define PCI_CAP_RESET_MASK 0x80000000U
> #define PCI_CAP_RESET_SHIFT 31
>
> #define PCI_CAP_TYPE_IOMMU 0x3
>
> #define PCI_CAP_MMIO_BAR_LOW_OFFSET 0x04
> #define PCI_CAP_MMIO_BAR_HIGH_OFFSET 0x08
> -#define PCI_CAP_MMIO_BAR_LOW_MASK 0xFFFFC000
> +#define PCI_CAP_MMIO_BAR_LOW_MASK 0xFFFFC000U
> #define IOMMU_MMIO_REGION_LENGTH 0x4000
>
> #define PCI_CAP_RANGE_OFFSET 0x0C
> -#define PCI_CAP_BUS_NUMBER_MASK 0x0000FF00
> +#define PCI_CAP_BUS_NUMBER_MASK 0x0000FF00U
> #define PCI_CAP_BUS_NUMBER_SHIFT 8
> -#define PCI_CAP_FIRST_DEVICE_MASK 0x00FF0000
> +#define PCI_CAP_FIRST_DEVICE_MASK 0x00FF0000U
> #define PCI_CAP_FIRST_DEVICE_SHIFT 16
> -#define PCI_CAP_LAST_DEVICE_MASK 0xFF000000
> +#define PCI_CAP_LAST_DEVICE_MASK 0xFF000000U
> #define PCI_CAP_LAST_DEVICE_SHIFT 24
>
> -#define PCI_CAP_UNIT_ID_MASK 0x0000001F
> +#define PCI_CAP_UNIT_ID_MASK 0x0000001FU
> #define PCI_CAP_UNIT_ID_SHIFT 0
> #define PCI_CAP_MISC_INFO_OFFSET 0x10
> -#define PCI_CAP_MSI_NUMBER_MASK 0x0000001F
> +#define PCI_CAP_MSI_NUMBER_MASK 0x0000001FU
> #define PCI_CAP_MSI_NUMBER_SHIFT 0
>
> /* Device Table */
> #define IOMMU_DEV_TABLE_BASE_LOW_OFFSET 0x00
> #define IOMMU_DEV_TABLE_BASE_HIGH_OFFSET 0x04
> -#define IOMMU_DEV_TABLE_SIZE_MASK 0x000001FF
> +#define IOMMU_DEV_TABLE_SIZE_MASK 0x000001FFU
> #define IOMMU_DEV_TABLE_SIZE_SHIFT 0
>
> #define IOMMU_DEV_TABLE_ENTRIES_PER_BUS 256
> @@ -159,13 +159,13 @@ struct amd_iommu_dte {
> #define IOMMU_CMD_BUFFER_BASE_HIGH_OFFSET 0x0C
> #define IOMMU_CMD_BUFFER_HEAD_OFFSET 0x2000
> #define IOMMU_CMD_BUFFER_TAIL_OFFSET 0x2008
> -#define IOMMU_CMD_BUFFER_LENGTH_MASK 0x0F000000
> +#define IOMMU_CMD_BUFFER_LENGTH_MASK 0x0F000000U
> #define IOMMU_CMD_BUFFER_LENGTH_SHIFT 24
>
> #define IOMMU_CMD_BUFFER_ENTRY_ORDER 4
> #define IOMMU_CMD_BUFFER_MAX_ENTRIES (1u << 15)
>
> -#define IOMMU_CMD_OPCODE_MASK 0xF0000000
> +#define IOMMU_CMD_OPCODE_MASK 0xF0000000U
> #define IOMMU_CMD_OPCODE_SHIFT 28
> #define IOMMU_CMD_COMPLETION_WAIT 0x1
> #define IOMMU_CMD_INVALIDATE_DEVTAB_ENTRY 0x2
> @@ -178,50 +178,50 @@ struct amd_iommu_dte {
> /* COMPLETION_WAIT command */
> #define IOMMU_COMP_WAIT_DATA_BUFFER_SIZE 8
> #define IOMMU_COMP_WAIT_DATA_BUFFER_ALIGNMENT 8
> -#define IOMMU_COMP_WAIT_S_FLAG_MASK 0x00000001
> -#define IOMMU_COMP_WAIT_I_FLAG_MASK 0x00000002
> -#define IOMMU_COMP_WAIT_F_FLAG_MASK 0x00000004
> -#define IOMMU_COMP_WAIT_ADDR_LOW_MASK 0xFFFFFFF8
> +#define IOMMU_COMP_WAIT_S_FLAG_MASK 0x00000001U
> +#define IOMMU_COMP_WAIT_I_FLAG_MASK 0x00000002U
> +#define IOMMU_COMP_WAIT_F_FLAG_MASK 0x00000004U
> +#define IOMMU_COMP_WAIT_ADDR_LOW_MASK 0xFFFFFFF8U
> #define IOMMU_COMP_WAIT_ADDR_LOW_SHIFT 3
> -#define IOMMU_COMP_WAIT_ADDR_HIGH_MASK 0x000FFFFF
> +#define IOMMU_COMP_WAIT_ADDR_HIGH_MASK 0x000FFFFFU
> #define IOMMU_COMP_WAIT_ADDR_HIGH_SHIFT 0
>
> /* INVALIDATE_IOMMU_PAGES command */
> -#define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_MASK 0x0000FFFF
> +#define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_MASK 0x0000FFFFU
> #define IOMMU_INV_IOMMU_PAGES_DOMAIN_ID_SHIFT 0
> -#define IOMMU_INV_IOMMU_PAGES_S_FLAG_MASK 0x00000001
> +#define IOMMU_INV_IOMMU_PAGES_S_FLAG_MASK 0x00000001U
> #define IOMMU_INV_IOMMU_PAGES_S_FLAG_SHIFT 0
> -#define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_MASK 0x00000002
> +#define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_MASK 0x00000002U
> #define IOMMU_INV_IOMMU_PAGES_PDE_FLAG_SHIFT 1
> -#define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_MASK 0xFFFFF000
> +#define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_MASK 0xFFFFF000U
> #define IOMMU_INV_IOMMU_PAGES_ADDR_LOW_SHIFT 12
> -#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_MASK 0xFFFFFFFF
> +#define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_MASK 0xFFFFFFFFU
> #define IOMMU_INV_IOMMU_PAGES_ADDR_HIGH_SHIFT 0
>
> /* INVALIDATE_DEVTAB_ENTRY command */
> -#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_MASK 0x0000FFFF
> +#define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_MASK 0x0000FFFFU
> #define IOMMU_INV_DEVTAB_ENTRY_DEVICE_ID_SHIFT 0
>
> /* INVALIDATE_INTERRUPT_TABLE command */
> -#define IOMMU_INV_INT_TABLE_DEVICE_ID_MASK 0x0000FFFF
> +#define IOMMU_INV_INT_TABLE_DEVICE_ID_MASK 0x0000FFFFU
> #define IOMMU_INV_INT_TABLE_DEVICE_ID_SHIFT 0
>
> /* INVALIDATE_IOTLB_PAGES command */
> -#define IOMMU_INV_IOTLB_PAGES_MAXPEND_MASK 0xff000000
> +#define IOMMU_INV_IOTLB_PAGES_MAXPEND_MASK 0xff000000U
> #define IOMMU_INV_IOTLB_PAGES_MAXPEND_SHIFT 24
> -#define IOMMU_INV_IOTLB_PAGES_PASID1_MASK 0x00ff0000
> +#define IOMMU_INV_IOTLB_PAGES_PASID1_MASK 0x00ff0000U
> #define IOMMU_INV_IOTLB_PAGES_PASID1_SHIFT 16
> -#define IOMMU_INV_IOTLB_PAGES_PASID2_MASK 0x0fff0000
> +#define IOMMU_INV_IOTLB_PAGES_PASID2_MASK 0x0fff0000U
> #define IOMMU_INV_IOTLB_PAGES_PASID2_SHIFT 16
> -#define IOMMU_INV_IOTLB_PAGES_QUEUEID_MASK 0x0000ffff
> +#define IOMMU_INV_IOTLB_PAGES_QUEUEID_MASK 0x0000ffffU
> #define IOMMU_INV_IOTLB_PAGES_QUEUEID_SHIFT 0
> -#define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_MASK 0x0000FFFF
> +#define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_MASK 0x0000FFFFU
> #define IOMMU_INV_IOTLB_PAGES_DEVICE_ID_SHIFT 0
> -#define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_MASK 0xFFFFF000
> +#define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_MASK 0xFFFFF000U
> #define IOMMU_INV_IOTLB_PAGES_ADDR_LOW_SHIFT 12
> -#define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_MASK 0xFFFFFFFF
> +#define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_MASK 0xFFFFFFFFU
> #define IOMMU_INV_IOTLB_PAGES_ADDR_HIGH_SHIFT 0
> -#define IOMMU_INV_IOTLB_PAGES_S_FLAG_MASK 0x00000001
> +#define IOMMU_INV_IOTLB_PAGES_S_FLAG_MASK 0x00000001U
> #define IOMMU_INV_IOTLB_PAGES_S_FLAG_SHIFT 0
>
> /* Event Log */
> @@ -229,18 +229,18 @@ struct amd_iommu_dte {
> #define IOMMU_EVENT_LOG_BASE_HIGH_OFFSET 0x14
> #define IOMMU_EVENT_LOG_HEAD_OFFSET 0x2010
> #define IOMMU_EVENT_LOG_TAIL_OFFSET 0x2018
> -#define IOMMU_EVENT_LOG_LENGTH_MASK 0x0F000000
> +#define IOMMU_EVENT_LOG_LENGTH_MASK 0x0F000000U
> #define IOMMU_EVENT_LOG_LENGTH_SHIFT 24
> -#define IOMMU_EVENT_LOG_HEAD_MASK 0x0007FFF0
> +#define IOMMU_EVENT_LOG_HEAD_MASK 0x0007FFF0U
> #define IOMMU_EVENT_LOG_HEAD_SHIFT 4
> -#define IOMMU_EVENT_LOG_TAIL_MASK 0x0007FFF0
> +#define IOMMU_EVENT_LOG_TAIL_MASK 0x0007FFF0U
> #define IOMMU_EVENT_LOG_TAIL_SHIFT 4
>
> #define IOMMU_EVENT_LOG_ENTRY_SIZE 16
> #define IOMMU_EVENT_LOG_POWER_OF2_ENTRIES_PER_PAGE 8
> #define IOMMU_EVENT_LOG_U32_PER_ENTRY (IOMMU_EVENT_LOG_ENTRY_SIZE / 4)
>
> -#define IOMMU_EVENT_CODE_MASK 0xF0000000
> +#define IOMMU_EVENT_CODE_MASK 0xF0000000U
> #define IOMMU_EVENT_CODE_SHIFT 28
> #define IOMMU_EVENT_ILLEGAL_DEV_TABLE_ENTRY 0x1
> #define IOMMU_EVENT_IO_PAGE_FAULT 0x2
> @@ -251,12 +251,12 @@ struct amd_iommu_dte {
> #define IOMMU_EVENT_IOTLB_INV_TIMEOUT 0x7
> #define IOMMU_EVENT_INVALID_DEV_REQUEST 0x8
>
> -#define IOMMU_EVENT_DOMAIN_ID_MASK 0x0000FFFF
> +#define IOMMU_EVENT_DOMAIN_ID_MASK 0x0000FFFFU
> #define IOMMU_EVENT_DOMAIN_ID_SHIFT 0
> -#define IOMMU_EVENT_DEVICE_ID_MASK 0x0000FFFF
> +#define IOMMU_EVENT_DEVICE_ID_MASK 0x0000FFFFU
> #define IOMMU_EVENT_DEVICE_ID_SHIFT 0
> #define IOMMU_EVENT_FLAGS_SHIFT 16
> -#define IOMMU_EVENT_FLAGS_MASK 0x0FFF0000
> +#define IOMMU_EVENT_FLAGS_MASK 0x0FFF0000U
>
> /* PPR Log */
> #define IOMMU_PPR_LOG_ENTRY_SIZE 16
> @@ -265,21 +265,21 @@ struct amd_iommu_dte {
>
> #define IOMMU_PPR_LOG_BASE_LOW_OFFSET 0x0038
> #define IOMMU_PPR_LOG_BASE_HIGH_OFFSET 0x003C
> -#define IOMMU_PPR_LOG_BASE_LOW_MASK 0xFFFFF000
> +#define IOMMU_PPR_LOG_BASE_LOW_MASK 0xFFFFF000U
> #define IOMMU_PPR_LOG_BASE_LOW_SHIFT 12
> -#define IOMMU_PPR_LOG_BASE_HIGH_MASK 0x000FFFFF
> +#define IOMMU_PPR_LOG_BASE_HIGH_MASK 0x000FFFFFU
> #define IOMMU_PPR_LOG_BASE_HIGH_SHIFT 0
> -#define IOMMU_PPR_LOG_LENGTH_MASK 0x0F000000
> +#define IOMMU_PPR_LOG_LENGTH_MASK 0x0F000000U
> #define IOMMU_PPR_LOG_LENGTH_SHIFT 24
> -#define IOMMU_PPR_LOG_HEAD_MASK 0x0007FFF0
> +#define IOMMU_PPR_LOG_HEAD_MASK 0x0007FFF0U
> #define IOMMU_PPR_LOG_HEAD_SHIFT 4
> -#define IOMMU_PPR_LOG_TAIL_MASK 0x0007FFF0
> +#define IOMMU_PPR_LOG_TAIL_MASK 0x0007FFF0U
> #define IOMMU_PPR_LOG_TAIL_SHIFT 4
> #define IOMMU_PPR_LOG_HEAD_OFFSET 0x2030
> #define IOMMU_PPR_LOG_TAIL_OFFSET 0x2038
> -#define IOMMU_PPR_LOG_DEVICE_ID_MASK 0x0000FFFF
> +#define IOMMU_PPR_LOG_DEVICE_ID_MASK 0x0000FFFFU
> #define IOMMU_PPR_LOG_DEVICE_ID_SHIFT 0
> -#define IOMMU_PPR_LOG_CODE_MASK 0xF0000000
> +#define IOMMU_PPR_LOG_CODE_MASK 0xF0000000U
> #define IOMMU_PPR_LOG_CODE_SHIFT 28
>
> #define IOMMU_LOG_ENTRY_TIMEOUT 1000
> @@ -342,17 +342,17 @@ union amd_iommu_control {
> #define IOMMU_EXCLUSION_BASE_HIGH_OFFSET 0x24
> #define IOMMU_EXCLUSION_LIMIT_LOW_OFFSET 0x28
> #define IOMMU_EXCLUSION_LIMIT_HIGH_OFFSET 0x2C
> -#define IOMMU_EXCLUSION_BASE_LOW_MASK 0xFFFFF000
> +#define IOMMU_EXCLUSION_BASE_LOW_MASK 0xFFFFF000U
> #define IOMMU_EXCLUSION_BASE_LOW_SHIFT 12
> -#define IOMMU_EXCLUSION_BASE_HIGH_MASK 0xFFFFFFFF
> +#define IOMMU_EXCLUSION_BASE_HIGH_MASK 0xFFFFFFFFU
> #define IOMMU_EXCLUSION_BASE_HIGH_SHIFT 0
> -#define IOMMU_EXCLUSION_RANGE_ENABLE_MASK 0x00000001
> +#define IOMMU_EXCLUSION_RANGE_ENABLE_MASK 0x00000001U
> #define IOMMU_EXCLUSION_RANGE_ENABLE_SHIFT 0
> -#define IOMMU_EXCLUSION_ALLOW_ALL_MASK 0x00000002
> +#define IOMMU_EXCLUSION_ALLOW_ALL_MASK 0x00000002U
> #define IOMMU_EXCLUSION_ALLOW_ALL_SHIFT 1
> -#define IOMMU_EXCLUSION_LIMIT_LOW_MASK 0xFFFFF000
> +#define IOMMU_EXCLUSION_LIMIT_LOW_MASK 0xFFFFF000U
> #define IOMMU_EXCLUSION_LIMIT_LOW_SHIFT 12
> -#define IOMMU_EXCLUSION_LIMIT_HIGH_MASK 0xFFFFFFFF
> +#define IOMMU_EXCLUSION_LIMIT_HIGH_MASK 0xFFFFFFFFU
> #define IOMMU_EXCLUSION_LIMIT_HIGH_SHIFT 0
>
> /* Extended Feature Register */
> @@ -476,14 +476,14 @@ union amd_iommu_pte {
>
> #define INV_IOMMU_ALL_PAGES_ADDRESS ((1ULL << 63) - 1)
>
> -#define IOMMU_RING_BUFFER_PTR_MASK 0x0007FFF0
> +#define IOMMU_RING_BUFFER_PTR_MASK 0x0007FFF0U
>
> -#define IOMMU_CMD_DEVICE_ID_MASK 0x0000FFFF
> +#define IOMMU_CMD_DEVICE_ID_MASK 0x0000FFFFU
> #define IOMMU_CMD_DEVICE_ID_SHIFT 0
>
> -#define IOMMU_REG_BASE_ADDR_LOW_MASK 0xFFFFF000
> +#define IOMMU_REG_BASE_ADDR_LOW_MASK 0xFFFFF000U
> #define IOMMU_REG_BASE_ADDR_LOW_SHIFT 12
> -#define IOMMU_REG_BASE_ADDR_HIGH_MASK 0x000FFFFF
> +#define IOMMU_REG_BASE_ADDR_HIGH_MASK 0x000FFFFFU
> #define IOMMU_REG_BASE_ADDR_HIGH_SHIFT 0
>
> #endif /* AMD_IOMMU_DEFS_H */
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 02/13] AMD/IOMMU: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 23:31 ` Stefano Stabellini
@ 2023-07-06 7:48 ` Jan Beulich
0 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 7:48 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Andrew Cooper,
Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder,
Stefano Stabellini
On 06.07.2023 01:31, Stefano Stabellini wrote:
> On Wed, 5 Jul 2023, Simone Ballarin wrote:
>> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>
>> 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: Simone Ballarin <simone.ballarin@bugseng.com>
>> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
>> Acked-by: Stefano Stabellini <sstabellini@kernel.org>
>
> I reviewed this again and I also the tag should be Reviewed-by (sorry it
> was my mistake last time):
>
> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 03/13] x86/svm: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
2023-07-05 15:26 ` [XEN PATCH v2 01/13] x86/cpufreq: " Simone Ballarin
2023-07-05 15:26 ` [XEN PATCH v2 02/13] AMD/IOMMU: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-06 7:52 ` Jan Beulich
2023-07-05 15:26 ` [XEN PATCH v2 04/13] xen/arm: " Simone Ballarin
` (9 subsequent siblings)
12 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Jan Beulich, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
Changes in v2:
- change commit title to make it unique
- change commit message
---
xen/arch/x86/hvm/svm/asid.c | 2 +-
xen/arch/x86/hvm/svm/svm.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c
index 09f8c23fd9..56306d1a16 100644
--- a/xen/arch/x86/hvm/svm/asid.c
+++ b/xen/arch/x86/hvm/svm/asid.c
@@ -16,7 +16,7 @@ void svm_asid_init(const struct cpuinfo_x86 *c)
/* Check for erratum #170, and leave ASIDs disabled if it's present. */
if ( !cpu_has_amd_erratum(c, AMD_ERRATUM_170) )
- nasids = cpuid_ebx(0x8000000A);
+ nasids = cpuid_ebx(0x8000000AU);
hvm_asid_init(nasids);
}
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 59a6e88dff..56cb2f61bb 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -269,9 +269,9 @@ svm_msrbit(unsigned long *msr_bitmap, uint32_t msr)
*/
if ( msr <= 0x1fff )
msr_bit = msr_bitmap + 0x0000 / BYTES_PER_LONG;
- else if ( (msr >= 0xc0000000) && (msr <= 0xc0001fff) )
+ else if ( (msr >= 0xc0000000U) && (msr <= 0xc0001fffU) )
msr_bit = msr_bitmap + 0x0800 / BYTES_PER_LONG;
- else if ( (msr >= 0xc0010000) && (msr <= 0xc0011fff) )
+ else if ( (msr >= 0xc0010000U) && (msr <= 0xc0011fffU) )
msr_bit = msr_bitmap + 0x1000 / BYTES_PER_LONG;
return msr_bit;
@@ -2539,8 +2539,8 @@ const struct hvm_function_table * __init start_svm(void)
setup_vmcb_dump();
- if ( boot_cpu_data.extended_cpuid_level >= 0x8000000a )
- svm_feature_flags = cpuid_edx(0x8000000a);
+ if ( boot_cpu_data.extended_cpuid_level >= 0x8000000aU )
+ svm_feature_flags = cpuid_edx(0x8000000aU);
printk("SVM: Supported advanced features:\n");
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 03/13] x86/svm: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 03/13] x86/svm: " Simone Ballarin
@ 2023-07-06 7:52 ` Jan Beulich
0 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 7:52 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, xen-devel
On 05.07.2023 17:26, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
albeit ...
> --- a/xen/arch/x86/hvm/svm/asid.c
> +++ b/xen/arch/x86/hvm/svm/asid.c
> @@ -16,7 +16,7 @@ void svm_asid_init(const struct cpuinfo_x86 *c)
>
> /* Check for erratum #170, and leave ASIDs disabled if it's present. */
> if ( !cpu_has_amd_erratum(c, AMD_ERRATUM_170) )
> - nasids = cpuid_ebx(0x8000000A);
> + nasids = cpuid_ebx(0x8000000AU);
... I guess it would be nice to also change A to a here, to match ...
> --- a/xen/arch/x86/hvm/svm/svm.c
> +++ b/xen/arch/x86/hvm/svm/svm.c
> @@ -269,9 +269,9 @@ svm_msrbit(unsigned long *msr_bitmap, uint32_t msr)
> */
> if ( msr <= 0x1fff )
> msr_bit = msr_bitmap + 0x0000 / BYTES_PER_LONG;
> - else if ( (msr >= 0xc0000000) && (msr <= 0xc0001fff) )
> + else if ( (msr >= 0xc0000000U) && (msr <= 0xc0001fffU) )
> msr_bit = msr_bitmap + 0x0800 / BYTES_PER_LONG;
> - else if ( (msr >= 0xc0010000) && (msr <= 0xc0011fff) )
> + else if ( (msr >= 0xc0010000U) && (msr <= 0xc0011fffU) )
> msr_bit = msr_bitmap + 0x1000 / BYTES_PER_LONG;
>
> return msr_bit;
> @@ -2539,8 +2539,8 @@ const struct hvm_function_table * __init start_svm(void)
>
> setup_vmcb_dump();
>
> - if ( boot_cpu_data.extended_cpuid_level >= 0x8000000a )
> - svm_feature_flags = cpuid_edx(0x8000000a);
> + if ( boot_cpu_data.extended_cpuid_level >= 0x8000000aU )
> + svm_feature_flags = cpuid_edx(0x8000000aU);
>
> printk("SVM: Supported advanced features:\n");
>
... other (similar and dissimilar) constants used (and adjusted).
I guess I'll take the liberty to make this adjustment while
committing.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 04/13] xen/arm: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (2 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 03/13] x86/svm: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 16:27 ` Luca Fancellu
2023-07-05 15:26 ` [XEN PATCH v2 05/13] xen/device-tree: " Simone Ballarin
` (8 subsequent siblings)
12 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Stefano Stabellini, Julien Grall,
Bertrand Marquis, Volodymyr Babchuk, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
Changes in v2:
- minor change to commit title
- change commit message
- fix in 'domain_build.c' file for consistency
- fix typo in 'gic-v2.c' file
- fix in 'insn.h' file for consistency
- add fixes in 'gic-v3.c', 'traps.c' and 'vgic-v3.c'
---
xen/arch/arm/domain_build.c | 4 ++--
xen/arch/arm/efi/efi-boot.h | 2 +-
xen/arch/arm/gic-v2.c | 6 +++---
xen/arch/arm/gic-v3.c | 10 +++++-----
xen/arch/arm/include/asm/arm64/brk.h | 2 +-
xen/arch/arm/include/asm/arm64/efibind.h | 10 +++++-----
xen/arch/arm/include/asm/arm64/insn.h | 16 ++++++++--------
xen/arch/arm/include/asm/vreg.h | 2 +-
xen/arch/arm/kernel.c | 2 +-
xen/arch/arm/traps.c | 14 +++++++-------
xen/arch/arm/vgic-v2.c | 2 +-
xen/arch/arm/vgic-v3.c | 2 +-
xen/include/public/arch-arm/smccc.h | 8 ++++----
13 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index d0d6be922d..d58604ef4a 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -3751,8 +3751,8 @@ static int __init construct_domain(struct domain *d, struct kernel_info *kinfo)
* r1 = machine nr, r2 = atags or dtb pointer.
*...
*/
- regs->r0 = 0; /* SBZ */
- regs->r1 = 0xffffffff; /* We use DTB therefore no machine id */
+ regs->r0 = 0U; /* SBZ */
+ regs->r1 = 0xffffffffU; /* We use DTB therefore no machine id */
regs->r2 = kinfo->dtb_paddr;
}
#ifdef CONFIG_ARM_64
diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h
index bb64925d70..585332647d 100644
--- a/xen/arch/arm/efi/efi-boot.h
+++ b/xen/arch/arm/efi/efi-boot.h
@@ -46,7 +46,7 @@ static int get_module_file_index(const char *name, unsigned int name_len);
static void PrintMessage(const CHAR16 *s);
#define DEVICE_TREE_GUID \
-{0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}}
+{0xb1b621d5U, 0xf19cU, 0x41a5U, {0x83U, 0x0bU, 0xd9U, 0x15U, 0x2cU, 0x69U, 0xaaU, 0xe0U}}
static struct file __initdata dtbfile;
static void __initdata *fdt;
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 6476ff4230..cf392bfd1c 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -386,9 +386,9 @@ static void gicv2_cpu_init(void)
/* The first 32 interrupts (PPI and SGI) are banked per-cpu, so
* even though they are controlled with GICD registers, they must
* be set up here with the other per-cpu state. */
- writel_gicd(0xffffffff, GICD_ICACTIVER); /* Diactivate PPIs and SGIs */
- writel_gicd(0xffff0000, GICD_ICENABLER); /* Disable all PPI */
- writel_gicd(0x0000ffff, GICD_ISENABLER); /* Enable all SGI */
+ writel_gicd(0xffffffffU, GICD_ICACTIVER); /* De-activate PPIs and SGIs */
+ writel_gicd(0xffff0000U, GICD_ICENABLER); /* Disable all PPI */
+ writel_gicd(0x0000ffffU, GICD_ISENABLER); /* Enable all SGI */
/* Set SGI priorities */
for ( i = 0; i < 16; i += 4 )
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index 4e6c98bada..95e4f020fe 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -619,8 +619,8 @@ static void __init gicv3_dist_init(void)
/* Disable/deactivate all global interrupts */
for ( i = NR_GIC_LOCAL_IRQS; i < nr_lines; i += 32 )
{
- writel_relaxed(0xffffffff, GICD + GICD_ICENABLER + (i / 32) * 4);
- writel_relaxed(0xffffffff, GICD + GICD_ICACTIVER + (i / 32) * 4);
+ writel_relaxed(0xffffffffU, GICD + GICD_ICENABLER + (i / 32) * 4);
+ writel_relaxed(0xffffffffU, GICD + GICD_ICACTIVER + (i / 32) * 4);
}
/*
@@ -832,13 +832,13 @@ static int gicv3_cpu_init(void)
* The activate state is unknown at boot, so make sure all
* SGIs and PPIs are de-activated.
*/
- writel_relaxed(0xffffffff, GICD_RDIST_SGI_BASE + GICR_ICACTIVER0);
+ writel_relaxed(0xffffffffU, GICD_RDIST_SGI_BASE + GICR_ICACTIVER0);
/*
* Disable all PPI interrupts, ensure all SGI interrupts are
* enabled.
*/
- writel_relaxed(0xffff0000, GICD_RDIST_SGI_BASE + GICR_ICENABLER0);
- writel_relaxed(0x0000ffff, GICD_RDIST_SGI_BASE + GICR_ISENABLER0);
+ writel_relaxed(0xffff0000U, GICD_RDIST_SGI_BASE + GICR_ICENABLER0);
+ writel_relaxed(0x0000ffffU, GICD_RDIST_SGI_BASE + GICR_ISENABLER0);
/* Configure SGIs/PPIs as non-secure Group-1 */
writel_relaxed(GENMASK(31, 0), GICD_RDIST_SGI_BASE + GICR_IGROUPR0);
diff --git a/xen/arch/arm/include/asm/arm64/brk.h b/xen/arch/arm/include/asm/arm64/brk.h
index 04442c4b9f..3af153a053 100644
--- a/xen/arch/arm/include/asm/arm64/brk.h
+++ b/xen/arch/arm/include/asm/arm64/brk.h
@@ -21,7 +21,7 @@
* BRK instruction encoding
* The #imm16 value should be placed at bits[20:5] within BRK ins
*/
-#define AARCH64_BREAK_MON 0xd4200000
+#define AARCH64_BREAK_MON 0xd4200000U
/*
* BRK instruction for provoking a fault on purpose
diff --git a/xen/arch/arm/include/asm/arm64/efibind.h b/xen/arch/arm/include/asm/arm64/efibind.h
index 8b43bb8495..0e890b666d 100644
--- a/xen/arch/arm/include/asm/arm64/efibind.h
+++ b/xen/arch/arm/include/asm/arm64/efibind.h
@@ -22,12 +22,12 @@ Revision History
#pragma pack()
#endif
-#define EFIERR(a) (0x8000000000000000 | a)
-#define EFI_ERROR_MASK 0x8000000000000000
-#define EFIERR_OEM(a) (0xc000000000000000 | a)
+#define EFIERR(a) (0x8000000000000000U | a)
+#define EFI_ERROR_MASK 0x8000000000000000U
+#define EFIERR_OEM(a) (0xc000000000000000U | a)
-#define BAD_POINTER 0xFBFBFBFBFBFBFBFB
-#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFF
+#define BAD_POINTER 0xFBFBFBFBFBFBFBFBU
+#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFFU
#define EFI_STUB_ERROR MAX_ADDRESS
diff --git a/xen/arch/arm/include/asm/arm64/insn.h b/xen/arch/arm/include/asm/arm64/insn.h
index 4e0d364d41..6308959449 100644
--- a/xen/arch/arm/include/asm/arm64/insn.h
+++ b/xen/arch/arm/include/asm/arm64/insn.h
@@ -60,14 +60,14 @@ static always_inline bool aarch64_insn_is_##abbr(u32 code) \
static always_inline u32 aarch64_insn_get_##abbr##_value(void) \
{ return (val); }
-__AARCH64_INSN_FUNCS(b, 0xFC000000, 0x14000000)
-__AARCH64_INSN_FUNCS(bl, 0xFC000000, 0x94000000)
-__AARCH64_INSN_FUNCS(cbz, 0x7F000000, 0x34000000)
-__AARCH64_INSN_FUNCS(cbnz, 0x7F000000, 0x35000000)
-__AARCH64_INSN_FUNCS(tbz, 0x7F000000, 0x36000000)
-__AARCH64_INSN_FUNCS(tbnz, 0x7F000000, 0x37000000)
-__AARCH64_INSN_FUNCS(bcond, 0xFF000010, 0x54000000)
-__AARCH64_INSN_FUNCS(hint, 0xFFFFF01F, 0xD503201F)
+__AARCH64_INSN_FUNCS(b, 0xFC000000U, 0x14000000U)
+__AARCH64_INSN_FUNCS(bl, 0xFC000000U, 0x94000000U)
+__AARCH64_INSN_FUNCS(cbz, 0x7F000000U, 0x34000000U)
+__AARCH64_INSN_FUNCS(cbnz, 0x7F000000U, 0x35000000U)
+__AARCH64_INSN_FUNCS(tbz, 0x7F000000U, 0x36000000U)
+__AARCH64_INSN_FUNCS(tbnz, 0x7F000000U, 0x37000000U)
+__AARCH64_INSN_FUNCS(bcond, 0xFF000010U, 0x54000000U)
+__AARCH64_INSN_FUNCS(hint, 0xFFFFF01FU, 0xD503201FU)
bool aarch64_insn_is_branch_imm(u32 insn);
diff --git a/xen/arch/arm/include/asm/vreg.h b/xen/arch/arm/include/asm/vreg.h
index bf945eebbd..387ce76e7e 100644
--- a/xen/arch/arm/include/asm/vreg.h
+++ b/xen/arch/arm/include/asm/vreg.h
@@ -56,7 +56,7 @@ static inline bool vreg_emulate_cp64(struct cpu_user_regs *regs, union hsr hsr,
if ( ret && cp64.read )
{
- set_user_reg(regs, cp64.reg1, x & 0xffffffff);
+ set_user_reg(regs, cp64.reg1, x & 0xffffffffU);
set_user_reg(regs, cp64.reg2, x >> 32);
}
diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
index ca5318515e..508c54824d 100644
--- a/xen/arch/arm/kernel.c
+++ b/xen/arch/arm/kernel.c
@@ -39,7 +39,7 @@ struct minimal_dtb_header {
/* There are other fields but we don't use them yet. */
};
-#define DTB_MAGIC 0xd00dfeed
+#define DTB_MAGIC 0xd00dfeedU
/**
* copy_from_paddr - copy data from a physical address
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index ef5c6a8195..d1ef787638 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -398,7 +398,7 @@ static vaddr_t exception_handler32(vaddr_t offset)
register_t sctlr = READ_SYSREG(SCTLR_EL1);
if ( sctlr & SCTLR_A32_EL1_V )
- return 0xffff0000 + offset;
+ return 0xffff0000U + offset;
else /* always have security exceptions */
return READ_SYSREG(VBAR_EL1) + offset;
}
@@ -809,7 +809,7 @@ static void show_registers_32(const struct cpu_user_regs *regs,
#ifdef CONFIG_ARM_64
(uint32_t)(ctxt->far >> 32),
ctxt->ifsr32_el2,
- (uint32_t)(ctxt->far & 0xffffffff),
+ (uint32_t)(ctxt->far & 0xffffffffU),
ctxt->esr_el1
#else
ctxt->ifar, ctxt->ifsr, ctxt->dfar, ctxt->dfsr
@@ -1414,16 +1414,16 @@ static void do_trap_hypercall(struct cpu_user_regs *regs, register_t *nr,
{
/* Deliberately corrupt parameter regs used by this hypercall. */
switch ( hypercall_args[*nr] ) {
- case 5: HYPERCALL_ARG5(regs) = 0xDEADBEEF;
- case 4: HYPERCALL_ARG4(regs) = 0xDEADBEEF;
- case 3: HYPERCALL_ARG3(regs) = 0xDEADBEEF;
- case 2: HYPERCALL_ARG2(regs) = 0xDEADBEEF;
+ case 5: HYPERCALL_ARG5(regs) = 0xDEADBEEFU;
+ case 4: HYPERCALL_ARG4(regs) = 0xDEADBEEFU;
+ case 3: HYPERCALL_ARG3(regs) = 0xDEADBEEFU;
+ case 2: HYPERCALL_ARG2(regs) = 0xDEADBEEFU;
case 1: /* Don't clobber x0/r0 -- it's the return value */
case 0: /* -ENOSYS case */
break;
default: BUG();
}
- *nr = 0xDEADBEEF;
+ *nr = 0xDEADBEEFU;
}
#endif
diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c
index 0b083c33e6..35363fee09 100644
--- a/xen/arch/arm/vgic-v2.c
+++ b/xen/arch/arm/vgic-v2.c
@@ -306,7 +306,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info,
case VREG32(GICD_SGIR):
if ( dabt.size != DABT_WORD ) goto bad_width;
/* Write only -- read unknown */
- *r = 0xdeadbeef;
+ *r = 0xdeadbeefU;
return 1;
case VRANGE32(0xF04, 0xF0C):
diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c
index 9c1fdcc3f8..f3e9eb2f92 100644
--- a/xen/arch/arm/vgic-v3.c
+++ b/xen/arch/arm/vgic-v3.c
@@ -354,7 +354,7 @@ read_reserved:
return 1;
read_unknown:
- *r = vreg_reg64_extract(0xdeadbeafdeadbeaf, info);
+ *r = vreg_reg64_extract(0xdeadbeafdeadbeafU, info);
return 1;
}
diff --git a/xen/include/public/arch-arm/smccc.h b/xen/include/public/arch-arm/smccc.h
index 802d800aad..8553f2f39e 100644
--- a/xen/include/public/arch-arm/smccc.h
+++ b/xen/include/public/arch-arm/smccc.h
@@ -26,16 +26,16 @@
#define XEN_SMCCC_MINOR_REVISION 1
/* Hypervisor Service UID. Randomly generated with uuidgen. */
-#define XEN_SMCCC_UID XEN_DEFINE_UUID(0xa71812dc, 0xc698, 0x4369, 0x9acf, \
- 0x79, 0xd1, 0x8d, 0xde, 0xe6, 0x67)
+#define XEN_SMCCC_UID XEN_DEFINE_UUID(0xa71812dcU, 0xc698U, 0x4369U, 0x9acfU, \
+ 0x79U, 0xd1U, 0x8dU, 0xdeU, 0xe6U, 0x67U)
/* Standard Service Service Call version. */
#define SSSC_SMCCC_MAJOR_REVISION 0
#define SSSC_SMCCC_MINOR_REVISION 1
/* Standard Service Call UID. Randomly generated with uuidgen. */
-#define SSSC_SMCCC_UID XEN_DEFINE_UUID(0xf863386f, 0x4b39, 0x4cbd, 0x9220,\
- 0xce, 0x16, 0x41, 0xe5, 0x9f, 0x6f)
+#define SSSC_SMCCC_UID XEN_DEFINE_UUID(0xf863386fU, 0x4b39U, 0x4cbdU, 0x9220U,\
+ 0xceU, 0x16U, 0x41U, 0xe5U, 0x9fU, 0x6fU)
#endif /* __XEN_PUBLIC_ARCH_ARM_SMCCC_H__ */
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 04/13] xen/arm: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 04/13] xen/arm: " Simone Ballarin
@ 2023-07-05 16:27 ` Luca Fancellu
2023-07-05 16:42 ` Julien Grall
0 siblings, 1 reply; 59+ messages in thread
From: Luca Fancellu @ 2023-07-05 16:27 UTC (permalink / raw)
To: Simone Ballarin
Cc: Xen-devel, consulting, Gianluca Luparini, Stefano Stabellini,
Julien Grall, Bertrand Marquis, Volodymyr Babchuk, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder
> On 5 Jul 2023, at 16:26, Simone Ballarin <simone.ballarin@bugseng.com> wrote:
>
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
> ---
> Changes in v2:
> - minor change to commit title
> - change commit message
> - fix in 'domain_build.c' file for consistency
> - fix typo in 'gic-v2.c' file
> - fix in 'insn.h' file for consistency
> - add fixes in 'gic-v3.c', 'traps.c' and 'vgic-v3.c'
> ---
> xen/arch/arm/domain_build.c | 4 ++--
> xen/arch/arm/efi/efi-boot.h | 2 +-
> xen/arch/arm/gic-v2.c | 6 +++---
> xen/arch/arm/gic-v3.c | 10 +++++-----
> xen/arch/arm/include/asm/arm64/brk.h | 2 +-
> xen/arch/arm/include/asm/arm64/efibind.h | 10 +++++-----
> xen/arch/arm/include/asm/arm64/insn.h | 16 ++++++++--------
> xen/arch/arm/include/asm/vreg.h | 2 +-
> xen/arch/arm/kernel.c | 2 +-
> xen/arch/arm/traps.c | 14 +++++++-------
> xen/arch/arm/vgic-v2.c | 2 +-
> xen/arch/arm/vgic-v3.c | 2 +-
> xen/include/public/arch-arm/smccc.h | 8 ++++----
> 13 files changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index d0d6be922d..d58604ef4a 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -3751,8 +3751,8 @@ static int __init construct_domain(struct domain *d, struct kernel_info *kinfo)
> * r1 = machine nr, r2 = atags or dtb pointer.
> *...
> */
> - regs->r0 = 0; /* SBZ */
> - regs->r1 = 0xffffffff; /* We use DTB therefore no machine id */
> + regs->r0 = 0U; /* SBZ */
> + regs->r1 = 0xffffffffU; /* We use DTB therefore no machine id */
> regs->r2 = kinfo->dtb_paddr;
> }
> #ifdef CONFIG_ARM_64
> diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h
> index bb64925d70..585332647d 100644
> --- a/xen/arch/arm/efi/efi-boot.h
> +++ b/xen/arch/arm/efi/efi-boot.h
> @@ -46,7 +46,7 @@ static int get_module_file_index(const char *name, unsigned int name_len);
> static void PrintMessage(const CHAR16 *s);
>
> #define DEVICE_TREE_GUID \
> -{0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}}
> +{0xb1b621d5U, 0xf19cU, 0x41a5U, {0x83U, 0x0bU, 0xd9U, 0x15U, 0x2cU, 0x69U, 0xaaU, 0xe0U}}
>
> static struct file __initdata dtbfile;
> static void __initdata *fdt;
> diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
> index 6476ff4230..cf392bfd1c 100644
> --- a/xen/arch/arm/gic-v2.c
> +++ b/xen/arch/arm/gic-v2.c
> @@ -386,9 +386,9 @@ static void gicv2_cpu_init(void)
> /* The first 32 interrupts (PPI and SGI) are banked per-cpu, so
> * even though they are controlled with GICD registers, they must
> * be set up here with the other per-cpu state. */
> - writel_gicd(0xffffffff, GICD_ICACTIVER); /* Diactivate PPIs and SGIs */
> - writel_gicd(0xffff0000, GICD_ICENABLER); /* Disable all PPI */
> - writel_gicd(0x0000ffff, GICD_ISENABLER); /* Enable all SGI */
> + writel_gicd(0xffffffffU, GICD_ICACTIVER); /* De-activate PPIs and SGIs */
> + writel_gicd(0xffff0000U, GICD_ICENABLER); /* Disable all PPI */
> + writel_gicd(0x0000ffffU, GICD_ISENABLER); /* Enable all SGI */
>
> /* Set SGI priorities */
> for ( i = 0; i < 16; i += 4 )
> diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
> index 4e6c98bada..95e4f020fe 100644
> --- a/xen/arch/arm/gic-v3.c
> +++ b/xen/arch/arm/gic-v3.c
> @@ -619,8 +619,8 @@ static void __init gicv3_dist_init(void)
> /* Disable/deactivate all global interrupts */
> for ( i = NR_GIC_LOCAL_IRQS; i < nr_lines; i += 32 )
> {
> - writel_relaxed(0xffffffff, GICD + GICD_ICENABLER + (i / 32) * 4);
> - writel_relaxed(0xffffffff, GICD + GICD_ICACTIVER + (i / 32) * 4);
> + writel_relaxed(0xffffffffU, GICD + GICD_ICENABLER + (i / 32) * 4);
> + writel_relaxed(0xffffffffU, GICD + GICD_ICACTIVER + (i / 32) * 4);
> }
>
> /*
> @@ -832,13 +832,13 @@ static int gicv3_cpu_init(void)
> * The activate state is unknown at boot, so make sure all
> * SGIs and PPIs are de-activated.
> */
> - writel_relaxed(0xffffffff, GICD_RDIST_SGI_BASE + GICR_ICACTIVER0);
> + writel_relaxed(0xffffffffU, GICD_RDIST_SGI_BASE + GICR_ICACTIVER0);
> /*
> * Disable all PPI interrupts, ensure all SGI interrupts are
> * enabled.
> */
> - writel_relaxed(0xffff0000, GICD_RDIST_SGI_BASE + GICR_ICENABLER0);
> - writel_relaxed(0x0000ffff, GICD_RDIST_SGI_BASE + GICR_ISENABLER0);
> + writel_relaxed(0xffff0000U, GICD_RDIST_SGI_BASE + GICR_ICENABLER0);
> + writel_relaxed(0x0000ffffU, GICD_RDIST_SGI_BASE + GICR_ISENABLER0);
> /* Configure SGIs/PPIs as non-secure Group-1 */
> writel_relaxed(GENMASK(31, 0), GICD_RDIST_SGI_BASE + GICR_IGROUPR0);
>
> diff --git a/xen/arch/arm/include/asm/arm64/brk.h b/xen/arch/arm/include/asm/arm64/brk.h
> index 04442c4b9f..3af153a053 100644
> --- a/xen/arch/arm/include/asm/arm64/brk.h
> +++ b/xen/arch/arm/include/asm/arm64/brk.h
> @@ -21,7 +21,7 @@
> * BRK instruction encoding
> * The #imm16 value should be placed at bits[20:5] within BRK ins
> */
> -#define AARCH64_BREAK_MON 0xd4200000
> +#define AARCH64_BREAK_MON 0xd4200000U
>
> /*
> * BRK instruction for provoking a fault on purpose
> diff --git a/xen/arch/arm/include/asm/arm64/efibind.h b/xen/arch/arm/include/asm/arm64/efibind.h
> index 8b43bb8495..0e890b666d 100644
> --- a/xen/arch/arm/include/asm/arm64/efibind.h
> +++ b/xen/arch/arm/include/asm/arm64/efibind.h
> @@ -22,12 +22,12 @@ Revision History
> #pragma pack()
> #endif
>
> -#define EFIERR(a) (0x8000000000000000 | a)
> -#define EFI_ERROR_MASK 0x8000000000000000
> -#define EFIERR_OEM(a) (0xc000000000000000 | a)
> +#define EFIERR(a) (0x8000000000000000U | a)
> +#define EFI_ERROR_MASK 0x8000000000000000U
> +#define EFIERR_OEM(a) (0xc000000000000000U | a)
>
> -#define BAD_POINTER 0xFBFBFBFBFBFBFBFB
> -#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFF
> +#define BAD_POINTER 0xFBFBFBFBFBFBFBFBU
> +#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFFU
>
Should these be UL? (From EFIERR to MAX_ADDRESS)
> #define EFI_STUB_ERROR MAX_ADDRESS
>
> diff --git a/xen/arch/arm/include/asm/arm64/insn.h b/xen/arch/arm/include/asm/arm64/insn.h
> index 4e0d364d41..6308959449 100644
> --- a/xen/arch/arm/include/asm/arm64/insn.h
> +++ b/xen/arch/arm/include/asm/arm64/insn.h
> @@ -60,14 +60,14 @@ static always_inline bool aarch64_insn_is_##abbr(u32 code) \
> static always_inline u32 aarch64_insn_get_##abbr##_value(void) \
> { return (val); }
>
> -__AARCH64_INSN_FUNCS(b, 0xFC000000, 0x14000000)
> -__AARCH64_INSN_FUNCS(bl, 0xFC000000, 0x94000000)
> -__AARCH64_INSN_FUNCS(cbz, 0x7F000000, 0x34000000)
> -__AARCH64_INSN_FUNCS(cbnz, 0x7F000000, 0x35000000)
> -__AARCH64_INSN_FUNCS(tbz, 0x7F000000, 0x36000000)
> -__AARCH64_INSN_FUNCS(tbnz, 0x7F000000, 0x37000000)
> -__AARCH64_INSN_FUNCS(bcond, 0xFF000010, 0x54000000)
> -__AARCH64_INSN_FUNCS(hint, 0xFFFFF01F, 0xD503201F)
> +__AARCH64_INSN_FUNCS(b, 0xFC000000U, 0x14000000U)
> +__AARCH64_INSN_FUNCS(bl, 0xFC000000U, 0x94000000U)
> +__AARCH64_INSN_FUNCS(cbz, 0x7F000000U, 0x34000000U)
> +__AARCH64_INSN_FUNCS(cbnz, 0x7F000000U, 0x35000000U)
> +__AARCH64_INSN_FUNCS(tbz, 0x7F000000U, 0x36000000U)
> +__AARCH64_INSN_FUNCS(tbnz, 0x7F000000U, 0x37000000U)
> +__AARCH64_INSN_FUNCS(bcond, 0xFF000010U, 0x54000000U)
> +__AARCH64_INSN_FUNCS(hint, 0xFFFFF01FU, 0xD503201FU)
>
> bool aarch64_insn_is_branch_imm(u32 insn);
>
> diff --git a/xen/arch/arm/include/asm/vreg.h b/xen/arch/arm/include/asm/vreg.h
> index bf945eebbd..387ce76e7e 100644
> --- a/xen/arch/arm/include/asm/vreg.h
> +++ b/xen/arch/arm/include/asm/vreg.h
> @@ -56,7 +56,7 @@ static inline bool vreg_emulate_cp64(struct cpu_user_regs *regs, union hsr hsr,
>
> if ( ret && cp64.read )
> {
> - set_user_reg(regs, cp64.reg1, x & 0xffffffff);
> + set_user_reg(regs, cp64.reg1, x & 0xffffffffU);
> set_user_reg(regs, cp64.reg2, x >> 32);
> }
>
> diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
> index ca5318515e..508c54824d 100644
> --- a/xen/arch/arm/kernel.c
> +++ b/xen/arch/arm/kernel.c
> @@ -39,7 +39,7 @@ struct minimal_dtb_header {
> /* There are other fields but we don't use them yet. */
> };
>
> -#define DTB_MAGIC 0xd00dfeed
> +#define DTB_MAGIC 0xd00dfeedU
>
> /**
> * copy_from_paddr - copy data from a physical address
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index ef5c6a8195..d1ef787638 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -398,7 +398,7 @@ static vaddr_t exception_handler32(vaddr_t offset)
> register_t sctlr = READ_SYSREG(SCTLR_EL1);
>
> if ( sctlr & SCTLR_A32_EL1_V )
> - return 0xffff0000 + offset;
> + return 0xffff0000U + offset;
> else /* always have security exceptions */
> return READ_SYSREG(VBAR_EL1) + offset;
> }
> @@ -809,7 +809,7 @@ static void show_registers_32(const struct cpu_user_regs *regs,
> #ifdef CONFIG_ARM_64
> (uint32_t)(ctxt->far >> 32),
> ctxt->ifsr32_el2,
> - (uint32_t)(ctxt->far & 0xffffffff),
> + (uint32_t)(ctxt->far & 0xffffffffU),
> ctxt->esr_el1
> #else
> ctxt->ifar, ctxt->ifsr, ctxt->dfar, ctxt->dfsr
> @@ -1414,16 +1414,16 @@ static void do_trap_hypercall(struct cpu_user_regs *regs, register_t *nr,
> {
> /* Deliberately corrupt parameter regs used by this hypercall. */
> switch ( hypercall_args[*nr] ) {
> - case 5: HYPERCALL_ARG5(regs) = 0xDEADBEEF;
> - case 4: HYPERCALL_ARG4(regs) = 0xDEADBEEF;
> - case 3: HYPERCALL_ARG3(regs) = 0xDEADBEEF;
> - case 2: HYPERCALL_ARG2(regs) = 0xDEADBEEF;
> + case 5: HYPERCALL_ARG5(regs) = 0xDEADBEEFU;
> + case 4: HYPERCALL_ARG4(regs) = 0xDEADBEEFU;
> + case 3: HYPERCALL_ARG3(regs) = 0xDEADBEEFU;
> + case 2: HYPERCALL_ARG2(regs) = 0xDEADBEEFU;
> case 1: /* Don't clobber x0/r0 -- it's the return value */
> case 0: /* -ENOSYS case */
> break;
> default: BUG();
> }
> - *nr = 0xDEADBEEF;
> + *nr = 0xDEADBEEFU;
> }
> #endif
>
> diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c
> index 0b083c33e6..35363fee09 100644
> --- a/xen/arch/arm/vgic-v2.c
> +++ b/xen/arch/arm/vgic-v2.c
> @@ -306,7 +306,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info,
> case VREG32(GICD_SGIR):
> if ( dabt.size != DABT_WORD ) goto bad_width;
> /* Write only -- read unknown */
> - *r = 0xdeadbeef;
> + *r = 0xdeadbeefU;
> return 1;
>
> case VRANGE32(0xF04, 0xF0C):
> diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c
> index 9c1fdcc3f8..f3e9eb2f92 100644
> --- a/xen/arch/arm/vgic-v3.c
> +++ b/xen/arch/arm/vgic-v3.c
> @@ -354,7 +354,7 @@ read_reserved:
> return 1;
>
> read_unknown:
> - *r = vreg_reg64_extract(0xdeadbeafdeadbeaf, info);
> + *r = vreg_reg64_extract(0xdeadbeafdeadbeafU, info);
Should this be UL?
> return 1;
> }
>
> diff --git a/xen/include/public/arch-arm/smccc.h b/xen/include/public/arch-arm/smccc.h
> index 802d800aad..8553f2f39e 100644
> --- a/xen/include/public/arch-arm/smccc.h
> +++ b/xen/include/public/arch-arm/smccc.h
> @@ -26,16 +26,16 @@
> #define XEN_SMCCC_MINOR_REVISION 1
>
> /* Hypervisor Service UID. Randomly generated with uuidgen. */
> -#define XEN_SMCCC_UID XEN_DEFINE_UUID(0xa71812dc, 0xc698, 0x4369, 0x9acf, \
> - 0x79, 0xd1, 0x8d, 0xde, 0xe6, 0x67)
> +#define XEN_SMCCC_UID XEN_DEFINE_UUID(0xa71812dcU, 0xc698U, 0x4369U, 0x9acfU, \
> + 0x79U, 0xd1U, 0x8dU, 0xdeU, 0xe6U, 0x67U)
>
> /* Standard Service Service Call version. */
> #define SSSC_SMCCC_MAJOR_REVISION 0
> #define SSSC_SMCCC_MINOR_REVISION 1
>
> /* Standard Service Call UID. Randomly generated with uuidgen. */
> -#define SSSC_SMCCC_UID XEN_DEFINE_UUID(0xf863386f, 0x4b39, 0x4cbd, 0x9220,\
> - 0xce, 0x16, 0x41, 0xe5, 0x9f, 0x6f)
> +#define SSSC_SMCCC_UID XEN_DEFINE_UUID(0xf863386fU, 0x4b39U, 0x4cbdU, 0x9220U,\
> + 0xceU, 0x16U, 0x41U, 0xe5U, 0x9fU, 0x6fU)
>
> #endif /* __XEN_PUBLIC_ARCH_ARM_SMCCC_H__ */
>
> --
> 2.41.0
>
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 04/13] xen/arm: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 16:27 ` Luca Fancellu
@ 2023-07-05 16:42 ` Julien Grall
0 siblings, 0 replies; 59+ messages in thread
From: Julien Grall @ 2023-07-05 16:42 UTC (permalink / raw)
To: Luca Fancellu, Simone Ballarin
Cc: Xen-devel, consulting, Gianluca Luparini, Stefano Stabellini,
Bertrand Marquis, Volodymyr Babchuk, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder
Hi,
On 05/07/2023 17:27, Luca Fancellu wrote:
>> diff --git a/xen/arch/arm/include/asm/arm64/efibind.h b/xen/arch/arm/include/asm/arm64/efibind.h
>> index 8b43bb8495..0e890b666d 100644
>> --- a/xen/arch/arm/include/asm/arm64/efibind.h
>> +++ b/xen/arch/arm/include/asm/arm64/efibind.h
>> @@ -22,12 +22,12 @@ Revision History
>> #pragma pack()
>> #endif
>>
>> -#define EFIERR(a) (0x8000000000000000 | a)
>> -#define EFI_ERROR_MASK 0x8000000000000000
>> -#define EFIERR_OEM(a) (0xc000000000000000 | a)
>> +#define EFIERR(a) (0x8000000000000000U | a)
>> +#define EFI_ERROR_MASK 0x8000000000000000U
>> +#define EFIERR_OEM(a) (0xc000000000000000U | a)
>>
>> -#define BAD_POINTER 0xFBFBFBFBFBFBFBFB
>> -#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFF
>> +#define BAD_POINTER 0xFBFBFBFBFBFBFBFBU
>> +#define MAX_ADDRESS 0xFFFFFFFFFFFFFFFFU
>>
>
> Should these be UL? (From EFIERR to MAX_ADDRESS)
Even though this arm64 only, it would be best to use ULL.
[...]
>> diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c
>> index 9c1fdcc3f8..f3e9eb2f92 100644
>> --- a/xen/arch/arm/vgic-v3.c
>> +++ b/xen/arch/arm/vgic-v3.c
>> @@ -354,7 +354,7 @@ read_reserved:
>> return 1;
>>
>> read_unknown:
>> - *r = vreg_reg64_extract(0xdeadbeafdeadbeaf, info);
>> + *r = vreg_reg64_extract(0xdeadbeafdeadbeafU, info);
>
> Should this be UL?
The code is common between arm32 and arm64. So this wants to be ULL (UL
is 32-bit on arm32).
Cheers,
--
Julien Grall
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 05/13] xen/device-tree: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (3 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 04/13] xen/arm: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 16:28 ` Luca Fancellu
` (2 more replies)
2023-07-05 15:26 ` [XEN PATCH v2 06/13] xen/efi: " Simone Ballarin
` (7 subsequent siblings)
12 siblings, 3 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Stefano Stabellini, Julien Grall,
Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder,
Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
Changes in v2:
- change commit title to the right one
- change commit message
- change maintainers in Cc
- remove changes in 'libfdt'
---
xen/common/device_tree.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 8da1052911..0677193ab3 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -2115,7 +2115,7 @@ static void __init __unflatten_device_tree(const void *fdt,
/* Allocate memory for the expanded device tree */
mem = (unsigned long)_xmalloc (size + 4, __alignof__(struct dt_device_node));
- ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);
+ ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeefU);
dt_dprintk(" unflattening %lx...\n", mem);
@@ -2125,7 +2125,7 @@ static void __init __unflatten_device_tree(const void *fdt,
if ( be32_to_cpup((__be32 *)start) != FDT_END )
printk(XENLOG_WARNING "Weird tag at end of tree: %08x\n",
*((u32 *)start));
- if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeef )
+ if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeefU )
printk(XENLOG_WARNING "End of tree marker overwritten: %08x\n",
be32_to_cpu(((__be32 *)mem)[size / 4]));
*allnextp = NULL;
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 05/13] xen/device-tree: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 05/13] xen/device-tree: " Simone Ballarin
@ 2023-07-05 16:28 ` Luca Fancellu
2023-07-05 23:32 ` Stefano Stabellini
2023-07-06 8:01 ` Julien Grall
2 siblings, 0 replies; 59+ messages in thread
From: Luca Fancellu @ 2023-07-05 16:28 UTC (permalink / raw)
To: Simone Ballarin
Cc: Xen-devel, consulting, Gianluca Luparini, Stefano Stabellini,
Julien Grall, Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder
> On 5 Jul 2023, at 16:26, Simone Ballarin <simone.ballarin@bugseng.com> wrote:
>
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Looks good to me
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
> ---
> Changes in v2:
> - change commit title to the right one
> - change commit message
> - change maintainers in Cc
> - remove changes in 'libfdt'
> ---
> xen/common/device_tree.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
> index 8da1052911..0677193ab3 100644
> --- a/xen/common/device_tree.c
> +++ b/xen/common/device_tree.c
> @@ -2115,7 +2115,7 @@ static void __init __unflatten_device_tree(const void *fdt,
> /* Allocate memory for the expanded device tree */
> mem = (unsigned long)_xmalloc (size + 4, __alignof__(struct dt_device_node));
>
> - ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);
> + ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeefU);
>
> dt_dprintk(" unflattening %lx...\n", mem);
>
> @@ -2125,7 +2125,7 @@ static void __init __unflatten_device_tree(const void *fdt,
> if ( be32_to_cpup((__be32 *)start) != FDT_END )
> printk(XENLOG_WARNING "Weird tag at end of tree: %08x\n",
> *((u32 *)start));
> - if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeef )
> + if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeefU )
> printk(XENLOG_WARNING "End of tree marker overwritten: %08x\n",
> be32_to_cpu(((__be32 *)mem)[size / 4]));
> *allnextp = NULL;
> --
> 2.41.0
>
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 05/13] xen/device-tree: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 05/13] xen/device-tree: " Simone Ballarin
2023-07-05 16:28 ` Luca Fancellu
@ 2023-07-05 23:32 ` Stefano Stabellini
2023-07-06 8:01 ` Julien Grall
2 siblings, 0 replies; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-05 23:32 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Stefano Stabellini,
Julien Grall, Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder
On Wed, 5 Jul 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> Changes in v2:
> - change commit title to the right one
> - change commit message
> - change maintainers in Cc
> - remove changes in 'libfdt'
> ---
> xen/common/device_tree.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
> index 8da1052911..0677193ab3 100644
> --- a/xen/common/device_tree.c
> +++ b/xen/common/device_tree.c
> @@ -2115,7 +2115,7 @@ static void __init __unflatten_device_tree(const void *fdt,
> /* Allocate memory for the expanded device tree */
> mem = (unsigned long)_xmalloc (size + 4, __alignof__(struct dt_device_node));
>
> - ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeef);
> + ((__be32 *)mem)[size / 4] = cpu_to_be32(0xdeadbeefU);
>
> dt_dprintk(" unflattening %lx...\n", mem);
>
> @@ -2125,7 +2125,7 @@ static void __init __unflatten_device_tree(const void *fdt,
> if ( be32_to_cpup((__be32 *)start) != FDT_END )
> printk(XENLOG_WARNING "Weird tag at end of tree: %08x\n",
> *((u32 *)start));
> - if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeef )
> + if ( be32_to_cpu(((__be32 *)mem)[size / 4]) != 0xdeadbeefU )
> printk(XENLOG_WARNING "End of tree marker overwritten: %08x\n",
> be32_to_cpu(((__be32 *)mem)[size / 4]));
> *allnextp = NULL;
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 05/13] xen/device-tree: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 05/13] xen/device-tree: " Simone Ballarin
2023-07-05 16:28 ` Luca Fancellu
2023-07-05 23:32 ` Stefano Stabellini
@ 2023-07-06 8:01 ` Julien Grall
2 siblings, 0 replies; 59+ messages in thread
From: Julien Grall @ 2023-07-06 8:01 UTC (permalink / raw)
To: Simone Ballarin, xen-devel
Cc: consulting, Gianluca Luparini, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder
Hi,
On 05/07/2023 16:26, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
This suggest the author is Gianluca but...
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
... the first signed-off-by is yours. So who is the author?
More generally, there tags are order chronogically. So if Gianluca is
the author then it should be the first Signed-off-by. Then it is yours.
This will be followed-by the Acked-by/Reviewed-by tags.
The same remark goes for the rest of the series.
Cheers,
--
Julien Grall
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 06/13] xen/efi: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (4 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 05/13] xen/device-tree: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 16:34 ` Luca Fancellu
2023-07-05 23:37 ` Stefano Stabellini
2023-07-05 15:26 ` [XEN PATCH v2 07/13] x86/vmx: " Simone Ballarin
` (6 subsequent siblings)
12 siblings, 2 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Jan Beulich, Stefano Stabellini,
Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder,
Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
Changes in v2:
- minor change to commit title
- change commit message
- remove changes in 'efibind.h', 'efiapi.h', 'efidef.h' and 'efiprot.h'
---
xen/common/efi/boot.c | 8 ++++----
xen/common/efi/runtime.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index c5850c26af..28a57fe434 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -34,13 +34,13 @@
#define EFI_REVISION(major, minor) (((major) << 16) | (minor))
#define SMBIOS3_TABLE_GUID \
- { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} }
+ { 0xf2fd1544U, 0x9794U, 0x4a2cU, {0x99U, 0x2eU, 0xe5U, 0xbbU, 0xcfU, 0x20U, 0xe3U, 0x94U} }
#define SHIM_LOCK_PROTOCOL_GUID \
- { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
+ { 0x605dab50U, 0xe046U, 0x4300U, {0xabU, 0xb6U, 0x3dU, 0xd8U, 0x10U, 0xddU, 0x8bU, 0x23U} }
#define APPLE_PROPERTIES_PROTOCOL_GUID \
- { 0x91bd12fe, 0xf6c3, 0x44fb, { 0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0} }
+ { 0x91bd12feU, 0xf6c3U, 0x44fbU, { 0xa5U, 0xb7U, 0x51U, 0x22U, 0xabU, 0x30U, 0x3aU, 0xe0U} }
#define EFI_SYSTEM_RESOURCE_TABLE_GUID \
- { 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80} }
+ { 0xb122a263U, 0x3661U, 0x4f68U, {0x99U, 0x29U, 0x78U, 0xf8U, 0xb0U, 0xd6U, 0x21U, 0x80U} }
#define EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION 1
typedef struct {
diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c
index 13b0975866..5cb7504c96 100644
--- a/xen/common/efi/runtime.c
+++ b/xen/common/efi/runtime.c
@@ -698,7 +698,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op)
#ifndef COMPAT
op->status = status;
#else
- op->status = (status & 0x3fffffff) | ((status >> 32) & 0xc0000000);
+ op->status = (status & 0x3fffffffU) | ((status >> 32) & 0xc0000000U);
#endif
return rc;
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 06/13] xen/efi: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 06/13] xen/efi: " Simone Ballarin
@ 2023-07-05 16:34 ` Luca Fancellu
2023-07-05 23:37 ` Stefano Stabellini
1 sibling, 0 replies; 59+ messages in thread
From: Luca Fancellu @ 2023-07-05 16:34 UTC (permalink / raw)
To: Simone Ballarin
Cc: Xen-devel, consulting, Gianluca Luparini, Jan Beulich,
Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder
> On 5 Jul 2023, at 16:26, Simone Ballarin <simone.ballarin@bugseng.com> wrote:
>
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Changes looks good to me, probably Jan knows better this part
Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
> ---
> Changes in v2:
> - minor change to commit title
> - change commit message
> - remove changes in 'efibind.h', 'efiapi.h', 'efidef.h' and 'efiprot.h'
> ---
> xen/common/efi/boot.c | 8 ++++----
> xen/common/efi/runtime.c | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
> index c5850c26af..28a57fe434 100644
> --- a/xen/common/efi/boot.c
> +++ b/xen/common/efi/boot.c
> @@ -34,13 +34,13 @@
> #define EFI_REVISION(major, minor) (((major) << 16) | (minor))
>
> #define SMBIOS3_TABLE_GUID \
> - { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} }
> + { 0xf2fd1544U, 0x9794U, 0x4a2cU, {0x99U, 0x2eU, 0xe5U, 0xbbU, 0xcfU, 0x20U, 0xe3U, 0x94U} }
> #define SHIM_LOCK_PROTOCOL_GUID \
> - { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
> + { 0x605dab50U, 0xe046U, 0x4300U, {0xabU, 0xb6U, 0x3dU, 0xd8U, 0x10U, 0xddU, 0x8bU, 0x23U} }
> #define APPLE_PROPERTIES_PROTOCOL_GUID \
> - { 0x91bd12fe, 0xf6c3, 0x44fb, { 0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0} }
> + { 0x91bd12feU, 0xf6c3U, 0x44fbU, { 0xa5U, 0xb7U, 0x51U, 0x22U, 0xabU, 0x30U, 0x3aU, 0xe0U} }
> #define EFI_SYSTEM_RESOURCE_TABLE_GUID \
> - { 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80} }
> + { 0xb122a263U, 0x3661U, 0x4f68U, {0x99U, 0x29U, 0x78U, 0xf8U, 0xb0U, 0xd6U, 0x21U, 0x80U} }
> #define EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION 1
>
> typedef struct {
> diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c
> index 13b0975866..5cb7504c96 100644
> --- a/xen/common/efi/runtime.c
> +++ b/xen/common/efi/runtime.c
> @@ -698,7 +698,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op)
> #ifndef COMPAT
> op->status = status;
> #else
> - op->status = (status & 0x3fffffff) | ((status >> 32) & 0xc0000000);
> + op->status = (status & 0x3fffffffU) | ((status >> 32) & 0xc0000000U);
> #endif
>
> return rc;
> --
> 2.41.0
>
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 06/13] xen/efi: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 06/13] xen/efi: " Simone Ballarin
2023-07-05 16:34 ` Luca Fancellu
@ 2023-07-05 23:37 ` Stefano Stabellini
2023-07-06 7:55 ` Jan Beulich
1 sibling, 1 reply; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-05 23:37 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Jan Beulich,
Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder
On Wed, 5 Jul 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> ---
> Changes in v2:
> - minor change to commit title
> - change commit message
> - remove changes in 'efibind.h', 'efiapi.h', 'efidef.h' and 'efiprot.h'
> ---
> xen/common/efi/boot.c | 8 ++++----
> xen/common/efi/runtime.c | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
> index c5850c26af..28a57fe434 100644
> --- a/xen/common/efi/boot.c
> +++ b/xen/common/efi/boot.c
> @@ -34,13 +34,13 @@
> #define EFI_REVISION(major, minor) (((major) << 16) | (minor))
>
> #define SMBIOS3_TABLE_GUID \
> - { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} }
> + { 0xf2fd1544U, 0x9794U, 0x4a2cU, {0x99U, 0x2eU, 0xe5U, 0xbbU, 0xcfU, 0x20U, 0xe3U, 0x94U} }
> #define SHIM_LOCK_PROTOCOL_GUID \
> - { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
> + { 0x605dab50U, 0xe046U, 0x4300U, {0xabU, 0xb6U, 0x3dU, 0xd8U, 0x10U, 0xddU, 0x8bU, 0x23U} }
> #define APPLE_PROPERTIES_PROTOCOL_GUID \
> - { 0x91bd12fe, 0xf6c3, 0x44fb, { 0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0} }
> + { 0x91bd12feU, 0xf6c3U, 0x44fbU, { 0xa5U, 0xb7U, 0x51U, 0x22U, 0xabU, 0x30U, 0x3aU, 0xe0U} }
> #define EFI_SYSTEM_RESOURCE_TABLE_GUID \
> - { 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80} }
> + { 0xb122a263U, 0x3661U, 0x4f68U, {0x99U, 0x29U, 0x78U, 0xf8U, 0xb0U, 0xd6U, 0x21U, 0x80U} }
> #define EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION 1
To be honest in these case I don't know if this is better or if it is
better to add U only to the first numbers (0xf2fd1544U, 0x605dab50U,
0x91bd12feU, 0xb122a263U).
Either way:
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> typedef struct {
> diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c
> index 13b0975866..5cb7504c96 100644
> --- a/xen/common/efi/runtime.c
> +++ b/xen/common/efi/runtime.c
> @@ -698,7 +698,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op)
> #ifndef COMPAT
> op->status = status;
> #else
> - op->status = (status & 0x3fffffff) | ((status >> 32) & 0xc0000000);
> + op->status = (status & 0x3fffffffU) | ((status >> 32) & 0xc0000000U);
> #endif
>
> return rc;
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 06/13] xen/efi: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 23:37 ` Stefano Stabellini
@ 2023-07-06 7:55 ` Jan Beulich
2023-07-06 22:14 ` Stefano Stabellini
0 siblings, 1 reply; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 7:55 UTC (permalink / raw)
To: Stefano Stabellini
Cc: xen-devel, consulting, Gianluca Luparini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, Simone Ballarin
On 06.07.2023 01:37, Stefano Stabellini wrote:
> On Wed, 5 Jul 2023, Simone Ballarin wrote:
>> --- a/xen/common/efi/boot.c
>> +++ b/xen/common/efi/boot.c
>> @@ -34,13 +34,13 @@
>> #define EFI_REVISION(major, minor) (((major) << 16) | (minor))
>>
>> #define SMBIOS3_TABLE_GUID \
>> - { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} }
>> + { 0xf2fd1544U, 0x9794U, 0x4a2cU, {0x99U, 0x2eU, 0xe5U, 0xbbU, 0xcfU, 0x20U, 0xe3U, 0x94U} }
>> #define SHIM_LOCK_PROTOCOL_GUID \
>> - { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
>> + { 0x605dab50U, 0xe046U, 0x4300U, {0xabU, 0xb6U, 0x3dU, 0xd8U, 0x10U, 0xddU, 0x8bU, 0x23U} }
>> #define APPLE_PROPERTIES_PROTOCOL_GUID \
>> - { 0x91bd12fe, 0xf6c3, 0x44fb, { 0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0} }
>> + { 0x91bd12feU, 0xf6c3U, 0x44fbU, { 0xa5U, 0xb7U, 0x51U, 0x22U, 0xabU, 0x30U, 0x3aU, 0xe0U} }
>> #define EFI_SYSTEM_RESOURCE_TABLE_GUID \
>> - { 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80} }
>> + { 0xb122a263U, 0x3661U, 0x4f68U, {0x99U, 0x29U, 0x78U, 0xf8U, 0xb0U, 0xd6U, 0x21U, 0x80U} }
>> #define EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION 1
>
> To be honest in these case I don't know if this is better or if it is
> better to add U only to the first numbers (0xf2fd1544U, 0x605dab50U,
> 0x91bd12feU, 0xb122a263U).
I'd prefer the latter, but I wonder whether that's in the spirit of Misra.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 06/13] xen/efi: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 7:55 ` Jan Beulich
@ 2023-07-06 22:14 ` Stefano Stabellini
0 siblings, 0 replies; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-06 22:14 UTC (permalink / raw)
To: Jan Beulich
Cc: Stefano Stabellini, xen-devel, consulting, Gianluca Luparini,
Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder,
Simone Ballarin
On Thu, 6 Jul 2023, Jan Beulich wrote:
> On 06.07.2023 01:37, Stefano Stabellini wrote:
> > On Wed, 5 Jul 2023, Simone Ballarin wrote:
> >> --- a/xen/common/efi/boot.c
> >> +++ b/xen/common/efi/boot.c
> >> @@ -34,13 +34,13 @@
> >> #define EFI_REVISION(major, minor) (((major) << 16) | (minor))
> >>
> >> #define SMBIOS3_TABLE_GUID \
> >> - { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} }
> >> + { 0xf2fd1544U, 0x9794U, 0x4a2cU, {0x99U, 0x2eU, 0xe5U, 0xbbU, 0xcfU, 0x20U, 0xe3U, 0x94U} }
> >> #define SHIM_LOCK_PROTOCOL_GUID \
> >> - { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }
> >> + { 0x605dab50U, 0xe046U, 0x4300U, {0xabU, 0xb6U, 0x3dU, 0xd8U, 0x10U, 0xddU, 0x8bU, 0x23U} }
> >> #define APPLE_PROPERTIES_PROTOCOL_GUID \
> >> - { 0x91bd12fe, 0xf6c3, 0x44fb, { 0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0} }
> >> + { 0x91bd12feU, 0xf6c3U, 0x44fbU, { 0xa5U, 0xb7U, 0x51U, 0x22U, 0xabU, 0x30U, 0x3aU, 0xe0U} }
> >> #define EFI_SYSTEM_RESOURCE_TABLE_GUID \
> >> - { 0xb122a263, 0x3661, 0x4f68, {0x99, 0x29, 0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80} }
> >> + { 0xb122a263U, 0x3661U, 0x4f68U, {0x99U, 0x29U, 0x78U, 0xf8U, 0xb0U, 0xd6U, 0x21U, 0x80U} }
> >> #define EFI_SYSTEM_RESOURCE_TABLE_FIRMWARE_RESOURCE_VERSION 1
> >
> > To be honest in these case I don't know if this is better or if it is
> > better to add U only to the first numbers (0xf2fd1544U, 0x605dab50U,
> > 0x91bd12feU, 0xb122a263U).
>
> I'd prefer the latter, but I wonder whether that's in the spirit of Misra.
My understanding is that MISRA only requests U to be added where
actually needed. Everything else is up to us and our desire (or not) for
consistency.
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 07/13] x86/vmx: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (5 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 06/13] xen/efi: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 23:39 ` Stefano Stabellini
2023-07-06 8:04 ` Jan Beulich
2023-07-05 15:26 ` [XEN PATCH v2 08/13] xen/pci: " Simone Ballarin
` (5 subsequent siblings)
12 siblings, 2 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Jun Nakajima, Kevin Tian,
Jan Beulich, Andrew Cooper, Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
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 | 12 ++++-----
xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 6 ++---
xen/arch/x86/include/asm/hvm/vmx/vmx.h | 34 ++++++++++++-------------
5 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c
index bda5d511ac..890c279310 100644
--- a/xen/arch/x86/cpu/vpmu_intel.c
+++ b/xen/arch/x86/cpu/vpmu_intel.c
@@ -946,7 +946,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 )
diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index b209563625..d5a2b847a9 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -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
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index 1034534c97..f59de0f124 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -257,14 +257,14 @@ uint64_t get_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding)
switch ( enc.width ) {
case VVMCS_WIDTH_16:
- res &= 0xffff;
+ res &= 0xffffU;
break;
case VVMCS_WIDTH_64:
if ( enc.access_type )
res >>= 32;
break;
case VVMCS_WIDTH_32:
- res &= 0xffffffff;
+ res &= 0xffffffffU;
break;
case VVMCS_WIDTH_NATURAL:
default:
@@ -311,19 +311,19 @@ void set_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding, uint64_t val)
switch ( enc.width ) {
case VVMCS_WIDTH_16:
- res = val & 0xffff;
+ res = val & 0xffffU;
break;
case VVMCS_WIDTH_64:
if ( enc.access_type )
{
- res &= 0xffffffff;
+ res &= 0xffffffffU;
res |= val << 32;
}
else
res = val;
break;
case VVMCS_WIDTH_32:
- res = val & 0xffffffff;
+ res = val & 0xffffffffU;
break;
case VVMCS_WIDTH_NATURAL:
default:
@@ -2307,7 +2307,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 */
diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
index d07fcb2bc9..4acf3970f5 100644
--- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
+++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
@@ -207,7 +207,7 @@ void vmx_vmcs_reload(struct vcpu *v);
#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_ACTIVATE_SECONDARY_CONTROLS 0x80000000U
extern u32 vmx_cpu_based_exec_control;
#define PIN_BASED_EXT_INTR_MASK 0x00000001
@@ -257,7 +257,7 @@ extern u32 vmx_vmentry_control;
#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_NOTIFY_VM_EXITING 0x80000000U
extern 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 0x00000001
diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
index 36c108d879..6642688e1d 100644
--- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h
+++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
@@ -136,7 +136,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 0x80000000U
#define VMX_EXIT_REASONS_BUS_LOCK (1u << 26)
#define EXIT_REASON_EXCEPTION_NMI 0
@@ -208,12 +208,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
@@ -246,15 +246,15 @@ typedef union cr_access_qual {
/*
* Access Rights
*/
-#define X86_SEG_AR_SEG_TYPE 0xf /* 3:0, segment type */
-#define X86_SEG_AR_DESC_TYPE (1u << 4) /* 4, descriptor type */
-#define X86_SEG_AR_DPL 0x60 /* 6:5, descriptor privilege level */
-#define X86_SEG_AR_SEG_PRESENT (1u << 7) /* 7, segment present */
-#define X86_SEG_AR_AVL (1u << 12) /* 12, available for system software */
-#define X86_SEG_AR_CS_LM_ACTIVE (1u << 13) /* 13, long mode active (CS only) */
-#define X86_SEG_AR_DEF_OP_SIZE (1u << 14) /* 14, default operation size */
-#define X86_SEG_AR_GRANULARITY (1u << 15) /* 15, granularity */
-#define X86_SEG_AR_SEG_UNUSABLE (1u << 16) /* 16, segment unusable */
+#define X86_SEG_AR_SEG_TYPE 0xfU /* 3:0, segment type */
+#define X86_SEG_AR_DESC_TYPE (1U << 4) /* 4, descriptor type */
+#define X86_SEG_AR_DPL 0x60U /* 6:5, descriptor privilege level */
+#define X86_SEG_AR_SEG_PRESENT (1U << 7) /* 7, segment present */
+#define X86_SEG_AR_AVL (1U << 12) /* 12, available for system software */
+#define X86_SEG_AR_CS_LM_ACTIVE (1U << 13) /* 13, long mode active (CS only) */
+#define X86_SEG_AR_DEF_OP_SIZE (1U << 14) /* 14, default operation size */
+#define X86_SEG_AR_GRANULARITY (1U << 15) /* 15, granularity */
+#define X86_SEG_AR_SEG_UNUSABLE (1U << 16) /* 16, segment unusable */
#define VMCALL_OPCODE ".byte 0x0f,0x01,0xc1\n"
#define VMCLEAR_OPCODE ".byte 0x66,0x0f,0xc7\n" /* reg/opcode: /6 */
@@ -606,7 +606,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 {
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 07/13] x86/vmx: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 07/13] x86/vmx: " Simone Ballarin
@ 2023-07-05 23:39 ` Stefano Stabellini
2023-07-06 8:04 ` Jan Beulich
1 sibling, 0 replies; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-05 23:39 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Jun Nakajima,
Kevin Tian, Jan Beulich, Andrew Cooper, Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder
On Wed, 5 Jul 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> 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 | 12 ++++-----
> xen/arch/x86/include/asm/hvm/vmx/vmcs.h | 6 ++---
> xen/arch/x86/include/asm/hvm/vmx/vmx.h | 34 ++++++++++++-------------
> 5 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c
> index bda5d511ac..890c279310 100644
> --- a/xen/arch/x86/cpu/vpmu_intel.c
> +++ b/xen/arch/x86/cpu/vpmu_intel.c
> @@ -946,7 +946,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 )
> diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
> index b209563625..d5a2b847a9 100644
> --- a/xen/arch/x86/hvm/vmx/vmcs.c
> +++ b/xen/arch/x86/hvm/vmx/vmcs.c
> @@ -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
> diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
> index 1034534c97..f59de0f124 100644
> --- a/xen/arch/x86/hvm/vmx/vvmx.c
> +++ b/xen/arch/x86/hvm/vmx/vvmx.c
> @@ -257,14 +257,14 @@ uint64_t get_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding)
>
> switch ( enc.width ) {
> case VVMCS_WIDTH_16:
> - res &= 0xffff;
> + res &= 0xffffU;
> break;
> case VVMCS_WIDTH_64:
> if ( enc.access_type )
> res >>= 32;
> break;
> case VVMCS_WIDTH_32:
> - res &= 0xffffffff;
> + res &= 0xffffffffU;
> break;
> case VVMCS_WIDTH_NATURAL:
> default:
> @@ -311,19 +311,19 @@ void set_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding, uint64_t val)
>
> switch ( enc.width ) {
> case VVMCS_WIDTH_16:
> - res = val & 0xffff;
> + res = val & 0xffffU;
> break;
> case VVMCS_WIDTH_64:
> if ( enc.access_type )
> {
> - res &= 0xffffffff;
> + res &= 0xffffffffU;
> res |= val << 32;
> }
> else
> res = val;
> break;
> case VVMCS_WIDTH_32:
> - res = val & 0xffffffff;
> + res = val & 0xffffffffU;
> break;
> case VVMCS_WIDTH_NATURAL:
> default:
> @@ -2307,7 +2307,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 */
> diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> index d07fcb2bc9..4acf3970f5 100644
> --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> @@ -207,7 +207,7 @@ void vmx_vmcs_reload(struct vcpu *v);
> #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_ACTIVATE_SECONDARY_CONTROLS 0x80000000U
> extern u32 vmx_cpu_based_exec_control;
>
> #define PIN_BASED_EXT_INTR_MASK 0x00000001
> @@ -257,7 +257,7 @@ extern u32 vmx_vmentry_control;
> #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_NOTIFY_VM_EXITING 0x80000000U
> extern 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 0x00000001
> diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> index 36c108d879..6642688e1d 100644
> --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> @@ -136,7 +136,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 0x80000000U
> #define VMX_EXIT_REASONS_BUS_LOCK (1u << 26)
>
> #define EXIT_REASON_EXCEPTION_NMI 0
> @@ -208,12 +208,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
> @@ -246,15 +246,15 @@ typedef union cr_access_qual {
> /*
> * Access Rights
> */
> -#define X86_SEG_AR_SEG_TYPE 0xf /* 3:0, segment type */
> -#define X86_SEG_AR_DESC_TYPE (1u << 4) /* 4, descriptor type */
> -#define X86_SEG_AR_DPL 0x60 /* 6:5, descriptor privilege level */
> -#define X86_SEG_AR_SEG_PRESENT (1u << 7) /* 7, segment present */
> -#define X86_SEG_AR_AVL (1u << 12) /* 12, available for system software */
> -#define X86_SEG_AR_CS_LM_ACTIVE (1u << 13) /* 13, long mode active (CS only) */
> -#define X86_SEG_AR_DEF_OP_SIZE (1u << 14) /* 14, default operation size */
> -#define X86_SEG_AR_GRANULARITY (1u << 15) /* 15, granularity */
> -#define X86_SEG_AR_SEG_UNUSABLE (1u << 16) /* 16, segment unusable */
> +#define X86_SEG_AR_SEG_TYPE 0xfU /* 3:0, segment type */
> +#define X86_SEG_AR_DESC_TYPE (1U << 4) /* 4, descriptor type */
> +#define X86_SEG_AR_DPL 0x60U /* 6:5, descriptor privilege level */
> +#define X86_SEG_AR_SEG_PRESENT (1U << 7) /* 7, segment present */
> +#define X86_SEG_AR_AVL (1U << 12) /* 12, available for system software */
> +#define X86_SEG_AR_CS_LM_ACTIVE (1U << 13) /* 13, long mode active (CS only) */
> +#define X86_SEG_AR_DEF_OP_SIZE (1U << 14) /* 14, default operation size */
> +#define X86_SEG_AR_GRANULARITY (1U << 15) /* 15, granularity */
> +#define X86_SEG_AR_SEG_UNUSABLE (1U << 16) /* 16, segment unusable */
>
> #define VMCALL_OPCODE ".byte 0x0f,0x01,0xc1\n"
> #define VMCLEAR_OPCODE ".byte 0x66,0x0f,0xc7\n" /* reg/opcode: /6 */
> @@ -606,7 +606,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 {
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 07/13] x86/vmx: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 07/13] x86/vmx: " Simone Ballarin
2023-07-05 23:39 ` Stefano Stabellini
@ 2023-07-06 8:04 ` Jan Beulich
2023-07-06 22:17 ` Stefano Stabellini
2023-07-07 8:18 ` Simone Ballarin
1 sibling, 2 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 8:04 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Jun Nakajima, Kevin Tian,
Andrew Cooper, Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, xen-devel
On 05.07.2023 17:26, Simone Ballarin wrote:
> --- a/xen/arch/x86/hvm/vmx/vvmx.c
> +++ b/xen/arch/x86/hvm/vmx/vvmx.c
> @@ -257,14 +257,14 @@ uint64_t get_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding)
>
> switch ( enc.width ) {
> case VVMCS_WIDTH_16:
> - res &= 0xffff;
> + res &= 0xffffU;
I don't think the suffix is needed in cases like this one, and ...
> break;
> case VVMCS_WIDTH_64:
> if ( enc.access_type )
> res >>= 32;
> break;
> case VVMCS_WIDTH_32:
> - res &= 0xffffffff;
> + res &= 0xffffffffU;
... while generally I'm suggesting to avoid casts I wonder whether
casting to uint32_t here wouldn't make things more obviously match
the purpose. (Same again further down then.)
> --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> @@ -207,7 +207,7 @@ void vmx_vmcs_reload(struct vcpu *v);
> #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_ACTIVATE_SECONDARY_CONTROLS 0x80000000U
Interesting - you don't change adjacent #define-s here, nor ...
> @@ -257,7 +257,7 @@ extern u32 vmx_vmentry_control;
> #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_NOTIFY_VM_EXITING 0x80000000U
... here. May I ask why that is? (I'm not opposed, but the
description suggests otherwise.)
> --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> @@ -136,7 +136,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 0x80000000U
> #define VMX_EXIT_REASONS_BUS_LOCK (1u << 26)
Along the lines of the latter, perhaps switch to 1u << 31?
> @@ -246,15 +246,15 @@ typedef union cr_access_qual {
> /*
> * Access Rights
> */
> -#define X86_SEG_AR_SEG_TYPE 0xf /* 3:0, segment type */
> -#define X86_SEG_AR_DESC_TYPE (1u << 4) /* 4, descriptor type */
> -#define X86_SEG_AR_DPL 0x60 /* 6:5, descriptor privilege level */
> -#define X86_SEG_AR_SEG_PRESENT (1u << 7) /* 7, segment present */
> -#define X86_SEG_AR_AVL (1u << 12) /* 12, available for system software */
> -#define X86_SEG_AR_CS_LM_ACTIVE (1u << 13) /* 13, long mode active (CS only) */
> -#define X86_SEG_AR_DEF_OP_SIZE (1u << 14) /* 14, default operation size */
> -#define X86_SEG_AR_GRANULARITY (1u << 15) /* 15, granularity */
> -#define X86_SEG_AR_SEG_UNUSABLE (1u << 16) /* 16, segment unusable */
> +#define X86_SEG_AR_SEG_TYPE 0xfU /* 3:0, segment type */
> +#define X86_SEG_AR_DESC_TYPE (1U << 4) /* 4, descriptor type */
> +#define X86_SEG_AR_DPL 0x60U /* 6:5, descriptor privilege level */
> +#define X86_SEG_AR_SEG_PRESENT (1U << 7) /* 7, segment present */
> +#define X86_SEG_AR_AVL (1U << 12) /* 12, available for system software */
> +#define X86_SEG_AR_CS_LM_ACTIVE (1U << 13) /* 13, long mode active (CS only) */
> +#define X86_SEG_AR_DEF_OP_SIZE (1U << 14) /* 14, default operation size */
> +#define X86_SEG_AR_GRANULARITY (1U << 15) /* 15, granularity */
> +#define X86_SEG_AR_SEG_UNUSABLE (1U << 16) /* 16, segment unusable */
How is this change related to rule 7.2? There are u suffixes already where
needed (and 0xf and 0x60 don't strictly need one), so there's no violation
here afaict. A mere style change to switch from u to U imo doesn't belong
here (and, as mentioned while discussing the rule, is imo hampering
readability in cases like these ones).
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 07/13] x86/vmx: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 8:04 ` Jan Beulich
@ 2023-07-06 22:17 ` Stefano Stabellini
2023-07-07 6:44 ` Jan Beulich
2023-07-07 8:18 ` Simone Ballarin
1 sibling, 1 reply; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-06 22:17 UTC (permalink / raw)
To: Jan Beulich
Cc: Simone Ballarin, consulting, Gianluca Luparini, Jun Nakajima,
Kevin Tian, Andrew Cooper, Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, xen-devel
On Thu, 6 Jul 2023, Jan Beulich wrote:
> On 05.07.2023 17:26, Simone Ballarin wrote:
> > --- a/xen/arch/x86/hvm/vmx/vvmx.c
> > +++ b/xen/arch/x86/hvm/vmx/vvmx.c
> > @@ -257,14 +257,14 @@ uint64_t get_vvmcs_virtual(void *vvmcs, uint32_t vmcs_encoding)
> >
> > switch ( enc.width ) {
> > case VVMCS_WIDTH_16:
> > - res &= 0xffff;
> > + res &= 0xffffU;
>
> I don't think the suffix is needed in cases like this one, and ...
>
> > break;
> > case VVMCS_WIDTH_64:
> > if ( enc.access_type )
> > res >>= 32;
> > break;
> > case VVMCS_WIDTH_32:
> > - res &= 0xffffffff;
> > + res &= 0xffffffffU;
>
> ... while generally I'm suggesting to avoid casts I wonder whether
> casting to uint32_t here wouldn't make things more obviously match
> the purpose. (Same again further down then.)
>
> > --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> > +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> > @@ -207,7 +207,7 @@ void vmx_vmcs_reload(struct vcpu *v);
> > #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_ACTIVATE_SECONDARY_CONTROLS 0x80000000U
>
> Interesting - you don't change adjacent #define-s here, nor ...
>
> > @@ -257,7 +257,7 @@ extern u32 vmx_vmentry_control;
> > #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_NOTIFY_VM_EXITING 0x80000000U
>
> ... here. May I ask why that is? (I'm not opposed, but the
> description suggests otherwise.)
Like I wrote in the other email, the requirement is only to add U where
the top bit is set (0x80000000). Adding U to the other constant is
optional and for us to decide.
> > --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> > +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> > @@ -136,7 +136,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 0x80000000U
> > #define VMX_EXIT_REASONS_BUS_LOCK (1u << 26)
>
> Along the lines of the latter, perhaps switch to 1u << 31?
>
> > @@ -246,15 +246,15 @@ typedef union cr_access_qual {
> > /*
> > * Access Rights
> > */
> > -#define X86_SEG_AR_SEG_TYPE 0xf /* 3:0, segment type */
> > -#define X86_SEG_AR_DESC_TYPE (1u << 4) /* 4, descriptor type */
> > -#define X86_SEG_AR_DPL 0x60 /* 6:5, descriptor privilege level */
> > -#define X86_SEG_AR_SEG_PRESENT (1u << 7) /* 7, segment present */
> > -#define X86_SEG_AR_AVL (1u << 12) /* 12, available for system software */
> > -#define X86_SEG_AR_CS_LM_ACTIVE (1u << 13) /* 13, long mode active (CS only) */
> > -#define X86_SEG_AR_DEF_OP_SIZE (1u << 14) /* 14, default operation size */
> > -#define X86_SEG_AR_GRANULARITY (1u << 15) /* 15, granularity */
> > -#define X86_SEG_AR_SEG_UNUSABLE (1u << 16) /* 16, segment unusable */
> > +#define X86_SEG_AR_SEG_TYPE 0xfU /* 3:0, segment type */
> > +#define X86_SEG_AR_DESC_TYPE (1U << 4) /* 4, descriptor type */
> > +#define X86_SEG_AR_DPL 0x60U /* 6:5, descriptor privilege level */
> > +#define X86_SEG_AR_SEG_PRESENT (1U << 7) /* 7, segment present */
> > +#define X86_SEG_AR_AVL (1U << 12) /* 12, available for system software */
> > +#define X86_SEG_AR_CS_LM_ACTIVE (1U << 13) /* 13, long mode active (CS only) */
> > +#define X86_SEG_AR_DEF_OP_SIZE (1U << 14) /* 14, default operation size */
> > +#define X86_SEG_AR_GRANULARITY (1U << 15) /* 15, granularity */
> > +#define X86_SEG_AR_SEG_UNUSABLE (1U << 16) /* 16, segment unusable */
>
> How is this change related to rule 7.2? There are u suffixes already where
> needed (and 0xf and 0x60 don't strictly need one), so there's no violation
> here afaict. A mere style change to switch from u to U imo doesn't belong
> here (and, as mentioned while discussing the rule, is imo hampering
> readability in cases like these ones).
My understanding is that these are not MISRA violations so could be
dropped
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 07/13] x86/vmx: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 22:17 ` Stefano Stabellini
@ 2023-07-07 6:44 ` Jan Beulich
0 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-07 6:44 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Simone Ballarin, consulting, Gianluca Luparini, Jun Nakajima,
Kevin Tian, Andrew Cooper, Roger Pau Monné,
Wei Liu, Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder,
xen-devel
On 07.07.2023 00:17, Stefano Stabellini wrote:
> On Thu, 6 Jul 2023, Jan Beulich wrote:
>> On 05.07.2023 17:26, Simone Ballarin wrote:
>>> --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
>>> +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
>>> @@ -207,7 +207,7 @@ void vmx_vmcs_reload(struct vcpu *v);
>>> #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_ACTIVATE_SECONDARY_CONTROLS 0x80000000U
>>
>> Interesting - you don't change adjacent #define-s here, nor ...
>>
>>> @@ -257,7 +257,7 @@ extern u32 vmx_vmentry_control;
>>> #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_NOTIFY_VM_EXITING 0x80000000U
>>
>> ... here. May I ask why that is? (I'm not opposed, but the
>> description suggests otherwise.)
>
> Like I wrote in the other email, the requirement is only to add U where
> the top bit is set (0x80000000). Adding U to the other constant is
> optional and for us to decide.
Right, but as said then the description shouldn't suggest things are
being done consistently everywhere. (Likely this is going to become
easy when splitting by maintainership area, by then simply omitting
the respective sentence from the description.)
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 07/13] x86/vmx: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 8:04 ` Jan Beulich
2023-07-06 22:17 ` Stefano Stabellini
@ 2023-07-07 8:18 ` Simone Ballarin
1 sibling, 0 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-07 8:18 UTC (permalink / raw)
To: Jan Beulich
Cc: consulting, Gianluca Luparini, Jun Nakajima, Kevin Tian,
Andrew Cooper, Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, xen-devel
[-- Attachment #1: Type: text/plain, Size: 4551 bytes --]
Il giorno gio 6 lug 2023 alle ore 10:04 Jan Beulich <jbeulich@suse.com> ha
scritto:
> On 05.07.2023 17:26, Simone Ballarin wrote:
> > --- a/xen/arch/x86/hvm/vmx/vvmx.c
> > +++ b/xen/arch/x86/hvm/vmx/vvmx.c
> > @@ -257,14 +257,14 @@ uint64_t get_vvmcs_virtual(void *vvmcs, uint32_t
> vmcs_encoding)
> >
> > switch ( enc.width ) {
> > case VVMCS_WIDTH_16:
> > - res &= 0xffff;
> > + res &= 0xffffU;
>
> I don't think the suffix is needed in cases like this one, and ...
>
> > break;
> > case VVMCS_WIDTH_64:
> > if ( enc.access_type )
> > res >>= 32;
> > break;
> > case VVMCS_WIDTH_32:
> > - res &= 0xffffffff;
> > + res &= 0xffffffffU;
>
> ... while generally I'm suggesting to avoid casts I wonder whether
> casting to uint32_t here wouldn't make things more obviously match
> the purpose. (Same again further down then.)
>
Using the cast is fine. I will change the patch.
>
> > --- a/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> > +++ b/xen/arch/x86/include/asm/hvm/vmx/vmcs.h
> > @@ -207,7 +207,7 @@ void vmx_vmcs_reload(struct vcpu *v);
> > #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_ACTIVATE_SECONDARY_CONTROLS 0x80000000U
>
> Interesting - you don't change adjacent #define-s here, nor ...
>
> > @@ -257,7 +257,7 @@ extern u32 vmx_vmentry_control;
> > #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_NOTIFY_VM_EXITING 0x80000000U
>
> ... here. May I ask why that is? (I'm not opposed, but the
> description suggests otherwise.)
>
> > --- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> > +++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
> > @@ -136,7 +136,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 0x80000000U
> > #define VMX_EXIT_REASONS_BUS_LOCK (1u << 26)
>
> Along the lines of the latter, perhaps switch to 1u << 31?
>
> > @@ -246,15 +246,15 @@ typedef union cr_access_qual {
> > /*
> > * Access Rights
> > */
> > -#define X86_SEG_AR_SEG_TYPE 0xf /* 3:0, segment type */
> > -#define X86_SEG_AR_DESC_TYPE (1u << 4) /* 4, descriptor type */
> > -#define X86_SEG_AR_DPL 0x60 /* 6:5, descriptor privilege
> level */
> > -#define X86_SEG_AR_SEG_PRESENT (1u << 7) /* 7, segment present */
> > -#define X86_SEG_AR_AVL (1u << 12) /* 12, available for system
> software */
> > -#define X86_SEG_AR_CS_LM_ACTIVE (1u << 13) /* 13, long mode active (CS
> only) */
> > -#define X86_SEG_AR_DEF_OP_SIZE (1u << 14) /* 14, default operation
> size */
> > -#define X86_SEG_AR_GRANULARITY (1u << 15) /* 15, granularity */
> > -#define X86_SEG_AR_SEG_UNUSABLE (1u << 16) /* 16, segment unusable */
> > +#define X86_SEG_AR_SEG_TYPE 0xfU /* 3:0, segment type */
> > +#define X86_SEG_AR_DESC_TYPE (1U << 4) /* 4, descriptor type */
> > +#define X86_SEG_AR_DPL 0x60U /* 6:5, descriptor privilege
> level */
> > +#define X86_SEG_AR_SEG_PRESENT (1U << 7) /* 7, segment present */
> > +#define X86_SEG_AR_AVL (1U << 12) /* 12, available for system
> software */
> > +#define X86_SEG_AR_CS_LM_ACTIVE (1U << 13) /* 13, long mode active (CS
> only) */
> > +#define X86_SEG_AR_DEF_OP_SIZE (1U << 14) /* 14, default operation
> size */
> > +#define X86_SEG_AR_GRANULARITY (1U << 15) /* 15, granularity */
> > +#define X86_SEG_AR_SEG_UNUSABLE (1U << 16) /* 16, segment unusable */
>
> How is this change related to rule 7.2? There are u suffixes already where
> needed (and 0xf and 0x60 don't strictly need one), so there's no violation
> here afaict. A mere style change to switch from u to U imo doesn't belong
> here (and, as mentioned while discussing the rule, is imo hampering
> readability in cases like these ones).
>
> Jan
>
In general, I will remove all non-strictly required U's you have pointed
out.
I will also amend the commit messages in these cases.
--
Simone Ballarin, M.Sc.
Field Application Engineer, BUGSENG (https://bugseng.com
<http://bugseng.com>)
[-- Attachment #2: Type: text/html, Size: 6395 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 08/13] xen/pci: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (6 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 07/13] x86/vmx: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-06 8:05 ` Jan Beulich
2023-07-05 15:26 ` [XEN PATCH v2 09/13] xen/public: " Simone Ballarin
` (4 subsequent siblings)
12 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Jan Beulich, Paul Durrant,
Roger Pau Monné,
Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
Changes in v2:
- minor change to commit title
- change commit message
---
xen/drivers/passthrough/pci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index 07d1986d33..95846e84f2 100644
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -990,8 +990,8 @@ bool_t __init pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func)
vendor = pci_conf_read32(PCI_SBDF(seg, bus, dev, func), PCI_VENDOR_ID);
/* some broken boards return 0 or ~0 if a slot is empty: */
- if ( (vendor == 0xffffffff) || (vendor == 0x00000000) ||
- (vendor == 0x0000ffff) || (vendor == 0xffff0000) )
+ if ( (vendor == 0xffffffffU) || (vendor == 0x00000000U) ||
+ (vendor == 0x0000ffffU) || (vendor == 0xffff0000U) )
return 0;
return 1;
}
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 08/13] xen/pci: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 08/13] xen/pci: " Simone Ballarin
@ 2023-07-06 8:05 ` Jan Beulich
0 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 8:05 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Paul Durrant, Roger Pau Monné,
Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, xen-devel
On 05.07.2023 17:26, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Jan Beulich <jbeulich@suse.com>
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 09/13] xen/public: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (7 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 08/13] xen/pci: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 15:33 ` Juergen Gross
2023-07-05 23:42 ` Stefano Stabellini
2023-07-05 15:26 ` [XEN PATCH v2 10/13] x86/monitor: " Simone Ballarin
` (3 subsequent siblings)
12 siblings, 2 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Juergen Gross, Stefano Stabellini,
Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder,
Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
Changes in v2:
- minor change to commit title
- change commit message
- correct macros code style
---
xen/include/public/io/ring.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
index 025939278b..0cae4367be 100644
--- a/xen/include/public/io/ring.h
+++ b/xen/include/public/io/ring.h
@@ -36,11 +36,11 @@
typedef unsigned int RING_IDX;
/* Round a 32-bit unsigned constant down to the nearest power of two. */
-#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1))
-#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x))
-#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x))
-#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x))
-#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))
+#define __RD2(x) (((x) & 0x00000002U) ? 0x2 : ((x) & 0x1))
+#define __RD4(x) (((x) & 0x0000000cU) ? __RD2((x) >> 2) << 2 : __RD2(x))
+#define __RD8(x) (((x) & 0x000000f0U) ? __RD4((x) >> 4) << 4 : __RD4(x))
+#define __RD16(x) (((x) & 0x0000ff00U) ? __RD8((x) >> 8) << 8 : __RD8(x))
+#define __RD32(x) (((x) & 0xffff0000U) ? __RD16((x) >> 16) << 16 : __RD16(x))
/*
* Calculate size of a shared ring, given the total available space for the
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 09/13] xen/public: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 09/13] xen/public: " Simone Ballarin
@ 2023-07-05 15:33 ` Juergen Gross
2023-07-06 7:43 ` Jan Beulich
2023-07-05 23:42 ` Stefano Stabellini
1 sibling, 1 reply; 59+ messages in thread
From: Juergen Gross @ 2023-07-05 15:33 UTC (permalink / raw)
To: Simone Ballarin, xen-devel
Cc: consulting, Gianluca Luparini, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder
[-- Attachment #1.1.1: Type: text/plain, Size: 2366 bytes --]
On 05.07.23 17:26, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
> ---
> Changes in v2:
> - minor change to commit title
> - change commit message
> - correct macros code style
> ---
> xen/include/public/io/ring.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
> index 025939278b..0cae4367be 100644
> --- a/xen/include/public/io/ring.h
> +++ b/xen/include/public/io/ring.h
> @@ -36,11 +36,11 @@
> typedef unsigned int RING_IDX;
>
> /* Round a 32-bit unsigned constant down to the nearest power of two. */
> -#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1))
> -#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x))
> -#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x))
> -#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x))
> -#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))
> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2 : ((x) & 0x1))
Shouldn't this be rather:
+#define __RD2(x) (((x) & 0x00000002U) ? 0x2U : ((x) & 0x1U))
> +#define __RD4(x) (((x) & 0x0000000cU) ? __RD2((x) >> 2) << 2 : __RD2(x))
> +#define __RD8(x) (((x) & 0x000000f0U) ? __RD4((x) >> 4) << 4 : __RD4(x))
> +#define __RD16(x) (((x) & 0x0000ff00U) ? __RD8((x) >> 8) << 8 : __RD8(x))
> +#define __RD32(x) (((x) & 0xffff0000U) ? __RD16((x) >> 16) << 16 : __RD16(x))
>
> /*
> * Calculate size of a shared ring, given the total available space for the
Other than that:
Reviewed-by: Juergen Gross <jgross@suse.com>
Juergen
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3149 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 09/13] xen/public: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:33 ` Juergen Gross
@ 2023-07-06 7:43 ` Jan Beulich
2023-07-06 7:57 ` Juergen Gross
0 siblings, 1 reply; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 7:43 UTC (permalink / raw)
To: Juergen Gross
Cc: consulting, Gianluca Luparini, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel, Simone Ballarin
On 05.07.2023 17:33, Juergen Gross wrote:
> On 05.07.23 17:26, Simone Ballarin wrote:
>> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>
>> 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: Simone Ballarin <simone.ballarin@bugseng.com>
>> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
>> ---
>> Changes in v2:
>> - minor change to commit title
>> - change commit message
>> - correct macros code style
>> ---
>> xen/include/public/io/ring.h | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
>> index 025939278b..0cae4367be 100644
>> --- a/xen/include/public/io/ring.h
>> +++ b/xen/include/public/io/ring.h
>> @@ -36,11 +36,11 @@
>> typedef unsigned int RING_IDX;
>>
>> /* Round a 32-bit unsigned constant down to the nearest power of two. */
>> -#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1))
>> -#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x))
>> -#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x))
>> -#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x))
>> -#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))
>> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2 : ((x) & 0x1))
>
> Shouldn't this be rather:
>
> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2U : ((x) & 0x1U))
I don't think it matters much (as the comment says, the input is expected
to be unsigned anyway), and I expect even the one U that was added here
was only added for consistency. The sole one that really matter is imo ...
>> +#define __RD4(x) (((x) & 0x0000000cU) ? __RD2((x) >> 2) << 2 : __RD2(x))
>> +#define __RD8(x) (((x) & 0x000000f0U) ? __RD4((x) >> 4) << 4 : __RD4(x))
>> +#define __RD16(x) (((x) & 0x0000ff00U) ? __RD8((x) >> 8) << 8 : __RD8(x))
>> +#define __RD32(x) (((x) & 0xffff0000U) ? __RD16((x) >> 16) << 16 : __RD16(x))
... this single one.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 09/13] xen/public: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 7:43 ` Jan Beulich
@ 2023-07-06 7:57 ` Juergen Gross
2023-07-06 8:43 ` Jan Beulich
0 siblings, 1 reply; 59+ messages in thread
From: Juergen Gross @ 2023-07-06 7:57 UTC (permalink / raw)
To: Jan Beulich
Cc: consulting, Gianluca Luparini, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel, Simone Ballarin
[-- Attachment #1.1.1: Type: text/plain, Size: 2817 bytes --]
On 06.07.23 09:43, Jan Beulich wrote:
> On 05.07.2023 17:33, Juergen Gross wrote:
>> On 05.07.23 17:26, Simone Ballarin wrote:
>>> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>>
>>> 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: Simone Ballarin <simone.ballarin@bugseng.com>
>>> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>> ---
>>> Changes in v2:
>>> - minor change to commit title
>>> - change commit message
>>> - correct macros code style
>>> ---
>>> xen/include/public/io/ring.h | 10 +++++-----
>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
>>> index 025939278b..0cae4367be 100644
>>> --- a/xen/include/public/io/ring.h
>>> +++ b/xen/include/public/io/ring.h
>>> @@ -36,11 +36,11 @@
>>> typedef unsigned int RING_IDX;
>>>
>>> /* Round a 32-bit unsigned constant down to the nearest power of two. */
>>> -#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1))
>>> -#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x))
>>> -#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x))
>>> -#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x))
>>> -#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))
>>> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2 : ((x) & 0x1))
>>
>> Shouldn't this be rather:
>>
>> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2U : ((x) & 0x1U))
>
> I don't think it matters much (as the comment says, the input is expected
> to be unsigned anyway), and I expect even the one U that was added here
> was only added for consistency. The sole one that really matter is imo ...
>
>>> +#define __RD4(x) (((x) & 0x0000000cU) ? __RD2((x) >> 2) << 2 : __RD2(x))
>>> +#define __RD8(x) (((x) & 0x000000f0U) ? __RD4((x) >> 4) << 4 : __RD4(x))
>>> +#define __RD16(x) (((x) & 0x0000ff00U) ? __RD8((x) >> 8) << 8 : __RD8(x))
>>> +#define __RD32(x) (((x) & 0xffff0000U) ? __RD16((x) >> 16) << 16 : __RD16(x))
>
> ... this single one.
I agree that only the last one is really needed.
But for consistency reasons I'd expect all optional "U"s to be either dropped or
specified, instead of a mixture.
Juergen
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3149 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 09/13] xen/public: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 7:57 ` Juergen Gross
@ 2023-07-06 8:43 ` Jan Beulich
2023-07-06 9:10 ` Juergen Gross
0 siblings, 1 reply; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 8:43 UTC (permalink / raw)
To: Juergen Gross
Cc: consulting, Gianluca Luparini, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel, Simone Ballarin
On 06.07.2023 09:57, Juergen Gross wrote:
> On 06.07.23 09:43, Jan Beulich wrote:
>> On 05.07.2023 17:33, Juergen Gross wrote:
>>> On 05.07.23 17:26, Simone Ballarin wrote:
>>>> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>>>
>>>> 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: Simone Ballarin <simone.ballarin@bugseng.com>
>>>> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>>> ---
>>>> Changes in v2:
>>>> - minor change to commit title
>>>> - change commit message
>>>> - correct macros code style
>>>> ---
>>>> xen/include/public/io/ring.h | 10 +++++-----
>>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>>>
>>>> diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
>>>> index 025939278b..0cae4367be 100644
>>>> --- a/xen/include/public/io/ring.h
>>>> +++ b/xen/include/public/io/ring.h
>>>> @@ -36,11 +36,11 @@
>>>> typedef unsigned int RING_IDX;
>>>>
>>>> /* Round a 32-bit unsigned constant down to the nearest power of two. */
>>>> -#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1))
>>>> -#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x))
>>>> -#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x))
>>>> -#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x))
>>>> -#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))
>>>> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2 : ((x) & 0x1))
>>>
>>> Shouldn't this be rather:
>>>
>>> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2U : ((x) & 0x1U))
>>
>> I don't think it matters much (as the comment says, the input is expected
>> to be unsigned anyway), and I expect even the one U that was added here
>> was only added for consistency. The sole one that really matter is imo ...
>>
>>>> +#define __RD4(x) (((x) & 0x0000000cU) ? __RD2((x) >> 2) << 2 : __RD2(x))
>>>> +#define __RD8(x) (((x) & 0x000000f0U) ? __RD4((x) >> 4) << 4 : __RD4(x))
>>>> +#define __RD16(x) (((x) & 0x0000ff00U) ? __RD8((x) >> 8) << 8 : __RD8(x))
>>>> +#define __RD32(x) (((x) & 0xffff0000U) ? __RD16((x) >> 16) << 16 : __RD16(x))
>>
>> ... this single one.
>
> I agree that only the last one is really needed.
>
> But for consistency reasons I'd expect all optional "U"s to be either dropped or
> specified, instead of a mixture.
Funny you should say this. Shift counts also aren't allowed to be negative
... For this reason, the pattern I see here is to have U uniformly on the
lhs of the ?: operator, and nowhere else.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 09/13] xen/public: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 8:43 ` Jan Beulich
@ 2023-07-06 9:10 ` Juergen Gross
0 siblings, 0 replies; 59+ messages in thread
From: Juergen Gross @ 2023-07-06 9:10 UTC (permalink / raw)
To: Jan Beulich
Cc: consulting, Gianluca Luparini, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel, Simone Ballarin
[-- Attachment #1.1.1: Type: text/plain, Size: 3481 bytes --]
On 06.07.23 10:43, Jan Beulich wrote:
> On 06.07.2023 09:57, Juergen Gross wrote:
>> On 06.07.23 09:43, Jan Beulich wrote:
>>> On 05.07.2023 17:33, Juergen Gross wrote:
>>>> On 05.07.23 17:26, Simone Ballarin wrote:
>>>>> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>>>>
>>>>> 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: Simone Ballarin <simone.ballarin@bugseng.com>
>>>>> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
>>>>> ---
>>>>> Changes in v2:
>>>>> - minor change to commit title
>>>>> - change commit message
>>>>> - correct macros code style
>>>>> ---
>>>>> xen/include/public/io/ring.h | 10 +++++-----
>>>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>>>>
>>>>> diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
>>>>> index 025939278b..0cae4367be 100644
>>>>> --- a/xen/include/public/io/ring.h
>>>>> +++ b/xen/include/public/io/ring.h
>>>>> @@ -36,11 +36,11 @@
>>>>> typedef unsigned int RING_IDX;
>>>>>
>>>>> /* Round a 32-bit unsigned constant down to the nearest power of two. */
>>>>> -#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1))
>>>>> -#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x))
>>>>> -#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x))
>>>>> -#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x))
>>>>> -#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))
>>>>> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2 : ((x) & 0x1))
>>>>
>>>> Shouldn't this be rather:
>>>>
>>>> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2U : ((x) & 0x1U))
>>>
>>> I don't think it matters much (as the comment says, the input is expected
>>> to be unsigned anyway), and I expect even the one U that was added here
>>> was only added for consistency. The sole one that really matter is imo ...
>>>
>>>>> +#define __RD4(x) (((x) & 0x0000000cU) ? __RD2((x) >> 2) << 2 : __RD2(x))
>>>>> +#define __RD8(x) (((x) & 0x000000f0U) ? __RD4((x) >> 4) << 4 : __RD4(x))
>>>>> +#define __RD16(x) (((x) & 0x0000ff00U) ? __RD8((x) >> 8) << 8 : __RD8(x))
>>>>> +#define __RD32(x) (((x) & 0xffff0000U) ? __RD16((x) >> 16) << 16 : __RD16(x))
>>>
>>> ... this single one.
>>
>> I agree that only the last one is really needed.
>>
>> But for consistency reasons I'd expect all optional "U"s to be either dropped or
>> specified, instead of a mixture.
>
> Funny you should say this. Shift counts also aren't allowed to be negative
> ... For this reason, the pattern I see here is to have U uniformly on the
> lhs of the ?: operator, and nowhere else.
Yes, this is one way to look at it.
My view would be that (at least) the constants used for ANDing should have a
uniform U attribution.
In the end I'm fine with either way. I just wanted to point out a slight
inconsistency with the patch.
Juergen
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3149 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 09/13] xen/public: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 09/13] xen/public: " Simone Ballarin
2023-07-05 15:33 ` Juergen Gross
@ 2023-07-05 23:42 ` Stefano Stabellini
1 sibling, 0 replies; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-05 23:42 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Juergen Gross,
Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder
On Wed, 5 Jul 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> ---
> Changes in v2:
> - minor change to commit title
> - change commit message
> - correct macros code style
> ---
> xen/include/public/io/ring.h | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h
> index 025939278b..0cae4367be 100644
> --- a/xen/include/public/io/ring.h
> +++ b/xen/include/public/io/ring.h
> @@ -36,11 +36,11 @@
> typedef unsigned int RING_IDX;
>
> /* Round a 32-bit unsigned constant down to the nearest power of two. */
> -#define __RD2(_x) (((_x) & 0x00000002) ? 0x2 : ((_x) & 0x1))
> -#define __RD4(_x) (((_x) & 0x0000000c) ? __RD2((_x)>>2)<<2 : __RD2(_x))
> -#define __RD8(_x) (((_x) & 0x000000f0) ? __RD4((_x)>>4)<<4 : __RD4(_x))
> -#define __RD16(_x) (((_x) & 0x0000ff00) ? __RD8((_x)>>8)<<8 : __RD8(_x))
> -#define __RD32(_x) (((_x) & 0xffff0000) ? __RD16((_x)>>16)<<16 : __RD16(_x))
> +#define __RD2(x) (((x) & 0x00000002U) ? 0x2 : ((x) & 0x1))
> +#define __RD4(x) (((x) & 0x0000000cU) ? __RD2((x) >> 2) << 2 : __RD2(x))
> +#define __RD8(x) (((x) & 0x000000f0U) ? __RD4((x) >> 4) << 4 : __RD4(x))
> +#define __RD16(x) (((x) & 0x0000ff00U) ? __RD8((x) >> 8) << 8 : __RD8(x))
> +#define __RD32(x) (((x) & 0xffff0000U) ? __RD16((x) >> 16) << 16 : __RD16(x))
>
> /*
> * Calculate size of a shared ring, given the total available space for the
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 10/13] x86/monitor: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (8 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 09/13] xen/public: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 15:26 ` [XEN PATCH v2 11/13] xen/vpci: " Simone Ballarin
` (2 subsequent siblings)
12 siblings, 0 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Tamas K Lengyel, Alexandru Isaila,
Petre Pircalabu, Jan Beulich, Andrew Cooper, Roger Pau Monné,
Wei Liu, Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
Changes in v2:
- change commit title to make it unique
- change commit message
---
xen/arch/x86/monitor.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/xen/arch/x86/monitor.c b/xen/arch/x86/monitor.c
index d4857faf8a..dc336c239a 100644
--- a/xen/arch/x86/monitor.c
+++ b/xen/arch/x86/monitor.c
@@ -48,17 +48,17 @@ static unsigned long *monitor_bitmap_for_msr(const struct domain *d, u32 *msr)
switch ( *msr )
{
- case 0 ... 0x1fff:
+ case 0 ... 0x1fffU:
BUILD_BUG_ON(sizeof(d->arch.monitor.msr_bitmap->low) * 8 <= 0x1fff);
return d->arch.monitor.msr_bitmap->low;
- case 0x40000000 ... 0x40001fff:
+ case 0x40000000U ... 0x40001fffU:
BUILD_BUG_ON(
sizeof(d->arch.monitor.msr_bitmap->hypervisor) * 8 <= 0x1fff);
*msr &= 0x1fff;
return d->arch.monitor.msr_bitmap->hypervisor;
- case 0xc0000000 ... 0xc0001fff:
+ case 0xc0000000U ... 0xc0001fffU:
BUILD_BUG_ON(sizeof(d->arch.monitor.msr_bitmap->high) * 8 <= 0x1fff);
*msr &= 0x1fff;
return d->arch.monitor.msr_bitmap->high;
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* [XEN PATCH v2 11/13] xen/vpci: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (9 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 10/13] x86/monitor: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-06 8:07 ` Jan Beulich
2023-07-05 15:26 ` [XEN PATCH v2 12/13] xen/x86: " Simone Ballarin
2023-07-05 15:26 ` [XEN PATCH v2 13/13] xen: " Simone Ballarin
12 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Roger Pau Monné,
Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
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(-)
diff --git a/xen/drivers/vpci/msi.c b/xen/drivers/vpci/msi.c
index 8f2b59e61a..7908a5dac6 100644
--- a/xen/drivers/vpci/msi.c
+++ b/xen/drivers/vpci/msi.c
@@ -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 &= 0xffffffffU;
msi->address |= (uint64_t)val << 32;
update_msi(pdev, msi);
diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c
index 25bde77586..d440ffcd81 100644
--- a/xen/drivers/vpci/msix.c
+++ b/xen/drivers/vpci/msix.c
@@ -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 &= 0xffffffffU;
entry->addr |= (uint64_t)data << 32;
break;
diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c
index d73fa76302..3bec9a4153 100644
--- a/xen/drivers/vpci/vpci.c
+++ b/xen/drivers/vpci/vpci.c
@@ -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);
}
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 11/13] xen/vpci: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 11/13] xen/vpci: " Simone Ballarin
@ 2023-07-06 8:07 ` Jan Beulich
0 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 8:07 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Roger Pau Monné,
Stefano Stabellini, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, xen-devel
On 05.07.2023 17:26, Simone Ballarin wrote:
> --- a/xen/drivers/vpci/msi.c
> +++ b/xen/drivers/vpci/msi.c
> @@ -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 &= 0xffffffffU;
> msi->address |= (uint64_t)val << 32;
Along the lines of the comment to an earlier patch and considering that
a cast to uint64_t is already present here, I again wonder whether
switching to casting to uint32_t wouldn't be the better change.
> --- a/xen/drivers/vpci/msix.c
> +++ b/xen/drivers/vpci/msix.c
> @@ -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 &= 0xffffffffU;
> entry->addr |= (uint64_t)data << 32;
> break;
Same here then.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (10 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 11/13] xen/vpci: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-06 0:11 ` Stefano Stabellini
2023-07-06 8:26 ` Jan Beulich
2023-07-05 15:26 ` [XEN PATCH v2 13/13] xen: " Simone Ballarin
12 siblings, 2 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Jan Beulich, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
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 | 8 +-
xen/arch/x86/cpu/mcheck/mce-apei.c | 8 +-
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/irq.c | 2 +-
xen/arch/x86/hvm/pmtimer.c | 4 +-
xen/arch/x86/hvm/stdvga.c | 66 +++---
xen/arch/x86/hvm/viridian/viridian.c | 2 +-
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/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/msi.h | 2 +-
xen/arch/x86/include/asm/msr-index.h | 202 +++++++++----------
xen/arch/x86/include/asm/pci.h | 8 +-
xen/arch/x86/include/asm/x86-defns.h | 2 +-
xen/arch/x86/percpu.c | 2 +-
xen/arch/x86/psr.c | 2 +-
xen/arch/x86/spec_ctrl.c | 8 +-
xen/arch/x86/x86_64/acpi_mmcfg.c | 2 +-
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 +-
30 files changed, 199 insertions(+), 199 deletions(-)
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index f71474d47d..03c5c0f2ee 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -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 )
diff --git a/xen/arch/x86/cpu-policy.c b/xen/arch/x86/cpu-policy.c
index f40eeb8be8..5516249cb6 100644
--- a/xen/arch/x86/cpu-policy.c
+++ b/xen/arch/x86/cpu-policy.c
@@ -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,9 +378,9 @@ 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,
+ p->extd.max_leaf = 0x80000000U | min_t(uint32_t, max_extd_leaf & 0xffffU,
ARRAY_SIZE(p->extd.raw) - 1);
x86_cpu_featureset_to_policy(boot_cpu_data.x86_capability, p);
@@ -768,7 +768,7 @@ 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->extd.max_leaf = 0x80000000U | min(p->extd.max_leaf & 0xffff,
((p->x86_vendor & (X86_VENDOR_AMD |
X86_VENDOR_HYGON))
? CPUID_GUEST_NR_EXTD_AMD
diff --git a/xen/arch/x86/cpu/mcheck/mce-apei.c b/xen/arch/x86/cpu/mcheck/mce-apei.c
index 53b6735896..1aa213b321 100644
--- a/xen/arch/x86/cpu/mcheck/mce-apei.c
+++ b/xen/arch/x86/cpu/mcheck/mce-apei.c
@@ -37,11 +37,11 @@
#include "mce.h"
#define CPER_CREATOR_MCE \
- UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \
- 0x64, 0x90, 0xb8, 0x9d)
+ UUID_LE(0x75a574e3U, 0x5052U, 0x4b29U, 0x8aU, 0x8eU, 0xbeU, 0x2cU, \
+ 0x64U, 0x90U, 0xb8U, 0x9dU)
#define CPER_SECTION_TYPE_MCE \
- UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \
- 0x04, 0x4a, 0x38, 0xfc)
+ UUID_LE(0xfe08ffbeU, 0x95e4U, 0x4be7U, 0xbcU, 0x73U, 0x40U, 0x96U, \
+ 0x04U, 0x4aU, 0x38U, 0xfcU)
/*
* CPER specification (in UEFI specification 2.3 appendix N) requires
diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c
index 455a09b2dd..7290a979c6 100644
--- a/xen/arch/x86/cpuid.c
+++ b/xen/arch/x86/cpuid.c
@@ -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) )
diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h
index 64c1a02cf1..cef3c2634e 100644
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -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
diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c
index c3771c2e39..6951a433e8 100644
--- a/xen/arch/x86/extable.c
+++ b/xen/arch/x86/extable.c
@@ -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 = 0xfedcba9876543210U,
.res.fields.trapnr = X86_EXC_SS },
{ .opc = { endbr64, 0xcc, 0xc3, 0xc3, 0xc3 }, /* int3 */
.res.fields.trapnr = X86_EXC_BP },
diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c
index 20d266ffd5..eeb73e1aa5 100644
--- a/xen/arch/x86/hvm/hypercall.c
+++ b/xen/arch/x86/hvm/hypercall.c
@@ -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;
diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index 1258371eb0..5c00127cfc 100644
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -383,7 +383,7 @@ int hvm_inject_msi(struct domain *d, uint64_t addr, uint32_t data)
if ( !vector )
{
- int pirq = ((addr >> 32) & 0xffffff00) | dest;
+ int pirq = ((addr >> 32) & 0xffffff00U) | dest;
if ( pirq > 0 )
{
diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c
index 2145c531b6..eb4a455763 100644
--- a/xen/arch/x86/hvm/pmtimer.c
+++ b/xen/arch/x86/hvm/pmtimer.c
@@ -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)
diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c
index 798a9a0549..d2cc7e0457 100644
--- a/xen/arch/x86/hvm/stdvga.c
+++ b/xen/arch/x86/hvm/stdvga.c
@@ -39,46 +39,46 @@
#define PAT(x) (x)
static const uint32_t mask16[16] = {
- PAT(0x00000000),
- PAT(0x000000ff),
- PAT(0x0000ff00),
- PAT(0x0000ffff),
- PAT(0x00ff0000),
- PAT(0x00ff00ff),
- PAT(0x00ffff00),
- PAT(0x00ffffff),
- PAT(0xff000000),
- PAT(0xff0000ff),
- PAT(0xff00ff00),
- PAT(0xff00ffff),
- PAT(0xffff0000),
- PAT(0xffff00ff),
- PAT(0xffffff00),
- PAT(0xffffffff),
+ PAT(0x00000000U),
+ PAT(0x000000ffU),
+ PAT(0x0000ff00U),
+ PAT(0x0000ffffU),
+ PAT(0x00ff0000U),
+ PAT(0x00ff00ffU),
+ PAT(0x00ffff00U),
+ PAT(0x00ffffffU),
+ PAT(0xff000000U),
+ PAT(0xff0000ffU),
+ PAT(0xff00ff00U),
+ PAT(0xff00ffffU),
+ PAT(0xffff0000U),
+ PAT(0xffff00ffU),
+ PAT(0xffffff00U),
+ PAT(0xffffffffU),
};
/* force some bits to zero */
static const uint8_t sr_mask[8] = {
- (uint8_t)~0xfc,
- (uint8_t)~0xc2,
- (uint8_t)~0xf0,
- (uint8_t)~0xc0,
- (uint8_t)~0xf1,
- (uint8_t)~0xff,
- (uint8_t)~0xff,
- (uint8_t)~0x00,
+ (uint8_t)~0xfcU,
+ (uint8_t)~0xc2U,
+ (uint8_t)~0xf0U,
+ (uint8_t)~0xc0U,
+ (uint8_t)~0xf1U,
+ (uint8_t)~0xffU,
+ (uint8_t)~0xffU,
+ (uint8_t)~0x00U,
};
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 */
+ (uint8_t)~0xf0U,
+ (uint8_t)~0xf0U,
+ (uint8_t)~0xf0U,
+ (uint8_t)~0xe0U,
+ (uint8_t)~0xfcU,
+ (uint8_t)~0x84U,
+ (uint8_t)~0xf0U,
+ (uint8_t)~0xf0U,
+ (uint8_t)~0x00U,
};
static uint8_t *vram_getb(struct hvm_hw_stdvga *s, unsigned int a)
diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c
index 7405c117bc..61171e3363 100644
--- a/xen/arch/x86/hvm/viridian/viridian.c
+++ b/xen/arch/x86/hvm/viridian/viridian.c
@@ -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);
diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index c7ce82d064..a8e87c4446 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -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 */
diff --git a/xen/arch/x86/include/asm/apicdef.h b/xen/arch/x86/include/asm/apicdef.h
index 2440d83c8d..7f21d3f49c 100644
--- a/xen/arch/x86/include/asm/apicdef.h
+++ b/xen/arch/x86/include/asm/apicdef.h
@@ -8,7 +8,7 @@
* Ingo Molnar <mingo@redhat.com>, 1999, 2000
*/
-#define APIC_DEFAULT_PHYS_BASE 0xfee00000
+#define APIC_DEFAULT_PHYS_BASE 0xfee00000U
#define APIC_ID 0x20
#define APIC_ID_MASK (0xFFu<<24)
diff --git a/xen/arch/x86/include/asm/config.h b/xen/arch/x86/include/asm/config.h
index fbc4bb3416..bbced338be 100644
--- a/xen/arch/x86/include/asm/config.h
+++ b/xen/arch/x86/include/asm/config.h
@@ -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)
diff --git a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
index 38f997a0c8..a6915ad731 100644
--- a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
+++ b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
@@ -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. */
diff --git a/xen/arch/x86/include/asm/hpet.h b/xen/arch/x86/include/asm/hpet.h
index 9919f74730..c5e8e9c8db 100644
--- a/xen/arch/x86/include/asm/hpet.h
+++ b/xen/arch/x86/include/asm/hpet.h
@@ -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)
diff --git a/xen/arch/x86/include/asm/hvm/trace.h b/xen/arch/x86/include/asm/hvm/trace.h
index 696e42eb94..0437966d1f 100644
--- a/xen/arch/x86/include/asm/hvm/trace.h
+++ b/xen/arch/x86/include/asm/hvm/trace.h
@@ -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) ((par) & 0xFFFFFFFFU), ((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, (d1) & 0xFFFFFFFFU, (d1) >> 32)
#define HVMTRACE_LONG_2D(evt, d1, d2, ...) \
HVMTRACE_3D(evt ## 64, d1, d2)
#define HVMTRACE_LONG_3D(evt, d1, d2, d3, ...) \
diff --git a/xen/arch/x86/include/asm/hvm/vioapic.h b/xen/arch/x86/include/asm/hvm/vioapic.h
index 2944ec20dd..68af6dce79 100644
--- a/xen/arch/x86/include/asm/hvm/vioapic.h
+++ b/xen/arch/x86/include/asm/hvm/vioapic.h
@@ -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. */
diff --git a/xen/arch/x86/include/asm/msi.h b/xen/arch/x86/include/asm/msi.h
index a53ade95c9..d89723d009 100644
--- a/xen/arch/x86/include/asm/msi.h
+++ b/xen/arch/x86/include/asm/msi.h
@@ -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
diff --git a/xen/arch/x86/include/asm/msr-index.h b/xen/arch/x86/include/asm/msr-index.h
index 4f861c0bb4..69ca8677c0 100644
--- 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)
@@ -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 */
-#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.
@@ -293,7 +293,7 @@
#define CMCI_EN (1UL<<30)
#define CMCI_THRESHOLD_MASK 0x7FFF
-#define MSR_AMD64_MC0_MASK 0xc0010044
+#define MSR_AMD64_MC0_MASK 0xc0010044U
#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x))
#define MSR_IA32_MCx_STATUS(x) (MSR_IA32_MC0_STATUS + 4*(x))
@@ -325,83 +325,83 @@
/* K7/K8 MSRs. Not complete. See the architecture manual for a more
complete list. */
-#define MSR_K7_EVNTSEL0 0xc0010000
-#define MSR_K7_PERFCTR0 0xc0010004
-#define MSR_K7_EVNTSEL1 0xc0010001
-#define MSR_K7_PERFCTR1 0xc0010005
-#define MSR_K7_EVNTSEL2 0xc0010002
-#define MSR_K7_PERFCTR2 0xc0010006
-#define MSR_K7_EVNTSEL3 0xc0010003
-#define MSR_K7_PERFCTR3 0xc0010007
-#define MSR_K8_TOP_MEM1 0xc001001a
-#define MSR_K7_CLK_CTL 0xc001001b
-#define MSR_K8_TOP_MEM2 0xc001001d
-
-#define MSR_K8_HWCR 0xc0010015
+#define MSR_K7_EVNTSEL0 0xc0010000U
+#define MSR_K7_PERFCTR0 0xc0010004U
+#define MSR_K7_EVNTSEL1 0xc0010001U
+#define MSR_K7_PERFCTR1 0xc0010005U
+#define MSR_K7_EVNTSEL2 0xc0010002U
+#define MSR_K7_PERFCTR2 0xc0010006U
+#define MSR_K7_EVNTSEL3 0xc0010003U
+#define MSR_K7_PERFCTR3 0xc0010007U
+#define MSR_K8_TOP_MEM1 0xc001001aU
+#define MSR_K7_CLK_CTL 0xc001001bU
+#define MSR_K8_TOP_MEM2 0xc001001dU
+
+#define MSR_K8_HWCR 0xc0010015U
#define K8_HWCR_TSC_FREQ_SEL (1ULL << 24)
#define K8_HWCR_CPUID_USER_DIS (1ULL << 35)
-#define MSR_K7_FID_VID_CTL 0xc0010041
-#define MSR_K7_FID_VID_STATUS 0xc0010042
-#define MSR_K8_PSTATE_LIMIT 0xc0010061
-#define MSR_K8_PSTATE_CTRL 0xc0010062
-#define MSR_K8_PSTATE_STATUS 0xc0010063
-#define MSR_K8_PSTATE0 0xc0010064
-#define MSR_K8_PSTATE1 0xc0010065
-#define MSR_K8_PSTATE2 0xc0010066
-#define MSR_K8_PSTATE3 0xc0010067
-#define MSR_K8_PSTATE4 0xc0010068
-#define MSR_K8_PSTATE5 0xc0010069
-#define MSR_K8_PSTATE6 0xc001006A
-#define MSR_K8_PSTATE7 0xc001006B
-#define MSR_K8_ENABLE_C1E 0xc0010055
-#define MSR_K8_VM_HSAVE_PA 0xc0010117
-
-#define MSR_AMD_FAM15H_EVNTSEL0 0xc0010200
-#define MSR_AMD_FAM15H_PERFCTR0 0xc0010201
-#define MSR_AMD_FAM15H_EVNTSEL1 0xc0010202
-#define MSR_AMD_FAM15H_PERFCTR1 0xc0010203
-#define MSR_AMD_FAM15H_EVNTSEL2 0xc0010204
-#define MSR_AMD_FAM15H_PERFCTR2 0xc0010205
-#define MSR_AMD_FAM15H_EVNTSEL3 0xc0010206
-#define MSR_AMD_FAM15H_PERFCTR3 0xc0010207
-#define MSR_AMD_FAM15H_EVNTSEL4 0xc0010208
-#define MSR_AMD_FAM15H_PERFCTR4 0xc0010209
-#define MSR_AMD_FAM15H_EVNTSEL5 0xc001020a
-#define MSR_AMD_FAM15H_PERFCTR5 0xc001020b
-
-#define MSR_AMD_L7S0_FEATURE_MASK 0xc0011002
-#define MSR_AMD_THRM_FEATURE_MASK 0xc0011003
-#define MSR_K8_FEATURE_MASK 0xc0011004
-#define MSR_K8_EXT_FEATURE_MASK 0xc0011005
+#define MSR_K7_FID_VID_CTL 0xc0010041U
+#define MSR_K7_FID_VID_STATUS 0xc0010042U
+#define MSR_K8_PSTATE_LIMIT 0xc0010061U
+#define MSR_K8_PSTATE_CTRL 0xc0010062U
+#define MSR_K8_PSTATE_STATUS 0xc0010063U
+#define MSR_K8_PSTATE0 0xc0010064U
+#define MSR_K8_PSTATE1 0xc0010065U
+#define MSR_K8_PSTATE2 0xc0010066U
+#define MSR_K8_PSTATE3 0xc0010067U
+#define MSR_K8_PSTATE4 0xc0010068U
+#define MSR_K8_PSTATE5 0xc0010069U
+#define MSR_K8_PSTATE6 0xc001006AU
+#define MSR_K8_PSTATE7 0xc001006BU
+#define MSR_K8_ENABLE_C1E 0xc0010055U
+#define MSR_K8_VM_HSAVE_PA 0xc0010117U
+
+#define MSR_AMD_FAM15H_EVNTSEL0 0xc0010200U
+#define MSR_AMD_FAM15H_PERFCTR0 0xc0010201U
+#define MSR_AMD_FAM15H_EVNTSEL1 0xc0010202U
+#define MSR_AMD_FAM15H_PERFCTR1 0xc0010203U
+#define MSR_AMD_FAM15H_EVNTSEL2 0xc0010204U
+#define MSR_AMD_FAM15H_PERFCTR2 0xc0010205U
+#define MSR_AMD_FAM15H_EVNTSEL3 0xc0010206U
+#define MSR_AMD_FAM15H_PERFCTR3 0xc0010207U
+#define MSR_AMD_FAM15H_EVNTSEL4 0xc0010208U
+#define MSR_AMD_FAM15H_PERFCTR4 0xc0010209U
+#define MSR_AMD_FAM15H_EVNTSEL5 0xc001020aU
+#define MSR_AMD_FAM15H_PERFCTR5 0xc001020bU
+
+#define MSR_AMD_L7S0_FEATURE_MASK 0xc0011002U
+#define MSR_AMD_THRM_FEATURE_MASK 0xc0011003U
+#define MSR_K8_FEATURE_MASK 0xc0011004U
+#define MSR_K8_EXT_FEATURE_MASK 0xc0011005U
/* AMD64 MSRs */
-#define MSR_AMD64_NB_CFG 0xc001001f
+#define MSR_AMD64_NB_CFG 0xc001001fU
#define AMD64_NB_CFG_CF8_EXT_ENABLE_BIT 46
-#define MSR_AMD64_LS_CFG 0xc0011020
-#define MSR_AMD64_IC_CFG 0xc0011021
-#define MSR_AMD64_DC_CFG 0xc0011022
-#define MSR_AMD64_DE_CFG 0xc0011029
+#define MSR_AMD64_LS_CFG 0xc0011020U
+#define MSR_AMD64_IC_CFG 0xc0011021U
+#define MSR_AMD64_DC_CFG 0xc0011022U
+#define MSR_AMD64_DE_CFG 0xc0011029U
#define AMD64_DE_CFG_LFENCE_SERIALISE (_AC(1, ULL) << 1)
-#define MSR_AMD64_EX_CFG 0xc001102c
-#define MSR_AMD64_DE_CFG2 0xc00110e3
+#define MSR_AMD64_EX_CFG 0xc001102cU
+#define MSR_AMD64_DE_CFG2 0xc00110e3U
-#define MSR_AMD64_DR0_ADDRESS_MASK 0xc0011027
-#define MSR_AMD64_DR1_ADDRESS_MASK 0xc0011019
-#define MSR_AMD64_DR2_ADDRESS_MASK 0xc001101a
-#define MSR_AMD64_DR3_ADDRESS_MASK 0xc001101b
+#define MSR_AMD64_DR0_ADDRESS_MASK 0xc0011027U
+#define MSR_AMD64_DR1_ADDRESS_MASK 0xc0011019U
+#define MSR_AMD64_DR2_ADDRESS_MASK 0xc001101aU
+#define MSR_AMD64_DR3_ADDRESS_MASK 0xc001101bU
/* AMD Family10h machine check MSRs */
-#define MSR_F10_MC4_MISC1 0xc0000408
-#define MSR_F10_MC4_MISC2 0xc0000409
-#define MSR_F10_MC4_MISC3 0xc000040A
+#define MSR_F10_MC4_MISC1 0xc0000408U
+#define MSR_F10_MC4_MISC2 0xc0000409U
+#define MSR_F10_MC4_MISC3 0xc000040AU
/* AMD Family10h Bus Unit MSRs */
-#define MSR_F10_BU_CFG 0xc0011023
-#define MSR_F10_BU_CFG2 0xc001102a
+#define MSR_F10_BU_CFG 0xc0011023U
+#define MSR_F10_BU_CFG2 0xc001102aU
/* Other AMD Fam10h MSRs */
-#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058
+#define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058U
#define FAM10H_MMIO_CONF_ENABLE (1<<0)
#define FAM10H_MMIO_CONF_BUSRANGE_MASK 0xf
#define FAM10H_MMIO_CONF_BUSRANGE_SHIFT 2
@@ -410,31 +410,31 @@
/* AMD Microcode MSRs */
#define MSR_AMD_PATCHLEVEL 0x0000008b
-#define MSR_AMD_PATCHLOADER 0xc0010020
+#define MSR_AMD_PATCHLOADER 0xc0010020U
/* AMD TSC RATE MSR */
-#define MSR_AMD64_TSC_RATIO 0xc0000104
+#define MSR_AMD64_TSC_RATIO 0xc0000104U
/* AMD Lightweight Profiling MSRs */
-#define MSR_AMD64_LWP_CFG 0xc0000105
-#define MSR_AMD64_LWP_CBADDR 0xc0000106
+#define MSR_AMD64_LWP_CFG 0xc0000105U
+#define MSR_AMD64_LWP_CBADDR 0xc0000106U
/* AMD OS Visible Workaround MSRs */
-#define MSR_AMD_OSVW_ID_LENGTH 0xc0010140
-#define MSR_AMD_OSVW_STATUS 0xc0010141
+#define MSR_AMD_OSVW_ID_LENGTH 0xc0010140U
+#define MSR_AMD_OSVW_STATUS 0xc0010141U
/* AMD Protected Processor Inventory Number */
-#define MSR_AMD_PPIN_CTL 0xc00102f0
-#define MSR_AMD_PPIN 0xc00102f1
+#define MSR_AMD_PPIN_CTL 0xc00102f0U
+#define MSR_AMD_PPIN 0xc00102f1U
/* K6 MSRs */
-#define MSR_K6_EFER 0xc0000080
-#define MSR_K6_STAR 0xc0000081
-#define MSR_K6_WHCR 0xc0000082
-#define MSR_K6_UWCCR 0xc0000085
-#define MSR_K6_EPMR 0xc0000086
-#define MSR_K6_PSOR 0xc0000087
-#define MSR_K6_PFIR 0xc0000088
+#define MSR_K6_EFER 0xc0000080U
+#define MSR_K6_STAR 0xc0000081U
+#define MSR_K6_WHCR 0xc0000082U
+#define MSR_K6_UWCCR 0xc0000085U
+#define MSR_K6_EPMR 0xc0000086U
+#define MSR_K6_PSOR 0xc0000087U
+#define MSR_K6_PFIR 0xc0000088U
/* Centaur-Hauls/IDT defined MSRs. */
#define MSR_IDT_FCR1 0x00000107
@@ -459,10 +459,10 @@
#define MSR_VIA_BCR2 0x00001147
/* Transmeta defined MSRs */
-#define MSR_TMTA_LONGRUN_CTRL 0x80868010
-#define MSR_TMTA_LONGRUN_FLAGS 0x80868011
-#define MSR_TMTA_LRTI_READOUT 0x80868018
-#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801a
+#define MSR_TMTA_LONGRUN_CTRL 0x80868010U
+#define MSR_TMTA_LONGRUN_FLAGS 0x80868011U
+#define MSR_TMTA_LRTI_READOUT 0x80868018U
+#define MSR_TMTA_LRTI_VOLT_MHZ 0x8086801aU
/* Intel defined MSRs. */
#define MSR_IA32_P5_MC_ADDR 0x00000000
diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h
index f4a58c8acf..e1dd12eb19 100644
--- a/xen/arch/x86/include/asm/pci.h
+++ b/xen/arch/x86/include/asm/pci.h
@@ -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 \
diff --git a/xen/arch/x86/include/asm/x86-defns.h b/xen/arch/x86/include/asm/x86-defns.h
index e350227e57..491ec6f298 100644
--- a/xen/arch/x86/include/asm/x86-defns.h
+++ b/xen/arch/x86/include/asm/x86-defns.h
@@ -103,7 +103,7 @@
/*
* Debug status flags in DR6.
*/
-#define X86_DR6_DEFAULT 0xffff0ff0 /* Default %dr6 value. */
+#define X86_DR6_DEFAULT 0xffff0ff0U /* Default %dr6 value. */
/*
* Debug control flags in DR7.
diff --git a/xen/arch/x86/percpu.c b/xen/arch/x86/percpu.c
index 288050cdba..1ebeb65ad6 100644
--- a/xen/arch/x86/percpu.c
+++ b/xen/arch/x86/percpu.c
@@ -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)
diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c
index a1e0af27c5..5581b4717a 100644
--- a/xen/arch/x86/psr.c
+++ b/xen/arch/x86/psr.c
@@ -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.
diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
index 4081cef200..b030ad8a5b 100644
--- a/xen/arch/x86/spec_ctrl.c
+++ b/xen/arch/x86/spec_ctrl.c
@@ -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);
}
diff --git a/xen/arch/x86/x86_64/acpi_mmcfg.c b/xen/arch/x86/x86_64/acpi_mmcfg.c
index 2159c68189..cdde7e453c 100644
--- a/xen/arch/x86/x86_64/acpi_mmcfg.c
+++ b/xen/arch/x86/x86_64/acpi_mmcfg.c
@@ -50,7 +50,7 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,
{
int year;
- if (cfg->address < 0xFFFFFFFF)
+ if (cfg->address < 0xFFFFFFFFU)
return 0;
if (!strncmp(mcfg->header.oem_id, "SGI", 3))
diff --git a/xen/arch/x86/x86_64/pci.c b/xen/arch/x86/x86_64/pci.c
index aad1c3f7cf..8d33429103 100644
--- a/xen/arch/x86/x86_64/pci.c
+++ b/xen/arch/x86/x86_64/pci.c
@@ -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)
{
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h
index 40d5054fb7..ec6d93fb2f 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.h
+++ b/xen/arch/x86/x86_emulate/x86_emulate.h
@@ -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))
/*
diff --git a/xen/lib/x86/cpuid.c b/xen/lib/x86/cpuid.c
index 07e5501914..a4ea579ebe 100644
--- a/xen/lib/x86/cpuid.c
+++ b/xen/lib/x86/cpuid.c
@@ -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;
diff --git a/xen/lib/x86/policy.c b/xen/lib/x86/policy.c
index a9c60000af..f033d22785 100644
--- a/xen/lib/x86/policy.c
+++ b/xen/lib/x86/policy.c
@@ -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. */
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 12/13] xen/x86: " Simone Ballarin
@ 2023-07-06 0:11 ` Stefano Stabellini
2023-07-06 8:26 ` Jan Beulich
1 sibling, 0 replies; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-06 0:11 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Jan Beulich,
Andrew Cooper, Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder
On Wed, 5 Jul 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
[...]
> diff --git a/xen/arch/x86/extable.c b/xen/arch/x86/extable.c
> index c3771c2e39..6951a433e8 100644
> --- a/xen/arch/x86/extable.c
> +++ b/xen/arch/x86/extable.c
> @@ -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 = 0xfedcba9876543210U,
In my opinion 64-bit values should be either UL or ULL. This one should
be UL ?
Everything else looks fine to me
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 12/13] xen/x86: " Simone Ballarin
2023-07-06 0:11 ` Stefano Stabellini
@ 2023-07-06 8:26 ` Jan Beulich
2023-07-06 16:08 ` Simone Ballarin
1 sibling, 1 reply; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 8:26 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
On 05.07.2023 17:26, Simone Ballarin wrote:
> --- a/xen/arch/x86/apic.c
> +++ b/xen/arch/x86/apic.c
> @@ -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);
While making the change less mechanical, we want to consider to switch
to ~0 in this and similar cases.
> @@ -378,9 +378,9 @@ 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,
> + p->extd.max_leaf = 0x80000000U | min_t(uint32_t, max_extd_leaf & 0xffffU,
> ARRAY_SIZE(p->extd.raw) - 1);
Adjustments like this or ...
> @@ -768,7 +768,7 @@ 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->extd.max_leaf = 0x80000000U | min(p->extd.max_leaf & 0xffff,
> ((p->x86_vendor & (X86_VENDOR_AMD |
> X86_VENDOR_HYGON))
> ? CPUID_GUEST_NR_EXTD_AMD
... this also need to adjust indentation of the following lines.
> --- a/xen/arch/x86/cpu/mcheck/mce-apei.c
> +++ b/xen/arch/x86/cpu/mcheck/mce-apei.c
> @@ -37,11 +37,11 @@
> #include "mce.h"
>
> #define CPER_CREATOR_MCE \
> - UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \
> - 0x64, 0x90, 0xb8, 0x9d)
> + UUID_LE(0x75a574e3U, 0x5052U, 0x4b29U, 0x8aU, 0x8eU, 0xbeU, 0x2cU, \
> + 0x64U, 0x90U, 0xb8U, 0x9dU)
> #define CPER_SECTION_TYPE_MCE \
> - UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \
> - 0x04, 0x4a, 0x38, 0xfc)
> + UUID_LE(0xfe08ffbeU, 0x95e4U, 0x4be7U, 0xbcU, 0x73U, 0x40U, 0x96U, \
> + 0x04U, 0x4aU, 0x38U, 0xfcU)
See the earlier (EFI) comment regarding excessive use of suffixes here.
> --- a/xen/arch/x86/hvm/stdvga.c
> +++ b/xen/arch/x86/hvm/stdvga.c
> @@ -39,46 +39,46 @@
>
> #define PAT(x) (x)
> static const uint32_t mask16[16] = {
> - PAT(0x00000000),
> - PAT(0x000000ff),
> - PAT(0x0000ff00),
> - PAT(0x0000ffff),
> - PAT(0x00ff0000),
> - PAT(0x00ff00ff),
> - PAT(0x00ffff00),
> - PAT(0x00ffffff),
> - PAT(0xff000000),
> - PAT(0xff0000ff),
> - PAT(0xff00ff00),
> - PAT(0xff00ffff),
> - PAT(0xffff0000),
> - PAT(0xffff00ff),
> - PAT(0xffffff00),
> - PAT(0xffffffff),
> + PAT(0x00000000U),
> + PAT(0x000000ffU),
> + PAT(0x0000ff00U),
> + PAT(0x0000ffffU),
> + PAT(0x00ff0000U),
> + PAT(0x00ff00ffU),
> + PAT(0x00ffff00U),
> + PAT(0x00ffffffU),
> + PAT(0xff000000U),
> + PAT(0xff0000ffU),
> + PAT(0xff00ff00U),
> + PAT(0xff00ffffU),
> + PAT(0xffff0000U),
> + PAT(0xffff00ffU),
> + PAT(0xffffff00U),
> + PAT(0xffffffffU),
> };
While I agree here, ...
> /* force some bits to zero */
> static const uint8_t sr_mask[8] = {
> - (uint8_t)~0xfc,
> - (uint8_t)~0xc2,
> - (uint8_t)~0xf0,
> - (uint8_t)~0xc0,
> - (uint8_t)~0xf1,
> - (uint8_t)~0xff,
> - (uint8_t)~0xff,
> - (uint8_t)~0x00,
> + (uint8_t)~0xfcU,
> + (uint8_t)~0xc2U,
> + (uint8_t)~0xf0U,
> + (uint8_t)~0xc0U,
> + (uint8_t)~0xf1U,
> + (uint8_t)~0xffU,
> + (uint8_t)~0xffU,
> + (uint8_t)~0x00U,
> };
>
> 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 */
> + (uint8_t)~0xf0U,
> + (uint8_t)~0xf0U,
> + (uint8_t)~0xf0U,
> + (uint8_t)~0xe0U,
> + (uint8_t)~0xfcU,
> + (uint8_t)~0x84U,
> + (uint8_t)~0xf0U,
> + (uint8_t)~0xf0U,
> + (uint8_t)~0x00U,
> };
I continue to question these changes. They don't fix anything, do they?
> --- a/xen/arch/x86/hvm/viridian/viridian.c
> +++ b/xen/arch/x86/hvm/viridian/viridian.c
> @@ -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);
Please can this and ...
> --- a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
> +++ b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
> @@ -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
> };
... this together be made a separate Viridian-specific change? (I
continue to be uncertain about touching the header file; the
Viridian maintainers will need to judge.)
> --- a/xen/arch/x86/include/asm/x86-defns.h
> +++ b/xen/arch/x86/include/asm/x86-defns.h
> @@ -103,7 +103,7 @@
> /*
> * Debug status flags in DR6.
> */
> -#define X86_DR6_DEFAULT 0xffff0ff0 /* Default %dr6 value. */
> +#define X86_DR6_DEFAULT 0xffff0ff0U /* Default %dr6 value. */
Considering the respective register is pointer-/long-size, wouldn't
this better use UL? But of course we'd want to check that this then
doesn't affect code in do_debug() in an undesirable way.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 8:26 ` Jan Beulich
@ 2023-07-06 16:08 ` Simone Ballarin
2023-07-06 16:22 ` Jan Beulich
2023-07-06 16:22 ` Jan Beulich
0 siblings, 2 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-06 16:08 UTC (permalink / raw)
To: Jan Beulich
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
[-- Attachment #1: Type: text/plain, Size: 8823 bytes --]
Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <jbeulich@suse.com> ha
scritto:
> On 05.07.2023 17:26, Simone Ballarin wrote:
> > --- a/xen/arch/x86/apic.c
> > +++ b/xen/arch/x86/apic.c
> > @@ -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);
>
> While making the change less mechanical, we want to consider to switch
> to ~0 in this and similar cases.
>
Changing ~0U is more than not mechanical: it is possibly dangerous.
The resulting value could be different depending on the architecture,
I prefer to not make such kind of changes in a MISRA-related patch.
>
> > @@ -378,9 +378,9 @@ 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,
> > + p->extd.max_leaf = 0x80000000U | min_t(uint32_t, max_extd_leaf &
> 0xffffU,
> > ARRAY_SIZE(p->extd.raw) - 1);
>
> Adjustments like this or ...
>
> > @@ -768,7 +768,7 @@ 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->extd.max_leaf = 0x80000000U | min(p->extd.max_leaf & 0xffff,
> > ((p->x86_vendor &
> (X86_VENDOR_AMD |
> >
> X86_VENDOR_HYGON))
> > ? CPUID_GUEST_NR_EXTD_AMD
>
> ... this also need to adjust indentation of the following lines.
>
Ok.
>
> > --- a/xen/arch/x86/cpu/mcheck/mce-apei.c
> > +++ b/xen/arch/x86/cpu/mcheck/mce-apei.c
> > @@ -37,11 +37,11 @@
> > #include "mce.h"
> >
> > #define CPER_CREATOR_MCE \
> > - UUID_LE(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c, \
> > - 0x64, 0x90, 0xb8, 0x9d)
> > + UUID_LE(0x75a574e3U, 0x5052U, 0x4b29U, 0x8aU, 0x8eU, 0xbeU,
> 0x2cU, \
> > + 0x64U, 0x90U, 0xb8U, 0x9dU)
> > #define CPER_SECTION_TYPE_MCE
> \
> > - UUID_LE(0xfe08ffbe, 0x95e4, 0x4be7, 0xbc, 0x73, 0x40, 0x96, \
> > - 0x04, 0x4a, 0x38, 0xfc)
> > + UUID_LE(0xfe08ffbeU, 0x95e4U, 0x4be7U, 0xbcU, 0x73U, 0x40U,
> 0x96U, \
> > + 0x04U, 0x4aU, 0x38U, 0xfcU)
>
> See the earlier (EFI) comment regarding excessive use of suffixes here.
>
Ok.
>
> > --- a/xen/arch/x86/hvm/stdvga.c
> > +++ b/xen/arch/x86/hvm/stdvga.c
> > @@ -39,46 +39,46 @@
> >
> > #define PAT(x) (x)
> > static const uint32_t mask16[16] = {
> > - PAT(0x00000000),
> > - PAT(0x000000ff),
> > - PAT(0x0000ff00),
> > - PAT(0x0000ffff),
> > - PAT(0x00ff0000),
> > - PAT(0x00ff00ff),
> > - PAT(0x00ffff00),
> > - PAT(0x00ffffff),
> > - PAT(0xff000000),
> > - PAT(0xff0000ff),
> > - PAT(0xff00ff00),
> > - PAT(0xff00ffff),
> > - PAT(0xffff0000),
> > - PAT(0xffff00ff),
> > - PAT(0xffffff00),
> > - PAT(0xffffffff),
> > + PAT(0x00000000U),
> > + PAT(0x000000ffU),
> > + PAT(0x0000ff00U),
> > + PAT(0x0000ffffU),
> > + PAT(0x00ff0000U),
> > + PAT(0x00ff00ffU),
> > + PAT(0x00ffff00U),
> > + PAT(0x00ffffffU),
> > + PAT(0xff000000U),
> > + PAT(0xff0000ffU),
> > + PAT(0xff00ff00U),
> > + PAT(0xff00ffffU),
> > + PAT(0xffff0000U),
> > + PAT(0xffff00ffU),
> > + PAT(0xffffff00U),
> > + PAT(0xffffffffU),
> > };
>
> While I agree here, ...
>
> > /* force some bits to zero */
> > static const uint8_t sr_mask[8] = {
> > - (uint8_t)~0xfc,
> > - (uint8_t)~0xc2,
> > - (uint8_t)~0xf0,
> > - (uint8_t)~0xc0,
> > - (uint8_t)~0xf1,
> > - (uint8_t)~0xff,
> > - (uint8_t)~0xff,
> > - (uint8_t)~0x00,
> > + (uint8_t)~0xfcU,
> > + (uint8_t)~0xc2U,
> > + (uint8_t)~0xf0U,
> > + (uint8_t)~0xc0U,
> > + (uint8_t)~0xf1U,
> > + (uint8_t)~0xffU,
> > + (uint8_t)~0xffU,
> > + (uint8_t)~0x00U,
> > };
> >
> > 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 */
> > + (uint8_t)~0xf0U,
> > + (uint8_t)~0xf0U,
> > + (uint8_t)~0xf0U,
> > + (uint8_t)~0xe0U,
> > + (uint8_t)~0xfcU,
> > + (uint8_t)~0x84U,
> > + (uint8_t)~0xf0U,
> > + (uint8_t)~0xf0U,
> > + (uint8_t)~0x00U,
> > };
>
> I continue to question these changes. They don't fix anything, do they?
>
No, they do not. They were done just for uniformity here.
I will remove the changes in sr_mask and gr_mask.
> --- a/xen/arch/x86/hvm/viridian/viridian.c
> > +++ b/xen/arch/x86/hvm/viridian/viridian.c
> > @@ -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);
>
> Please can this and ...
>
> > --- a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
> > +++ b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h
> > @@ -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
> > };
>
> ... this together be made a separate Viridian-specific change? (I
> continue to be uncertain about touching the header file; the
> Viridian maintainers will need to judge.)
>
Ok, I will split the patch.
> > --- a/xen/arch/x86/include/asm/x86-defns.h
> > +++ b/xen/arch/x86/include/asm/x86-defns.h
> > @@ -103,7 +103,7 @@
> > /*
> > * Debug status flags in DR6.
> > */
> > -#define X86_DR6_DEFAULT 0xffff0ff0 /* Default %dr6 value. */
> > +#define X86_DR6_DEFAULT 0xffff0ff0U /* Default %dr6 value. */
>
> Considering the respective register is pointer-/long-size, wouldn't
> this better use UL? But of course we'd want to check that this then
> doesn't affect code in do_debug() in an undesirable way.
>
> Jan
>
--
Simone Ballarin, M.Sc.
Field Application Engineer, BUGSENG (https://bugseng.com
<http://bugseng.com>)
[-- Attachment #2: Type: text/html, Size: 12275 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 16:08 ` Simone Ballarin
@ 2023-07-06 16:22 ` Jan Beulich
2023-07-07 6:50 ` Simone Ballarin
2023-07-06 16:22 ` Jan Beulich
1 sibling, 1 reply; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 16:22 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
On 06.07.2023 18:08, Simone Ballarin wrote:
> Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <jbeulich@suse.com> ha
> scritto:
>
>> On 05.07.2023 17:26, Simone Ballarin wrote:
>>> --- a/xen/arch/x86/apic.c
>>> +++ b/xen/arch/x86/apic.c
>>> @@ -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);
>>
>> While making the change less mechanical, we want to consider to switch
>> to ~0 in this and similar cases.
>>
>
> Changing ~0U is more than not mechanical: it is possibly dangerous.
> The resulting value could be different depending on the architecture,
> I prefer to not make such kind of changes in a MISRA-related patch.
What do you mean by "depending on the architecture", when this is
x86-only code _and_ you can check what type parameter the called
function has?
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 16:22 ` Jan Beulich
@ 2023-07-07 6:50 ` Simone Ballarin
2023-07-07 7:04 ` Jan Beulich
0 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-07 6:50 UTC (permalink / raw)
To: Jan Beulich
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
Il giorno gio 6 lug 2023 alle ore 18:22 Jan Beulich <jbeulich@suse.com> ha
scritto:
> On 06.07.2023 18:08, Simone Ballarin wrote:
> > Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <jbeulich@suse.com>
> ha
> > scritto:
> >
> >> On 05.07.2023 17:26, Simone Ballarin wrote:
> >>> --- a/xen/arch/x86/apic.c
> >>> +++ b/xen/arch/x86/apic.c
> >>> @@ -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);
> >>
> >> While making the change less mechanical, we want to consider to switch
> >> to ~0 in this and similar cases.
> >>
> >
> > Changing ~0U is more than not mechanical: it is possibly dangerous.
> > The resulting value could be different depending on the architecture,
> > I prefer to not make such kind of changes in a MISRA-related patch.
>
> What do you mean by "depending on the architecture", when this is
> x86-only code _and_ you can check what type parameter the called
> function has?
>
> Jan
>
Ok, I will change these literals in ~0U in the next submission.
--
Simone Ballarin, M.Sc.
Field Application Engineer, BUGSENG (https://bugseng.com
<http://bugseng.com>)
[-- Attachment #2: Type: text/html, Size: 2127 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-07 6:50 ` Simone Ballarin
@ 2023-07-07 7:04 ` Jan Beulich
2023-07-07 8:04 ` Simone Ballarin
0 siblings, 1 reply; 59+ messages in thread
From: Jan Beulich @ 2023-07-07 7:04 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
On 07.07.2023 08:50, Simone Ballarin wrote:
> Il giorno gio 6 lug 2023 alle ore 18:22 Jan Beulich <jbeulich@suse.com> ha
> scritto:
>
>> On 06.07.2023 18:08, Simone Ballarin wrote:
>>> Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <jbeulich@suse.com>
>> ha
>>> scritto:
>>>
>>>> On 05.07.2023 17:26, Simone Ballarin wrote:
>>>>> --- a/xen/arch/x86/apic.c
>>>>> +++ b/xen/arch/x86/apic.c
>>>>> @@ -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);
>>>>
>>>> While making the change less mechanical, we want to consider to switch
>>>> to ~0 in this and similar cases.
>>>>
>>>
>>> Changing ~0U is more than not mechanical: it is possibly dangerous.
>>> The resulting value could be different depending on the architecture,
>>> I prefer to not make such kind of changes in a MISRA-related patch.
>>
>> What do you mean by "depending on the architecture", when this is
>> x86-only code _and_ you can check what type parameter the called
>> function has?
>
> Ok, I will change these literals in ~0U in the next submission.
Except that I specifically meant ~0, not ~0U. We mean "maximum value"
here, and at the call site it doesn't matter how wide the function
parameter's type is. If it was 64-bit, ~0U would not do what is wanted.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-07 7:04 ` Jan Beulich
@ 2023-07-07 8:04 ` Simone Ballarin
2023-07-07 9:46 ` Jan Beulich
0 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-07 8:04 UTC (permalink / raw)
To: Jan Beulich
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
[-- Attachment #1: Type: text/plain, Size: 2087 bytes --]
Il giorno ven 7 lug 2023 alle ore 09:04 Jan Beulich <jbeulich@suse.com> ha
scritto:
> On 07.07.2023 08:50, Simone Ballarin wrote:
> > Il giorno gio 6 lug 2023 alle ore 18:22 Jan Beulich <jbeulich@suse.com>
> ha
> > scritto:
> >
> >> On 06.07.2023 18:08, Simone Ballarin wrote:
> >>> Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <jbeulich@suse.com
> >
> >> ha
> >>> scritto:
> >>>
> >>>> On 05.07.2023 17:26, Simone Ballarin wrote:
> >>>>> --- a/xen/arch/x86/apic.c
> >>>>> +++ b/xen/arch/x86/apic.c
> >>>>> @@ -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);
> >>>>
> >>>> While making the change less mechanical, we want to consider to switch
> >>>> to ~0 in this and similar cases.
> >>>>
> >>>
> >>> Changing ~0U is more than not mechanical: it is possibly dangerous.
> >>> The resulting value could be different depending on the architecture,
> >>> I prefer to not make such kind of changes in a MISRA-related patch.
> >>
> >> What do you mean by "depending on the architecture", when this is
> >> x86-only code _and_ you can check what type parameter the called
> >> function has?
> >
> > Ok, I will change these literals in ~0U in the next submission.
>
> Except that I specifically meant ~0, not ~0U. We mean "maximum value"
> here, and at the call site it doesn't matter how wide the function
> parameter's type is. If it was 64-bit, ~0U would not do what is wanted.
>
> Jan
>
~0 is not a MISRA-compliant solution since bitwise operations on signed
integers have implementation-defined behavior. This solution definitively
violates Rule 10.1.
As you said ~0 is different than ~0U, 0xffffffffU, and 0xffffffff, so using
~0 means changing the semantics of the code: this is not the aim of the
patch.
--
Simone Ballarin, M.Sc.
Field Application Engineer, BUGSENG (https://bugseng.com
<http://bugseng.com>)
[-- Attachment #2: Type: text/html, Size: 3173 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-07 8:04 ` Simone Ballarin
@ 2023-07-07 9:46 ` Jan Beulich
2023-07-07 21:53 ` Stefano Stabellini
0 siblings, 1 reply; 59+ messages in thread
From: Jan Beulich @ 2023-07-07 9:46 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
On 07.07.2023 10:04, Simone Ballarin wrote:
> Il giorno ven 7 lug 2023 alle ore 09:04 Jan Beulich <jbeulich@suse.com> ha
> scritto:
>
>> On 07.07.2023 08:50, Simone Ballarin wrote:
>>> Il giorno gio 6 lug 2023 alle ore 18:22 Jan Beulich <jbeulich@suse.com>
>> ha
>>> scritto:
>>>
>>>> On 06.07.2023 18:08, Simone Ballarin wrote:
>>>>> Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <jbeulich@suse.com
>>>
>>>> ha
>>>>> scritto:
>>>>>
>>>>>> On 05.07.2023 17:26, Simone Ballarin wrote:
>>>>>>> --- a/xen/arch/x86/apic.c
>>>>>>> +++ b/xen/arch/x86/apic.c
>>>>>>> @@ -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);
>>>>>>
>>>>>> While making the change less mechanical, we want to consider to switch
>>>>>> to ~0 in this and similar cases.
>>>>>>
>>>>>
>>>>> Changing ~0U is more than not mechanical: it is possibly dangerous.
>>>>> The resulting value could be different depending on the architecture,
>>>>> I prefer to not make such kind of changes in a MISRA-related patch.
>>>>
>>>> What do you mean by "depending on the architecture", when this is
>>>> x86-only code _and_ you can check what type parameter the called
>>>> function has?
>>>
>>> Ok, I will change these literals in ~0U in the next submission.
>>
>> Except that I specifically meant ~0, not ~0U. We mean "maximum value"
>> here, and at the call site it doesn't matter how wide the function
>> parameter's type is. If it was 64-bit, ~0U would not do what is wanted.
>
> ~0 is not a MISRA-compliant solution since bitwise operations on signed
> integers have implementation-defined behavior. This solution definitively
> violates Rule 10.1.
So if we adopted that rule (we didn't so far), we'd have to e.g. change
all literal number shift counts to have U suffixes, no matter that
without the suffix it is still entirely obvious that the numbers are
unsigned? I'm afraid that'll face my opposition ...
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-07 9:46 ` Jan Beulich
@ 2023-07-07 21:53 ` Stefano Stabellini
2023-07-10 16:09 ` Simone Ballarin
0 siblings, 1 reply; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-07 21:53 UTC (permalink / raw)
To: Jan Beulich
Cc: Simone Ballarin, consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
On Fri, 7 Jul 2023, Jan Beulich wrote:
> On 07.07.2023 10:04, Simone Ballarin wrote:
> > Il giorno ven 7 lug 2023 alle ore 09:04 Jan Beulich <jbeulich@suse.com> ha
> > scritto:
> >
> >> On 07.07.2023 08:50, Simone Ballarin wrote:
> >>> Il giorno gio 6 lug 2023 alle ore 18:22 Jan Beulich <jbeulich@suse.com>
> >> ha
> >>> scritto:
> >>>
> >>>> On 06.07.2023 18:08, Simone Ballarin wrote:
> >>>>> Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <jbeulich@suse.com
> >>>
> >>>> ha
> >>>>> scritto:
> >>>>>
> >>>>>> On 05.07.2023 17:26, Simone Ballarin wrote:
> >>>>>>> --- a/xen/arch/x86/apic.c
> >>>>>>> +++ b/xen/arch/x86/apic.c
> >>>>>>> @@ -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);
> >>>>>>
> >>>>>> While making the change less mechanical, we want to consider to switch
> >>>>>> to ~0 in this and similar cases.
> >>>>>>
> >>>>>
> >>>>> Changing ~0U is more than not mechanical: it is possibly dangerous.
> >>>>> The resulting value could be different depending on the architecture,
> >>>>> I prefer to not make such kind of changes in a MISRA-related patch.
> >>>>
> >>>> What do you mean by "depending on the architecture", when this is
> >>>> x86-only code _and_ you can check what type parameter the called
> >>>> function has?
> >>>
> >>> Ok, I will change these literals in ~0U in the next submission.
> >>
> >> Except that I specifically meant ~0, not ~0U. We mean "maximum value"
> >> here, and at the call site it doesn't matter how wide the function
> >> parameter's type is. If it was 64-bit, ~0U would not do what is wanted.
> >
> > ~0 is not a MISRA-compliant solution since bitwise operations on signed
> > integers have implementation-defined behavior. This solution definitively
> > violates Rule 10.1.
>
> So if we adopted that rule (we didn't so far), we'd have to e.g. change
> all literal number shift counts to have U suffixes, no matter that
> without the suffix it is still entirely obvious that the numbers are
> unsigned? I'm afraid that'll face my opposition ...
Indeed we have not adopted Rule 10.1. However, may I suggest that we
don't make things potentially worse, just in case we end up deciding in
favor of 10.1? We might not adopt 10.1 at all, but still... The code is
already 0xffffffff, let's make things easier for all of us and just do
0xffffffffU ?
Let's put Rule 10.1 and the whole of MISRA C aside for a second.
Jan, let's say that you prefer ~0 or a different function parameter name
or something else on any of these patches. You do realize that you don't
need Simone or Federico or anyone else to make that change for you? You
can make the change, submit a patch, and in your case anyone can ack
it. Roger, Andrew, me, Bertrand, Julien, and almost anyone else could
ack it and it would go in. As I wrote yesterday, feel free to CC me and
I'll help you get in all the changes that you want.
If you submitted that patch to switch to ~0 it might already be
committed by now.
I am trying to highlight that suggesting changes on these mechanical
patches end up with more work for both the contributor and also the
maintainer compared to do the change yourself.
I think we should try to accept these patches as
mechanical-changes-only. This is the only way to scale up this effort.
If you spot something that you'd rather be done differently, do one of
the following:
a) Accept the patch as-is and submit a patch afterwards. Yes the line
gets changed twice but it is the easiest solution.
b) Ask the contribitor to drop the single change you would rather do
differently, or even better drop it yourself on commit. Then submit a
patch with the change that you prefer.
c) For trivial things, like code style changes, do the change directly
on commit.
I know emails encourage English replies, but to make this work we need
to do more code changes together and less English.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-07 21:53 ` Stefano Stabellini
@ 2023-07-10 16:09 ` Simone Ballarin
0 siblings, 0 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-10 16:09 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Jan Beulich, consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Michal Orzel, Xenia Ragiadakou,
Ayan Kumar Halder, xen-devel
[-- Attachment #1: Type: text/plain, Size: 4537 bytes --]
Il giorno ven 7 lug 2023 alle ore 23:53 Stefano Stabellini <
sstabellini@kernel.org> ha scritto:
> On Fri, 7 Jul 2023, Jan Beulich wrote:
> > On 07.07.2023 10:04, Simone Ballarin wrote:
> > > Il giorno ven 7 lug 2023 alle ore 09:04 Jan Beulich <jbeulich@suse.com>
> ha
> > > scritto:
> > >
> > >> On 07.07.2023 08:50, Simone Ballarin wrote:
> > >>> Il giorno gio 6 lug 2023 alle ore 18:22 Jan Beulich <
> jbeulich@suse.com>
> > >> ha
> > >>> scritto:
> > >>>
> > >>>> On 06.07.2023 18:08, Simone Ballarin wrote:
> > >>>>> Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <
> jbeulich@suse.com
> > >>>
> > >>>> ha
> > >>>>> scritto:
> > >>>>>
> > >>>>>> On 05.07.2023 17:26, Simone Ballarin wrote:
> > >>>>>>> --- a/xen/arch/x86/apic.c
> > >>>>>>> +++ b/xen/arch/x86/apic.c
> > >>>>>>> @@ -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);
> > >>>>>>
> > >>>>>> While making the change less mechanical, we want to consider to
> switch
> > >>>>>> to ~0 in this and similar cases.
> > >>>>>>
> > >>>>>
> > >>>>> Changing ~0U is more than not mechanical: it is possibly dangerous.
> > >>>>> The resulting value could be different depending on the
> architecture,
> > >>>>> I prefer to not make such kind of changes in a MISRA-related patch.
> > >>>>
> > >>>> What do you mean by "depending on the architecture", when this is
> > >>>> x86-only code _and_ you can check what type parameter the called
> > >>>> function has?
> > >>>
> > >>> Ok, I will change these literals in ~0U in the next submission.
> > >>
> > >> Except that I specifically meant ~0, not ~0U. We mean "maximum value"
> > >> here, and at the call site it doesn't matter how wide the function
> > >> parameter's type is. If it was 64-bit, ~0U would not do what is
> wanted.
> > >
> > > ~0 is not a MISRA-compliant solution since bitwise operations on signed
> > > integers have implementation-defined behavior. This solution
> definitively
> > > violates Rule 10.1.
> >
> > So if we adopted that rule (we didn't so far), we'd have to e.g. change
> > all literal number shift counts to have U suffixes, no matter that
> > without the suffix it is still entirely obvious that the numbers are
> > unsigned? I'm afraid that'll face my opposition ...
>
> Indeed we have not adopted Rule 10.1. However, may I suggest that we
> don't make things potentially worse, just in case we end up deciding in
> favor of 10.1? We might not adopt 10.1 at all, but still... The code is
> already 0xffffffff, let's make things easier for all of us and just do
> 0xffffffffU ?
>
> Let's put Rule 10.1 and the whole of MISRA C aside for a second.
>
>
> Jan, let's say that you prefer ~0 or a different function parameter name
> or something else on any of these patches. You do realize that you don't
> need Simone or Federico or anyone else to make that change for you? You
> can make the change, submit a patch, and in your case anyone can ack
> it. Roger, Andrew, me, Bertrand, Julien, and almost anyone else could
> ack it and it would go in. As I wrote yesterday, feel free to CC me and
> I'll help you get in all the changes that you want.
>
> If you submitted that patch to switch to ~0 it might already be
> committed by now.
>
> I am trying to highlight that suggesting changes on these mechanical
> patches end up with more work for both the contributor and also the
> maintainer compared to do the change yourself.
>
> I think we should try to accept these patches as
> mechanical-changes-only. This is the only way to scale up this effort.
> If you spot something that you'd rather be done differently, do one of
> the following:
>
> a) Accept the patch as-is and submit a patch afterwards. Yes the line
> gets changed twice but it is the easiest solution.
>
> b) Ask the contribitor to drop the single change you would rather do
> differently, or even better drop it yourself on commit. Then submit a
> patch with the change that you prefer.
>
> c) For trivial things, like code style changes, do the change directly
> on commit.
>
>
> I know emails encourage English replies, but to make this work we need
> to do more code changes together and less English.
>
I agree.
--
Simone Ballarin, M.Sc.
Field Application Engineer, BUGSENG (https://bugseng.com
<http://bugseng.com>)
[-- Attachment #2: Type: text/html, Size: 6319 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 12/13] xen/x86: fix violations of MISRA C:2012 Rule 7.2
2023-07-06 16:08 ` Simone Ballarin
2023-07-06 16:22 ` Jan Beulich
@ 2023-07-06 16:22 ` Jan Beulich
1 sibling, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 16:22 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Andrew Cooper,
Roger Pau Monné,
Wei Liu, Paul Durrant, Stefano Stabellini, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
On 06.07.2023 18:08, Simone Ballarin wrote:
> Il giorno gio 6 lug 2023 alle ore 10:26 Jan Beulich <jbeulich@suse.com> ha
> scritto:
>
>> On 05.07.2023 17:26, Simone Ballarin wrote:
>>> --- a/xen/arch/x86/apic.c
>>> +++ b/xen/arch/x86/apic.c
>>> @@ -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);
>>
>> While making the change less mechanical, we want to consider to switch
>> to ~0 in this and similar cases.
>>
>
> Changing ~0U is more than not mechanical: it is possibly dangerous.
> The resulting value could be different depending on the architecture,
> I prefer to not make such kind of changes in a MISRA-related patch.
What do you mean by "depending on the architecture", when this is
x86-only code _and_ you can check what type parameter the called
function has?
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* [XEN PATCH v2 13/13] xen: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 [XEN PATCH v2 00/13] xen: fix violations of MISRA C:2012 Rule 7.2 Simone Ballarin
` (11 preceding siblings ...)
2023-07-05 15:26 ` [XEN PATCH v2 12/13] xen/x86: " Simone Ballarin
@ 2023-07-05 15:26 ` Simone Ballarin
2023-07-05 16:43 ` Luca Fancellu
` (2 more replies)
12 siblings, 3 replies; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 15:26 UTC (permalink / raw)
To: xen-devel
Cc: consulting, Gianluca Luparini, Andrew Cooper, George Dunlap,
Jan Beulich, Julien Grall, Stefano Stabellini, Wei Liu,
Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder,
Simone Ballarin
From: Gianluca Luparini <gianluca.luparini@bugseng.com>
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: Simone Ballarin <simone.ballarin@bugseng.com>
Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
---
Changes in v2:
- minor change to commit title
- change commit message
- add '(uint32_t)' in 'muldiv64.c' for consistency
- add fix in 'vesa.c'
---
xen/common/gunzip.c | 2 +-
xen/common/xmalloc_tlsf.c | 2 +-
xen/drivers/char/ehci-dbgp.c | 4 ++--
xen/drivers/video/vesa.c | 2 +-
xen/include/public/memory.h | 2 +-
xen/include/public/sysctl.h | 4 ++--
xen/include/xen/bitops.h | 10 +++++-----
xen/include/xen/cper.h | 34 +++++++++++++++++-----------------
xen/lib/muldiv64.c | 2 +-
9 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/xen/common/gunzip.c b/xen/common/gunzip.c
index 71ec5f26be..b810499be2 100644
--- a/xen/common/gunzip.c
+++ b/xen/common/gunzip.c
@@ -11,7 +11,7 @@ static unsigned char *__initdata window;
static memptr __initdata free_mem_ptr;
static memptr __initdata free_mem_end_ptr;
-#define WSIZE 0x80000000
+#define WSIZE 0x80000000U
static unsigned char *__initdata inbuf;
static unsigned int __initdata insize;
diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c
index 75bdf18c4e..c21bf71e88 100644
--- a/xen/common/xmalloc_tlsf.c
+++ b/xen/common/xmalloc_tlsf.c
@@ -46,7 +46,7 @@
#define BHDR_OVERHEAD (sizeof(struct bhdr) - MIN_BLOCK_SIZE)
#define PTR_MASK (sizeof(void *) - 1)
-#define BLOCK_SIZE_MASK (0xFFFFFFFF - PTR_MASK)
+#define BLOCK_SIZE_MASK (0xFFFFFFFFU - PTR_MASK)
#define GET_NEXT_BLOCK(addr, r) ((struct bhdr *) \
((char *)(addr) + (r)))
diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
index bb9d3198d9..4d8d765122 100644
--- a/xen/drivers/char/ehci-dbgp.c
+++ b/xen/drivers/char/ehci-dbgp.c
@@ -375,12 +375,12 @@ static inline u32 dbgp_pid_write_update(u32 x, u32 tok)
static u8 data0 = USB_PID_DATA1;
data0 ^= USB_PID_DATA0 ^ USB_PID_DATA1;
- return (x & 0xffff0000) | (data0 << 8) | (tok & 0xff);
+ return (x & 0xffff0000U) | (data0 << 8) | (tok & 0xffU);
}
static inline u32 dbgp_pid_read_update(u32 x, u32 tok)
{
- return (x & 0xffffff00) | (tok & 0xff);
+ return (x & 0xffffff00U) | (tok & 0xffU);
}
static inline void dbgp_set_data(struct ehci_dbg_port __iomem *ehci_debug,
diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c
index c41f6b8d40..b007ff5678 100644
--- a/xen/drivers/video/vesa.c
+++ b/xen/drivers/video/vesa.c
@@ -123,7 +123,7 @@ void __init vesa_init(void)
if ( vlfb_info.bits_per_pixel > 8 )
{
/* Light grey in truecolor. */
- unsigned int grey = 0xaaaaaaaa;
+ unsigned int grey = 0xaaaaaaaaU;
lfbp.pixel_on =
((grey >> (32 - vlfb_info. red_size)) << vlfb_info. red_pos) |
((grey >> (32 - vlfb_info.green_size)) << vlfb_info.green_pos) |
diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
index c5f0d31e23..5e545ae9a4 100644
--- a/xen/include/public/memory.h
+++ b/xen/include/public/memory.h
@@ -234,7 +234,7 @@ struct xen_add_to_physmap {
unsigned int space; /* => enum phys_map_space */
-#define XENMAPIDX_grant_table_status 0x80000000
+#define XENMAPIDX_grant_table_status 0x80000000U
/* Index into space being mapped. */
xen_ulong_t idx;
diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
index 33e86ace51..fa7147de47 100644
--- a/xen/include/public/sysctl.h
+++ b/xen/include/public/sysctl.h
@@ -384,7 +384,7 @@ struct xen_sysctl_pm_op {
struct xen_set_cpufreq_para set_para;
uint64_aligned_t get_avgfreq;
uint32_t set_sched_opt_smt;
-#define XEN_SYSCTL_CX_UNLIMITED 0xffffffff
+#define XEN_SYSCTL_CX_UNLIMITED 0xffffffffU
uint32_t get_max_cstate;
uint32_t set_max_cstate;
} u;
@@ -547,7 +547,7 @@ struct xen_sysctl_numainfo {
#define XEN_SYSCTL_CPUPOOL_OP_RMCPU 5 /* R */
#define XEN_SYSCTL_CPUPOOL_OP_MOVEDOMAIN 6 /* M */
#define XEN_SYSCTL_CPUPOOL_OP_FREEINFO 7 /* F */
-#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFF
+#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFFU
struct xen_sysctl_cpupool_op {
uint32_t op; /* IN */
uint32_t cpupool_id; /* IN: CDIARM OUT: CI */
diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
index 33619a0873..3b7e09a26e 100644
--- a/xen/include/xen/bitops.h
+++ b/xen/include/xen/bitops.h
@@ -227,11 +227,11 @@ static inline __u32 ror32(__u32 word, unsigned int shift)
}
/* base-2 logarithm */
-#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0)
-#define __L4(_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x))
-#define __L8(_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x))
-#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
-#define ilog2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x))
+#define __L2(_x) (((_x) & 0x00000002U) ? 1 : 0)
+#define __L4(_x) (((_x) & 0x0000000cU) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x))
+#define __L8(_x) (((_x) & 0x000000f0U) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x))
+#define __L16(_x) (((_x) & 0x0000ff00U) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
+#define ilog2(_x) (((_x) & 0xffff0000U) ? (16 + __L16((_x)>>16)) : __L16(_x))
/**
* for_each_set_bit - iterate over every set bit in a memory region
diff --git a/xen/include/xen/cper.h b/xen/include/xen/cper.h
index f8e5272bc1..71d14faa02 100644
--- a/xen/include/xen/cper.h
+++ b/xen/include/xen/cper.h
@@ -56,7 +56,7 @@ static inline uint64_t cper_next_record_id(void)
#define CPER_SIG_RECORD "CPER"
#define CPER_SIG_SIZE 4
/* Used in signature_end field in struct cper_record_header */
-#define CPER_SIG_END 0xffffffff
+#define CPER_SIG_END 0xffffffffU
/*
* CPER record header revision, used in revision field in struct
@@ -80,36 +80,36 @@ static inline uint64_t cper_next_record_id(void)
* Corrected Machine Check
*/
#define CPER_NOTIFY_CMC \
- UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \
- 0xEB, 0xD4, 0xF8, 0x90)
+ UUID_LE(0x2DCE8BB1U, 0xBDD7U, 0x450eU, 0xB9U, 0xADU, 0x9CU, 0xF4U, \
+ 0xEBU, 0xD4U, 0xF8U, 0x90U)
/* Corrected Platform Error */
#define CPER_NOTIFY_CPE \
- UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \
- 0xF2, 0x7E, 0xBE, 0xEE)
+ UUID_LE(0x4E292F96U, 0xD843U, 0x4a55U, 0xA8U, 0xC2U, 0xD4U, 0x81U, \
+ 0xF2U, 0x7EU, 0xBEU, 0xEEU)
/* Machine Check Exception */
#define CPER_NOTIFY_MCE \
- UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \
- 0xE1, 0x49, 0x13, 0xBB)
+ UUID_LE(0xE8F56FFEU, 0x919CU, 0x4cc5U, 0xBAU, 0x88U, 0x65U, 0xABU, \
+ 0xE1U, 0x49U, 0x13U, 0xBBU)
/* PCI Express Error */
#define CPER_NOTIFY_PCIE \
- UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \
- 0xAF, 0x67, 0xC1, 0x04)
+ UUID_LE(0xCF93C01FU, 0x1A16U, 0x4dfcU, 0xB8U, 0xBCU, 0x9CU, 0x4DU, \
+ 0xAFU, 0x67U, 0xC1U, 0x04U)
/* INIT Record (for IPF) */
#define CPER_NOTIFY_INIT \
- UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \
- 0xD3, 0x9B, 0xC9, 0x8E)
+ UUID_LE(0xCC5263E8U, 0x9308U, 0x454aU, 0x89U, 0xD0U, 0x34U, 0x0BU, \
+ 0xD3U, 0x9BU, 0xC9U, 0x8EU)
/* Non-Maskable Interrupt */
#define CPER_NOTIFY_NMI \
- UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \
- 0x85, 0xD6, 0xE9, 0x8A)
+ UUID_LE(0x5BAD89FFU, 0xB7E6U, 0x42c9U, 0x81U, 0x4AU, 0xCFU, 0x24U, \
+ 0x85U, 0xD6U, 0xE9U, 0x8AU)
/* BOOT Error Record */
#define CPER_NOTIFY_BOOT \
- UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \
- 0xD4, 0x64, 0xB3, 0x8F)
+ UUID_LE(0x3D61A466U, 0xAB40U, 0x409aU, 0xA6U, 0x98U, 0xF3U, 0x62U, \
+ 0xD4U, 0x64U, 0xB3U, 0x8FU)
/* DMA Remapping Error */
#define CPER_NOTIFY_DMAR \
- UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \
- 0x72, 0x2D, 0xEB, 0x41)
+ UUID_LE(0x667DD791U, 0xC6B3U, 0x4c27U, 0x8AU, 0x6BU, 0x0FU, 0x8EU, \
+ 0x72U, 0x2DU, 0xEBU, 0x41U)
/*
* Flags bits definitions for flags in struct cper_record_header
diff --git a/xen/lib/muldiv64.c b/xen/lib/muldiv64.c
index 78177ce616..e9bacc4c59 100644
--- a/xen/lib/muldiv64.c
+++ b/xen/lib/muldiv64.c
@@ -27,7 +27,7 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
rh = (uint64_t)u.l.high * (uint64_t)b;
rh += (rl >> 32);
res.l.high = rh / c;
- res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c;
+ res.l.low = (((rh % c) << 32) + ((uint32_t)rl & 0xffffffffU)) / c;
return res.ll;
#endif
--
2.41.0
^ permalink raw reply related [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 13/13] xen: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 13/13] xen: " Simone Ballarin
@ 2023-07-05 16:43 ` Luca Fancellu
2023-07-05 18:42 ` Simone Ballarin
2023-07-05 23:49 ` Stefano Stabellini
2023-07-06 8:40 ` Jan Beulich
2 siblings, 1 reply; 59+ messages in thread
From: Luca Fancellu @ 2023-07-05 16:43 UTC (permalink / raw)
To: Simone Ballarin
Cc: Xen-devel, consulting, Gianluca Luparini, Andrew Cooper,
George Dunlap, Jan Beulich, Julien Grall, Stefano Stabellini,
Wei Liu, Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder
> On 5 Jul 2023, at 16:26, Simone Ballarin <simone.ballarin@bugseng.com> wrote:
>
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
> ---
> Changes in v2:
> - minor change to commit title
> - change commit message
> - add '(uint32_t)' in 'muldiv64.c' for consistency
> - add fix in 'vesa.c'
> ---
> xen/common/gunzip.c | 2 +-
> xen/common/xmalloc_tlsf.c | 2 +-
> xen/drivers/char/ehci-dbgp.c | 4 ++--
> xen/drivers/video/vesa.c | 2 +-
> xen/include/public/memory.h | 2 +-
> xen/include/public/sysctl.h | 4 ++--
> xen/include/xen/bitops.h | 10 +++++-----
> xen/include/xen/cper.h | 34 +++++++++++++++++-----------------
> xen/lib/muldiv64.c | 2 +-
> 9 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/xen/common/gunzip.c b/xen/common/gunzip.c
> index 71ec5f26be..b810499be2 100644
> --- a/xen/common/gunzip.c
> +++ b/xen/common/gunzip.c
> @@ -11,7 +11,7 @@ static unsigned char *__initdata window;
> static memptr __initdata free_mem_ptr;
> static memptr __initdata free_mem_end_ptr;
>
> -#define WSIZE 0x80000000
> +#define WSIZE 0x80000000U
>
> static unsigned char *__initdata inbuf;
> static unsigned int __initdata insize;
> diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c
> index 75bdf18c4e..c21bf71e88 100644
> --- a/xen/common/xmalloc_tlsf.c
> +++ b/xen/common/xmalloc_tlsf.c
> @@ -46,7 +46,7 @@
> #define BHDR_OVERHEAD (sizeof(struct bhdr) - MIN_BLOCK_SIZE)
>
> #define PTR_MASK (sizeof(void *) - 1)
> -#define BLOCK_SIZE_MASK (0xFFFFFFFF - PTR_MASK)
> +#define BLOCK_SIZE_MASK (0xFFFFFFFFU - PTR_MASK)
>
> #define GET_NEXT_BLOCK(addr, r) ((struct bhdr *) \
> ((char *)(addr) + (r)))
> diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
> index bb9d3198d9..4d8d765122 100644
> --- a/xen/drivers/char/ehci-dbgp.c
> +++ b/xen/drivers/char/ehci-dbgp.c
> @@ -375,12 +375,12 @@ static inline u32 dbgp_pid_write_update(u32 x, u32 tok)
> static u8 data0 = USB_PID_DATA1;
>
> data0 ^= USB_PID_DATA0 ^ USB_PID_DATA1;
> - return (x & 0xffff0000) | (data0 << 8) | (tok & 0xff);
> + return (x & 0xffff0000U) | (data0 << 8) | (tok & 0xffU);
> }
>
> static inline u32 dbgp_pid_read_update(u32 x, u32 tok)
> {
> - return (x & 0xffffff00) | (tok & 0xff);
> + return (x & 0xffffff00U) | (tok & 0xffU);
> }
>
> static inline void dbgp_set_data(struct ehci_dbg_port __iomem *ehci_debug,
> diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c
> index c41f6b8d40..b007ff5678 100644
> --- a/xen/drivers/video/vesa.c
> +++ b/xen/drivers/video/vesa.c
> @@ -123,7 +123,7 @@ void __init vesa_init(void)
> if ( vlfb_info.bits_per_pixel > 8 )
> {
> /* Light grey in truecolor. */
> - unsigned int grey = 0xaaaaaaaa;
> + unsigned int grey = 0xaaaaaaaaU;
> lfbp.pixel_on =
> ((grey >> (32 - vlfb_info. red_size)) << vlfb_info. red_pos) |
> ((grey >> (32 - vlfb_info.green_size)) << vlfb_info.green_pos) |
> diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
> index c5f0d31e23..5e545ae9a4 100644
> --- a/xen/include/public/memory.h
> +++ b/xen/include/public/memory.h
> @@ -234,7 +234,7 @@ struct xen_add_to_physmap {
>
> unsigned int space; /* => enum phys_map_space */
>
> -#define XENMAPIDX_grant_table_status 0x80000000
> +#define XENMAPIDX_grant_table_status 0x80000000U
>
> /* Index into space being mapped. */
> xen_ulong_t idx;
> diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
> index 33e86ace51..fa7147de47 100644
> --- a/xen/include/public/sysctl.h
> +++ b/xen/include/public/sysctl.h
> @@ -384,7 +384,7 @@ struct xen_sysctl_pm_op {
> struct xen_set_cpufreq_para set_para;
> uint64_aligned_t get_avgfreq;
> uint32_t set_sched_opt_smt;
> -#define XEN_SYSCTL_CX_UNLIMITED 0xffffffff
> +#define XEN_SYSCTL_CX_UNLIMITED 0xffffffffU
> uint32_t get_max_cstate;
> uint32_t set_max_cstate;
> } u;
> @@ -547,7 +547,7 @@ struct xen_sysctl_numainfo {
> #define XEN_SYSCTL_CPUPOOL_OP_RMCPU 5 /* R */
> #define XEN_SYSCTL_CPUPOOL_OP_MOVEDOMAIN 6 /* M */
> #define XEN_SYSCTL_CPUPOOL_OP_FREEINFO 7 /* F */
> -#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFF
> +#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFFU
> struct xen_sysctl_cpupool_op {
> uint32_t op; /* IN */
> uint32_t cpupool_id; /* IN: CDIARM OUT: CI */
> diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
> index 33619a0873..3b7e09a26e 100644
> --- a/xen/include/xen/bitops.h
> +++ b/xen/include/xen/bitops.h
> @@ -227,11 +227,11 @@ static inline __u32 ror32(__u32 word, unsigned int shift)
> }
>
> /* base-2 logarithm */
> -#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0)
> -#define __L4(_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x))
> -#define __L8(_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x))
> -#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
> -#define ilog2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x))
> +#define __L2(_x) (((_x) & 0x00000002U) ? 1 : 0)
> +#define __L4(_x) (((_x) & 0x0000000cU) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x))
> +#define __L8(_x) (((_x) & 0x000000f0U) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x))
> +#define __L16(_x) (((_x) & 0x0000ff00U) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
> +#define ilog2(_x) (((_x) & 0xffff0000U) ? (16 + __L16((_x)>>16)) : __L16(_x))
>
> /**
> * for_each_set_bit - iterate over every set bit in a memory region
> diff --git a/xen/include/xen/cper.h b/xen/include/xen/cper.h
> index f8e5272bc1..71d14faa02 100644
> --- a/xen/include/xen/cper.h
> +++ b/xen/include/xen/cper.h
> @@ -56,7 +56,7 @@ static inline uint64_t cper_next_record_id(void)
> #define CPER_SIG_RECORD "CPER"
> #define CPER_SIG_SIZE 4
> /* Used in signature_end field in struct cper_record_header */
> -#define CPER_SIG_END 0xffffffff
> +#define CPER_SIG_END 0xffffffffU
>
> /*
> * CPER record header revision, used in revision field in struct
> @@ -80,36 +80,36 @@ static inline uint64_t cper_next_record_id(void)
> * Corrected Machine Check
> */
> #define CPER_NOTIFY_CMC \
> - UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \
> - 0xEB, 0xD4, 0xF8, 0x90)
> + UUID_LE(0x2DCE8BB1U, 0xBDD7U, 0x450eU, 0xB9U, 0xADU, 0x9CU, 0xF4U, \
> + 0xEBU, 0xD4U, 0xF8U, 0x90U)
> /* Corrected Platform Error */
> #define CPER_NOTIFY_CPE \
> - UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \
> - 0xF2, 0x7E, 0xBE, 0xEE)
> + UUID_LE(0x4E292F96U, 0xD843U, 0x4a55U, 0xA8U, 0xC2U, 0xD4U, 0x81U, \
> + 0xF2U, 0x7EU, 0xBEU, 0xEEU)
> /* Machine Check Exception */
> #define CPER_NOTIFY_MCE \
> - UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \
> - 0xE1, 0x49, 0x13, 0xBB)
> + UUID_LE(0xE8F56FFEU, 0x919CU, 0x4cc5U, 0xBAU, 0x88U, 0x65U, 0xABU, \
> + 0xE1U, 0x49U, 0x13U, 0xBBU)
> /* PCI Express Error */
> #define CPER_NOTIFY_PCIE \
> - UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \
> - 0xAF, 0x67, 0xC1, 0x04)
> + UUID_LE(0xCF93C01FU, 0x1A16U, 0x4dfcU, 0xB8U, 0xBCU, 0x9CU, 0x4DU, \
> + 0xAFU, 0x67U, 0xC1U, 0x04U)
> /* INIT Record (for IPF) */
> #define CPER_NOTIFY_INIT \
> - UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \
> - 0xD3, 0x9B, 0xC9, 0x8E)
> + UUID_LE(0xCC5263E8U, 0x9308U, 0x454aU, 0x89U, 0xD0U, 0x34U, 0x0BU, \
> + 0xD3U, 0x9BU, 0xC9U, 0x8EU)
> /* Non-Maskable Interrupt */
> #define CPER_NOTIFY_NMI \
> - UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \
> - 0x85, 0xD6, 0xE9, 0x8A)
> + UUID_LE(0x5BAD89FFU, 0xB7E6U, 0x42c9U, 0x81U, 0x4AU, 0xCFU, 0x24U, \
> + 0x85U, 0xD6U, 0xE9U, 0x8AU)
> /* BOOT Error Record */
> #define CPER_NOTIFY_BOOT \
> - UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \
> - 0xD4, 0x64, 0xB3, 0x8F)
> + UUID_LE(0x3D61A466U, 0xAB40U, 0x409aU, 0xA6U, 0x98U, 0xF3U, 0x62U, \
> + 0xD4U, 0x64U, 0xB3U, 0x8FU)
> /* DMA Remapping Error */
> #define CPER_NOTIFY_DMAR \
> - UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \
> - 0x72, 0x2D, 0xEB, 0x41)
> + UUID_LE(0x667DD791U, 0xC6B3U, 0x4c27U, 0x8AU, 0x6BU, 0x0FU, 0x8EU, \
> + 0x72U, 0x2DU, 0xEBU, 0x41U)
>
> /*
> * Flags bits definitions for flags in struct cper_record_header
> diff --git a/xen/lib/muldiv64.c b/xen/lib/muldiv64.c
> index 78177ce616..e9bacc4c59 100644
> --- a/xen/lib/muldiv64.c
> +++ b/xen/lib/muldiv64.c
> @@ -27,7 +27,7 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
> rh = (uint64_t)u.l.high * (uint64_t)b;
> rh += (rl >> 32);
> res.l.high = rh / c;
> - res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c;
> + res.l.low = (((rh % c) << 32) + ((uint32_t)rl & 0xffffffffU)) / c;
Why the explicit cast on rl? Shouldn’t it work without it?
>
> return res.ll;
> #endif
> --
> 2.41.0
>
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 13/13] xen: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 16:43 ` Luca Fancellu
@ 2023-07-05 18:42 ` Simone Ballarin
2023-07-05 19:32 ` Simone Ballarin
0 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 18:42 UTC (permalink / raw)
To: Luca Fancellu
Cc: Xen-devel, consulting, Gianluca Luparini, Andrew Cooper,
George Dunlap, Jan Beulich, Julien Grall, Stefano Stabellini,
Wei Liu, Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder
[-- Attachment #1: Type: text/plain, Size: 10669 bytes --]
Il giorno mer 5 lug 2023 alle ore 18:43 Luca Fancellu <Luca.Fancellu@arm.com>
ha scritto:
>
>
> > On 5 Jul 2023, at 16:26, Simone Ballarin <simone.ballarin@bugseng.com>
> wrote:
> >
> > From: Gianluca Luparini <gianluca.luparini@bugseng.com>
> >
> > 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: Simone Ballarin <simone.ballarin@bugseng.com>
> > Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
> > ---
> > Changes in v2:
> > - minor change to commit title
> > - change commit message
> > - add '(uint32_t)' in 'muldiv64.c' for consistency
> > - add fix in 'vesa.c'
> > ---
> > xen/common/gunzip.c | 2 +-
> > xen/common/xmalloc_tlsf.c | 2 +-
> > xen/drivers/char/ehci-dbgp.c | 4 ++--
> > xen/drivers/video/vesa.c | 2 +-
> > xen/include/public/memory.h | 2 +-
> > xen/include/public/sysctl.h | 4 ++--
> > xen/include/xen/bitops.h | 10 +++++-----
> > xen/include/xen/cper.h | 34 +++++++++++++++++-----------------
> > xen/lib/muldiv64.c | 2 +-
> > 9 files changed, 31 insertions(+), 31 deletions(-)
> >
> > diff --git a/xen/common/gunzip.c b/xen/common/gunzip.c
> > index 71ec5f26be..b810499be2 100644
> > --- a/xen/common/gunzip.c
> > +++ b/xen/common/gunzip.c
> > @@ -11,7 +11,7 @@ static unsigned char *__initdata window;
> > static memptr __initdata free_mem_ptr;
> > static memptr __initdata free_mem_end_ptr;
> >
> > -#define WSIZE 0x80000000
> > +#define WSIZE 0x80000000U
> >
> > static unsigned char *__initdata inbuf;
> > static unsigned int __initdata insize;
> > diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c
> > index 75bdf18c4e..c21bf71e88 100644
> > --- a/xen/common/xmalloc_tlsf.c
> > +++ b/xen/common/xmalloc_tlsf.c
> > @@ -46,7 +46,7 @@
> > #define BHDR_OVERHEAD (sizeof(struct bhdr) - MIN_BLOCK_SIZE)
> >
> > #define PTR_MASK (sizeof(void *) - 1)
> > -#define BLOCK_SIZE_MASK (0xFFFFFFFF - PTR_MASK)
> > +#define BLOCK_SIZE_MASK (0xFFFFFFFFU - PTR_MASK)
> >
> > #define GET_NEXT_BLOCK(addr, r) ((struct bhdr *) \
> > ((char *)(addr) + (r)))
> > diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
> > index bb9d3198d9..4d8d765122 100644
> > --- a/xen/drivers/char/ehci-dbgp.c
> > +++ b/xen/drivers/char/ehci-dbgp.c
> > @@ -375,12 +375,12 @@ static inline u32 dbgp_pid_write_update(u32 x, u32
> tok)
> > static u8 data0 = USB_PID_DATA1;
> >
> > data0 ^= USB_PID_DATA0 ^ USB_PID_DATA1;
> > - return (x & 0xffff0000) | (data0 << 8) | (tok & 0xff);
> > + return (x & 0xffff0000U) | (data0 << 8) | (tok & 0xffU);
> > }
> >
> > static inline u32 dbgp_pid_read_update(u32 x, u32 tok)
> > {
> > - return (x & 0xffffff00) | (tok & 0xff);
> > + return (x & 0xffffff00U) | (tok & 0xffU);
> > }
> >
> > static inline void dbgp_set_data(struct ehci_dbg_port __iomem
> *ehci_debug,
> > diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c
> > index c41f6b8d40..b007ff5678 100644
> > --- a/xen/drivers/video/vesa.c
> > +++ b/xen/drivers/video/vesa.c
> > @@ -123,7 +123,7 @@ void __init vesa_init(void)
> > if ( vlfb_info.bits_per_pixel > 8 )
> > {
> > /* Light grey in truecolor. */
> > - unsigned int grey = 0xaaaaaaaa;
> > + unsigned int grey = 0xaaaaaaaaU;
> > lfbp.pixel_on =
> > ((grey >> (32 - vlfb_info. red_size)) << vlfb_info.
> red_pos) |
> > ((grey >> (32 - vlfb_info.green_size)) <<
> vlfb_info.green_pos) |
> > diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
> > index c5f0d31e23..5e545ae9a4 100644
> > --- a/xen/include/public/memory.h
> > +++ b/xen/include/public/memory.h
> > @@ -234,7 +234,7 @@ struct xen_add_to_physmap {
> >
> > unsigned int space; /* => enum phys_map_space */
> >
> > -#define XENMAPIDX_grant_table_status 0x80000000
> > +#define XENMAPIDX_grant_table_status 0x80000000U
> >
> > /* Index into space being mapped. */
> > xen_ulong_t idx;
> > diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
> > index 33e86ace51..fa7147de47 100644
> > --- a/xen/include/public/sysctl.h
> > +++ b/xen/include/public/sysctl.h
> > @@ -384,7 +384,7 @@ struct xen_sysctl_pm_op {
> > struct xen_set_cpufreq_para set_para;
> > uint64_aligned_t get_avgfreq;
> > uint32_t set_sched_opt_smt;
> > -#define XEN_SYSCTL_CX_UNLIMITED 0xffffffff
> > +#define XEN_SYSCTL_CX_UNLIMITED 0xffffffffU
> > uint32_t get_max_cstate;
> > uint32_t set_max_cstate;
> > } u;
> > @@ -547,7 +547,7 @@ struct xen_sysctl_numainfo {
> > #define XEN_SYSCTL_CPUPOOL_OP_RMCPU 5 /* R */
> > #define XEN_SYSCTL_CPUPOOL_OP_MOVEDOMAIN 6 /* M */
> > #define XEN_SYSCTL_CPUPOOL_OP_FREEINFO 7 /* F */
> > -#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFF
> > +#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFFU
> > struct xen_sysctl_cpupool_op {
> > uint32_t op; /* IN */
> > uint32_t cpupool_id; /* IN: CDIARM OUT: CI */
> > diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
> > index 33619a0873..3b7e09a26e 100644
> > --- a/xen/include/xen/bitops.h
> > +++ b/xen/include/xen/bitops.h
> > @@ -227,11 +227,11 @@ static inline __u32 ror32(__u32 word, unsigned int
> shift)
> > }
> >
> > /* base-2 logarithm */
> > -#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0)
> > -#define __L4(_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2(
> _x))
> > -#define __L8(_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4(
> _x))
> > -#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8(
> _x))
> > -#define ilog2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) :
> __L16(_x))
> > +#define __L2(_x) (((_x) & 0x00000002U) ? 1 : 0)
> > +#define __L4(_x) (((_x) & 0x0000000cU) ? ( 2 + __L2( (_x)>> 2)) :
> __L2( _x))
> > +#define __L8(_x) (((_x) & 0x000000f0U) ? ( 4 + __L4( (_x)>> 4)) :
> __L4( _x))
> > +#define __L16(_x) (((_x) & 0x0000ff00U) ? ( 8 + __L8( (_x)>> 8)) :
> __L8( _x))
> > +#define ilog2(_x) (((_x) & 0xffff0000U) ? (16 + __L16((_x)>>16)) :
> __L16(_x))
> >
> > /**
> > * for_each_set_bit - iterate over every set bit in a memory region
> > diff --git a/xen/include/xen/cper.h b/xen/include/xen/cper.h
> > index f8e5272bc1..71d14faa02 100644
> > --- a/xen/include/xen/cper.h
> > +++ b/xen/include/xen/cper.h
> > @@ -56,7 +56,7 @@ static inline uint64_t cper_next_record_id(void)
> > #define CPER_SIG_RECORD "CPER"
> > #define CPER_SIG_SIZE 4
> > /* Used in signature_end field in struct cper_record_header */
> > -#define CPER_SIG_END 0xffffffff
> > +#define CPER_SIG_END 0xffffffffU
> >
> > /*
> > * CPER record header revision, used in revision field in struct
> > @@ -80,36 +80,36 @@ static inline uint64_t cper_next_record_id(void)
> > * Corrected Machine Check
> > */
> > #define CPER_NOTIFY_CMC \
> > - UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \
> > - 0xEB, 0xD4, 0xF8, 0x90)
> > + UUID_LE(0x2DCE8BB1U, 0xBDD7U, 0x450eU, 0xB9U, 0xADU, 0x9CU, 0xF4U, \
> > + 0xEBU, 0xD4U, 0xF8U, 0x90U)
> > /* Corrected Platform Error */
> > #define CPER_NOTIFY_CPE \
> > - UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \
> > - 0xF2, 0x7E, 0xBE, 0xEE)
> > + UUID_LE(0x4E292F96U, 0xD843U, 0x4a55U, 0xA8U, 0xC2U, 0xD4U, 0x81U, \
> > + 0xF2U, 0x7EU, 0xBEU, 0xEEU)
> > /* Machine Check Exception */
> > #define CPER_NOTIFY_MCE \
> > - UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \
> > - 0xE1, 0x49, 0x13, 0xBB)
> > + UUID_LE(0xE8F56FFEU, 0x919CU, 0x4cc5U, 0xBAU, 0x88U, 0x65U, 0xABU, \
> > + 0xE1U, 0x49U, 0x13U, 0xBBU)
> > /* PCI Express Error */
> > #define CPER_NOTIFY_PCIE \
> > - UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \
> > - 0xAF, 0x67, 0xC1, 0x04)
> > + UUID_LE(0xCF93C01FU, 0x1A16U, 0x4dfcU, 0xB8U, 0xBCU, 0x9CU, 0x4DU, \
> > + 0xAFU, 0x67U, 0xC1U, 0x04U)
> > /* INIT Record (for IPF) */
> > #define CPER_NOTIFY_INIT \
> > - UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \
> > - 0xD3, 0x9B, 0xC9, 0x8E)
> > + UUID_LE(0xCC5263E8U, 0x9308U, 0x454aU, 0x89U, 0xD0U, 0x34U, 0x0BU, \
> > + 0xD3U, 0x9BU, 0xC9U, 0x8EU)
> > /* Non-Maskable Interrupt */
> > #define CPER_NOTIFY_NMI \
> > - UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \
> > - 0x85, 0xD6, 0xE9, 0x8A)
> > + UUID_LE(0x5BAD89FFU, 0xB7E6U, 0x42c9U, 0x81U, 0x4AU, 0xCFU, 0x24U, \
> > + 0x85U, 0xD6U, 0xE9U, 0x8AU)
> > /* BOOT Error Record */
> > #define CPER_NOTIFY_BOOT \
> > - UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \
> > - 0xD4, 0x64, 0xB3, 0x8F)
> > + UUID_LE(0x3D61A466U, 0xAB40U, 0x409aU, 0xA6U, 0x98U, 0xF3U, 0x62U, \
> > + 0xD4U, 0x64U, 0xB3U, 0x8FU)
> > /* DMA Remapping Error */
> > #define CPER_NOTIFY_DMAR \
> > - UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \
> > - 0x72, 0x2D, 0xEB, 0x41)
> > + UUID_LE(0x667DD791U, 0xC6B3U, 0x4c27U, 0x8AU, 0x6BU, 0x0FU, 0x8EU, \
> > + 0x72U, 0x2DU, 0xEBU, 0x41U)
> >
> > /*
> > * Flags bits definitions for flags in struct cper_record_header
> > diff --git a/xen/lib/muldiv64.c b/xen/lib/muldiv64.c
> > index 78177ce616..e9bacc4c59 100644
> > --- a/xen/lib/muldiv64.c
> > +++ b/xen/lib/muldiv64.c
> > @@ -27,7 +27,7 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
> > rh = (uint64_t)u.l.high * (uint64_t)b;
> > rh += (rl >> 32);
> > res.l.high = rh / c;
> > - res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c;
> > + res.l.low = (((rh % c) << 32) + ((uint32_t)rl & 0xffffffffU)) / c;
>
> Why the explicit cast on rl? Shouldn’t it work without it?
>
> Yes, the cast is not related to the MISRA rule.
It was requested by Jan in "[XEN PATCH 00/13] xen: fixed violations of
MISRA C:2012 Rule 7.2"
to be more consistent with the surrounding code.
> >
> > return res.ll;
>
--
Simone Ballarin, M.Sc.
Field Application Engineer, BUGSENG (https://bugseng.com
<http://bugseng.com>)
[-- Attachment #2: Type: text/html, Size: 13258 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 13/13] xen: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 18:42 ` Simone Ballarin
@ 2023-07-05 19:32 ` Simone Ballarin
2023-07-06 8:28 ` Jan Beulich
0 siblings, 1 reply; 59+ messages in thread
From: Simone Ballarin @ 2023-07-05 19:32 UTC (permalink / raw)
To: Luca Fancellu
Cc: Xen-devel, consulting, Gianluca Luparini, Andrew Cooper,
George Dunlap, Jan Beulich, Julien Grall, Stefano Stabellini,
Wei Liu, Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder
[-- Attachment #1: Type: text/plain, Size: 11289 bytes --]
Rethinking about it, probably Jan's hint was to add the cast and remove the
&.
I will fix it in the next patch.
Il giorno mer 5 lug 2023 alle ore 20:42 Simone Ballarin <
simone.ballarin@bugseng.com> ha scritto:
>
>
> Il giorno mer 5 lug 2023 alle ore 18:43 Luca Fancellu <
> Luca.Fancellu@arm.com> ha scritto:
>
>>
>>
>> > On 5 Jul 2023, at 16:26, Simone Ballarin <simone.ballarin@bugseng.com>
>> wrote:
>> >
>> > From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>> >
>> > 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: Simone Ballarin <simone.ballarin@bugseng.com>
>> > Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
>> > ---
>> > Changes in v2:
>> > - minor change to commit title
>> > - change commit message
>> > - add '(uint32_t)' in 'muldiv64.c' for consistency
>> > - add fix in 'vesa.c'
>> > ---
>> > xen/common/gunzip.c | 2 +-
>> > xen/common/xmalloc_tlsf.c | 2 +-
>> > xen/drivers/char/ehci-dbgp.c | 4 ++--
>> > xen/drivers/video/vesa.c | 2 +-
>> > xen/include/public/memory.h | 2 +-
>> > xen/include/public/sysctl.h | 4 ++--
>> > xen/include/xen/bitops.h | 10 +++++-----
>> > xen/include/xen/cper.h | 34 +++++++++++++++++-----------------
>> > xen/lib/muldiv64.c | 2 +-
>> > 9 files changed, 31 insertions(+), 31 deletions(-)
>> >
>> > diff --git a/xen/common/gunzip.c b/xen/common/gunzip.c
>> > index 71ec5f26be..b810499be2 100644
>> > --- a/xen/common/gunzip.c
>> > +++ b/xen/common/gunzip.c
>> > @@ -11,7 +11,7 @@ static unsigned char *__initdata window;
>> > static memptr __initdata free_mem_ptr;
>> > static memptr __initdata free_mem_end_ptr;
>> >
>> > -#define WSIZE 0x80000000
>> > +#define WSIZE 0x80000000U
>> >
>> > static unsigned char *__initdata inbuf;
>> > static unsigned int __initdata insize;
>> > diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c
>> > index 75bdf18c4e..c21bf71e88 100644
>> > --- a/xen/common/xmalloc_tlsf.c
>> > +++ b/xen/common/xmalloc_tlsf.c
>> > @@ -46,7 +46,7 @@
>> > #define BHDR_OVERHEAD (sizeof(struct bhdr) - MIN_BLOCK_SIZE)
>> >
>> > #define PTR_MASK (sizeof(void *) - 1)
>> > -#define BLOCK_SIZE_MASK (0xFFFFFFFF - PTR_MASK)
>> > +#define BLOCK_SIZE_MASK (0xFFFFFFFFU - PTR_MASK)
>> >
>> > #define GET_NEXT_BLOCK(addr, r) ((struct bhdr *) \
>> > ((char *)(addr) + (r)))
>> > diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
>> > index bb9d3198d9..4d8d765122 100644
>> > --- a/xen/drivers/char/ehci-dbgp.c
>> > +++ b/xen/drivers/char/ehci-dbgp.c
>> > @@ -375,12 +375,12 @@ static inline u32 dbgp_pid_write_update(u32 x,
>> u32 tok)
>> > static u8 data0 = USB_PID_DATA1;
>> >
>> > data0 ^= USB_PID_DATA0 ^ USB_PID_DATA1;
>> > - return (x & 0xffff0000) | (data0 << 8) | (tok & 0xff);
>> > + return (x & 0xffff0000U) | (data0 << 8) | (tok & 0xffU);
>> > }
>> >
>> > static inline u32 dbgp_pid_read_update(u32 x, u32 tok)
>> > {
>> > - return (x & 0xffffff00) | (tok & 0xff);
>> > + return (x & 0xffffff00U) | (tok & 0xffU);
>> > }
>> >
>> > static inline void dbgp_set_data(struct ehci_dbg_port __iomem
>> *ehci_debug,
>> > diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c
>> > index c41f6b8d40..b007ff5678 100644
>> > --- a/xen/drivers/video/vesa.c
>> > +++ b/xen/drivers/video/vesa.c
>> > @@ -123,7 +123,7 @@ void __init vesa_init(void)
>> > if ( vlfb_info.bits_per_pixel > 8 )
>> > {
>> > /* Light grey in truecolor. */
>> > - unsigned int grey = 0xaaaaaaaa;
>> > + unsigned int grey = 0xaaaaaaaaU;
>> > lfbp.pixel_on =
>> > ((grey >> (32 - vlfb_info. red_size)) << vlfb_info.
>> red_pos) |
>> > ((grey >> (32 - vlfb_info.green_size)) <<
>> vlfb_info.green_pos) |
>> > diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
>> > index c5f0d31e23..5e545ae9a4 100644
>> > --- a/xen/include/public/memory.h
>> > +++ b/xen/include/public/memory.h
>> > @@ -234,7 +234,7 @@ struct xen_add_to_physmap {
>> >
>> > unsigned int space; /* => enum phys_map_space */
>> >
>> > -#define XENMAPIDX_grant_table_status 0x80000000
>> > +#define XENMAPIDX_grant_table_status 0x80000000U
>> >
>> > /* Index into space being mapped. */
>> > xen_ulong_t idx;
>> > diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
>> > index 33e86ace51..fa7147de47 100644
>> > --- a/xen/include/public/sysctl.h
>> > +++ b/xen/include/public/sysctl.h
>> > @@ -384,7 +384,7 @@ struct xen_sysctl_pm_op {
>> > struct xen_set_cpufreq_para set_para;
>> > uint64_aligned_t get_avgfreq;
>> > uint32_t set_sched_opt_smt;
>> > -#define XEN_SYSCTL_CX_UNLIMITED 0xffffffff
>> > +#define XEN_SYSCTL_CX_UNLIMITED 0xffffffffU
>> > uint32_t get_max_cstate;
>> > uint32_t set_max_cstate;
>> > } u;
>> > @@ -547,7 +547,7 @@ struct xen_sysctl_numainfo {
>> > #define XEN_SYSCTL_CPUPOOL_OP_RMCPU 5 /* R */
>> > #define XEN_SYSCTL_CPUPOOL_OP_MOVEDOMAIN 6 /* M */
>> > #define XEN_SYSCTL_CPUPOOL_OP_FREEINFO 7 /* F */
>> > -#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFF
>> > +#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFFU
>> > struct xen_sysctl_cpupool_op {
>> > uint32_t op; /* IN */
>> > uint32_t cpupool_id; /* IN: CDIARM OUT: CI */
>> > diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
>> > index 33619a0873..3b7e09a26e 100644
>> > --- a/xen/include/xen/bitops.h
>> > +++ b/xen/include/xen/bitops.h
>> > @@ -227,11 +227,11 @@ static inline __u32 ror32(__u32 word, unsigned
>> int shift)
>> > }
>> >
>> > /* base-2 logarithm */
>> > -#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0)
>> > -#define __L4(_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) :
>> __L2( _x))
>> > -#define __L8(_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) :
>> __L4( _x))
>> > -#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) :
>> __L8( _x))
>> > -#define ilog2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) :
>> __L16(_x))
>> > +#define __L2(_x) (((_x) & 0x00000002U) ? 1 : 0)
>> > +#define __L4(_x) (((_x) & 0x0000000cU) ? ( 2 + __L2( (_x)>> 2)) :
>> __L2( _x))
>> > +#define __L8(_x) (((_x) & 0x000000f0U) ? ( 4 + __L4( (_x)>> 4)) :
>> __L4( _x))
>> > +#define __L16(_x) (((_x) & 0x0000ff00U) ? ( 8 + __L8( (_x)>> 8)) :
>> __L8( _x))
>> > +#define ilog2(_x) (((_x) & 0xffff0000U) ? (16 + __L16((_x)>>16)) :
>> __L16(_x))
>> >
>> > /**
>> > * for_each_set_bit - iterate over every set bit in a memory region
>> > diff --git a/xen/include/xen/cper.h b/xen/include/xen/cper.h
>> > index f8e5272bc1..71d14faa02 100644
>> > --- a/xen/include/xen/cper.h
>> > +++ b/xen/include/xen/cper.h
>> > @@ -56,7 +56,7 @@ static inline uint64_t cper_next_record_id(void)
>> > #define CPER_SIG_RECORD "CPER"
>> > #define CPER_SIG_SIZE 4
>> > /* Used in signature_end field in struct cper_record_header */
>> > -#define CPER_SIG_END 0xffffffff
>> > +#define CPER_SIG_END 0xffffffffU
>> >
>> > /*
>> > * CPER record header revision, used in revision field in struct
>> > @@ -80,36 +80,36 @@ static inline uint64_t cper_next_record_id(void)
>> > * Corrected Machine Check
>> > */
>> > #define CPER_NOTIFY_CMC \
>> > - UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \
>> > - 0xEB, 0xD4, 0xF8, 0x90)
>> > + UUID_LE(0x2DCE8BB1U, 0xBDD7U, 0x450eU, 0xB9U, 0xADU, 0x9CU, 0xF4U, \
>> > + 0xEBU, 0xD4U, 0xF8U, 0x90U)
>> > /* Corrected Platform Error */
>> > #define CPER_NOTIFY_CPE \
>> > - UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \
>> > - 0xF2, 0x7E, 0xBE, 0xEE)
>> > + UUID_LE(0x4E292F96U, 0xD843U, 0x4a55U, 0xA8U, 0xC2U, 0xD4U, 0x81U, \
>> > + 0xF2U, 0x7EU, 0xBEU, 0xEEU)
>> > /* Machine Check Exception */
>> > #define CPER_NOTIFY_MCE \
>> > - UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \
>> > - 0xE1, 0x49, 0x13, 0xBB)
>> > + UUID_LE(0xE8F56FFEU, 0x919CU, 0x4cc5U, 0xBAU, 0x88U, 0x65U, 0xABU, \
>> > + 0xE1U, 0x49U, 0x13U, 0xBBU)
>> > /* PCI Express Error */
>> > #define CPER_NOTIFY_PCIE \
>> > - UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \
>> > - 0xAF, 0x67, 0xC1, 0x04)
>> > + UUID_LE(0xCF93C01FU, 0x1A16U, 0x4dfcU, 0xB8U, 0xBCU, 0x9CU, 0x4DU, \
>> > + 0xAFU, 0x67U, 0xC1U, 0x04U)
>> > /* INIT Record (for IPF) */
>> > #define CPER_NOTIFY_INIT \
>> > - UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \
>> > - 0xD3, 0x9B, 0xC9, 0x8E)
>> > + UUID_LE(0xCC5263E8U, 0x9308U, 0x454aU, 0x89U, 0xD0U, 0x34U, 0x0BU, \
>> > + 0xD3U, 0x9BU, 0xC9U, 0x8EU)
>> > /* Non-Maskable Interrupt */
>> > #define CPER_NOTIFY_NMI \
>> > - UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \
>> > - 0x85, 0xD6, 0xE9, 0x8A)
>> > + UUID_LE(0x5BAD89FFU, 0xB7E6U, 0x42c9U, 0x81U, 0x4AU, 0xCFU, 0x24U, \
>> > + 0x85U, 0xD6U, 0xE9U, 0x8AU)
>> > /* BOOT Error Record */
>> > #define CPER_NOTIFY_BOOT \
>> > - UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \
>> > - 0xD4, 0x64, 0xB3, 0x8F)
>> > + UUID_LE(0x3D61A466U, 0xAB40U, 0x409aU, 0xA6U, 0x98U, 0xF3U, 0x62U, \
>> > + 0xD4U, 0x64U, 0xB3U, 0x8FU)
>> > /* DMA Remapping Error */
>> > #define CPER_NOTIFY_DMAR \
>> > - UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \
>> > - 0x72, 0x2D, 0xEB, 0x41)
>> > + UUID_LE(0x667DD791U, 0xC6B3U, 0x4c27U, 0x8AU, 0x6BU, 0x0FU, 0x8EU, \
>> > + 0x72U, 0x2DU, 0xEBU, 0x41U)
>> >
>> > /*
>> > * Flags bits definitions for flags in struct cper_record_header
>> > diff --git a/xen/lib/muldiv64.c b/xen/lib/muldiv64.c
>> > index 78177ce616..e9bacc4c59 100644
>> > --- a/xen/lib/muldiv64.c
>> > +++ b/xen/lib/muldiv64.c
>> > @@ -27,7 +27,7 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
>> > rh = (uint64_t)u.l.high * (uint64_t)b;
>> > rh += (rl >> 32);
>> > res.l.high = rh / c;
>> > - res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c;
>> > + res.l.low = (((rh % c) << 32) + ((uint32_t)rl & 0xffffffffU)) / c;
>>
>> Why the explicit cast on rl? Shouldn’t it work without it?
>>
>> Yes, the cast is not related to the MISRA rule.
> It was requested by Jan in "[XEN PATCH 00/13] xen: fixed violations of
> MISRA C:2012 Rule 7.2"
> to be more consistent with the surrounding code.
>
>
>> >
>> > return res.ll;
>>
>
>
> --
> Simone Ballarin, M.Sc.
>
> Field Application Engineer, BUGSENG (https://bugseng.com
> <http://bugseng.com>)
>
--
Simone Ballarin, M.Sc.
Field Application Engineer, BUGSENG (https://bugseng.com
<http://bugseng.com>)
[-- Attachment #2: Type: text/html, Size: 14094 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 13/13] xen: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 19:32 ` Simone Ballarin
@ 2023-07-06 8:28 ` Jan Beulich
0 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 8:28 UTC (permalink / raw)
To: Simone Ballarin
Cc: Xen-devel, consulting, Gianluca Luparini, Andrew Cooper,
George Dunlap, Julien Grall, Stefano Stabellini, Wei Liu,
Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder, Luca Fancellu
On 05.07.2023 21:32, Simone Ballarin wrote:
> Rethinking about it, probably Jan's hint was to add the cast and remove the
> &.
Indeed.
> I will fix it in the next patch.
Thanks.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 13/13] xen: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 13/13] xen: " Simone Ballarin
2023-07-05 16:43 ` Luca Fancellu
@ 2023-07-05 23:49 ` Stefano Stabellini
2023-07-06 8:34 ` Jan Beulich
2023-07-06 8:40 ` Jan Beulich
2 siblings, 1 reply; 59+ messages in thread
From: Stefano Stabellini @ 2023-07-05 23:49 UTC (permalink / raw)
To: Simone Ballarin
Cc: xen-devel, consulting, Gianluca Luparini, Andrew Cooper,
George Dunlap, Jan Beulich, Julien Grall, Stefano Stabellini,
Wei Liu, Michal Orzel, Xenia Ragiadakou, Ayan Kumar Halder
On Wed, 5 Jul 2023, Simone Ballarin wrote:
> From: Gianluca Luparini <gianluca.luparini@bugseng.com>
>
> 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: Simone Ballarin <simone.ballarin@bugseng.com>
> Signed-off-by: Gianluca Luparini <gianluca.luparini@bugseng.com>
> ---
> Changes in v2:
> - minor change to commit title
> - change commit message
> - add '(uint32_t)' in 'muldiv64.c' for consistency
> - add fix in 'vesa.c'
> ---
> xen/common/gunzip.c | 2 +-
> xen/common/xmalloc_tlsf.c | 2 +-
> xen/drivers/char/ehci-dbgp.c | 4 ++--
> xen/drivers/video/vesa.c | 2 +-
> xen/include/public/memory.h | 2 +-
> xen/include/public/sysctl.h | 4 ++--
> xen/include/xen/bitops.h | 10 +++++-----
> xen/include/xen/cper.h | 34 +++++++++++++++++-----------------
> xen/lib/muldiv64.c | 2 +-
> 9 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/xen/common/gunzip.c b/xen/common/gunzip.c
> index 71ec5f26be..b810499be2 100644
> --- a/xen/common/gunzip.c
> +++ b/xen/common/gunzip.c
> @@ -11,7 +11,7 @@ static unsigned char *__initdata window;
> static memptr __initdata free_mem_ptr;
> static memptr __initdata free_mem_end_ptr;
>
> -#define WSIZE 0x80000000
> +#define WSIZE 0x80000000U
>
> static unsigned char *__initdata inbuf;
> static unsigned int __initdata insize;
> diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c
> index 75bdf18c4e..c21bf71e88 100644
> --- a/xen/common/xmalloc_tlsf.c
> +++ b/xen/common/xmalloc_tlsf.c
> @@ -46,7 +46,7 @@
> #define BHDR_OVERHEAD (sizeof(struct bhdr) - MIN_BLOCK_SIZE)
>
> #define PTR_MASK (sizeof(void *) - 1)
> -#define BLOCK_SIZE_MASK (0xFFFFFFFF - PTR_MASK)
> +#define BLOCK_SIZE_MASK (0xFFFFFFFFU - PTR_MASK)
>
> #define GET_NEXT_BLOCK(addr, r) ((struct bhdr *) \
> ((char *)(addr) + (r)))
> diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
> index bb9d3198d9..4d8d765122 100644
> --- a/xen/drivers/char/ehci-dbgp.c
> +++ b/xen/drivers/char/ehci-dbgp.c
> @@ -375,12 +375,12 @@ static inline u32 dbgp_pid_write_update(u32 x, u32 tok)
> static u8 data0 = USB_PID_DATA1;
>
> data0 ^= USB_PID_DATA0 ^ USB_PID_DATA1;
> - return (x & 0xffff0000) | (data0 << 8) | (tok & 0xff);
> + return (x & 0xffff0000U) | (data0 << 8) | (tok & 0xffU);
> }
>
> static inline u32 dbgp_pid_read_update(u32 x, u32 tok)
> {
> - return (x & 0xffffff00) | (tok & 0xff);
> + return (x & 0xffffff00U) | (tok & 0xffU);
> }
>
> static inline void dbgp_set_data(struct ehci_dbg_port __iomem *ehci_debug,
> diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c
> index c41f6b8d40..b007ff5678 100644
> --- a/xen/drivers/video/vesa.c
> +++ b/xen/drivers/video/vesa.c
> @@ -123,7 +123,7 @@ void __init vesa_init(void)
> if ( vlfb_info.bits_per_pixel > 8 )
> {
> /* Light grey in truecolor. */
> - unsigned int grey = 0xaaaaaaaa;
> + unsigned int grey = 0xaaaaaaaaU;
> lfbp.pixel_on =
> ((grey >> (32 - vlfb_info. red_size)) << vlfb_info. red_pos) |
> ((grey >> (32 - vlfb_info.green_size)) << vlfb_info.green_pos) |
> diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
> index c5f0d31e23..5e545ae9a4 100644
> --- a/xen/include/public/memory.h
> +++ b/xen/include/public/memory.h
> @@ -234,7 +234,7 @@ struct xen_add_to_physmap {
>
> unsigned int space; /* => enum phys_map_space */
>
> -#define XENMAPIDX_grant_table_status 0x80000000
> +#define XENMAPIDX_grant_table_status 0x80000000U
>
> /* Index into space being mapped. */
> xen_ulong_t idx;
> diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
> index 33e86ace51..fa7147de47 100644
> --- a/xen/include/public/sysctl.h
> +++ b/xen/include/public/sysctl.h
> @@ -384,7 +384,7 @@ struct xen_sysctl_pm_op {
> struct xen_set_cpufreq_para set_para;
> uint64_aligned_t get_avgfreq;
> uint32_t set_sched_opt_smt;
> -#define XEN_SYSCTL_CX_UNLIMITED 0xffffffff
> +#define XEN_SYSCTL_CX_UNLIMITED 0xffffffffU
> uint32_t get_max_cstate;
> uint32_t set_max_cstate;
> } u;
> @@ -547,7 +547,7 @@ struct xen_sysctl_numainfo {
> #define XEN_SYSCTL_CPUPOOL_OP_RMCPU 5 /* R */
> #define XEN_SYSCTL_CPUPOOL_OP_MOVEDOMAIN 6 /* M */
> #define XEN_SYSCTL_CPUPOOL_OP_FREEINFO 7 /* F */
> -#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFF
> +#define XEN_SYSCTL_CPUPOOL_PAR_ANY 0xFFFFFFFFU
> struct xen_sysctl_cpupool_op {
> uint32_t op; /* IN */
> uint32_t cpupool_id; /* IN: CDIARM OUT: CI */
> diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
> index 33619a0873..3b7e09a26e 100644
> --- a/xen/include/xen/bitops.h
> +++ b/xen/include/xen/bitops.h
> @@ -227,11 +227,11 @@ static inline __u32 ror32(__u32 word, unsigned int shift)
> }
>
> /* base-2 logarithm */
> -#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0)
> -#define __L4(_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x))
> -#define __L8(_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x))
> -#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
> -#define ilog2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x))
> +#define __L2(_x) (((_x) & 0x00000002U) ? 1 : 0)
> +#define __L4(_x) (((_x) & 0x0000000cU) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x))
> +#define __L8(_x) (((_x) & 0x000000f0U) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x))
> +#define __L16(_x) (((_x) & 0x0000ff00U) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
> +#define ilog2(_x) (((_x) & 0xffff0000U) ? (16 + __L16((_x)>>16)) : __L16(_x))
Jan, would you want to replace _x with x here as well?
If so, I think it would be best if done in a separate patch (keep
mechanical changes mechanical) and keep this patch as is:
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> /**
> * for_each_set_bit - iterate over every set bit in a memory region
> diff --git a/xen/include/xen/cper.h b/xen/include/xen/cper.h
> index f8e5272bc1..71d14faa02 100644
> --- a/xen/include/xen/cper.h
> +++ b/xen/include/xen/cper.h
> @@ -56,7 +56,7 @@ static inline uint64_t cper_next_record_id(void)
> #define CPER_SIG_RECORD "CPER"
> #define CPER_SIG_SIZE 4
> /* Used in signature_end field in struct cper_record_header */
> -#define CPER_SIG_END 0xffffffff
> +#define CPER_SIG_END 0xffffffffU
>
> /*
> * CPER record header revision, used in revision field in struct
> @@ -80,36 +80,36 @@ static inline uint64_t cper_next_record_id(void)
> * Corrected Machine Check
> */
> #define CPER_NOTIFY_CMC \
> - UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \
> - 0xEB, 0xD4, 0xF8, 0x90)
> + UUID_LE(0x2DCE8BB1U, 0xBDD7U, 0x450eU, 0xB9U, 0xADU, 0x9CU, 0xF4U, \
> + 0xEBU, 0xD4U, 0xF8U, 0x90U)
> /* Corrected Platform Error */
> #define CPER_NOTIFY_CPE \
> - UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \
> - 0xF2, 0x7E, 0xBE, 0xEE)
> + UUID_LE(0x4E292F96U, 0xD843U, 0x4a55U, 0xA8U, 0xC2U, 0xD4U, 0x81U, \
> + 0xF2U, 0x7EU, 0xBEU, 0xEEU)
> /* Machine Check Exception */
> #define CPER_NOTIFY_MCE \
> - UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \
> - 0xE1, 0x49, 0x13, 0xBB)
> + UUID_LE(0xE8F56FFEU, 0x919CU, 0x4cc5U, 0xBAU, 0x88U, 0x65U, 0xABU, \
> + 0xE1U, 0x49U, 0x13U, 0xBBU)
> /* PCI Express Error */
> #define CPER_NOTIFY_PCIE \
> - UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \
> - 0xAF, 0x67, 0xC1, 0x04)
> + UUID_LE(0xCF93C01FU, 0x1A16U, 0x4dfcU, 0xB8U, 0xBCU, 0x9CU, 0x4DU, \
> + 0xAFU, 0x67U, 0xC1U, 0x04U)
> /* INIT Record (for IPF) */
> #define CPER_NOTIFY_INIT \
> - UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \
> - 0xD3, 0x9B, 0xC9, 0x8E)
> + UUID_LE(0xCC5263E8U, 0x9308U, 0x454aU, 0x89U, 0xD0U, 0x34U, 0x0BU, \
> + 0xD3U, 0x9BU, 0xC9U, 0x8EU)
> /* Non-Maskable Interrupt */
> #define CPER_NOTIFY_NMI \
> - UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \
> - 0x85, 0xD6, 0xE9, 0x8A)
> + UUID_LE(0x5BAD89FFU, 0xB7E6U, 0x42c9U, 0x81U, 0x4AU, 0xCFU, 0x24U, \
> + 0x85U, 0xD6U, 0xE9U, 0x8AU)
> /* BOOT Error Record */
> #define CPER_NOTIFY_BOOT \
> - UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \
> - 0xD4, 0x64, 0xB3, 0x8F)
> + UUID_LE(0x3D61A466U, 0xAB40U, 0x409aU, 0xA6U, 0x98U, 0xF3U, 0x62U, \
> + 0xD4U, 0x64U, 0xB3U, 0x8FU)
> /* DMA Remapping Error */
> #define CPER_NOTIFY_DMAR \
> - UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \
> - 0x72, 0x2D, 0xEB, 0x41)
> + UUID_LE(0x667DD791U, 0xC6B3U, 0x4c27U, 0x8AU, 0x6BU, 0x0FU, 0x8EU, \
> + 0x72U, 0x2DU, 0xEBU, 0x41U)
>
> /*
> * Flags bits definitions for flags in struct cper_record_header
> diff --git a/xen/lib/muldiv64.c b/xen/lib/muldiv64.c
> index 78177ce616..e9bacc4c59 100644
> --- a/xen/lib/muldiv64.c
> +++ b/xen/lib/muldiv64.c
> @@ -27,7 +27,7 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
> rh = (uint64_t)u.l.high * (uint64_t)b;
> rh += (rl >> 32);
> res.l.high = rh / c;
> - res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c;
> + res.l.low = (((rh % c) << 32) + ((uint32_t)rl & 0xffffffffU)) / c;
>
> return res.ll;
> #endif
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 59+ messages in thread* Re: [XEN PATCH v2 13/13] xen: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 23:49 ` Stefano Stabellini
@ 2023-07-06 8:34 ` Jan Beulich
0 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 8:34 UTC (permalink / raw)
To: Stefano Stabellini
Cc: xen-devel, consulting, Gianluca Luparini, Andrew Cooper,
George Dunlap, Julien Grall, Wei Liu, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, Simone Ballarin
On 06.07.2023 01:49, Stefano Stabellini wrote:
>> --- a/xen/include/xen/bitops.h
>> +++ b/xen/include/xen/bitops.h
>> @@ -227,11 +227,11 @@ static inline __u32 ror32(__u32 word, unsigned int shift)
>> }
>>
>> /* base-2 logarithm */
>> -#define __L2(_x) (((_x) & 0x00000002) ? 1 : 0)
>> -#define __L4(_x) (((_x) & 0x0000000c) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x))
>> -#define __L8(_x) (((_x) & 0x000000f0) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x))
>> -#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
>> -#define ilog2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) : __L16(_x))
>> +#define __L2(_x) (((_x) & 0x00000002U) ? 1 : 0)
>> +#define __L4(_x) (((_x) & 0x0000000cU) ? ( 2 + __L2( (_x)>> 2)) : __L2( _x))
>> +#define __L8(_x) (((_x) & 0x000000f0U) ? ( 4 + __L4( (_x)>> 4)) : __L4( _x))
>> +#define __L16(_x) (((_x) & 0x0000ff00U) ? ( 8 + __L8( (_x)>> 8)) : __L8( _x))
>> +#define ilog2(_x) (((_x) & 0xffff0000U) ? (16 + __L16((_x)>>16)) : __L16(_x))
>
> Jan, would you want to replace _x with x here as well?
Yes.
> If so, I think it would be best if done in a separate patch (keep
> mechanical changes mechanical) and keep this patch as is:
It was done in one go in patch 9, so I don't see why doing it here
as well would do any harm. Additionally missing blanks before >>
should be inserted at this occasion, and perhaps excess ones dropped
from the first of the changed lines (or further ones added to align
toe colons). While with that the lines still stay just below the 80
chars limit, dropping the leading underscores would get us a little
father away from that boundary.
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [XEN PATCH v2 13/13] xen: fix violations of MISRA C:2012 Rule 7.2
2023-07-05 15:26 ` [XEN PATCH v2 13/13] xen: " Simone Ballarin
2023-07-05 16:43 ` Luca Fancellu
2023-07-05 23:49 ` Stefano Stabellini
@ 2023-07-06 8:40 ` Jan Beulich
2 siblings, 0 replies; 59+ messages in thread
From: Jan Beulich @ 2023-07-06 8:40 UTC (permalink / raw)
To: Simone Ballarin
Cc: consulting, Gianluca Luparini, Andrew Cooper, George Dunlap,
Julien Grall, Stefano Stabellini, Wei Liu, Michal Orzel,
Xenia Ragiadakou, Ayan Kumar Halder, xen-devel
On 05.07.2023 17:26, Simone Ballarin wrote:
> @@ -80,36 +80,36 @@ static inline uint64_t cper_next_record_id(void)
> * Corrected Machine Check
> */
> #define CPER_NOTIFY_CMC \
> - UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \
> - 0xEB, 0xD4, 0xF8, 0x90)
> + UUID_LE(0x2DCE8BB1U, 0xBDD7U, 0x450eU, 0xB9U, 0xADU, 0x9CU, 0xF4U, \
> + 0xEBU, 0xD4U, 0xF8U, 0x90U)
> /* Corrected Platform Error */
> #define CPER_NOTIFY_CPE \
> - UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \
> - 0xF2, 0x7E, 0xBE, 0xEE)
> + UUID_LE(0x4E292F96U, 0xD843U, 0x4a55U, 0xA8U, 0xC2U, 0xD4U, 0x81U, \
> + 0xF2U, 0x7EU, 0xBEU, 0xEEU)
> /* Machine Check Exception */
> #define CPER_NOTIFY_MCE \
> - UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \
> - 0xE1, 0x49, 0x13, 0xBB)
> + UUID_LE(0xE8F56FFEU, 0x919CU, 0x4cc5U, 0xBAU, 0x88U, 0x65U, 0xABU, \
> + 0xE1U, 0x49U, 0x13U, 0xBBU)
> /* PCI Express Error */
> #define CPER_NOTIFY_PCIE \
> - UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \
> - 0xAF, 0x67, 0xC1, 0x04)
> + UUID_LE(0xCF93C01FU, 0x1A16U, 0x4dfcU, 0xB8U, 0xBCU, 0x9CU, 0x4DU, \
> + 0xAFU, 0x67U, 0xC1U, 0x04U)
> /* INIT Record (for IPF) */
> #define CPER_NOTIFY_INIT \
> - UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \
> - 0xD3, 0x9B, 0xC9, 0x8E)
> + UUID_LE(0xCC5263E8U, 0x9308U, 0x454aU, 0x89U, 0xD0U, 0x34U, 0x0BU, \
> + 0xD3U, 0x9BU, 0xC9U, 0x8EU)
> /* Non-Maskable Interrupt */
> #define CPER_NOTIFY_NMI \
> - UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \
> - 0x85, 0xD6, 0xE9, 0x8A)
> + UUID_LE(0x5BAD89FFU, 0xB7E6U, 0x42c9U, 0x81U, 0x4AU, 0xCFU, 0x24U, \
> + 0x85U, 0xD6U, 0xE9U, 0x8AU)
> /* BOOT Error Record */
> #define CPER_NOTIFY_BOOT \
> - UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \
> - 0xD4, 0x64, 0xB3, 0x8F)
> + UUID_LE(0x3D61A466U, 0xAB40U, 0x409aU, 0xA6U, 0x98U, 0xF3U, 0x62U, \
> + 0xD4U, 0x64U, 0xB3U, 0x8FU)
> /* DMA Remapping Error */
> #define CPER_NOTIFY_DMAR \
> - UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \
> - 0x72, 0x2D, 0xEB, 0x41)
> + UUID_LE(0x667DD791U, 0xC6B3U, 0x4c27U, 0x8AU, 0x6BU, 0x0FU, 0x8EU, \
> + 0x72U, 0x2DU, 0xEBU, 0x41U)
Same remark again regarding excess uses of suffixes. The changes to this
file may want splitting out anyway, as this is an ACPI (APEI) header (and
could hence do with saying so in the subject).
Jan
^ permalink raw reply [flat|nested] 59+ messages in thread