From: Gavin Shan <gshan@redhat.com>
To: Fuad Tabba <tabba@google.com>,
kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-mm@kvack.org
Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au,
anup@brainfault.org, paul.walmsley@sifive.com,
palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com,
viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org,
akpm@linux-foundation.org, xiaoyao.li@intel.com,
yilun.xu@intel.com, chao.p.peng@linux.intel.com,
jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com,
isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz,
vannapurve@google.com, ackerleytng@google.com,
mail@maciej.szmigiero.name, david@redhat.com,
michael.roth@amd.com, wei.w.wang@intel.com,
liam.merwick@oracle.com, isaku.yamahata@gmail.com,
kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com,
steven.price@arm.com, quic_eberman@quicinc.com,
quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com,
quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com,
quic_pderrin@quicinc.com, quic_pheragu@quicinc.com,
catalin.marinas@arm.com, james.morse@arm.com,
yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org,
will@kernel.org, qperret@google.com, keirf@google.com,
roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org,
jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com,
fvdl@google.com, hughd@google.com, jthoughton@google.com,
peterx@redhat.com, pankaj.gupta@amd.com, ira.weiny@intel.com
Subject: Re: [PATCH v9 16/17] KVM: selftests: guest_memfd mmap() test when mapping is allowed
Date: Wed, 21 May 2025 16:53:27 +1000 [thread overview]
Message-ID: <7bbe7aea-3b17-444b-8cd3-c5941950307c@redhat.com> (raw)
In-Reply-To: <20250513163438.3942405-17-tabba@google.com>
Hi Fuad,
On 5/14/25 2:34 AM, Fuad Tabba wrote:
> Expand the guest_memfd selftests to include testing mapping guest
> memory for VM types that support it.
>
> Also, build the guest_memfd selftest for arm64.
>
> Co-developed-by: Ackerley Tng <ackerleytng@google.com>
> Signed-off-by: Ackerley Tng <ackerleytng@google.com>
> Signed-off-by: Fuad Tabba <tabba@google.com>
> ---
> tools/testing/selftests/kvm/Makefile.kvm | 1 +
> .../testing/selftests/kvm/guest_memfd_test.c | 145 +++++++++++++++---
> 2 files changed, 126 insertions(+), 20 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selftests/kvm/Makefile.kvm
> index f62b0a5aba35..ccf95ed037c3 100644
> --- a/tools/testing/selftests/kvm/Makefile.kvm
> +++ b/tools/testing/selftests/kvm/Makefile.kvm
> @@ -163,6 +163,7 @@ TEST_GEN_PROGS_arm64 += access_tracking_perf_test
> TEST_GEN_PROGS_arm64 += arch_timer
> TEST_GEN_PROGS_arm64 += coalesced_io_test
> TEST_GEN_PROGS_arm64 += dirty_log_perf_test
> +TEST_GEN_PROGS_arm64 += guest_memfd_test
> TEST_GEN_PROGS_arm64 += get-reg-list
> TEST_GEN_PROGS_arm64 += memslot_modification_stress_test
> TEST_GEN_PROGS_arm64 += memslot_perf_test
> diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c
> index ce687f8d248f..443c49185543 100644
> --- a/tools/testing/selftests/kvm/guest_memfd_test.c
> +++ b/tools/testing/selftests/kvm/guest_memfd_test.c
> @@ -34,12 +34,46 @@ static void test_file_read_write(int fd)
> "pwrite on a guest_mem fd should fail");
> }
>
> -static void test_mmap(int fd, size_t page_size)
> +static void test_mmap_allowed(int fd, size_t page_size, size_t total_size)
> +{
> + const char val = 0xaa;
> + char *mem;
> + size_t i;
> + int ret;
> +
> + mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> + TEST_ASSERT(mem != MAP_FAILED, "mmaping() guest memory should pass.");
> +
> + memset(mem, val, total_size);
> + for (i = 0; i < total_size; i++)
> + TEST_ASSERT_EQ(mem[i], val);
> +
> + ret = fallocate(fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE, 0,
> + page_size);
> + TEST_ASSERT(!ret, "fallocate the first page should succeed");
> +
> + for (i = 0; i < page_size; i++)
> + TEST_ASSERT_EQ(mem[i], 0x00);
> + for (; i < total_size; i++)
> + TEST_ASSERT_EQ(mem[i], val);
> +
> + memset(mem, val, total_size);
> + for (i = 0; i < total_size; i++)
> + TEST_ASSERT_EQ(mem[i], val);
> +
The last memset() and check the resident values look redudant because same
test has been covered by the first memset(). If we really want to double
confirm that the page-cache is writabble, it would be enough to cover the
first page. Otherwise, I guess this hunk of code can be removed :)
memset(mem, val, page_size);
for (i = 0; i < page_size; i++)
TEST_ASSERT_EQ(mem[i], val);
> + ret = munmap(mem, total_size);
> + TEST_ASSERT(!ret, "munmap should succeed");
> +}
> +
> +static void test_mmap_denied(int fd, size_t page_size, size_t total_size)
> {
> char *mem;
>
> mem = mmap(NULL, page_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> TEST_ASSERT_EQ(mem, MAP_FAILED);
> +
> + mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> + TEST_ASSERT_EQ(mem, MAP_FAILED);
> }
>
> static void test_file_size(int fd, size_t page_size, size_t total_size)
> @@ -120,26 +154,19 @@ static void test_invalid_punch_hole(int fd, size_t page_size, size_t total_size)
> }
> }
>
> -static void test_create_guest_memfd_invalid(struct kvm_vm *vm)
> +static void test_create_guest_memfd_invalid_sizes(struct kvm_vm *vm,
> + uint64_t guest_memfd_flags,
> + size_t page_size)
> {
> - size_t page_size = getpagesize();
> - uint64_t flag;
> size_t size;
> int fd;
>
> for (size = 1; size < page_size; size++) {
> - fd = __vm_create_guest_memfd(vm, size, 0);
> + fd = __vm_create_guest_memfd(vm, size, guest_memfd_flags);
> TEST_ASSERT(fd == -1 && errno == EINVAL,
> "guest_memfd() with non-page-aligned page size '0x%lx' should fail with EINVAL",
> size);
> }
> -
> - for (flag = BIT(0); flag; flag <<= 1) {
> - fd = __vm_create_guest_memfd(vm, page_size, flag);
> - TEST_ASSERT(fd == -1 && errno == EINVAL,
> - "guest_memfd() with flag '0x%lx' should fail with EINVAL",
> - flag);
> - }
> }
>
> static void test_create_guest_memfd_multiple(struct kvm_vm *vm)
> @@ -170,30 +197,108 @@ static void test_create_guest_memfd_multiple(struct kvm_vm *vm)
> close(fd1);
> }
>
> -int main(int argc, char *argv[])
> +static void test_with_type(unsigned long vm_type, uint64_t guest_memfd_flags,
> + bool expect_mmap_allowed)
> {
> - size_t page_size;
> + struct kvm_vm *vm;
> size_t total_size;
> + size_t page_size;
> int fd;
> - struct kvm_vm *vm;
>
> - TEST_REQUIRE(kvm_has_cap(KVM_CAP_GUEST_MEMFD));
> + if (!(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(vm_type)))
> + return;
>
The check seems incorrect for aarch64 since 0 is always returned from
kvm_check_cap() there. The test is skipped for VM_TYPE_DEFAULT on aarch64.
So it would be something like below:
#define VM_TYPE_DEFAULT 0
if (vm_type != VM_TYPE_DEFAULT &&
!(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(vm_type)))
return;
> page_size = getpagesize();
> total_size = page_size * 4;
>
> - vm = vm_create_barebones();
> + vm = vm_create_barebones_type(vm_type);
>
> - test_create_guest_memfd_invalid(vm);
> test_create_guest_memfd_multiple(vm);
> + test_create_guest_memfd_invalid_sizes(vm, guest_memfd_flags, page_size);
>
> - fd = vm_create_guest_memfd(vm, total_size, 0);
> + fd = vm_create_guest_memfd(vm, total_size, guest_memfd_flags);
>
> test_file_read_write(fd);
> - test_mmap(fd, page_size);
> +
> + if (expect_mmap_allowed)
> + test_mmap_allowed(fd, page_size, total_size);
> + else
> + test_mmap_denied(fd, page_size, total_size);
> +
> test_file_size(fd, page_size, total_size);
> test_fallocate(fd, page_size, total_size);
> test_invalid_punch_hole(fd, page_size, total_size);
>
> close(fd);
> + kvm_vm_release(vm);
> +}
> +
> +static void test_vm_type_gmem_flag_validity(unsigned long vm_type,
> + uint64_t expected_valid_flags)
> +{
> + size_t page_size = getpagesize();
> + struct kvm_vm *vm;
> + uint64_t flag = 0;
> + int fd;
> +
> + if (!(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(vm_type)))
> + return;
Same as above
> +
> + vm = vm_create_barebones_type(vm_type);
> +
> + for (flag = BIT(0); flag; flag <<= 1) {
> + fd = __vm_create_guest_memfd(vm, page_size, flag);
> +
> + if (flag & expected_valid_flags) {
> + TEST_ASSERT(fd > 0,
> + "guest_memfd() with flag '0x%lx' should be valid",
> + flag);
> + close(fd);
> + } else {
> + TEST_ASSERT(fd == -1 && errno == EINVAL,
> + "guest_memfd() with flag '0x%lx' should fail with EINVAL",
> + flag);
It's more robust to have:
TEST_ASSERT(fd < 0 && errno == EINVAL, ...);
> + }
> + }
> +
> + kvm_vm_release(vm);
> +}
> +
> +static void test_gmem_flag_validity(void)
> +{
> + uint64_t non_coco_vm_valid_flags = 0;
> +
> + if (kvm_has_cap(KVM_CAP_GMEM_SHARED_MEM))
> + non_coco_vm_valid_flags = GUEST_MEMFD_FLAG_SUPPORT_SHARED;
> +
> + test_vm_type_gmem_flag_validity(VM_TYPE_DEFAULT, non_coco_vm_valid_flags);
> +
> +#ifdef __x86_64__
> + test_vm_type_gmem_flag_validity(KVM_X86_SW_PROTECTED_VM, non_coco_vm_valid_flags);
> + test_vm_type_gmem_flag_validity(KVM_X86_SEV_VM, 0);
> + test_vm_type_gmem_flag_validity(KVM_X86_SEV_ES_VM, 0);
> + test_vm_type_gmem_flag_validity(KVM_X86_SNP_VM, 0);
> + test_vm_type_gmem_flag_validity(KVM_X86_TDX_VM, 0);
> +#endif
> +}
> +
> +int main(int argc, char *argv[])
> +{
> + TEST_REQUIRE(kvm_has_cap(KVM_CAP_GUEST_MEMFD));
> +
> + test_gmem_flag_validity();
> +
> + test_with_type(VM_TYPE_DEFAULT, 0, false);
> + if (kvm_has_cap(KVM_CAP_GMEM_SHARED_MEM)) {
> + test_with_type(VM_TYPE_DEFAULT, GUEST_MEMFD_FLAG_SUPPORT_SHARED,
> + true);
> + }
> +
> +#ifdef __x86_64__
> + test_with_type(KVM_X86_SW_PROTECTED_VM, 0, false);
> + if (kvm_has_cap(KVM_CAP_GMEM_SHARED_MEM)) {
> + test_with_type(KVM_X86_SW_PROTECTED_VM,
> + GUEST_MEMFD_FLAG_SUPPORT_SHARED, true);
> + }
> +#endif
> }
Thanks,
Gavin
next prev parent reply other threads:[~2025-05-21 6:53 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-13 16:34 [PATCH v9 00/17] KVM: Mapping guest_memfd backed memory at the host for software protected VMs Fuad Tabba
2025-05-13 16:34 ` [PATCH v9 01/17] KVM: Rename CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_GMEM Fuad Tabba
2025-05-21 7:14 ` Gavin Shan
2025-05-13 16:34 ` [PATCH v9 02/17] KVM: Rename CONFIG_KVM_GENERIC_PRIVATE_MEM to CONFIG_KVM_GENERIC_GMEM_POPULATE Fuad Tabba
2025-05-13 21:56 ` Ira Weiny
2025-05-21 7:14 ` Gavin Shan
2025-05-13 16:34 ` [PATCH v9 03/17] KVM: Rename kvm_arch_has_private_mem() to kvm_arch_supports_gmem() Fuad Tabba
2025-05-21 7:15 ` Gavin Shan
2025-05-13 16:34 ` [PATCH v9 04/17] KVM: x86: Rename kvm->arch.has_private_mem to kvm->arch.supports_gmem Fuad Tabba
2025-05-21 7:15 ` Gavin Shan
2025-05-13 16:34 ` [PATCH v9 05/17] KVM: Rename kvm_slot_can_be_private() to kvm_slot_has_gmem() Fuad Tabba
2025-05-21 7:16 ` Gavin Shan
2025-05-13 16:34 ` [PATCH v9 06/17] KVM: Fix comments that refer to slots_lock Fuad Tabba
2025-05-21 7:16 ` Gavin Shan
2025-05-13 16:34 ` [PATCH v9 07/17] KVM: guest_memfd: Allow host to map guest_memfd() pages Fuad Tabba
2025-05-13 18:37 ` Ackerley Tng
2025-05-16 19:21 ` James Houghton
2025-05-18 15:17 ` Fuad Tabba
2025-05-21 7:36 ` David Hildenbrand
2025-05-14 8:03 ` Shivank Garg
2025-05-14 9:45 ` Fuad Tabba
2025-05-14 10:07 ` Roy, Patrick
2025-05-14 11:30 ` Fuad Tabba
2025-05-14 20:40 ` James Houghton
2025-05-15 7:25 ` Fuad Tabba
2025-05-15 23:42 ` Gavin Shan
2025-05-16 7:31 ` Fuad Tabba
2025-05-16 6:08 ` Gavin Shan
2025-05-16 7:56 ` Fuad Tabba
2025-05-16 11:12 ` Gavin Shan
2025-05-16 14:20 ` Fuad Tabba
2025-05-21 7:41 ` David Hildenbrand
2025-05-13 16:34 ` [PATCH v9 08/17] KVM: guest_memfd: Check that userspace_addr and fd+offset refer to same range Fuad Tabba
2025-05-13 20:30 ` James Houghton
2025-05-14 7:33 ` Fuad Tabba
2025-05-14 13:32 ` Sean Christopherson
2025-05-14 13:47 ` Ackerley Tng
2025-05-14 13:52 ` Sean Christopherson
2025-05-14 17:39 ` David Hildenbrand
2025-05-13 16:34 ` [PATCH v9 09/17] KVM: x86/mmu: Handle guest page faults for guest_memfd with shared memory Fuad Tabba
2025-05-21 7:48 ` David Hildenbrand
2025-05-22 0:40 ` Ackerley Tng
2025-05-22 7:16 ` David Hildenbrand
2025-05-22 7:46 ` Fuad Tabba
2025-05-22 8:14 ` David Hildenbrand
2025-05-22 10:24 ` Fuad Tabba
2025-05-13 16:34 ` [PATCH v9 10/17] KVM: x86: Compute max_mapping_level with input from guest_memfd Fuad Tabba
2025-05-14 7:13 ` Shivank Garg
2025-05-14 7:24 ` Fuad Tabba
2025-05-14 15:27 ` kernel test robot
2025-05-21 8:01 ` David Hildenbrand
2025-05-22 0:45 ` Ackerley Tng
2025-05-22 13:22 ` Sean Christopherson
2025-05-22 13:49 ` David Hildenbrand
2025-05-22 7:22 ` Fuad Tabba
2025-05-22 8:56 ` David Hildenbrand
2025-05-22 9:34 ` Fuad Tabba
2025-05-13 16:34 ` [PATCH v9 11/17] KVM: arm64: Refactor user_mem_abort() calculation of force_pte Fuad Tabba
2025-05-13 16:34 ` [PATCH v9 12/17] KVM: arm64: Rename variables in user_mem_abort() Fuad Tabba
2025-05-21 2:25 ` Gavin Shan
2025-05-21 9:57 ` Fuad Tabba
2025-05-21 8:02 ` David Hildenbrand
2025-05-13 16:34 ` [PATCH v9 13/17] KVM: arm64: Handle guest_memfd()-backed guest page faults Fuad Tabba
2025-05-14 21:26 ` James Houghton
2025-05-15 9:27 ` Fuad Tabba
2025-05-21 8:04 ` David Hildenbrand
2025-05-21 11:10 ` Fuad Tabba
2025-05-13 16:34 ` [PATCH v9 14/17] KVM: arm64: Enable mapping guest_memfd in arm64 Fuad Tabba
2025-05-15 23:50 ` James Houghton
2025-05-16 7:07 ` Fuad Tabba
2025-05-21 8:05 ` David Hildenbrand
2025-05-21 10:12 ` Fuad Tabba
2025-05-21 10:26 ` David Hildenbrand
2025-05-21 10:29 ` Fuad Tabba
2025-05-21 12:44 ` David Hildenbrand
2025-05-21 13:15 ` Fuad Tabba
2025-05-21 13:21 ` David Hildenbrand
2025-05-21 13:32 ` Fuad Tabba
2025-05-21 13:45 ` David Hildenbrand
2025-05-21 14:14 ` Fuad Tabba
2025-05-13 16:34 ` [PATCH v9 15/17] KVM: Introduce the KVM capability KVM_CAP_GMEM_SHARED_MEM Fuad Tabba
2025-05-21 2:46 ` Gavin Shan
2025-05-21 8:24 ` Fuad Tabba
2025-05-21 8:06 ` David Hildenbrand
2025-05-13 16:34 ` [PATCH v9 16/17] KVM: selftests: guest_memfd mmap() test when mapping is allowed Fuad Tabba
2025-05-21 6:53 ` Gavin Shan [this message]
2025-05-21 9:38 ` Fuad Tabba
2025-05-13 16:34 ` [PATCH v9 17/17] KVM: selftests: Test guest_memfd same-range validation Fuad Tabba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7bbe7aea-3b17-444b-8cd3-c5941950307c@redhat.com \
--to=gshan@redhat.com \
--cc=ackerleytng@google.com \
--cc=akpm@linux-foundation.org \
--cc=amoorthy@google.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=brauner@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=chao.p.peng@linux.intel.com \
--cc=chenhuacai@kernel.org \
--cc=david@redhat.com \
--cc=dmatlack@google.com \
--cc=fvdl@google.com \
--cc=hch@infradead.org \
--cc=hughd@google.com \
--cc=ira.weiny@intel.com \
--cc=isaku.yamahata@gmail.com \
--cc=isaku.yamahata@intel.com \
--cc=james.morse@arm.com \
--cc=jarkko@kernel.org \
--cc=jgg@nvidia.com \
--cc=jhubbard@nvidia.com \
--cc=jthoughton@google.com \
--cc=keirf@google.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=liam.merwick@oracle.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mail@maciej.szmigiero.name \
--cc=maz@kernel.org \
--cc=mic@digikod.net \
--cc=michael.roth@amd.com \
--cc=mpe@ellerman.id.au \
--cc=oliver.upton@linux.dev \
--cc=palmer@dabbelt.com \
--cc=pankaj.gupta@amd.com \
--cc=paul.walmsley@sifive.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qperret@google.com \
--cc=quic_cvanscha@quicinc.com \
--cc=quic_eberman@quicinc.com \
--cc=quic_mnalajal@quicinc.com \
--cc=quic_pderrin@quicinc.com \
--cc=quic_pheragu@quicinc.com \
--cc=quic_svaddagi@quicinc.com \
--cc=quic_tsoni@quicinc.com \
--cc=rientjes@google.com \
--cc=roypat@amazon.co.uk \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=steven.price@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tabba@google.com \
--cc=vannapurve@google.com \
--cc=vbabka@suse.cz \
--cc=viro@zeniv.linux.org.uk \
--cc=wei.w.wang@intel.com \
--cc=will@kernel.org \
--cc=willy@infradead.org \
--cc=xiaoyao.li@intel.com \
--cc=yilun.xu@intel.com \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).