Skip to contentSkip to conversation

KVM: selftests: Ignore KVM 5-level paging support for VM_MODE_PXXV48_4K

PATCH In review Sean Christopherson 2 participants 4 messages May 28, 2020 – Jun 9, 2020

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

PATCH 1/1 KVM: selftests: Ignore KVM 5-level paging support for VM_MODE_PXXV48_4K

Explicitly set the VA width to 48 bits for the x86_64-only PXXV48_4K VM mode instead of asserting the guest VA width is 48 bits. The fact that KVM supports 5-level paging is irrelevant unless the selftests opt-in to 5-level paging by setting CR4.LA57 for the guest. The overzealous assert prevents running the selftests on a kernel with 5-level paging enabled.

Incorporate LA57 into the assert instead of removing the assert entirely as a sanity check of KVM's CPUID output.

Fixes 567a9f1e9deb ("KVM: selftests: Introduce VM_MODE_PXXV48_4K")
Cc Adriana Cervantes Jimenez <[email protected]>
Cc Peter Xu <[email protected]>
---
 tools/testing/selftests/kvm/lib/kvm_util.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +9 -2
index c9cede5c7d0de..74776ee228f2d 100644
@@ -195,11 +195,18 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)
 	case VM_MODE_PXXV48_4K:
 #ifdef __x86_64__
 		kvm_get_cpu_address_width(&vm->pa_bits, &vm->va_bits);
-		TEST_ASSERT(vm->va_bits == 48, "Linear address width "
-			    "(%d bits) not supported", vm->va_bits);
+		/*
+		 * Ignore KVM support for 5-level paging (vm->va_bits == 57),
+		 * it doesn't take effect unless a CR4.LA57 is set, which it
+		 * isn't for this VM_MODE.
+		 */
+		TEST_ASSERT(vm->va_bits == 48 || vm->va_bits == 57,
+			    "Linear address width (%d bits) not supported",
+			    vm->va_bits);
 		pr_debug("Guest physical address width detected: %d\n",
 			 vm->pa_bits);
 		vm->pgtable_levels = 4;
+		vm->va_bits = 48;
 #else
 		TEST_FAIL("VM_MODE_PXXV48_4K not supported on non-x86 platforms");
 #endif
Signature · 1 line
2.26.0
maintainer
#1 lore raw
Quoted 35 lines · Sean Christopherson

Explicitly set the VA width to 48 bits for the x86_64-only PXXV48_4K VM mode instead of asserting the guest VA width is 48 bits. The fact that KVM supports 5-level paging is irrelevant unless the selftests opt-in to 5-level paging by setting CR4.LA57 for the guest. The overzealous assert prevents running the selftests on a kernel with 5-level paging enabled.

Incorporate LA57 into the assert instead of removing the assert entirely as a sanity check of KVM's CPUID output.

Fixes 567a9f1e9deb ("KVM: selftests: Introduce VM_MODE_PXXV48_4K")
Cc Adriana Cervantes Jimenez <[email protected]>
Cc Peter Xu <[email protected]>
---
 tools/testing/selftests/kvm/lib/kvm_util.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +5 -2
index c9cede5c7d0de..74776ee228f2d 100644
@@ -195,11 +195,18 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)
 	case VM_MODE_PXXV48_4K:
 #ifdef __x86_64__
 		kvm_get_cpu_address_width(&vm->pa_bits, &vm->va_bits);
-		TEST_ASSERT(vm->va_bits == 48, "Linear address width "
-			    "(%d bits) not supported", vm->va_bits);
+		/*
+		 * Ignore KVM support for 5-level paging (vm->va_bits == 57),
+		 * it doesn't take effect unless a CR4.LA57 is set, which it
+		 * isn't for this VM_MODE.
+		 */

tools/testing/selftests/kvm/lib/kvm_util.c struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) · line 212

Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +4 -0
+		TEST_ASSERT(vm->va_bits == 48 || vm->va_bits == 57,
+			    "Linear address width (%d bits) not supported",
+			    vm->va_bits);
 		pr_debug("Guest physical address width detected: %d\n",
 			 vm->pa_bits);
 		vm->pgtable_levels = 4;
+		vm->va_bits = 48;
 #else
 		TEST_FAIL("VM_MODE_PXXV48_4K not supported on non-x86 platforms");
 #endif

Queued, thnaks.

Paolo

#2 lore raw
Quoted 49 lines · Paolo Bonzini
Quoted 35 lines · Sean Christopherson

