Skip to contentSkip to conversation

arm64: KVM: Fix HCR_EL2 and VTCR_EL2 configuration bits

PATCH Superseded Pranavkumar Sawargaonkar 3 participants 5 messages May 10, 2013 – May 14, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 arm64: KVM: Fix HCR_EL2 and VTCR_EL2 configuration bits

This patch does following fixes:

1. Make HCR_* flags as unsigned long long constants Reason : By default, compiler assumes numeric constants as signed hence sign extending it when assigned to unsigned variable such as hcr_el2 (in VCPU context). This accidently sets HCR_ID and HCR_CD making entire guest memory non-cacheable. On real HW, this breaks Stage2 ttbl walks and also breaks VirtIO.

2. VTCR_EL2_ORGN0_WBWA and VTCR_EL2_IRGN0_WBWA macros.

---
 arch/arm64/include/asm/kvm_arm.h |   73 +++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 36 deletions(-)
arch/arm64/include/asm/kvm_arm.h +37 -36
index 8ced0ca..14ead69 100644
@@ -18,44 +18,45 @@
 #ifndef __ARM64_KVM_ARM_H__
 #define __ARM64_KVM_ARM_H__
 
+#include <linux/const.h>
 #include <asm/types.h>
 
 /* Hyp Configuration Register (HCR) bits */
-#define HCR_ID		(1 << 33)
-#define HCR_CD		(1 << 32)
+#define HCR_ID		(UL(0x1) << 33)
+#define HCR_CD		(UL(0x1) << 32)
 #define HCR_RW_SHIFT	31
-#define HCR_RW		(1 << HCR_RW_SHIFT)
-#define HCR_TRVM	(1 << 30)
-#define HCR_HCD		(1 << 29)
-#define HCR_TDZ		(1 << 28)
-#define HCR_TGE		(1 << 27)
-#define HCR_TVM		(1 << 26)
-#define HCR_TTLB	(1 << 25)
-#define HCR_TPU		(1 << 24)
-#define HCR_TPC		(1 << 23)
-#define HCR_TSW		(1 << 22)
-#define HCR_TAC		(1 << 21)
-#define HCR_TIDCP	(1 << 20)
-#define HCR_TSC		(1 << 19)
-#define HCR_TID3	(1 << 18)
-#define HCR_TID2	(1 << 17)
-#define HCR_TID1	(1 << 16)
-#define HCR_TID0	(1 << 15)
-#define HCR_TWE		(1 << 14)
-#define HCR_TWI		(1 << 13)
-#define HCR_DC		(1 << 12)
-#define HCR_BSU		(3 << 10)
-#define HCR_BSU_IS	(1 << 10)
-#define HCR_FB		(1 << 9)
-#define HCR_VA		(1 << 8)
-#define HCR_VI		(1 << 7)
-#define HCR_VF		(1 << 6)
-#define HCR_AMO		(1 << 5)
-#define HCR_IMO		(1 << 4)
-#define HCR_FMO		(1 << 3)
-#define HCR_PTW		(1 << 2)
-#define HCR_SWIO	(1 << 1)
-#define HCR_VM		(1)
+#define HCR_RW		(UL(0x1) << HCR_RW_SHIFT)
+#define HCR_TRVM	(UL(0x1) << 30)
+#define HCR_HCD		(UL(0x1) << 29)
+#define HCR_TDZ		(UL(0x1) << 28)
+#define HCR_TGE		(UL(0x1) << 27)
+#define HCR_TVM		(UL(0x1) << 26)
+#define HCR_TTLB	(UL(0x1) << 25)
+#define HCR_TPU		(UL(0x1) << 24)
+#define HCR_TPC		(UL(0x1) << 23)
+#define HCR_TSW		(UL(0x1) << 22)
+#define HCR_TAC		(UL(0x1) << 21)
+#define HCR_TIDCP	(UL(0x1) << 20)
+#define HCR_TSC		(UL(0x1) << 19)
+#define HCR_TID3	(UL(0x1) << 18)
+#define HCR_TID2	(UL(0x1) << 17)
+#define HCR_TID1	(UL(0x1) << 16)
+#define HCR_TID0	(UL(0x1) << 15)
+#define HCR_TWE		(UL(0x1) << 14)
+#define HCR_TWI		(UL(0x1) << 13)
+#define HCR_DC		(UL(0x1) << 12)
+#define HCR_BSU		(UL(0x3) << 10)
+#define HCR_BSU_IS	(UL(0x1) << 10)
+#define HCR_FB		(UL(0x1) << 9)
+#define HCR_VA		(UL(0x1) << 8)
+#define HCR_VI		(UL(0x1) << 7)
+#define HCR_VF		(UL(0x1) << 6)
+#define HCR_AMO		(UL(0x1) << 5)
+#define HCR_IMO		(UL(0x1) << 4)
+#define HCR_FMO		(UL(0x1) << 3)
+#define HCR_PTW		(UL(0x1) << 2)
+#define HCR_SWIO	(UL(0x1) << 1)
+#define HCR_VM		(UL(0x1))
 
 /*
  * The bits we set in HCR:
@@ -111,9 +112,9 @@
 #define VTCR_EL2_SH0_MASK	(3 << 12)
 #define VTCR_EL2_SH0_INNER	(3 << 12)
 #define VTCR_EL2_ORGN0_MASK	(3 << 10)
-#define VTCR_EL2_ORGN0_WBWA	(3 << 10)
+#define VTCR_EL2_ORGN0_WBWA	(1 << 10)
 #define VTCR_EL2_IRGN0_MASK	(3 << 8)
-#define VTCR_EL2_IRGN0_WBWA	(3 << 8)
+#define VTCR_EL2_IRGN0_WBWA	(1 << 8)
 #define VTCR_EL2_SL0_MASK	(3 << 6)
 #define VTCR_EL2_SL0_LVL1	(1 << 6)
 #define VTCR_EL2_T0SZ_MASK	0x3f
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 arm64: KVM: Fix HCR_EL2 and VTCR_EL2 configuration bits

Hi Pranavkumar,

Quoted 23 lines · Pranavkumar Sawargaonkar

This patch does following fixes:

1. Make HCR_* flags as unsigned long long constants Reason : By default, compiler assumes numeric constants as signed hence sign extending it when assigned to unsigned variable such as hcr_el2 (in VCPU context). This accidently sets HCR_ID and HCR_CD making entire guest memory non-cacheable. On real HW, this breaks Stage2 ttbl walks and also breaks VirtIO.

2. VTCR_EL2_ORGN0_WBWA and VTCR_EL2_IRGN0_WBWA macros.

---
 arch/arm64/include/asm/kvm_arm.h |   73 +++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 36 deletions(-)
arch/arm64/include/asm/kvm_arm.h +0 -0
index 8ced0ca..14ead69 100644
@@ -18,44 +18,45 @@
 #ifndef __ARM64_KVM_ARM_H__

arch/arm64/include/asm/kvm_arm.h line 26

Quoted 10 lines
arch/arm64/include/asm/kvm_arm.h +3 -2
 #define __ARM64_KVM_ARM_H__
 
+#include <linux/const.h>
 #include <asm/types.h>
 
 /* Hyp Configuration Register (HCR) bits */
