Skip to contentSkip to conversation

KVM: selftests: x86: Prioritize getting max_gfn from GuestPhysBits

PATCH Superseded Tao Su 3 participants 6 messages May 10, 2024 – May 13, 2024

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tao Su

author
#0 lore raw

PATCH v2 1/1 KVM: selftests: x86: Prioritize getting max_gfn from GuestPhysBits

Use the max mappable GPA via GuestPhysBits advertised by KVM to calculate max_gfn. Currently some selftests (e.g. access_tracking_perf_test, dirty_log_test...) add RAM regions close to max_gfn, so guest may access GPA beyond its mappable range and cause infinite loop.

Adjust max_gfn in vm_compute_max_gfn() since x86 selftests already overrides vm_compute_max_gfn() specifically to deal with goofy edge cases.

---
This patch is based on https://github.com/kvm-x86/linux/commit/b628cb523c65

Changelog:
v1 -> v2:
- Only adjust vm->max_gfn in vm_compute_max_gfn()
- Add Yi Lai's Tested-by

v1: https://lore.kernel.org/all/[email protected]/

---
 tools/testing/selftests/kvm/include/x86_64/processor.h |  1 +
 tools/testing/selftests/kvm/lib/x86_64/processor.c     | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
index 81ce37ec407d..ff99f66d81a0 100644
@@ -282,6 +282,7 @@ struct kvm_x86_cpu_property {
 #define X86_PROPERTY_MAX_EXT_LEAF		KVM_X86_CPU_PROPERTY(0x80000000, 0, EAX, 0, 31)
 #define X86_PROPERTY_MAX_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 0, 7)
 #define X86_PROPERTY_MAX_VIRT_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 8, 15)
+#define X86_PROPERTY_MAX_GUEST_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 16, 23)
 #define X86_PROPERTY_SEV_C_BIT			KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 0, 5)
 #define X86_PROPERTY_PHYS_ADDR_REDUCTION	KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 6, 11)
 
tools/testing/selftests/kvm/lib/x86_64/processor.c +8 -2
index 74a4c736c9ae..aa9966ead543 100644
@@ -1293,10 +1293,16 @@ const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)
 unsigned long vm_compute_max_gfn(struct kvm_vm *vm)
 {
 	const unsigned long num_ht_pages = 12 << (30 - vm->page_shift); /* 12 GiB */
-	unsigned long ht_gfn, max_gfn, max_pfn;
+	unsigned long ht_gfn, max_gfn, max_pfn, max_bits = 0;
 	uint8_t maxphyaddr;
 
-	max_gfn = (1ULL << (vm->pa_bits - vm->page_shift)) - 1;
+	if (kvm_cpu_has_p(X86_PROPERTY_MAX_GUEST_PHY_ADDR))
+		max_bits = kvm_cpu_property(X86_PROPERTY_MAX_GUEST_PHY_ADDR);
+
+	if (!max_bits)
+		max_bits = vm->pa_bits;
+
+	max_gfn = (1ULL << (max_bits - vm->page_shift)) - 1;
 
 	/* Avoid reserved HyperTransport region on AMD processors.  */
 	if (!host_cpu_is_amd)

base-commit: 448b3fe5a0eab5b625a7e15c67c7972169e47ff8

Signature · 1 line
2.34.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 41 lines · Tao Su

Use the max mappable GPA via GuestPhysBits advertised by KVM to calculate max_gfn. Currently some selftests (e.g. access_tracking_perf_test, dirty_log_test...) add RAM regions close to max_gfn, so guest may access GPA beyond its mappable range and cause infinite loop.

Adjust max_gfn in vm_compute_max_gfn() since x86 selftests already overrides vm_compute_max_gfn() specifically to deal with goofy edge cases.

---
This patch is based on https://github.com/kvm-x86/linux/commit/b628cb523c65

Changelog:
v1 -> v2:
- Only adjust vm->max_gfn in vm_compute_max_gfn()
- Add Yi Lai's Tested-by

v1: https://lore.kernel.org/all/[email protected]/

---
  tools/testing/selftests/kvm/include/x86_64/processor.h |  1 +
  tools/testing/selftests/kvm/lib/x86_64/processor.c     | 10 ++++++++--
  2 files changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
index 81ce37ec407d..ff99f66d81a0 100644
@@ -282,6 +282,7 @@ struct kvm_x86_cpu_property {
  #define X86_PROPERTY_MAX_EXT_LEAF		KVM_X86_CPU_PROPERTY(0x80000000, 0, EAX, 0, 31)
  #define X86_PROPERTY_MAX_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 0, 7)
  #define X86_PROPERTY_MAX_VIRT_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 8, 15)
+#define X86_PROPERTY_MAX_GUEST_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 16, 23)
  #define X86_PROPERTY_SEV_C_BIT			KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 0, 5)
  #define X86_PROPERTY_PHYS_ADDR_REDUCTION	KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 6, 11)
 
tools/testing/selftests/kvm/lib/x86_64/processor.c +0 -0
index 74a4c736c9ae..aa9966ead543 100644

tools/testing/selftests/kvm/lib/x86_64/processor.c const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu) · line 1300

Quoted 10 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +3 -2
@@ -1293,10 +1293,16 @@ const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)
  unsigned long vm_compute_max_gfn(struct kvm_vm *vm)
  {
  	const unsigned long num_ht_pages = 12 << (30 - vm->page_shift); /* 12 GiB */
-	unsigned long ht_gfn, max_gfn, max_pfn;
+	unsigned long ht_gfn, max_gfn, max_pfn, max_bits = 0;
  	uint8_t maxphyaddr;
 
-	max_gfn = (1ULL << (vm->pa_bits - vm->page_shift)) - 1;
+	if (kvm_cpu_has_p(X86_PROPERTY_MAX_GUEST_PHY_ADDR))
+		max_bits = kvm_cpu_property(X86_PROPERTY_MAX_GUEST_PHY_ADDR);

We can get rid of the kvm_cpu_has_p(X86_PROPERTY_MAX_GUEST_PHY_ADDR) check and call kvm_cpu_property() unconditionally. As a bonus, we don't need to init max_bits as 0.

BTW, could we just name it guest_pa_bits?

Otherwise,

Quoted 10 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +5 -0
+
+	if (!max_bits)
+		max_bits = vm->pa_bits;
+
+	max_gfn = (1ULL << (max_bits - vm->page_shift)) - 1;
 
  	/* Avoid reserved HyperTransport region on AMD processors.  */
  	if (!host_cpu_is_amd)

base-commit: 448b3fe5a0eab5b625a7e15c67c7972169e47ff8

author
#2 lore raw

On Sat, May 11, 2024 at 03:08:16PM +0800, Xiaoyao Li wrote:

[...]

Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +1 -1
index 74a4c736c9ae..aa9966ead543 100644
@@ -1293,10 +1293,16 @@ const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)
  unsigned long vm_compute_max_gfn(struct kvm_vm *vm)
  {
  	const unsigned long num_ht_pages = 12 << (30 - vm->page_shift); /* 12 GiB */
-	unsigned long ht_gfn, max_gfn, max_pfn;
+	unsigned long ht_gfn, max_gfn, max_pfn, max_bits = 0;
Quoted 8 lines

tools/testing/selftests/kvm/lib/x86_64/processor.c const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu) · line 1300

