Skip to contentSkip to conversation

x86/lam: Allocate test page from AREA_LOW instead of AREA_NORMAL

PATCH Applied Yexuan Yang 3 participants 3 messages Jul 16 – Sep 25 KVM

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 x86/lam: Allocate test page from AREA_LOW instead of AREA_NORMAL

The lam test does not set a guest memory size in x86/unittests.cfg, so QEMU falls back to the default of 128 MiB. AREA_NORMAL starts at PFN BIT(36-12), i.e. physical 64 GiB, which is never initialized in a 128 MiB guest. As a result, alloc_pages_flags(0, AREA_NORMAL) returns NULL and test_lam_user() ends up running its LAM checks against a NULL pointer, which is semantically meaningless even if the metadata-bit arithmetic happens to succeed.

Allocate from AREA_LOW instead. AREA_LOW_PFN is BIT(24-12) (16 MiB), well within a 128 MiB guest, and bits 63..47 of the resulting linear address are still zero, so the LAM48/LAM57 metadata-bit checks remain valid. Update the adjacent comment accordingly.

Fixes 0164d7595c85 ("x86: Add test cases for LAM_{U48,U57}")

---
v4: Change author information.
v3: Change static_assert to assert.

    https://lore.kernel.org/all/[email protected]/
v2: Assert vaddr instead of pfn.
    https://lore.kernel.org/all/[email protected]/

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

 x86/lam.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
x86/lam.c +3 -3
index 87efc5dd..63a36539 100644
@@ -231,13 +231,13 @@ static void test_lam_user(void)
 	bool has_lam = this_cpu_has(X86_FEATURE_LAM);
 
 	/*
-	 * The physical address of AREA_NORMAL is within 36 bits, so that using
+	 * The physical address of AREA_LOW is within 36 bits, so that using
 	 * identical mapping, the linear address will be considered as user mode
 	 * address from the view of LAM, and the metadata bits are not used as
 	 * address for both LAM48 and LAM57.
 	 */
-	vaddr = alloc_pages_flags(0, AREA_NORMAL);
-	static_assert((AREA_NORMAL_PFN & GENMASK(63, 47)) == 0UL);
+	vaddr = alloc_pages_flags(0, AREA_LOW);
+	assert(((u64)vaddr & GENMASK(63, 47)) == 0UL);
 
 	/*
 	 * Note, LAM doesn't have a global control bit to turn on/off LAM
Signature · 1 line
2.54.0
Reviewed-by on v4 1/1
#1 lore raw
Quoted 8 lines · Yexuan Yang

The lam test does not set a guest memory size in x86/unittests.cfg, so QEMU falls back to the default of 128 MiB. AREA_NORMAL starts at PFN BIT(36-12), i.e. physical 64 GiB, which is never initialized in a 128 MiB guest. As a result, alloc_pages_flags(0, AREA_NORMAL) returns NULL and test_lam_user() ends up running its LAM checks against a NULL pointer, which is semantically meaningless even if the metadata-bit arithmetic happens to succeed.

Quoted 7 lines

Allocate from AREA_LOW instead. AREA_LOW_PFN is BIT(24-12) (16 MiB), well within a 128 MiB guest, and bits 63..47 of the resulting linear address are still zero, so the LAM48/LAM57 metadata-bit checks remain valid. Update the adjacent comment accordingly.

Fixes 0164d7595c85 ("x86: Add test cases for LAM_{U48,U57}")
Quoted 32 lines

---
v4: Change author information.
v3: Change static_assert to assert.

    https://lore.kernel.org/all/[email protected]/
v2: Assert vaddr instead of pfn.
    https://lore.kernel.org/all/[email protected]/

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

 x86/lam.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
x86/lam.c +3 -3
index 87efc5dd..63a36539 100644
@@ -231,13 +231,13 @@ static void test_lam_user(void)
 	bool has_lam = this_cpu_has(X86_FEATURE_LAM);
 
 	/*
-	 * The physical address of AREA_NORMAL is within 36 bits, so that using
+	 * The physical address of AREA_LOW is within 36 bits, so that using
 	 * identical mapping, the linear address will be considered as user mode
 	 * address from the view of LAM, and the metadata bits are not used as
 	 * address for both LAM48 and LAM57.
 	 */
-	vaddr = alloc_pages_flags(0, AREA_NORMAL);
-	static_assert((AREA_NORMAL_PFN & GENMASK(63, 47)) == 0UL);
+	vaddr = alloc_pages_flags(0, AREA_LOW);
+	assert(((u64)vaddr & GENMASK(63, 47)) == 0UL);
 
 	/*
 	 * Note, LAM doesn't have a global control bit to turn on/off LAM
reviewer Applied
#2 lore raw
In reply to Yexuan Yang
Quoted 9 lines · Yexuan Yang

The lam test does not set a guest memory size in x86/unittests.cfg, so QEMU falls back to the default of 128 MiB. AREA_NORMAL starts at PFN BIT(36-12), i.e. physical 64 GiB, which is never initialized in a 128 MiB guest. As a result, alloc_pages_flags(0, AREA_NORMAL) returns NULL and test_lam_user() ends up running its LAM checks against a NULL pointer, which is semantically meaningless even if the metadata-bit arithmetic happens to succeed.

[...]

Applied to kvm-x86 next, thanks!

[1/1] x86/lam: Allocate test page from AREA_LOW instead of AREA_NORMAL

      https://github.com/kvm-x86/kvm-unit-tests/commit/5ce4dcd089c1

--
https://github.com/kvm-x86/kvm-unit-tests/tree/next