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 EAE14C3ABD8 for ; Wed, 14 May 2025 23:46:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D4696B00E8; Wed, 14 May 2025 19:44:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25AA66B00E7; Wed, 14 May 2025 19:44:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 03AEC6B00E8; Wed, 14 May 2025 19:44:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D5B4C6B00AE for ; Wed, 14 May 2025 19:44:13 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 14B14140672 for ; Wed, 14 May 2025 23:44:15 +0000 (UTC) X-FDA: 83443144470.26.992E257 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf21.hostedemail.com (Postfix) with ESMTP id 3E0AD1C000D for ; Wed, 14 May 2025 23:44:13 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="GYyT/aCz"; spf=pass (imf21.hostedemail.com: domain of 3zColaAsKCP0fhpjwqj3ysllttlqj.htrqnsz2-rrp0fhp.twl@flex--ackerleytng.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3zColaAsKCP0fhpjwqj3ysllttlqj.htrqnsz2-rrp0fhp.twl@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=1747266253; 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=VIHO3z7qgUdLCctBcJJdIeKM53vTdpjbrMww0TEetmg=; b=NKuXA6+lvr/aYNeEw7htkbDG/n2DbOSQexZ5AP/FkHfq387zF3PiKH1WsQYtGYN7+4f/xR KYX3Vht01tKHhDRnfykRveI6yaCDx062cNmJ4Ab6uV2FQ2d2bwiW7C5RX8cVGWe0b/9/9o tSIBnqEpAGCHGKPtxUNafk6b5m3E5+8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="GYyT/aCz"; spf=pass (imf21.hostedemail.com: domain of 3zColaAsKCP0fhpjwqj3ysllttlqj.htrqnsz2-rrp0fhp.twl@flex--ackerleytng.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3zColaAsKCP0fhpjwqj3ysllttlqj.htrqnsz2-rrp0fhp.twl@flex--ackerleytng.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266253; a=rsa-sha256; cv=none; b=sGx6auyvCFB1ZHYtvhdKacNgehffvkwsTCA4SKak1dI9m5yMy0MLfitFuV4Cdx5He1beg3 heojDm5RNlD0mm2jNkFOfdHz5NWVquCRgv1vv6O3UgL6GIScuIc/RKLz8OX9yHcl0iMMmJ EL8hHyFyKjNIhqOu+St/fg7Vsq69p+Q= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-22e815dd332so5525065ad.3 for ; Wed, 14 May 2025 16:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266252; x=1747871052; 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=VIHO3z7qgUdLCctBcJJdIeKM53vTdpjbrMww0TEetmg=; b=GYyT/aCz4wjKovv0Fx6vZ3LbugDCvXL+UW8qtmcBtA5TJsohHHcw31bvbDIH1v2GOL dayIdAeZX+aUNTRMOx89XRCxBCZYZkquSvySR1VDNNxYoTs+Jyvx8HxkzTtu4Qu6b53F gk7WQ4ibv4hsxuCqaMC7RM0d/ZLdraSND6ocVYg/degJHpU/SjaSJY/VZYbvfvowuomN KxupfgtZ2PXYvRNJgxxqRv4l8wL5ftBvhwbUyEKukNaZSDDFvyvl5eIhZCqHcg4yfoXD 9VfAiyiCQqaRZy/5SfkCS27GEqkUCVbWvt3fR1koCycxkg1Flk1shGUoWyokfvPvF9IB ameg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266252; x=1747871052; 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=VIHO3z7qgUdLCctBcJJdIeKM53vTdpjbrMww0TEetmg=; b=Zw9qIJAEWl1I8lCuxcyzVCk+Lw+Is4VpNMBQnqG35iUbp2zk4gDqsIwVOmT8OZT01G Wii1z7RS42O4IEPkvziJR7shIyIDgcf3H2Tb8lcggrhiljufZO/znF/tuuWIQordpNir p8DOoQ1Zlbe8TaF99byXt/oC59zqpwP22eHvUpHydkDZaVQjlRaDZ81M37HUWNIGa676 cUBjs6LFSZO4eNI4P2cUCqGInJ6ijSXZ+Qm1C70pVONF6G/mGRcfSA/O/PFyhkamlfUl JHJa/abBp/CUkCnqxDfdlh+gBjDahpgCom7Ctw5l29vq5F4BI+zwBjIj8TCFiCl5T6Cp Kr7g== X-Forwarded-Encrypted: i=1; AJvYcCVamCHrEn4PbAWYY/lOXrtzdDamYuZV6jH+0ugx4kW0ppzEUiqGL2iYWhao7xdsrWL1qikc6WFNYw==@kvack.org X-Gm-Message-State: AOJu0Yz0OBqM5rlsf21zjjlJTsrsqMj7VayTIt6CRVRdsw60cmPBj8mf o0PWH9ZNjVlbVRlRyVZQYF2Gkg8rJMgx9TSK1I3G0AlrZgoIrgrvseKYNCvYW3dI+TOfqnpA6zZ YLMTqe9/ulJ8zSEcngEdWAg== X-Google-Smtp-Source: AGHT+IHmwCzSwN6Nfb7PIWHR4ZLGRIGjOq8g3mWPjJm4bmOxXDdJ3v5NacuKAC2o4rPhtu2Mbj8tJejqtkdzvZ+2iQ== X-Received: from plgk17.prod.google.com ([2002:a17:902:ce11:b0:22e:15c1:3510]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1744:b0:223:f639:69df with SMTP id d9443c01a7336-231b60fd7e5mr4722055ad.41.1747266252099; Wed, 14 May 2025 16:44:12 -0700 (PDT) Date: Wed, 14 May 2025 16:42:27 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: Subject: [RFC PATCH v2 48/51] KVM: selftests: Update test for various private memory backing source types 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-Server: rspam10 X-Stat-Signature: zpao7gf6crjpmfqhzx35rigqptc1j4er X-Rspamd-Queue-Id: 3E0AD1C000D X-Rspam-User: X-HE-Tag: 1747266253-549710 X-HE-Meta: U2FsdGVkX19KK22pilO8fmCGCMDYC2MmpCWYxp1UA8vti6PLeu871b0jl3Av5TaNNxqvkh37vZB7GZowC/vOhfSdBJCoJJds0IocTWZdhysDFKwqeGqoiRlJc/p2A543ddYBFV5yNwyLldU3COA9a9eJlH7+iJ2goXlPAbgpJepW5834UhDA3rx01sZZEfxcYovR0gbKjUMYTQZzXIhnsMz2uyh7AdBboJ4eVGKCDTve4QGRpmYftU2z3twCxPDgehXbZSy0iNgZ3PS9Me300wjdKfK/j/5yFPh5kBvPH4XtDtQYihUt/WCJm8VjD2lE3lA2xY47zC74AV7g0HaRcZvx89m4YuTLi5TUXVTjR98s4ox96xpc6//oVAvDsNZNl6K/FrHVRyM8ITYgeJcNGZTpHDozMzgmE8JOv/V5g1XywJ5En7VPw3zo7qbkjk4/m0ZDAShfgtQJQozCr2azXO0tZtVdTOAilyYRRnqhGT0k7LS4zXDZtfbvpdmc2Zeyc3Xpn7rIFMBpskQ7tdIlytAJAEeu6WM23yoFLLwI1K7Am+S0qhSWF77A9DeESGjeueDxyk/rc1QxNMsYVFBZqW6Cf8mwYlr/i7UKF1uudb7oM9ymc9ZDKP8dNI1TCaJvyjbHSb6mJTnOX2ZEsV3BBkFknYbh2pvOCLZaaVJBDbum3aBzGfMnNGt8eDkdqzgQ4nvJWtcEQrGoIyIBiWaveK7t6cQRPogKHH6SVYF06fhMwLITilPRxH6pdjbf1kGcr+XK00eyBOwvpp5As3D0rE4q0KmdRKXO8md4xNh59WZp9eBdIykMXgFs4Qap/raYx3PXKCUYs0JQDEahxBgWuPgSUTCk5e82Wc8cz550R6iIXEBFWoIFyileBWhEqr/5yLPpUiFFxwgdYk6vgE18f07C/fjMslX314t7v/Wv694drP+gZcT6XGUS+w7DfXNF+yx3xbuSZszLSb7YzBT pi9gLgSP +dHLXxyJrVwSQXZURpsuilSfaiVFmWY0icnJMWZRyyLe/sHrTs8a0W3v24YSETKkPNzH9+JX3JLK45vrbQrQxy50yrHVfBjox8XhFOVj+T7kX2gM08gQY9BtnxBLZwJpFBpOSbKxWxOf/xX1S2rvt38CahN3E0vDJWYJHQNy+pfb8t03uWwgKVaLdJz1ZCxRc/6cYrLS8V5S3flYaOgshxKRB3wW7FOh8EPbCVY7NJQhJEhkzf4uvbP5zwDtR4A6RJifkswUkIltHX6SNGcfvEZxHpN6JBvozPCNvEQf3PZvNtLBaERv8ngRYCjp9eiyPy15DSZrX3TVd2WrUUdU+qP06/MYEByfee3SUFnOOLPc90EmKGxczx4x4YJrYhhgP9Ie4rgpj5Dh4ed/XxLvcRbgMpMty1cD7ZI13VO+OOdlBaD96AmPrLQAg1G5Me0AV8DdjNtMMH4oQZsPGcBjmfy65X+xuqgwQGGHrfiVswuOOyxIEdVWVrd91h+lT+gQ80NnQNLdL+zmZtpdUiNpDTMO0hJjb68TdLSRTH8+dSRnwc9rIEp/+g5worxMxQJtrsBYCR5ZVZ0q136bYmQ+8SoQms46szDou4iBL4QUhzpjad9HvQ1Nz8QoZnVh2fZYwKq4LLwsI5vWwAyuvlfTtjwcCeA== 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: Update private_mem_conversions_test for various private memory backing source types, testing HugeTLB support in guest_memfd. Change-Id: I50facb166a282f97570591eb331c3f19676b01cc Signed-off-by: Ackerley Tng --- .../kvm/x86/private_mem_conversions_test.c | 42 +++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c index ec20bb7e95c8..5a0fd9155ce8 100644 --- a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c +++ b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c @@ -450,21 +450,18 @@ static void *__test_mem_conversions(void *params) } static void test_mem_conversions(enum vm_mem_backing_src_type src_type, + enum vm_private_mem_backing_src_type private_mem_src_type, uint32_t nr_vcpus, uint32_t nr_memslots, bool back_shared_memory_with_guest_memfd) { - /* - * Allocate enough memory so that each vCPU's chunk of memory can be - * naturally aligned with respect to the size of the backing store. - */ - const size_t alignment = max_t(size_t, SZ_2M, get_backing_src_pagesz(src_type)); struct test_thread_args *thread_args[KVM_MAX_VCPUS]; - const size_t per_cpu_size = align_up(PER_CPU_DATA_SIZE, alignment); - const size_t memfd_size = per_cpu_size * nr_vcpus; - const size_t slot_size = memfd_size / nr_memslots; struct kvm_vcpu *vcpus[KVM_MAX_VCPUS]; pthread_t threads[KVM_MAX_VCPUS]; + size_t per_cpu_size; + size_t memfd_size; struct kvm_vm *vm; + size_t alignment; + size_t slot_size; int memfd, i, r; uint64_t flags; @@ -473,6 +470,18 @@ static void test_mem_conversions(enum vm_mem_backing_src_type src_type, .type = KVM_X86_SW_PROTECTED_VM, }; + /* + * Allocate enough memory so that each vCPU's chunk of memory can be + * naturally aligned with respect to the size of the backing store. + */ + alignment = max_t(size_t, SZ_2M, + max_t(size_t, get_backing_src_pagesz(src_type), + get_private_mem_backing_src_pagesz( + private_mem_src_type))); + per_cpu_size = align_up(PER_CPU_DATA_SIZE, alignment); + memfd_size = per_cpu_size * nr_vcpus; + slot_size = memfd_size / nr_memslots; + TEST_ASSERT(slot_size * nr_memslots == memfd_size, "The memfd size (0x%lx) needs to be cleanly divisible by the number of memslots (%u)", memfd_size, nr_memslots); @@ -483,6 +492,7 @@ static void test_mem_conversions(enum vm_mem_backing_src_type src_type, flags = back_shared_memory_with_guest_memfd ? GUEST_MEMFD_FLAG_SUPPORT_SHARED : 0; + flags |= vm_private_mem_backing_src_alias(private_mem_src_type)->flag; memfd = vm_create_guest_memfd(vm, memfd_size, flags); for (i = 0; i < nr_memslots; i++) { @@ -547,10 +557,13 @@ static void test_mem_conversions(enum vm_mem_backing_src_type src_type, static void usage(const char *cmd) { puts(""); - printf("usage: %s [-h] [-g] [-m nr_memslots] [-s mem_type] [-n nr_vcpus]\n", cmd); + printf("usage: %s [-h] [-g] [-m nr_memslots] [-s mem_type] [-p private_mem_type] [-n nr_vcpus]\n", + cmd); puts(""); backing_src_help("-s"); puts(""); + private_mem_backing_src_help("-p"); + puts(""); puts(" -n: specify the number of vcpus (default: 1)"); puts(""); puts(" -m: specify the number of memslots (default: 1)"); @@ -561,6 +574,7 @@ static void usage(const char *cmd) int main(int argc, char *argv[]) { + enum vm_private_mem_backing_src_type private_mem_src_type = DEFAULT_VM_PRIVATE_MEM_SRC; enum vm_mem_backing_src_type src_type = DEFAULT_VM_MEM_SRC; bool back_shared_memory_with_guest_memfd = false; uint32_t nr_memslots = 1; @@ -569,11 +583,14 @@ int main(int argc, char *argv[]) TEST_REQUIRE(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SW_PROTECTED_VM)); - while ((opt = getopt(argc, argv, "hgm:s:n:")) != -1) { + while ((opt = getopt(argc, argv, "hgm:s:p:n:")) != -1) { switch (opt) { case 's': src_type = parse_backing_src_type(optarg); break; + case 'p': + private_mem_src_type = parse_private_mem_backing_src_type(optarg); + break; case 'n': nr_vcpus = atoi_positive("nr_vcpus", optarg); break; @@ -590,9 +607,8 @@ int main(int argc, char *argv[]) } } - test_mem_conversions(src_type, nr_vcpus, nr_memslots, - back_shared_memory_with_guest_memfd); - + test_mem_conversions(src_type, private_mem_src_type, nr_vcpus, + nr_memslots, back_shared_memory_with_guest_memfd); return 0; } -- 2.49.0.1045.g170613ef41-goog