Quoted 4 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +2 -1
  	uint8_t maxphyaddr;
-	max_gfn = (1ULL << (vm->pa_bits - vm->page_shift)) - 1;
+	if (kvm_cpu_has_p(X86_PROPERTY_MAX_GUEST_PHY_ADDR))
+		max_bits = kvm_cpu_property(X86_PROPERTY_MAX_GUEST_PHY_ADDR);

We can get rid of the kvm_cpu_has_p(X86_PROPERTY_MAX_GUEST_PHY_ADDR) check and call kvm_cpu_property() unconditionally. As a bonus, we don't need to init max_bits as 0.

Thanks, good suggestion!

Quoted 2 lines

BTW, could we just name it guest_pa_bits?

Yes, it will be more accurate.

#3 lore raw
In reply to Tao Su
Quoted 41 lines · Tao Su

Use the max mappable GPA via GuestPhysBits advertised by KVM to calculate max_gfn. Currently some selftests (e.g. access_tracking_perf_test, dirty_log_test...) add RAM regions close to max_gfn, so guest may access GPA beyond its mappable range and cause infinite loop.

Adjust max_gfn in vm_compute_max_gfn() since x86 selftests already overrides vm_compute_max_gfn() specifically to deal with goofy edge cases.

---
This patch is based on https://github.com/kvm-x86/linux/commit/b628cb523c65

Changelog:
v1 -> v2:
- Only adjust vm->max_gfn in vm_compute_max_gfn()
- Add Yi Lai's Tested-by

v1: https://lore.kernel.org/all/[email protected]/
---
tools/testing/selftests/kvm/include/x86_64/processor.h | 1 +
tools/testing/selftests/kvm/lib/x86_64/processor.c | 10 ++++++++--