-#define HCR_ID		(1 << 33)
-#define HCR_CD		(1 << 32)
+#define HCR_ID		(UL(0x1) << 33)
+#define HCR_CD		(UL(0x1) << 32)

Consider using the BIT() macro from linux/bitops.h to improve readability.

[...]

Christopher

Signature · 3 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by the Linux Foundation.
#2 lore raw

PATCH v2 1/1 arm64: KVM: Fix HCR_EL2 and VTCR_EL2 configuration bits

Quoted 33 lines · Christopher Covington

Hi Pranavkumar,

Quoted 30 lines · Pranavkumar Sawargaonkar

This patch does following fixes:

1. Make HCR_* flags as unsigned long long constants Reason : By default, compiler assumes numeric constants as signed hence sign extending it when assigned to unsigned variable such as hcr_el2 (in VCPU context). This accidently sets HCR_ID and HCR_CD making entire guest memory non-cacheable. On real HW, this breaks Stage2 ttbl walks and also breaks VirtIO.

2. VTCR_EL2_ORGN0_WBWA and VTCR_EL2_IRGN0_WBWA macros.

---
 arch/arm64/include/asm/kvm_arm.h |   73
 +++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 36 deletions(-)
arch/arm64/include/asm/kvm_arm.h +1 -0
index 8ced0ca..14ead69 100644
@@ -18,44 +18,45 @@
 #ifndef __ARM64_KVM_ARM_H__
 #define __ARM64_KVM_ARM_H__
 
+#include <linux/const.h>
 #include <asm/types.h>
 
Quoted 7 lines

arch/arm64/include/asm/kvm_arm.h line 26

Quoted 5 lines
arch/arm64/include/asm/kvm_arm.h +2 -2
 /* Hyp Configuration Register (HCR) bits */
-#define HCR_ID		(1 << 33)
-#define HCR_CD		(1 << 32)
+#define HCR_ID		(UL(0x1) << 33)
+#define HCR_CD		(UL(0x1) << 32)

