From: Fuad Tabba <tabba@google.com>
To: James Houghton <jthoughton@google.com>
Cc: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-mm@kvack.org, kvmarm@lists.linux.dev, 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, peterx@redhat.com,
pankaj.gupta@amd.com, ira.weiny@intel.com
Subject: Re: [PATCH v11 18/18] KVM: selftests: guest_memfd mmap() test when mapping is allowed
Date: Fri, 6 Jun 2025 09:14:18 +0100 [thread overview]
Message-ID: <CA+EHjTwHgAoGos+ZBzEPdkNPzLpX9t8nJLQ89YALPUw4LK4QTA@mail.gmail.com> (raw)
In-Reply-To: <CADrL8HVn_qswsZgWwXcBa-oP61nbWExWSQAKeSSKn2ffMTNtcg@mail.gmail.com>
Hi James,
On Thu, 5 Jun 2025 at 23:07, James Houghton <jthoughton@google.com> wrote:
>
> On Thu, Jun 5, 2025 at 8:38 AM Fuad Tabba <tabba@google.com> wrote:
> >
> > Expand the guest_memfd selftests to include testing mapping guest
> > memory for VM types that support it.
> >
> > Co-developed-by: Ackerley Tng <ackerleytng@google.com>
> > Signed-off-by: Ackerley Tng <ackerleytng@google.com>
> > Signed-off-by: Fuad Tabba <tabba@google.com>
>
> Feel free to add:
>
> Reviewed-by: James Houghton <jthoughton@google.com>
Thanks!
> > ---
> > .../testing/selftests/kvm/guest_memfd_test.c | 201 ++++++++++++++++--
> > 1 file changed, 180 insertions(+), 21 deletions(-)
> >
> > diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c
> > index 341ba616cf55..1612d3adcd0d 100644
> > --- a/tools/testing/selftests/kvm/guest_memfd_test.c
> > +++ b/tools/testing/selftests/kvm/guest_memfd_test.c
> > @@ -13,6 +13,8 @@
> >
> > #include <linux/bitmap.h>
> > #include <linux/falloc.h>
> > +#include <setjmp.h>
> > +#include <signal.h>
> > #include <sys/mman.h>
> > #include <sys/types.h>
> > #include <sys/stat.h>
> > @@ -34,12 +36,83 @@ 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_supported(int fd, size_t page_size, size_t total_size)
> > +{
> > + const char val = 0xaa;
> > + char *mem;
>
> This must be `volatile char *` to ensure that the compiler doesn't
> elide the accesses you have written.
>
> > + size_t i;
> > + int ret;
> > +
> > + mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
> > + TEST_ASSERT(mem == MAP_FAILED, "Copy-on-write not allowed by guest_memfd.");
> > +
> > + mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> > + TEST_ASSERT(mem != MAP_FAILED, "mmap() for shared guest memory should succeed.");
> > +
> > + memset(mem, val, total_size);
>
> Now unfortunately, `memset` and `munmap` will complain about the
> volatile qualification. So...
>
> memset((char *)mem, val, total_size);
>
> Eh... wish they just wouldn't complain, but this is a small price to
> pay for correctness. :)
>
> > + for (i = 0; i < total_size; i++)
> > + TEST_ASSERT_EQ(mem[i], val);
>
> The compiler is allowed to[1] elide the read of `mem[i]` and just
> assume that it is `val`.
>
> [1]: https://godbolt.org/z/Wora54bP6
>
> Feel free to add `volatile` to that snippet to see how the code changes.
Having tried that and Sean's READ_ONCE() suggestion, I went with the
latter. Like Sean said, they're not optimised out, and avoid the need
to cast.
> > +
> > + 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, page_size);
> > + for (i = 0; i < total_size; i++)
> > + TEST_ASSERT_EQ(mem[i], val);
> > +
> > + ret = munmap(mem, total_size);
> > + TEST_ASSERT(!ret, "munmap() should succeed.");
> > +}
> > +
> > +static sigjmp_buf jmpbuf;
> > +void fault_sigbus_handler(int signum)
> > +{
> > + siglongjmp(jmpbuf, 1);
> > +}
> > +
> > +static void test_fault_overflow(int fd, size_t page_size, size_t total_size)
> > +{
> > + struct sigaction sa_old, sa_new = {
> > + .sa_handler = fault_sigbus_handler,
> > + };
> > + size_t map_size = total_size * 4;
> > + const char val = 0xaa;
> > + char *mem;
>
> `volatile` here as well.
>
> > + size_t i;
> > + int ret;
> > +
> > + mem = mmap(NULL, map_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
> > + TEST_ASSERT(mem != MAP_FAILED, "mmap() for shared guest memory should succeed.");
> > +
> > + sigaction(SIGBUS, &sa_new, &sa_old);
> > + if (sigsetjmp(jmpbuf, 1) == 0) {
> > + memset(mem, 0xaa, map_size);
> > + TEST_ASSERT(false, "memset() should have triggered SIGBUS.");
> > + }
> > + sigaction(SIGBUS, &sa_old, NULL);
> > +
> > + for (i = 0; i < total_size; i++)
> > + TEST_ASSERT_EQ(mem[i], val);
> > +
> > + ret = munmap(mem, map_size);
> > + TEST_ASSERT(!ret, "munmap() should succeed.");
> > +}
> > +
> > +static void test_mmap_not_supported(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 +193,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);
> > - TEST_ASSERT(fd == -1 && errno == EINVAL,
> > + fd = __vm_create_guest_memfd(vm, size, guest_memfd_flags);
> > + TEST_ASSERT(fd < 0 && 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)
> > @@ -171,30 +237,123 @@ static void test_create_guest_memfd_multiple(struct kvm_vm *vm)
> > close(fd1);
> > }
> >
> > -int main(int argc, char *argv[])
> > +static bool check_vm_type(unsigned long vm_type)
> > {
> > - size_t page_size;
> > + /*
> > + * Not all architectures support KVM_CAP_VM_TYPES. However, those that
> > + * support guest_memfd have that support for the default VM type.
> > + */
> > + if (vm_type == VM_TYPE_DEFAULT)
> > + return true;
> > +
> > + return kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(vm_type);
> > +}
> > +
> > +static void test_with_type(unsigned long vm_type, uint64_t guest_memfd_flags,
> > + bool expect_mmap_allowed)
> > +{
> > + 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 (!check_vm_type(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_supported(fd, page_size, total_size);
> > + test_fault_overflow(fd, page_size, total_size);
> > +
> > + } else {
> > + test_mmap_not_supported(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);
>
> I think kvm_vm_free() is probably more appropriate?
Ack (for both).
Cheers,
/fuad
> > +}
> > +
> > +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 (!check_vm_type(vm_type))
> > + return;
> > +
> > + 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 < 0 && errno == EINVAL,
> > + "guest_memfd() with flag '0x%lx' should fail with EINVAL",
> > + flag);
> > + }
> > + }
> > +
> > + kvm_vm_release(vm);
>
> Same here.
>
> > +}
> > +
> > +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
> > }
> > --
> > 2.49.0.1266.g31b7d2e469-goog
> >
next prev parent reply other threads:[~2025-06-06 8:14 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-05 15:37 [PATCH v11 00/18] KVM: Mapping guest_memfd backed memory at the host for software protected VMs Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 01/18] KVM: Rename CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_GMEM Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 02/18] KVM: Rename CONFIG_KVM_GENERIC_PRIVATE_MEM to CONFIG_KVM_GENERIC_GMEM_POPULATE Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 03/18] KVM: Rename kvm_arch_has_private_mem() to kvm_arch_supports_gmem() Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 04/18] KVM: x86: Rename kvm->arch.has_private_mem to kvm->arch.supports_gmem Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 05/18] KVM: Rename kvm_slot_can_be_private() to kvm_slot_has_gmem() Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 06/18] KVM: Fix comments that refer to slots_lock Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 07/18] KVM: Fix comment that refers to kvm uapi header path Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 08/18] KVM: guest_memfd: Allow host to map guest_memfd pages Fuad Tabba
2025-06-06 9:12 ` David Hildenbrand
2025-06-06 9:30 ` Fuad Tabba
2025-06-06 9:55 ` David Hildenbrand
2025-06-06 10:33 ` Fuad Tabba
2025-06-11 6:29 ` Shivank Garg
2025-06-11 18:20 ` Ackerley Tng
2025-06-08 23:42 ` Gavin Shan
2025-06-05 15:37 ` [PATCH v11 09/18] KVM: guest_memfd: Track shared memory support in memslot Fuad Tabba
2025-06-06 9:13 ` David Hildenbrand
2025-06-08 23:42 ` Gavin Shan
2025-06-05 15:37 ` [PATCH v11 10/18] KVM: x86/mmu: Handle guest page faults for guest_memfd with shared memory Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 11/18] KVM: x86: Consult guest_memfd when computing max_mapping_level Fuad Tabba
2025-06-06 9:14 ` David Hildenbrand
2025-06-06 9:48 ` Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 12/18] KVM: x86: Enable guest_memfd shared memory for SW-protected VMs Fuad Tabba
2025-06-05 15:49 ` David Hildenbrand
2025-06-05 16:11 ` Fuad Tabba
2025-06-05 17:35 ` David Hildenbrand
2025-06-05 17:43 ` Fuad Tabba
2025-06-05 17:45 ` David Hildenbrand
2025-06-05 18:29 ` Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 13/18] KVM: arm64: Refactor user_mem_abort() Fuad Tabba
2025-06-09 0:27 ` Gavin Shan
2025-06-09 7:01 ` Fuad Tabba
2025-06-09 9:02 ` Gavin Shan
2025-06-05 15:37 ` [PATCH v11 14/18] KVM: arm64: Handle guest_memfd-backed guest page faults Fuad Tabba
2025-06-05 17:21 ` James Houghton
2025-06-06 7:31 ` Fuad Tabba
2025-06-06 7:39 ` David Hildenbrand
2025-06-09 4:08 ` Gavin Shan
2025-06-09 7:04 ` Fuad Tabba
2025-06-09 9:06 ` Gavin Shan
2025-06-05 15:37 ` [PATCH v11 15/18] KVM: arm64: Enable host mapping of shared guest_memfd memory Fuad Tabba
2025-06-05 17:26 ` James Houghton
2025-06-09 0:29 ` Gavin Shan
2025-06-05 15:37 ` [PATCH v11 16/18] KVM: Introduce the KVM capability KVM_CAP_GMEM_SHARED_MEM Fuad Tabba
2025-06-05 15:37 ` [PATCH v11 17/18] KVM: selftests: Don't use hardcoded page sizes in guest_memfd test Fuad Tabba
2025-06-06 8:15 ` David Hildenbrand
2025-06-08 23:43 ` Gavin Shan
2025-06-05 15:38 ` [PATCH v11 18/18] KVM: selftests: guest_memfd mmap() test when mapping is allowed Fuad Tabba
2025-06-05 22:07 ` James Houghton
2025-06-05 22:12 ` Sean Christopherson
2025-06-05 22:17 ` James Houghton
2025-06-06 8:14 ` Fuad Tabba [this message]
2025-06-08 23:43 ` Gavin Shan
2025-06-09 7:06 ` Fuad Tabba
2025-06-06 9:18 ` [PATCH v11 00/18] KVM: Mapping guest_memfd backed memory at the host for software protected VMs David Hildenbrand
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=CA+EHjTwHgAoGos+ZBzEPdkNPzLpX9t8nJLQ89YALPUw4LK4QTA@mail.gmail.com \
--to=tabba@google.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=kvmarm@lists.linux.dev \
--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=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