From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CD91C3ABD8 for ; Wed, 14 May 2025 23:45:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B281C6B009A; Wed, 14 May 2025 19:44:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AAEB96B00E4; Wed, 14 May 2025 19:44:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 902D96B00E5; Wed, 14 May 2025 19:44:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6ECA76B009A for ; Wed, 14 May 2025 19:44:04 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BE7D81611F8 for ; Wed, 14 May 2025 23:44:05 +0000 (UTC) X-FDA: 83443144050.29.AD0FAC0 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf02.hostedemail.com (Postfix) with ESMTP id 025B78000B for ; Wed, 14 May 2025 23:44:03 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=eBx3S+nt; spf=pass (imf02.hostedemail.com: domain of 3wiolaAsKCPMVXfZmgZtoibbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--ackerleytng.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3wiolaAsKCPMVXfZmgZtoibbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--ackerleytng.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266244; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BduUPNqb61B8Eivz+AJ2LgpTa1Bu3K7jmzRP1k+UIFk=; b=yEfEsZEVyA7LrLpWv3Dp69XV7LABoTqGnoVHA+bPJHAFIZa+wMTOG7oahBZV+jE5M0Q4jb W2ybOK71lg3mhFCQXZh6jFBtYNJ0XigT+WRQDWcmtNORkFwkjWJZ9iLRvWaWQy4Qlmqr+G Bcdj38mj0ga2NDACfJbP5R/apDMlUKQ= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=eBx3S+nt; spf=pass (imf02.hostedemail.com: domain of 3wiolaAsKCPMVXfZmgZtoibbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--ackerleytng.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3wiolaAsKCPMVXfZmgZtoibbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--ackerleytng.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266244; a=rsa-sha256; cv=none; b=OdwubJ7BHdlucTWNyPRyuUCpGnhzNS+km0K+fXK4Eevazh/QOqPg+d2O3MUQhvK81nNiyx ByzmZIawWtjXhTvg9URfaW6K0L0GhfrqQIhAmyhuQwpQWXucy869hbkPrD9+929+vq7Nyi Qq4iXfq5uGptKRqyHk61L7PNeOGhf28= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-30c54b4007cso174652a91.3 for ; Wed, 14 May 2025 16:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266243; x=1747871043; darn=kvack.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=BduUPNqb61B8Eivz+AJ2LgpTa1Bu3K7jmzRP1k+UIFk=; b=eBx3S+ntc9KOWabOyCzbyVvjZ83r6dXvIiRRVS09LF1+bC6oP0fYrtTjRHA36zK4uF MH/9iTMSQesp8DuCEvRf2Msk/vNVobpNKNdANOPiiDeMflb0TZuWKKWwJDC6EHurJuC9 bKTjoNMSbFyOcroniocHjnz7NhS20O+BWA0uoZ/zewEZ00V6UcIkWlrVjDvZ73hqqWcH s9oAf82G+Mz9AvmgGaN7hNG9bhm7zQStdzHitGJRlqmj5DlLXGNw363nKCwFO2MYrZF+ YFbnw9zMViXIiPwA8C8YgKZKW2rL1C6qUFtviyDDyz9/8EFJlRo0sD10uODMXIe4jvoR q/zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266243; x=1747871043; 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=BduUPNqb61B8Eivz+AJ2LgpTa1Bu3K7jmzRP1k+UIFk=; b=XJHQmgK3Ph61scwlaPddmOhA90amNQLMMQUgNfK7QS+CIshiLnPTppmAnam/Nwt40s xz1fCKje8zsff+QsbTMUj+jwJp4pCA3feiREpjXDOpEWgvQMeTybx3/5v7ex5/0cdk8S BDKq63JbVqCKbZwWN9c1Tt6CZkWfybbgtwo59iR+dP2d8n4l9v7phqKNKuBw6P0IrRCJ 830Whv+fASrxlg+tsrnOWLOojDLRAooThQZPG3XpXwHovnH2wR+um9FOYcN0PVuPgEVI uGVlRjiKM76vmews2sWfsSnE68IqyJpRVwj4bmwwzCIguVUTUiBQLSBZaNUNnpnG4W98 WzcQ== X-Forwarded-Encrypted: i=1; AJvYcCWW46mY9L9Ef0/30aEB0nUchWvqOHqnWl+zsW1b/KwYBbJormmnOD58UAAbuORgK3xwtW/dLoVzsQ==@kvack.org X-Gm-Message-State: AOJu0YzQSUmJmcPdLSNAWEua4a7bgpCg5tlzxsYHbe6GvDYPa2Ceo6Gp Of6E23DEftQkhC/Z1rYkWa0it9h/5kqIaM2zyeXjxSUZUaSDP7rVMfYtpBbD1TvYgc/FoFIWhNB eMsitn3CBRMQL63g4PR2SAA== X-Google-Smtp-Source: AGHT+IEjnuIuPh++1YsJBYPVFxGMfCMSkD+n47vqKHsfozYjZZGvfWXQQGTInhBsTuWssNrzOA4VxrkjA/1Su+uotw== X-Received: from pjbpw8.prod.google.com ([2002:a17:90b:2788:b0:301:1ea9:63b0]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:17c6:b0:2fa:15ab:4dff with SMTP id 98e67ed59e1d1-30e2e643c54mr7245629a91.31.1747266242805; Wed, 14 May 2025 16:44:02 -0700 (PDT) Date: Wed, 14 May 2025 16:42:21 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <322b245180f09076c5cbbac0d68ea27c0a8c878b.1747264138.git.ackerleytng@google.com> Subject: [RFC PATCH v2 42/51] KVM: selftests: Add basic selftests for hugetlb-backed guest_memfd From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 025B78000B X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: x8p8khb6w54ckjrrfiwtif3jimpbimm5 X-HE-Tag: 1747266243-186101 X-HE-Meta: U2FsdGVkX1/65P+ZdLH2fl8crj2kz2fuJJQxCgX6Z9yyGn5gwbQPdtuChl8HBHtYdyPbpAXnDoqUqFVIK2FAPgWHRv3cvU4bPSw6mqzARjyQZAjzmnjKXYU2jvaLUU2FPVWXWsd/zVIYg/MAIJiA2F+cKmg0Y1olV8fKNb9YxOcVF4gjKcYLR7FcKnrdUxNY93rksbGvDq/6rFn10Emt0MGoM9G7IOoMP/N4kzdREhrhIplcqLJfgbzODh796maOjIPxOPySBiG71Dm0VhTjuSLlkEtD0YhmPXPvJsfRszfgBamjKcS/JhW+fE0Fy3vTlLq04rMEkUbhMWv6CE7a3iMdgZpUjjeeaw6vTin+njrt+Bk60qNMfaRo+Z26qCfMhLT/M2UzXMiyL0d4uv7nlmopYdkVsfnRVF6uHU6gFCTiv8Qxd9tWRTNEtVAQ97hU5EJvHAXxTX1wP2rDUtA3BFVp8Hi2bDHaaw7vLjYun2eXJauncPvtWSlCtPjZ/VRMjR85n3Dv+IB08ToznUkX32gNo4QnK+bxlDlt+gCX1X2TrSieQr1aeJWewTZwHAqOtT3H8h1LrikJuDyEEfTKjm3fReoDx+CzAGKZUVEr2Qi0DCYZ0rNs/YRmYF2eTljXAqB4ojFZB/1LowBbd9ghGvlMbhB+qwMJUZSkjJJdY2/nLVUyCc+YfISwUJlCPzwDwiPU8ieL9WrVGwP16T0fZHQfHyXYbMoaB0J6ygfDJrtjME+DwYZ+eng6Wao1QyzImuBwu+U9/aPSHzf3uuVn+I+IvL4+t+5ELtwsbd1rLcM9OxuEH0gItYV708FBLQTAabufJsB3G5s0NrxkGaT+7GnXgELiE8s+pP+SYt1pXh76JgORA3vqyHbMD4MT9H7+i2C0XG9/l/ryQctGn1gQa/dEXchgxYqxzO5pYiHphP7D4bm3srXr2uEBGHVH+UrXguRYxnOxSCdWWX2VSVN r1zHgyId wYgBk/ue60OzMHSC/u1ibJ9+oZrXSVkOBNrXdsk2M2GZjig0Ktr9O/3taC5p/feAi2DiZp1hHwnABePG2ypBSXQxicRsEo8IxdXhbbh21adXCGOAVUXiFNIoo1mFMUvzC/QkJUPXO4/7SrT/AktawkY4m1QI24iG8n7RVDRZnpFOra90ndjPAD6+mTze5ytucrugMQK2CYq8YkwKAW0rQfSFUmhYoJ5nXBfN1DZ71jcUZjhBVDEfngJcvgtiALHTmMZ/uj5PpsXT39BsayOMEuhnXP6+Flwphzf032Dq7lbBXKA+Lt0DBT16UV4rYN5rPgqd8dr2xL2apY5pjQpVj7Ft64wVIKG0DN8wNrRwwsY9qg2yyeXaaDt0Nb1/PVXY/bpBdmkk0VLQijwGhWlgiIVtQWESZ0mlzD49ZW7ZlXwWT+/sSoHek73DTX+ItGpnQtWfScqgyxdXX1/wyzkThnpshksAv3tKZniWU82MrEUM3WmaZTYrowp1FZBb1pQ4qK2Ntnsoiz7I5ZH7W1oQKObUV1DRDuqL17/Mx98da6VAqMJgAEJUOWs2FKRg0MuxogsxCfpRlKbEEwVckyXvIWjMoEiSr2FjvjCTF6H0IONc1Eu4POxUm8zH7DuAK85ZHzkACpYa/wFdXW56se5ML8kwq3WawL3GgXd9vVFMN2VW+DujgRV8WWTudLBLQY5uRK0bL X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add tests for 2MB and 1GB page sizes, and update the invalid flags test for GUEST_MEMFD_FLAG_HUGETLB. In tests, touch every page but not every byte in page to save time while testing. Change-Id: I7d80a12b991a064cfd796e3c6e11f9a95fd16ec1 Signed-off-by: Ackerley Tng --- .../testing/selftests/kvm/guest_memfd_test.c | 94 +++++++++++++------ 1 file changed, 67 insertions(+), 27 deletions(-) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c index 1e79382fd830..c8acccaa9e1d 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -13,6 +13,8 @@ #include #include +#include +#include #include #include #include @@ -38,6 +40,7 @@ static void test_file_read_write(int fd) static void test_faulting_allowed(int fd, size_t page_size, size_t total_size) { const char val = 0xaa; + size_t increment; char *mem; size_t i; int ret; @@ -45,21 +48,25 @@ static void test_faulting_allowed(int fd, size_t page_size, size_t total_size) 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++) + increment = page_size >> 1; + + for (i = 0; i < total_size; i += increment) + mem[i] = val; + for (i = 0; i < total_size; i += increment) 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++) + for (i = 0; i < page_size; i += increment) TEST_ASSERT_EQ(mem[i], 0x00); - for (; i < total_size; i++) + for (; i < total_size; i += increment) TEST_ASSERT_EQ(mem[i], val); - memset(mem, val, total_size); - for (i = 0; i < total_size; i++) + for (i = 0; i < total_size; i += increment) + mem[i] = val; + for (i = 0; i < total_size; i += increment) TEST_ASSERT_EQ(mem[i], val); ret = munmap(mem, total_size); @@ -209,7 +216,7 @@ static void test_create_guest_memfd_invalid_sizes(struct kvm_vm *vm, size_t size; int fd; - for (size = 1; size < page_size; size++) { + for (size = 1; size < page_size; size += (page_size >> 1)) { 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", @@ -217,28 +224,33 @@ static void test_create_guest_memfd_invalid_sizes(struct kvm_vm *vm, } } -static void test_create_guest_memfd_multiple(struct kvm_vm *vm) +static void test_create_guest_memfd_multiple(struct kvm_vm *vm, + uint64_t guest_memfd_flags, + size_t page_size) { int fd1, fd2, ret; struct stat st1, st2; - fd1 = __vm_create_guest_memfd(vm, 4096, 0); + fd1 = __vm_create_guest_memfd(vm, page_size, guest_memfd_flags); TEST_ASSERT(fd1 != -1, "memfd creation should succeed"); ret = fstat(fd1, &st1); TEST_ASSERT(ret != -1, "memfd fstat should succeed"); - TEST_ASSERT(st1.st_size == 4096, "memfd st_size should match requested size"); + TEST_ASSERT(st1.st_size == page_size, "memfd st_size should match requested size"); - fd2 = __vm_create_guest_memfd(vm, 8192, 0); + fd2 = __vm_create_guest_memfd(vm, page_size * 2, guest_memfd_flags); TEST_ASSERT(fd2 != -1, "memfd creation should succeed"); ret = fstat(fd2, &st2); TEST_ASSERT(ret != -1, "memfd fstat should succeed"); - TEST_ASSERT(st2.st_size == 8192, "second memfd st_size should match requested size"); + TEST_ASSERT(st2.st_size == page_size * 2, + "second memfd st_size should match requested size"); + ret = fstat(fd1, &st1); TEST_ASSERT(ret != -1, "memfd fstat should succeed"); - TEST_ASSERT(st1.st_size == 4096, "first memfd st_size should still match requested size"); + TEST_ASSERT(st1.st_size == page_size, + "first memfd st_size should still match requested size"); TEST_ASSERT(st1.st_ino != st2.st_ino, "different memfd should have different inode numbers"); close(fd2); @@ -449,21 +461,13 @@ static void test_guest_memfd_features(struct kvm_vm *vm, size_t page_size, close(fd); } -static void test_with_type(unsigned long vm_type, uint64_t guest_memfd_flags, - bool expect_mmap_allowed) +static void test_guest_memfd_features_for_page_size(struct kvm_vm *vm, + uint64_t guest_memfd_flags, + size_t page_size, + bool expect_mmap_allowed) { - struct kvm_vm *vm; - size_t page_size; + test_create_guest_memfd_multiple(vm, guest_memfd_flags, page_size); - if (!(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(vm_type))) - return; - - vm = vm_create_barebones_type(vm_type); - - test_create_guest_memfd_multiple(vm); - test_bind_guest_memfd_wrt_userspace_addr(vm); - - page_size = getpagesize(); if (guest_memfd_flags & GUEST_MEMFD_FLAG_SUPPORT_SHARED) { test_guest_memfd_features(vm, page_size, guest_memfd_flags, expect_mmap_allowed, true); @@ -479,6 +483,34 @@ static void test_with_type(unsigned long vm_type, uint64_t guest_memfd_flags, test_guest_memfd_features(vm, page_size, guest_memfd_flags, expect_mmap_allowed, false); } +} + +static void test_with_type(unsigned long vm_type, uint64_t base_flags, + bool expect_mmap_allowed) +{ + struct kvm_vm *vm; + uint64_t flags; + + if (!(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(vm_type))) + return; + + vm = vm_create_barebones_type(vm_type); + + test_bind_guest_memfd_wrt_userspace_addr(vm); + + printf("Test guest_memfd with 4K pages for vm_type %ld\n", vm_type); + test_guest_memfd_features_for_page_size(vm, base_flags, getpagesize(), expect_mmap_allowed); + printf("\tPASSED\n"); + + printf("Test guest_memfd with 2M pages for vm_type %ld\n", vm_type); + flags = base_flags | GUEST_MEMFD_FLAG_HUGETLB | GUESTMEM_HUGETLB_FLAG_2MB; + test_guest_memfd_features_for_page_size(vm, flags, SZ_2M, expect_mmap_allowed); + printf("\tPASSED\n"); + + printf("Test guest_memfd with 1G pages for vm_type %ld\n", vm_type); + flags = base_flags | GUEST_MEMFD_FLAG_HUGETLB | GUESTMEM_HUGETLB_FLAG_1GB; + test_guest_memfd_features_for_page_size(vm, flags, SZ_1G, expect_mmap_allowed); + printf("\tPASSED\n"); kvm_vm_release(vm); } @@ -486,9 +518,14 @@ static void test_with_type(unsigned long vm_type, uint64_t guest_memfd_flags, static void test_vm_with_gmem_flag(struct kvm_vm *vm, uint64_t flag, bool expect_valid) { - size_t page_size = getpagesize(); + size_t page_size; int fd; + if (flag == GUEST_MEMFD_FLAG_HUGETLB) + page_size = get_def_hugetlb_pagesz(); + else + page_size = getpagesize(); + fd = __vm_create_guest_memfd(vm, page_size, flag); if (expect_valid) { @@ -550,6 +587,9 @@ static void test_gmem_flag_validity(void) /* After conversions are supported, all VM types support shared mem. */ uint64_t valid_flags = GUEST_MEMFD_FLAG_SUPPORT_SHARED; + if (kvm_has_cap(KVM_CAP_GMEM_HUGETLB)) + valid_flags |= GUEST_MEMFD_FLAG_HUGETLB; + test_vm_type_gmem_flag_validity(VM_TYPE_DEFAULT, valid_flags); #ifdef __x86_64__ -- 2.49.0.1045.g170613ef41-goog