Explicitly set the VA width to 48 bits for the x86_64-only PXXV48_4K VM mode instead of asserting the guest VA width is 48 bits. The fact that KVM supports 5-level paging is irrelevant unless the selftests opt-in to 5-level paging by setting CR4.LA57 for the guest. The overzealous assert prevents running the selftests on a kernel with 5-level paging enabled.

Incorporate LA57 into the assert instead of removing the assert entirely as a sanity check of KVM's CPUID output.

Fixes 567a9f1e9deb ("KVM: selftests: Introduce VM_MODE_PXXV48_4K")
Cc Adriana Cervantes Jimenez <[email protected]>
Cc Peter Xu <[email protected]>
---
 tools/testing/selftests/kvm/lib/kvm_util.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +5 -2
index c9cede5c7d0de..74776ee228f2d 100644
@@ -195,11 +195,18 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)
 	case VM_MODE_PXXV48_4K:
 #ifdef __x86_64__
 		kvm_get_cpu_address_width(&vm->pa_bits, &vm->va_bits);
-		TEST_ASSERT(vm->va_bits == 48, "Linear address width "
-			    "(%d bits) not supported", vm->va_bits);
+		/*
+		 * Ignore KVM support for 5-level paging (vm->va_bits == 57),
+		 * it doesn't take effect unless a CR4.LA57 is set, which it
+		 * isn't for this VM_MODE.
+		 */

tools/testing/selftests/kvm/lib/kvm_util.c struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) · line 212

Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +4 -0
+		TEST_ASSERT(vm->va_bits == 48 || vm->va_bits == 57,
+			    "Linear address width (%d bits) not supported",
+			    vm->va_bits);
 		pr_debug("Guest physical address width detected: %d\n",
 			 vm->pa_bits);
 		vm->pgtable_levels = 4;
+		vm->va_bits = 48;
 #else
 		TEST_FAIL("VM_MODE_PXXV48_4K not supported on non-x86 platforms");
 #endif

Queued, thnaks.

Quoted 1 line

Paolo

Looks like this one also got lost in the 5.7 -> 5.8 transition.

maintainer
#3 lore raw
Quoted 50 lines · Sean Christopherson
Quoted 49 lines · Paolo Bonzini
Quoted 35 lines · Sean Christopherson

Explicitly set the VA width to 48 bits for the x86_64-only PXXV48_4K VM mode instead of asserting the guest VA width is 48 bits. The fact that KVM supports 5-level paging is irrelevant unless the selftests opt-in to 5-level paging by setting CR4.LA57 for the guest. The overzealous assert prevents running the selftests on a kernel with 5-level paging enabled.

Incorporate LA57 into the assert instead of removing the assert entirely as a sanity check of KVM's CPUID output.

Fixes 567a9f1e9deb ("KVM: selftests: Introduce VM_MODE_PXXV48_4K")
Cc Adriana Cervantes Jimenez <[email protected]>
Cc Peter Xu <[email protected]>
---
 tools/testing/selftests/kvm/lib/kvm_util.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +5 -2
index c9cede5c7d0de..74776ee228f2d 100644
@@ -195,11 +195,18 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm)
 	case VM_MODE_PXXV48_4K:
 #ifdef __x86_64__
 		kvm_get_cpu_address_width(&vm->pa_bits, &vm->va_bits);
-		TEST_ASSERT(vm->va_bits == 48, "Linear address width "
-			    "(%d bits) not supported", vm->va_bits);
+		/*
+		 * Ignore KVM support for 5-level paging (vm->va_bits == 57),
+		 * it doesn't take effect unless a CR4.LA57 is set, which it
+		 * isn't for this VM_MODE.
+		 */

tools/testing/selftests/kvm/lib/kvm_util.c struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) · line 212

Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +4 -0
+		TEST_ASSERT(vm->va_bits == 48 || vm->va_bits == 57,
+			    "Linear address width (%d bits) not supported",
+			    vm->va_bits);
 		pr_debug("Guest physical address width detected: %d\n",
 			 vm->pa_bits);
 		vm->pgtable_levels = 4;
+		vm->va_bits = 48;
 #else
 		TEST_FAIL("VM_MODE_PXXV48_4K not supported on non-x86 platforms");
 #endif

Queued, thnaks.

Quoted 4 lines
Quoted 1 line

Paolo

Looks like this one also got lost in the 5.7 -> 5.8 transition.

Indeed, added back to the queue now.

Paolo