From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2325D3BFE31 for ; Tue, 2 Jun 2026 21:56:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780437374; cv=none; b=VXtCFwZG4WjfbuvrN/NHatVzn97P4Sg7PFWOPZovutFztTK5kWDj/eO8xC2Rj0blMlLw989Hm8bz8TIjRY1ONvkRlsyG4hWcOmYe2JPKVBG4V5wOAfSvH9FUNOtQcmQ6PUyrRzTRd9v7+pXmR/BVSfdzqGJxpZzxU9IWYKov21c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780437374; c=relaxed/simple; bh=uanUhuG5chBI7iGRiYb/NQJAUXfg811Uv7P0B8yjofM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VhzXh82N96MYGVONA1/gLxAZl8d0+EdyizH1tHE3cLCeEI0BrA/lREzANTgtrgv345KyDQ2q/U2BpAjP3F2C02OUZ537iZbHcEQVUxn58FsNeTMbn6tqhIiRYWjfhMxBN86b88I6isiXXHXxBadfWErb1UYgF3g8KYhxorLu0JQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--wyihan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=YsrltzuQ; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--wyihan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YsrltzuQ" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-36b7f696b40so4918273a91.1 for ; Tue, 02 Jun 2026 14:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780437372; x=1781042172; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ZQ6ZTIKmnZDIm2PqykNUkTYiLD4CQXsPT3VeVYf4kfY=; b=YsrltzuQg6r8vvBGRRQl6NBQBolG2j3VmiiuPv7n27jc14LhiwcvNwQ+HYUdq1+gNJ makdmZA9+8PncYMuIlvRbklo0eK8MMZYPrPHR2XZO5wzS+cJRwEU90o4K9RNFX0MdBuj /t+azHEOfiVUbEW8/k/LYvwxdFQIQvvsjZbNIt6OxfxV/rfgIKa3LMCnE8tL9H9nPPzR jW7hsgBcCOB2rkIL0EKC/goPffDx0MPHYw9V/4t2eCBkV6jdX8ktPbRy/WH7uikUDQea DyuOSwOIrQIhpzFakfwFGc2F+inU2FCQZZarSZ19KaNuWsnDuan6xBIsapaaBq0atBDF Sg/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780437372; x=1781042172; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZQ6ZTIKmnZDIm2PqykNUkTYiLD4CQXsPT3VeVYf4kfY=; b=k/Ad5hbj2eDjq2ROM8JswI+AfzGom6na58j6j38ln7HGZs76vl0FUA44tCoYxlTOQM OjBiSuavXtqKKtQmb/HjnnJ3VhCfB/pWsadgq6YOcL54hLGzccF3FZfprvBJrKKgRcIP 0Lr4Q+nyuFOT6w6rkIpcxO+5IAdBMHU9Cl4YFuAnfuVzA0kbWSqRViRQW1t5dVvk8vph RdCzpQN2e+Be2Evo6WKm3ibN3xF3PChEqL0Ef1cwJWuP21dlDs2Qm/uDR7tGuhJVqnj/ B4ebn+F73tB322XBeDFDKYu6B3i5tYf7o9Pdzjr8e+69NUd3Rsj31yYPcW+cq4wYXgkp 6teQ== X-Forwarded-Encrypted: i=1; AFNElJ8+QkVZShre5m+lNXBoDnV46q7FHuKpTI6FO6FZvMn9EqBhS/0DulMdUtkqnYUztP+xXdXMOxK0kPBQTeI=@vger.kernel.org X-Gm-Message-State: AOJu0YxCfWDklJ4041TH7uSEMJ+Cyp+Xzi2UlOuBgLgl5dAPlJGZDGms iT1jOT8vVHlq1nMQ7GAZ3ra5aA5SFqi16SxRRWpbqxuyk0jEYV0jo+1tRf/g4Sa/31xRExU8rgR 0rDuEEA== X-Received: from pju15.prod.google.com ([2002:a17:90a:d4f:b0:36b:89e6:3ee5]) (user=wyihan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3e4e:b0:35f:b647:d98a with SMTP id 98e67ed59e1d1-36e30552788mr686479a91.5.1780437372149; Tue, 02 Jun 2026 14:56:12 -0700 (PDT) Date: Tue, 02 Jun 2026 21:55:47 +0000 In-Reply-To: <20260602-memory-failure-mf-delayed-fix-v4-0-a5bc7db5a9b2@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260602-memory-failure-mf-delayed-fix-v4-0-a5bc7db5a9b2@google.com> X-Developer-Key: i=wyihan@google.com; a=ed25519; pk=cRi0fKzS5BMxlHyHY2pJv3w/1zcgfYKr6EYGYppdMYc= X-Developer-Signature: v=1; a=ed25519-sha256; t=1780437363; l=3092; i=wyihan@google.com; s=20260319; h=from:subject:message-id; bh=uanUhuG5chBI7iGRiYb/NQJAUXfg811Uv7P0B8yjofM=; b=onjoJh2jwfvgE5J9KsFufxaaM/BBUoZUbER0Iv4yiEZbnHtSt3LZi3VagZRC8gVSTIjS36l5y WirOgE+fH18CGioPV6fp/j5ijMuy/gRGi7+ecGc+dvu8oYZZXqd01R3 X-Mailer: b4 0.14.3 Message-ID: <20260602-memory-failure-mf-delayed-fix-v4-7-a5bc7db5a9b2@google.com> Subject: [PATCH v4 7/7] KVM: selftests: Test guest_memfd behavior with respect to stage 2 page tables From: Lisa Wang To: Miaohe Lin , Naoya Horiguchi , Andrew Morton , Paolo Bonzini , Shuah Khan , Hugh Dickins , Baolin Wang , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: rientjes@google.com, seanjc@google.com, ackerleytng@google.com, vannapurve@google.com, michael.roth@amd.com, jiaqiyan@google.com, tabba@google.com, dave.hansen@linux.intel.com, Lisa Wang Content-Type: text/plain; charset="utf-8" Test that + memory failure handling results in unmapping of bad memory from stage 2 page tables, hence requiring faulting on next guest access + when the guest tries to fault a poisoned page from guest_memfd, the userspace VMM informed with EHWPOISON Co-developed-by: Ackerley Tng Signed-off-by: Ackerley Tng Signed-off-by: Lisa Wang --- .../kvm/guest_memfd_memory_failure_test.c | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/tools/testing/selftests/kvm/guest_memfd_memory_failure_test.c b/tools/testing/selftests/kvm/guest_memfd_memory_failure_test.c index 6c8032d390ae..e6f4c327bd5a 100644 --- a/tools/testing/selftests/kvm/guest_memfd_memory_failure_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_memory_failure_test.c @@ -24,6 +24,7 @@ #include "kvm_util.h" #include "test_util.h" #include "kselftest_harness.h" +#include "ucall_common.h" static size_t page_size, total_size; @@ -313,6 +314,71 @@ TEST_F(guest_memfd_failure, test_memory_failure) } } +static void __guest_code_read(uint64_t gpa) +{ + uint8_t *mem = (uint8_t *)gpa; + + READ_ONCE(*mem); + GUEST_SYNC(0); + READ_ONCE(*mem); + GUEST_DONE(); +} + +static void guest_read(struct kvm_vcpu *vcpu, int expected_errno) +{ + if (expected_errno) { + TEST_ASSERT_EQ(_vcpu_run(vcpu), -1); + TEST_ASSERT_EQ(errno, expected_errno); + } else { + vcpu_run(vcpu); + TEST_ASSERT_EQ(get_ucall(vcpu, NULL), UCALL_SYNC); + } +} + +TEST_F(guest_memfd_failure, test_memory_failure_guest) +{ + const uint64_t gpa = SZ_4G; + const int slot = 1; + + unsigned long memory_failure_pfn; + struct kvm_vcpu *vcpu; + uint8_t *mem; + + /* Limit guest test execution to a single variant to avoid redundant runs. */ + if (variant->method != MF_INJECT_DEBUGFS || + variant->kill_config != PR_MCE_KILL_EARLY || + !variant->map_page || !variant->dirty_page) + return; + + self->vm = __vm_create_shape_with_one_vcpu(VM_SHAPE_DEFAULT, &vcpu, 1, __guest_code_read); + vcpu_args_set(vcpu, 1, gpa); + + self->fd = vm_create_guest_memfd(self->vm, self->vm->page_size, + GUEST_MEMFD_FLAG_MMAP | + GUEST_MEMFD_FLAG_INIT_SHARED); + vm_set_user_memory_region2(self->vm, slot, KVM_MEM_GUEST_MEMFD, gpa, + self->vm->page_size, NULL, self->fd, 0); + + mem = mmap(NULL, self->vm->page_size, PROT_READ | PROT_WRITE, + MAP_SHARED, self->fd, 0); + TEST_ASSERT(mem != MAP_FAILED, "mmap() for guest_memfd should succeed."); + virt_pg_map(self->vm, gpa, gpa); + + /* Fault in page to read pfn, then unmap page for testing. */ + READ_ONCE(*mem); + + memory_failure_pfn = addr_to_pfn(mem); + munmap(mem, self->vm->page_size); + + /* Fault page into stage2 page tables. */ + guest_read(vcpu, 0); + + self->poisoned_pfn = memory_failure_pfn; + mark_memory_failure(memory_failure_pfn, 0); + + guest_read(vcpu, EHWPOISON); +} + static bool can_inject_memory_failure(void) { int fd; -- 2.54.0.1013.g208068f2d8-goog