Consider using the BIT() macro from linux/bitops.h to improve

readability.

This would probably cause problems when using these macros from assembly code.

        M.
Signature · 1 line
Fast, cheap, reliable. Pick two.
#3 lore raw

PATCH v2 1/1 arm64: KVM: Fix HCR_EL2 and VTCR_EL2 configuration bits

Quoted 42 lines · Marc Zyngier
Quoted 33 lines · Christopher Covington

Hi Pranavkumar,

Quoted 30 lines · Pranavkumar Sawargaonkar

This patch does following fixes:

1. Make HCR_* flags as unsigned long long constants Reason : By default, compiler assumes numeric constants as signed hence sign extending it when assigned to unsigned variable such as hcr_el2 (in VCPU context). This accidently sets HCR_ID and HCR_CD making entire guest memory non-cacheable. On real HW, this breaks Stage2 ttbl walks and also breaks VirtIO.

2. VTCR_EL2_ORGN0_WBWA and VTCR_EL2_IRGN0_WBWA macros.

---
 arch/arm64/include/asm/kvm_arm.h |   73
 +++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 36 deletions(-)
arch/arm64/include/asm/kvm_arm.h +1 -0
index 8ced0ca..14ead69 100644
@@ -18,44 +18,45 @@
 #ifndef __ARM64_KVM_ARM_H__
 #define __ARM64_KVM_ARM_H__
 
+#include <linux/const.h>
 #include <asm/types.h>
 
Quoted 7 lines

arch/arm64/include/asm/kvm_arm.h line 26

Quoted 5 lines
arch/arm64/include/asm/kvm_arm.h +2 -2
 /* Hyp Configuration Register (HCR) bits */
-#define HCR_ID		(1 << 33)
-#define HCR_CD		(1 << 32)
+#define HCR_ID		(UL(0x1) << 33)
+#define HCR_CD		(UL(0x1) << 32)

Consider using the BIT() macro from linux/bitops.h to improve

Quoted 4 lines

readability.

This would probably cause problems when using these macros from assembly code.

It does indeed cause problems. What a shame. How about a quick local definition, to perhaps be eventually replaced by a more accessible shared definition?

Christopher

Signature · 3 lines
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by the Linux Foundation.
#4 lore raw

PATCH v2 1/1 arm64: KVM: Fix HCR_EL2 and VTCR_EL2 configuration bits

Hi Christopher,

Quoted 43 lines · Christopher Covington
Quoted 42 lines · Marc Zyngier
Quoted 40 lines · Christopher Covington

Hi Pranavkumar,

Quoted 25 lines · Pranavkumar Sawargaonkar

This patch does following fixes:

1. Make HCR_* flags as unsigned long long constants Reason : By default, compiler assumes numeric constants as signed hence sign extending it when assigned to unsigned variable such as hcr_el2 (in VCPU context). This accidently sets HCR_ID and HCR_CD making entire guest memory non-cacheable. On real HW, this breaks Stage2 ttbl walks and also breaks VirtIO.

2. VTCR_EL2_ORGN0_WBWA and VTCR_EL2_IRGN0_WBWA macros.

---
 arch/arm64/include/asm/kvm_arm.h |   73
 +++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 36 deletions(-)
arch/arm64/include/asm/kvm_arm.h +0 -0
index 8ced0ca..14ead69 100644
@@ -18,44 +18,45 @@
 #ifndef __ARM64_KVM_ARM_H__

arch/arm64/include/asm/kvm_arm.h line 26

Quoted 10 lines
arch/arm64/include/asm/kvm_arm.h +3 -2
 #define __ARM64_KVM_ARM_H__
 
+#include <linux/const.h>
 #include <asm/types.h>
 
 /* Hyp Configuration Register (HCR) bits */
-#define HCR_ID             (1 << 33)
-#define HCR_CD             (1 << 32)
+#define HCR_ID             (UL(0x1) << 33)
+#define HCR_CD             (UL(0x1) << 32)

Consider using the BIT() macro from linux/bitops.h to improve

Quoted 8 lines
Quoted 4 lines

readability.

This would probably cause problems when using these macros from assembly code.

It does indeed cause problems. What a shame. How about a quick local definition, to perhaps be eventually replaced by a more accessible shared definition?

I have used UL to be synced with current arm64 code style (it has been used in other files also).
Using BIT is good idea (not sure about local definition i.e. how good it is when we have one inside bitops.h)
but if we want to use it is, then better idea is to use it everywhere.

Quoted 2 lines

Christopher

Thanks,
Pranav

Quoted 5 lines

--
Employee of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation.