xen/arm: Using unsigned long for arm64 MPIDR mask
PATCH 1/1 xen/arm: Using unsigned long for arm64 MPIDR mask
Curretly, Xen is using UINT32 for MPIDR mask to retrieve affinity[0,1,2,3] values for MPIDR_EL1 register. The value of MPIDR_EL1 is 64-bit unsigned long. The operation of 64-bit and 32-bit integers are compiler related. This means the value is unpredictable.
For example, when we are using MPIDR_AFF0_MASK to get cluster_id from a 64-bit integer in gic-v3 driver:uint64_t cluster_id = cpu_logical_map(cpu) & ~MPIDR_AFF0_MASK;
When MPIDR_AFF0_MASK is UINT32, compiler output:
f7c: 92785c16 and x22, x0, #0xffffff00
When MPIDR_AFF0_MASK is unsigned long, compiler output:
f88: 9278dc75 and x21, x3, #0xffffffffffffff00If we have a cpu_logical_map(cpu)= 0x1,00000000. We except to get a cluster_id 1, but with UINT32 MPIDR_AFF0_MASK, we will get 0.
So, in this patch, we force aarch64 to use unsigned long as MPIDR mask to avoid such unpredictable operations.
--- xen/include/asm-arm/processor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
xen/include/asm-arm/processor.h +3 -3
@@ -75,11 +75,11 @@/* MPIDR Multiprocessor Affinity Register */ #define _MPIDR_UP (30) -#define MPIDR_UP (_AC(1,U) << _MPIDR_UP) +#define MPIDR_UP (_AC(1,UL) << _MPIDR_UP)#define _MPIDR_SMP (31) -#define MPIDR_SMP (_AC(1,U) << _MPIDR_SMP) +#define MPIDR_SMP (_AC(1,UL) << _MPIDR_SMP)#define MPIDR_AFF0_SHIFT (0) -#define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) +#define MPIDR_AFF0_MASK (_AC(0xff,UL) << MPIDR_AFF0_SHIFT)#ifdef CONFIG_ARM_64 #define MPIDR_HWID_MASK _AC(0xff00ffffff,UL)#else
Signature · 1 line
2.25.1
Hi Wei,
Quoted 1 line · Wei Chen
Curretly, Xen is using UINT32 for MPIDR mask to retrieve
s/Curretly/Currently/
Quoted 4 lines
affinity[0,1,2,3] values for
MPIDR_EL1register. The value ofMPIDR_EL1is 64-bit unsigned long. The operation of 64-bit and 32-bit integers are compiler related. This means the value is unpredictable.
So I agree that ~MPIDR_AFF0_MASK will do the negation in 32-bit rather than 64-bit. However, I disagree that this is unpredicable or compiler specific.
Quoted 5 lines
For example, when we are using
MPIDR_AFF0_MASKto getcluster_idfrom a 64-bit integer in gic-v3 driver:uint64_tcluster_id=cpu_logical_map(cpu)& ~MPIDR_AFF0_MASK;
Quoted 8 lines
When
MPIDR_AFF0_MASKis UINT32, compiler output:f7c: 92785c16 and x22, x0, #0xffffff00 When MPIDR_AFF0_MASK is unsigned long, compiler output: f88: 9278dc75 and x21, x3, #0xffffffffffffff00If we have a cpu_logical_map(cpu)= 0x1,00000000. We except to get a
cluster_id1, but with UINT32MPIDR_AFF0_MASK, we will get 0.
Something doesn't match here. If the cluster_id were 1, then it should surely be 1 as well even with the 32-bit mask because there is no shift.
So did you intend to say 0x1,00000000?
Quoted 3 lines
So, in this patch, we force aarch64 to use unsigned long as MPIDR mask to avoid such unpredictable operations.
Per above, I don't think this is unpredictable.
Quoted 26 lines
Signed-off-by Wei Chen <[email protected]>--- xen/include/asm-arm/processor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)xen/include/asm-arm/processor.h +3
-3@@ -75,11 +75,11 @@/* MPIDR Multiprocessor Affinity Register */ #define _MPIDR_UP (30) -#define MPIDR_UP (_AC(1,U) << _MPIDR_UP) +#define MPIDR_UP (_AC(1,UL) << _MPIDR_UP)#define _MPIDR_SMP (31) -#define MPIDR_SMP (_AC(1,U) << _MPIDR_SMP) +#define MPIDR_SMP (_AC(1,UL) << _MPIDR_SMP)#define MPIDR_AFF0_SHIFT (0) -#define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) +#define MPIDR_AFF0_MASK (_AC(0xff,UL) << MPIDR_AFF0_SHIFT)#ifdef CONFIG_ARM_64 #define MPIDR_HWID_MASK _AC(0xff00ffffff,UL)#else
Signature · 1 line
Julien Grall
Hi Julien,
Quoted 10 lines
-----Original Message-----
From: Julien Grall <[email protected]>
Sent: 2021年1月5日 19:01
To: Wei Chen <[email protected]>; [email protected]; [email protected]
Cc: Bertrand Marquis <[email protected]>; Penny Zheng <[email protected]>; Jiamei Xie <[email protected]>; nd <[email protected]>
Subject: Re: [PATCH] xen/arm: Using unsigned long for arm64 MPIDR mask
Quoted 7 lines
Hi Wei,
Quoted 1 line · Wei Chen
Curretly, Xen is using UINT32 for MPIDR mask to retrieve
s/Curretly/Currently/
got it.
Quoted 9 lines
Quoted 4 lines
affinity[0,1,2,3] values for
MPIDR_EL1register. The value ofMPIDR_EL1is 64-bit unsigned long. The operation of 64-bit and 32-bit integers are compiler related. This means the value is unpredictable.So I agree that ~MPIDR_AFF0_MASK will do the negation in 32-bit rather than 64-bit. However, I disagree that this is unpredicable or compiler specific.
Yeah, I agree with you, my commit message here is not accurate. This problem hadn't been found so far, so I had thought maybe someone can work well with aff3. From the code, Xen had used 'U' for constant in MPIDR_AFF0_MASK, so it would always be a unsigned extend. The aff3 will be dropped. I will update my commit message in next version.
Quoted 10 lines
Quoted 10 lines
For example, when we are using
MPIDR_AFF0_MASKto getcluster_idfrom a 64-bit integer in gic-v3 driver:uint64_tcluster_id=cpu_logical_map(cpu)& ~MPIDR_AFF0_MASK;When
MPIDR_AFF0_MASKis UINT32, compiler output:f7c: 92785c16 and x22, x0, #0xffffff00 When MPIDR_AFF0_MASK is unsigned long, compiler output: f88: 9278dc75 and x21, x3, #0xffffffffffffff00
Quoted 9 lines
Quoted 3 lines
If we have a cpu_logical_map(cpu)= 0x1,00000000. We except to get a
cluster_id1, but with UINT32MPIDR_AFF0_MASK, we will get 0.Something doesn't match here. If the
cluster_idwere 1, then it should surely be 1 as well even with the 32-bit mask because there is no shift.So did you intend to say 0x1,00000000?
Sorry, I copied the value from device tree node name. I intend to say the cpu_logical_map(cpu)= 0x100000000UL, the aff3 (bit32 ~ 39) is 1.
I am not sure we are in the same page of cluster_id. The cluster_id I mentioned above is a variable in gicv3_send_sgi_list function. The cluster_id you had mentioned is aff2?
Quoted 5 lines
Quoted 3 lines
So, in this patch, we force aarch64 to use unsigned long as MPIDR mask to avoid such unpredictable operations.
Per above, I don't think this is unpredictable.
I will remove the last part of above sentence.
Quoted 31 lines
xen/include/asm-
Quoted 8 lines
Signed-off-by Wei Chen <[email protected]>--- xen/include/asm-arm/processor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)xen/include/asm- renamed from xen/include/asm-arm/processor.h +0
-0
arm/processor.hQuoted 9 lines
index
87c8136022..5c1768cdec100644xen/include/asm-arm/processor.h +0
-1@@ -75,11 +75,11 @@/* MPIDR Multiprocessor Affinity Register */ #define _MPIDR_UP (30) -#define MPIDR_UP (_AC(1,U) << _MPIDR_UP)xen/include/asm-arm/processor.h line 85
Quoted 10 lines
xen/include/asm-arm/processor.h +3
-2+#define MPIDR_UP (_AC(1,UL) << _MPIDR_UP)#define _MPIDR_SMP (31) -#define MPIDR_SMP (_AC(1,U) << _MPIDR_SMP) +#define MPIDR_SMP (_AC(1,UL) << _MPIDR_SMP)#define MPIDR_AFF0_SHIFT (0) -#define MPIDR_AFF0_MASK (_AC(0xff,U) << MPIDR_AFF0_SHIFT) +#define MPIDR_AFF0_MASK (_AC(0xff,UL) << MPIDR_AFF0_SHIFT)#ifdef CONFIG_ARM_64 #define MPIDR_HWID_MASK _AC(0xff00ffffff,UL)#else --
Julien Grall