| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250822070554.26523-1-yan.y.zhao@intel.com>
Date: Fri, 22 Aug 2025 15:05:54 +0800
From: Yan Zhao <yan.y.zhao@...el.com>
To: pbonzini@...hat.com,
seanjc@...gle.com
Cc: reinette.chatre@...el.com,
rick.p.edgecombe@...el.com,
linux-kernel@...r.kernel.org,
kvm@...r.kernel.org,
Yan Zhao <yan.y.zhao@...el.com>
Subject: [PATCH v2 3/3] KVM: selftests: Test prefault memory during concurrent memslot removal
Test prefault memory during concurrent memslot removal.
Add a new param "remove_slot" to pre_fault_memory() to indicate testing
concurrent memslot removal. When "remove_slot" is set:
Create a remove_thread which deletes the test slot concurrently while the
main thread is executing ioctl KVM_PRE_FAULT_MEMORY on the test slot memory
range.
Introduce variables "delete_thread_ready" and "prefault_ready" to
synchronize the slot removal and ioctl KVM_PRE_FAULT_MEMORY. When the
concurrency is achieved, ioctl KVM_PRE_FAULT_MEMORY should return the error
EAGAIN. Otherwise, the ioctl should succeed as in cases where remove_slot
is not set.
Retry ioctl KVM_PRE_FAULT_MEMORY upon receiving EAGAIN. Since the memslot
should have been successfully removed during the retry, EFAULT or ENOENT
should be returned depending on whether the prefault is for private or
shared memory.
Split the existing "gpa" parameter in pre_fault_memory() into "base_gpa"
and "offset" to facilitate adding the test slot back to "base_gpa" after
the test concludes, ensuring that subsequent tests are not affected.
Signed-off-by: Yan Zhao <yan.y.zhao@...el.com>
---
.../selftests/kvm/pre_fault_memory_test.c | 94 +++++++++++++++----
1 file changed, 78 insertions(+), 16 deletions(-)
diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/testing/selftests/kvm/pre_fault_memory_test.c
index 0350a8896a2f..56e65feb4c8c 100644
--- a/tools/testing/selftests/kvm/pre_fault_memory_test.c
+++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c
@@ -10,12 +10,16 @@
#include <test_util.h>
#include <kvm_util.h>
#include <processor.h>
+#include <pthread.h>
/* Arbitrarily chosen values */
#define TEST_SIZE (SZ_2M + PAGE_SIZE)
#define TEST_NPAGES (TEST_SIZE / PAGE_SIZE)
#define TEST_SLOT 10
+static bool prefault_ready;
+static bool delete_thread_ready;
+
static void guest_code(uint64_t base_gpa)
{
volatile uint64_t val __used;
@@ -30,17 +34,47 @@ static void guest_code(uint64_t base_gpa)
GUEST_DONE();
}
-static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 gpa, u64 size,
- u64 left)
+static void *remove_slot_worker(void *data)
+{
+ struct kvm_vcpu *vcpu = (struct kvm_vcpu *)data;
+
+ WRITE_ONCE(delete_thread_ready, true);
+
+ while (!READ_ONCE(prefault_ready))
+ cpu_relax();
+
+ vm_mem_region_delete(vcpu->vm, TEST_SLOT);
+
+ WRITE_ONCE(delete_thread_ready, false);
+ return NULL;
+}
+
+static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 base_gpa, u64 offset,
+ u64 size, u64 left, bool private, bool remove_slot)
{
struct kvm_pre_fault_memory range = {
- .gpa = gpa,
+ .gpa = base_gpa + offset,
.size = size,
.flags = 0,
};
- u64 prev;
+ pthread_t remove_thread;
+ bool remove_hit = false;
int ret, save_errno;
+ u64 prev;
+ if (remove_slot) {
+ pthread_create(&remove_thread, NULL, remove_slot_worker, vcpu);
+
+ while (!READ_ONCE(delete_thread_ready))
+ cpu_relax();
+
+ WRITE_ONCE(prefault_ready, true);
+ }
+
+ /*
+ * EAGAIN may be returned if slot removal is performed during
+ * KVM_PRE_FAULT_MEMORY.
+ */
do {
prev = range.size;
ret = __vcpu_ioctl(vcpu, KVM_PRE_FAULT_MEMORY, &range);
@@ -49,18 +83,42 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 gpa, u64 size,
"%sexpecting range.size to change on %s",
ret < 0 ? "not " : "",
ret < 0 ? "failure" : "success");
- } while (ret >= 0 ? range.size : save_errno == EINTR);
- TEST_ASSERT(range.size == left,
- "Completed with %lld bytes left, expected %" PRId64,
- range.size, left);
+ if (remove_slot && ret < 0 && save_errno == EAGAIN)
+ remove_hit = true;
+
+ } while (ret >= 0 ? range.size : ((save_errno == EINTR) || (save_errno == EAGAIN)));
- if (left == 0)
- __TEST_ASSERT_VM_VCPU_IOCTL(!ret, "KVM_PRE_FAULT_MEMORY", ret, vcpu->vm);
- else
- /* No memory slot causes RET_PF_EMULATE. it results in -ENOENT. */
- __TEST_ASSERT_VM_VCPU_IOCTL(ret && save_errno == ENOENT,
+ if (remove_slot) {
+ pthread_join(remove_thread, NULL);
+ WRITE_ONCE(prefault_ready, false);
+
+ vm_userspace_mem_region_add(vcpu->vm, VM_MEM_SRC_ANONYMOUS,
+ base_gpa, TEST_SLOT, TEST_NPAGES,
+ private ? KVM_MEM_GUEST_MEMFD : 0);
+ }
+
+ if (remove_hit) {
+ /*
+ * Prefault within a removed memory slot range returns
+ * - EFAULT for private memory or
+ * - ENOENT for shared memory (due to RET_PF_EMULATE).
+ */
+ __TEST_ASSERT_VM_VCPU_IOCTL(ret && save_errno == (private ? EFAULT : ENOENT),
"KVM_PRE_FAULT_MEMORY", ret, vcpu->vm);
+ } else {
+ TEST_ASSERT(range.size == left,
+ "Completed with %lld bytes left, expected %" PRId64,
+ range.size, left);
+
+ if (left == 0)
+ __TEST_ASSERT_VM_VCPU_IOCTL(!ret, "KVM_PRE_FAULT_MEMORY",
+ ret, vcpu->vm);
+ else
+ /* No memory slot causes RET_PF_EMULATE. it results in -ENOENT. */
+ __TEST_ASSERT_VM_VCPU_IOCTL(ret && save_errno == ENOENT,
+ "KVM_PRE_FAULT_MEMORY", ret, vcpu->vm);
+ }
}
static void __test_pre_fault_memory(unsigned long vm_type, bool private)
@@ -97,9 +155,13 @@ static void __test_pre_fault_memory(unsigned long vm_type, bool private)
if (private)
vm_mem_set_private(vm, guest_test_phys_mem, TEST_SIZE);
- pre_fault_memory(vcpu, guest_test_phys_mem, SZ_2M, 0);
- pre_fault_memory(vcpu, guest_test_phys_mem + SZ_2M, PAGE_SIZE * 2, PAGE_SIZE);
- pre_fault_memory(vcpu, guest_test_phys_mem + TEST_SIZE, PAGE_SIZE, PAGE_SIZE);
+
+ pre_fault_memory(vcpu, guest_test_phys_mem, 0, SZ_2M, 0, private, true);
+ pre_fault_memory(vcpu, guest_test_phys_mem, 0, SZ_2M, 0, private, false);
+ pre_fault_memory(vcpu, guest_test_phys_mem, SZ_2M, PAGE_SIZE * 2, PAGE_SIZE,
+ private, false);
+ pre_fault_memory(vcpu, guest_test_phys_mem, TEST_SIZE, PAGE_SIZE, PAGE_SIZE,
+ private, false);
vcpu_args_set(vcpu, 1, guest_test_virt_mem);
vcpu_run(vcpu);
--
2.43.2
Powered by blists - more mailing lists