From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E98313D34B1; Tue, 28 Apr 2026 23:25:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777418721; cv=none; b=JtNf9sP3c1aCQDMyAcbL+cPNx5uei+C99uj7nZZdtWgQH+1jj5l8Z29/jgXiVgN9l1VLAT1aF5R97R4SedggX1N1SIgfc2SpoP/vUr8/6hv0dFgrZ4xlm/AmGgTxeijFCJ0d3SPDqCIECua/POawWCsAsetkFFR/LR0BszaciBs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777418721; c=relaxed/simple; bh=fi5qoarFijE2lWp5XxDoESzLwDXl1eAEmD22R/fPyIs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aneW6fn3P5w8HOpjRjC7S6qtEP/dVNND2vMzgGU63JjPCY7I19iVm3LUzThagOByew3J/PRkx6h+MdghoFHO8pbxFLZNtljAP7JRyqyjjCAQlOzZwYZPrgefEEl9qdVqORyRZpI8ysu1E5nzxZNf79uWDwMy+FXjhiTgOL3dz5I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L4evB6Kh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L4evB6Kh" Received: by smtp.kernel.org (Postfix) with ESMTPS id CD0C0C2BCB8; Tue, 28 Apr 2026 23:25:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777418720; bh=fi5qoarFijE2lWp5XxDoESzLwDXl1eAEmD22R/fPyIs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=L4evB6Khg1O5ByRuDGL14styXW8AJIiKNKNXoWZY9e310k/C1vn/SFuMfURWGVPFa gmcf5CnqjWieP74atQhouofZc1jF9je/jvHIb2aj1JJzmii3hehhvgLLnm5sj0brlu dbs1VTzi6/6YkWGIV7yKlsstePw0fGeyRcvtCTvXNaPoq9KPmTdISzS7P1goc8gLUS G8OhlMs7Y38okfdUbOYcZt5aQ31hutAwW3ekCzM/0Z+Xak0kDlDBY1XWhlNWJQqq7t gMFsCtoXPdhd8zTHv/g8h6xFzjf1B4Oex42GzYC+1o16QTkAzhBve/XweR6s1j956U AuOFKb5gEIM6A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1014FF8875; Tue, 28 Apr 2026 23:25:20 +0000 (UTC) From: Ackerley Tng via B4 Relay Date: Tue, 28 Apr 2026 16:25:38 -0700 Subject: [PATCH RFC v5 43/53] KVM: selftests: Support checking that data not equal expected Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260428-gmem-inplace-conversion-v5-43-d8608ccfca22@google.com> References: <20260428-gmem-inplace-conversion-v5-0-d8608ccfca22@google.com> In-Reply-To: <20260428-gmem-inplace-conversion-v5-0-d8608ccfca22@google.com> To: aik@amd.com, andrew.jones@linux.dev, binbin.wu@linux.intel.com, brauner@kernel.org, chao.p.peng@linux.intel.com, david@kernel.org, ira.weiny@intel.com, jmattson@google.com, jthoughton@google.com, michael.roth@amd.com, oupton@kernel.org, pankaj.gupta@amd.com, qperret@google.com, rick.p.edgecombe@intel.com, rientjes@google.com, shivankg@amd.com, steven.price@arm.com, tabba@google.com, willy@infradead.org, wyihan@google.com, yan.y.zhao@intel.com, forkloop@google.com, pratyush@kernel.org, suzuki.poulose@arm.com, aneesh.kumar@kernel.org, Paolo Bonzini , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Jonathan Corbet , Shuah Khan , Shuah Khan , Vishal Annapurve , Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Youngjun Park , Qi Zheng , Shakeel Butt , Kiryl Shutsemau , Jason Gunthorpe , Vlastimil Babka Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, Ackerley Tng X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777418714; l=2851; i=ackerleytng@google.com; s=20260225; h=from:subject:message-id; bh=7gz8kf/n4ixOaF8MVfsAM6UcG2xye98XFNb81uX9/Q0=; b=K0nhoHtw+bHDcFt0NTXB9H8IY5KufQrx9yXWXRDB44IJvZWG6vgqoP88UFkyWNZSvMMA4sjKx IeEHazMTIeLBYKybYfkuwhPvhexJMT5hxbaymArE73yb7zsZfD59Xn1 X-Developer-Key: i=ackerleytng@google.com; a=ed25519; pk=sAZDYXdm6Iz8FHitpHeFlCMXwabodTm7p8/3/8xUxuU= X-Endpoint-Received: by B4 Relay for ackerleytng@google.com/20260225 with auth_id=649 X-Original-From: Ackerley Tng Reply-To: ackerleytng@google.com From: Ackerley Tng Expand run_guest_do_rmw() to support checking that data at given pgoff is not equal to expected_val. This will be used in a later patch that tests that memory contents are scrambled. Signed-off-by: Ackerley Tng --- .../selftests/kvm/x86/guest_memfd_conversions_test.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/guest_memfd_conversions_test.c b/tools/testing/selftests/kvm/x86/guest_memfd_conversions_test.c index 922261ebaff96..57adb6d84a053 100644 --- a/tools/testing/selftests/kvm/x86/guest_memfd_conversions_test.c +++ b/tools/testing/selftests/kvm/x86/guest_memfd_conversions_test.c @@ -137,6 +137,7 @@ static void __gmem_conversions_multipage_##test(test_data_t *t, int nr_pages, \ struct guest_check_data { void *mem; char expected_val; + bool assert_not_equal; char write_val; }; static struct guest_check_data guest_data; @@ -146,7 +147,13 @@ static void guest_do_rmw(void) for (;;) { char *mem = READ_ONCE(guest_data.mem); - GUEST_ASSERT_EQ(READ_ONCE(*mem), READ_ONCE(guest_data.expected_val)); + if (READ_ONCE(guest_data.assert_not_equal)) { + GUEST_ASSERT_NE(READ_ONCE(*mem), + READ_ONCE(guest_data.expected_val)); + } else { + GUEST_ASSERT_EQ(READ_ONCE(*mem), + READ_ONCE(guest_data.expected_val)); + } WRITE_ONCE(*mem, READ_ONCE(guest_data.write_val)); GUEST_SYNC(0); @@ -154,13 +161,15 @@ static void guest_do_rmw(void) } static void run_guest_do_rmw(struct kvm_vcpu *vcpu, loff_t pgoff, - char expected_val, char write_val) + char expected_val, char write_val, + bool assert_not_equal) { struct ucall uc; int r; guest_data.mem = (void *)GUEST_MEMFD_SHARING_TEST_GVA + pgoff * page_size; guest_data.expected_val = expected_val; + guest_data.assert_not_equal = assert_not_equal; guest_data.write_val = write_val; sync_global_to_guest(vcpu->vm, guest_data); @@ -191,7 +200,7 @@ static void test_private(test_data_t *t, loff_t pgoff, char starting_val, char write_val) { TEST_EXPECT_SIGBUS(WRITE_ONCE(t->mem[pgoff * page_size], write_val)); - run_guest_do_rmw(t->vcpu, pgoff, starting_val, write_val); + run_guest_do_rmw(t->vcpu, pgoff, starting_val, write_val, false); TEST_EXPECT_SIGBUS(READ_ONCE(t->mem[pgoff * page_size])); } @@ -207,7 +216,7 @@ static void test_shared(test_data_t *t, loff_t pgoff, char starting_val, char host_write_val, char write_val) { host_do_rmw(t->mem, pgoff, starting_val, host_write_val); - run_guest_do_rmw(t->vcpu, pgoff, host_write_val, write_val); + run_guest_do_rmw(t->vcpu, pgoff, host_write_val, write_val, false); TEST_ASSERT_EQ(READ_ONCE(t->mem[pgoff * page_size]), write_val); } -- 2.54.0.545.g6539524ca2-goog