2 files changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
index 81ce37ec407d..ff99f66d81a0 100644
@@ -282,6 +282,7 @@ struct kvm_x86_cpu_property {
 #define X86_PROPERTY_MAX_EXT_LEAF		KVM_X86_CPU_PROPERTY(0x80000000, 0, EAX, 0, 31)
 #define X86_PROPERTY_MAX_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 0, 7)
 #define X86_PROPERTY_MAX_VIRT_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 8, 15)
+#define X86_PROPERTY_MAX_GUEST_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 16, 23)
 #define X86_PROPERTY_SEV_C_BIT			KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 0, 5)
 #define X86_PROPERTY_PHYS_ADDR_REDUCTION	KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 6, 11)
 
tools/testing/selftests/kvm/lib/x86_64/processor.c +0 -0
index 74a4c736c9ae..aa9966ead543 100644

tools/testing/selftests/kvm/lib/x86_64/processor.c const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu) · line 1296

Quoted 5 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +1 -1
@@ -1293,10 +1293,16 @@ const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)
 unsigned long vm_compute_max_gfn(struct kvm_vm *vm)
 {
 	const unsigned long num_ht_pages = 12 << (30 - vm->page_shift); /* 12 GiB */
-	unsigned long ht_gfn, max_gfn, max_pfn;
+	unsigned long ht_gfn, max_gfn, max_pfn, max_bits = 0;

nit: max_bits has only 8 bits. so max_bits should be uint8_t.

Quoted 18 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +7 -1
 	uint8_t maxphyaddr;
 
-	max_gfn = (1ULL << (vm->pa_bits - vm->page_shift)) - 1;
+	if (kvm_cpu_has_p(X86_PROPERTY_MAX_GUEST_PHY_ADDR))
+		max_bits = kvm_cpu_property(X86_PROPERTY_MAX_GUEST_PHY_ADDR);
+
+	if (!max_bits)
+		max_bits = vm->pa_bits;
+
+	max_gfn = (1ULL << (max_bits - vm->page_shift)) - 1;
 
 	/* Avoid reserved HyperTransport region on AMD processors.  */
 	if (!host_cpu_is_amd)

base-commit: 448b3fe5a0eab5b625a7e15c67c7972169e47ff8

Signature · 1 line
2.34.1
author
#4 lore raw
Quoted 37 lines · Chao Gao
Quoted 36 lines · Tao Su

Use the max mappable GPA via GuestPhysBits advertised by KVM to calculate max_gfn. Currently some selftests (e.g. access_tracking_perf_test, dirty_log_test...) add RAM regions close to max_gfn, so guest may access GPA beyond its mappable range and cause infinite loop.

Adjust max_gfn in vm_compute_max_gfn() since x86 selftests already overrides vm_compute_max_gfn() specifically to deal with goofy edge cases.

---
This patch is based on https://github.com/kvm-x86/linux/commit/b628cb523c65

Changelog:
v1 -> v2:
- Only adjust vm->max_gfn in vm_compute_max_gfn()
- Add Yi Lai's Tested-by

v1: https://lore.kernel.org/all/[email protected]/
---
tools/testing/selftests/kvm/include/x86_64/processor.h | 1 +
tools/testing/selftests/kvm/lib/x86_64/processor.c | 10 ++++++++--

2 files changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
index 81ce37ec407d..ff99f66d81a0 100644
@@ -282,6 +282,7 @@ struct kvm_x86_cpu_property {
 #define X86_PROPERTY_MAX_EXT_LEAF		KVM_X86_CPU_PROPERTY(0x80000000, 0, EAX, 0, 31)
 #define X86_PROPERTY_MAX_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 0, 7)
 #define X86_PROPERTY_MAX_VIRT_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 8, 15)
+#define X86_PROPERTY_MAX_GUEST_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 16, 23)
 #define X86_PROPERTY_SEV_C_BIT			KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 0, 5)
 #define X86_PROPERTY_PHYS_ADDR_REDUCTION	KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 6, 11)
 
Quoted 12 lines

tools/testing/selftests/kvm/lib/x86_64/processor.c const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu) · line 1296

Quoted 10 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +1 -1
index 74a4c736c9ae..aa9966ead543 100644
@@ -1293,10 +1293,16 @@ const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)
 unsigned long vm_compute_max_gfn(struct kvm_vm *vm)
 {
 	const unsigned long num_ht_pages = 12 << (30 - vm->page_shift); /* 12 GiB */
-	unsigned long ht_gfn, max_gfn, max_pfn;
+	unsigned long ht_gfn, max_gfn, max_pfn, max_bits = 0;

nit: max_bits has only 8 bits. so max_bits should be uint8_t.

Because vm->pa_bits is unsigned int, I'm worried that the compiler will complain on stricter compilation, what do you think?

Quoted 19 lines
Quoted 19 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +7 -1
 	uint8_t maxphyaddr;
 
-	max_gfn = (1ULL << (vm->pa_bits - vm->page_shift)) - 1;
+	if (kvm_cpu_has_p(X86_PROPERTY_MAX_GUEST_PHY_ADDR))
+		max_bits = kvm_cpu_property(X86_PROPERTY_MAX_GUEST_PHY_ADDR);
+
+	if (!max_bits)
+		max_bits = vm->pa_bits;
+
+	max_gfn = (1ULL << (max_bits - vm->page_shift)) - 1;
 
 	/* Avoid reserved HyperTransport region on AMD processors.  */
 	if (!host_cpu_is_amd)

base-commit: 448b3fe5a0eab5b625a7e15c67c7972169e47ff8

Signature · 1 line
2.34.1
#5 lore raw
Quoted 51 lines · Tao Su
Quoted 37 lines · Chao Gao
Quoted 36 lines · Tao Su

Use the max mappable GPA via GuestPhysBits advertised by KVM to calculate max_gfn. Currently some selftests (e.g. access_tracking_perf_test, dirty_log_test...) add RAM regions close to max_gfn, so guest may access GPA beyond its mappable range and cause infinite loop.

Adjust max_gfn in vm_compute_max_gfn() since x86 selftests already overrides vm_compute_max_gfn() specifically to deal with goofy edge cases.

---
This patch is based on https://github.com/kvm-x86/linux/commit/b628cb523c65

Changelog:
v1 -> v2:
- Only adjust vm->max_gfn in vm_compute_max_gfn()
- Add Yi Lai's Tested-by

v1: https://lore.kernel.org/all/[email protected]/
---
tools/testing/selftests/kvm/include/x86_64/processor.h | 1 +
tools/testing/selftests/kvm/lib/x86_64/processor.c | 10 ++++++++--

2 files changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +1 -0
index 81ce37ec407d..ff99f66d81a0 100644
@@ -282,6 +282,7 @@ struct kvm_x86_cpu_property {
 #define X86_PROPERTY_MAX_EXT_LEAF		KVM_X86_CPU_PROPERTY(0x80000000, 0, EAX, 0, 31)
 #define X86_PROPERTY_MAX_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 0, 7)
 #define X86_PROPERTY_MAX_VIRT_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 8, 15)
+#define X86_PROPERTY_MAX_GUEST_PHY_ADDR		KVM_X86_CPU_PROPERTY(0x80000008, 0, EAX, 16, 23)
 #define X86_PROPERTY_SEV_C_BIT			KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 0, 5)
 #define X86_PROPERTY_PHYS_ADDR_REDUCTION	KVM_X86_CPU_PROPERTY(0x8000001F, 0, EBX, 6, 11)
 
Quoted 12 lines

tools/testing/selftests/kvm/lib/x86_64/processor.c const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu) · line 1296

Quoted 10 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +1 -1
index 74a4c736c9ae..aa9966ead543 100644
@@ -1293,10 +1293,16 @@ const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu)
 unsigned long vm_compute_max_gfn(struct kvm_vm *vm)
 {
 	const unsigned long num_ht_pages = 12 << (30 - vm->page_shift); /* 12 GiB */
-	unsigned long ht_gfn, max_gfn, max_pfn;
+	unsigned long ht_gfn, max_gfn, max_pfn, max_bits = 0;

nit: max_bits has only 8 bits. so max_bits should be uint8_t.

Quoted 2 lines

Because vm->pa_bits is unsigned int, I'm worried that the compiler will complain on stricter compilation, what do you think?

@maxphyaddr (right below) is in the same situation.

And if it was a problem for the compiler, casting vm->page_shift to uint8_t explicitly would be a better solution.

Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
tools/testing/selftests/kvm/lib/x86_64/processor.c +7 -1
 	uint8_t maxphyaddr;
 
-	max_gfn = (1ULL << (vm->pa_bits - vm->page_shift)) - 1;
+	if (kvm_cpu_has_p(X86_PROPERTY_MAX_GUEST_PHY_ADDR))
+		max_bits = kvm_cpu_property(X86_PROPERTY_MAX_GUEST_PHY_ADDR);
+
+	if (!max_bits)
+		max_bits = vm->pa_bits;
+
+	max_gfn = (1ULL << (max_bits - vm->page_shift)) - 1;
 
 	/* Avoid reserved HyperTransport region on AMD processors.  */
 	if (!host_cpu_is_amd)

base-commit: 448b3fe5a0eab5b625a7e15c67c7972169e47ff8

Signature · 1 line
2.34.1