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 A6AB1C678DC for ; Wed, 11 Jun 2025 13:34:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64FBB6B00B0; Wed, 11 Jun 2025 09:34:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 600576B00B1; Wed, 11 Jun 2025 09:34:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4EF8A6B00B2; Wed, 11 Jun 2025 09:34:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2F7C96B00B0 for ; Wed, 11 Jun 2025 09:34:11 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E4A6E1D712B for ; Wed, 11 Jun 2025 13:34:10 +0000 (UTC) X-FDA: 83543213460.21.B2A47D4 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf23.hostedemail.com (Postfix) with ESMTP id E283114000F for ; Wed, 11 Jun 2025 13:34:08 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=sizvuK4y; spf=pass (imf23.hostedemail.com: domain of 3z4VJaAUKCEo5mnnms00sxq.o0yxuz69-yyw7mow.03s@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3z4VJaAUKCEo5mnnms00sxq.o0yxuz69-yyw7mow.03s@flex--tabba.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=1749648849; 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=HhMMHPCLGACkcKVf5+6mUDlWv9E5h4gdh0oW2i6XcGE=; b=cMoLuAzh/hQZkZdL9PfCu78dZWghKhvODZ+2hEecCBhBtAzJmBx3kHy9U/QQtrVTUvmQ7w EBbOD/jkP5UoAxQKcDqhNsUAohvIb1ElZDX5ixrtKX16yMCp/kWiYzOFNXRjub20HzMvfV 0EfcxyOCnB4sd4Ys9ui6sCWAKJjksfw= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=sizvuK4y; spf=pass (imf23.hostedemail.com: domain of 3z4VJaAUKCEo5mnnms00sxq.o0yxuz69-yyw7mow.03s@flex--tabba.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3z4VJaAUKCEo5mnnms00sxq.o0yxuz69-yyw7mow.03s@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749648849; a=rsa-sha256; cv=none; b=eubC4yp0oViHwQFGjvlwMerkXI5ig6tLOKryosG3qAd/y8fyQfxutPneiYpHzJUpybgmrm xIuEOBie23lfJWEbdf5Z+RPfIXvsrZqQO0LYUWqA4WlUaLGx2VtuLEejOveB5r6dtbvJC/ 5RFqTgq6Cdqn/ACRgkZod4c6JJhTSlY= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-451d7de4ae3so41774055e9.2 for ; Wed, 11 Jun 2025 06:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1749648847; x=1750253647; 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=HhMMHPCLGACkcKVf5+6mUDlWv9E5h4gdh0oW2i6XcGE=; b=sizvuK4yY4pQoITIb/S2lvCVGsdL3mmMCpRgo2+MG4aQnMPthhZaPWKTSy33KR6IjS waD268Wj47sCXFJ/FzmoRsB0PF9p4/3wu4sSFIPmTRrhZalItCR7n0oefbmEWUSWJ4c7 NoKgGOmiUFEFZ/2on/xrip7wmNo2FbQp47BGc83IpduXWqAq7yl9KiZd9zl6cQYP22BP uA3kOLUNyUjWRLoWXbbuaCUleAvhb7T/6AcP9PVCMzHpdSAnG2HFtbAl8NEveLtc8rSb 98HLpgXqBPX0eBez0ayDHUBer2YZV5s4S9eQnDyKfTcFcCHAVJ6IiTv4iRBqoSSC5pdF hCdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749648847; x=1750253647; 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=HhMMHPCLGACkcKVf5+6mUDlWv9E5h4gdh0oW2i6XcGE=; b=ZeKOVlert7j6UpdLG3uwC/MaNrb2q3tcEMiRDYvmpejR5u39Tt3uc0a4AiV4jPTGWO yQfpw4BwXeONEJdt+1fwbzsJZNC5CfjiukQwb26UpGgUAiBSkPbOnVRB9CCPNWSDUnLV ECTkGMlmB4l1HsLmZP9Q3pEkK5e8HkbqMzuurLw1701tMOSFoDTGpeBpL/MuTvVKJIzS nwQlylCP42Jsk8aFy02FoIRiMaT51JRF8QUJk1OmmqTqTOamg+MmQ+lNHfAGFmUESne5 AAFfgY3rxax/nVD6IKg2O8pdGZ6P1il4/ImVZi6EKJQWT2jLkKzW+uqjo8AKZtPN+Fuh Cv4A== X-Forwarded-Encrypted: i=1; AJvYcCXVpG0ryvCc4ZdghTMbfUWfXWn0fGsRcKVYocMbJLDGi1Ac5NzZ/cyrSKkXcwynpPjI4Zb0KsnAZQ==@kvack.org X-Gm-Message-State: AOJu0YwgwSjlk+650ZkeBfGTgSrQONgl96EXXM3oedctqvTy1XLWBpoc qVQ9D2gmb8woA+cHD7ds44k35MlqvVNWxh0NS81yWjWCHpTodXnAIFpT0TZ9cP299XtEjNcB4m/ 4rA== X-Google-Smtp-Source: AGHT+IFl2rGDbEyyq3Z/x9draA1KG6JcfdmJL5N0xgRsAf7iQvJmF31fca8I9HdR2qtrE21yQqMSi290GA== X-Received: from wmth23.prod.google.com ([2002:a05:600c:8b77:b0:451:d768:b11d]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d92:b0:450:cd50:3c66 with SMTP id 5b1f17b1804b1-45324f4017dmr26302775e9.29.1749648847434; Wed, 11 Jun 2025 06:34:07 -0700 (PDT) Date: Wed, 11 Jun 2025 14:33:29 +0100 In-Reply-To: <20250611133330.1514028-1-tabba@google.com> Mime-Version: 1.0 References: <20250611133330.1514028-1-tabba@google.com> X-Mailer: git-send-email 2.50.0.rc0.642.g800a2b2222-goog Message-ID: <20250611133330.1514028-18-tabba@google.com> Subject: [PATCH v12 17/18] KVM: selftests: Don't use hardcoded page sizes in guest_memfd test From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org, kvmarm@lists.linux.dev 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, tabba@google.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: E283114000F X-Rspamd-Server: rspam03 X-Rspam-User: X-Stat-Signature: 169nbs9ff1sjtz4mwon8tjtpx9iw6cfr X-HE-Tag: 1749648848-98354 X-HE-Meta: U2FsdGVkX19ysZSjRvqsfkn6HtRhRNRM0R/Lc+RVX+gBD+lOTpOC4qY4S2obAECgeVciA9e9UdIkwX6MqNeauNr4KIFHP5RFQOFMgOKRvi8KwYbYSjdYHGO2+ztTPGZcnpQFAY3yS0qCrIVmpiijwpbcAeaZCBzA6x8inN+hzxji3IHPTG8eKYZH4xT97dDcfGq3GiTFVthQBsrf/vQFpzETeNnpdNaaxHOQcMUyHcZnyua9k9n0zzolNIWdCLsVEUFktkSNOmkvixzUkzWasYo3jdmgR1sJz2OP8vp+qnpGtBDK+fZTwBfldDFCKTZVLZVWUah766ilypPBP5GnZ9vF6RdczZy4QQNhpDe9h9FoHIpkE+NKdQTaglCrIOxkIgKQwMcfeuSDL0yPDaLjTEXmNa1B/uWCiR3wjCWHMmpQxC0t6xhofdCeVSgvjNs1EpxQ5ceCMWykvsSi/ci1T+Ny8OyLBIMP/f6tlp4vlWgNuPWBBwEcdrgxeqPvDsR+GagvTfFl+696wK3E5piSEhrg9MhQHfriZ8jD4nVLCqfurExjJnk/Bet+AZX8RmodN7uQqXCNlzixMYRxnRwNcZfFkPPptXT+oOceQAED3ihLsFJOhs4LZ9OnBH4iYWcBguXZp2xRSGLfxyBX/p6I4Ay3OKjS3Sk7wGTtfyoLwizg1Ec3k+CM/wn1/oO5mYgW8CUxdWTSDubbzq0wafj2I3k4ewuHsLWmkuHmFu+P7+7JJEMHm0vWNlJaE7O6bHnvWEIk6Pl6bW6A8Y1S6xwVDq/A1eiE2Pv9nFKXvz/SejARd0D61Egn0hSpD5nDt/ozJ8Qe0iGlwu9CobqAqBTrgwwTDWm2mKRTl2TFVitqpdgqdeuCj+e4ibDx7UKsvdgSYQH1q174z+kz8UrXraI4YSZ1iDU3DoESjvgZo08ivMJveSQKXBk+sLkSGCHW7RoOg0SWUSnw2W/vz+Iqv4p wtYUGZcs uGhoslg0g+vUsQAKU0/OD368Zmwgl88TliUOGsy9YUdWLkgB1evpTgkplG5+3Yi7Ws5bwSVOM8np0NrGdRbw0mNXVFplLHQQ347pJg75Qegry0TLLtzVO0VnsAyauHGniZHgMxovfVy0p2Qy4tzrK6FUC7v037XqaqH/t8Jm9JEkhN6Tyr81TA3Q6RhjDcVZF7N+nEfSCTSbL4G9A6H7hjwWWAQp/5B5ztEF7pVrxIdZLfMjsOFjo1UJlyUTO2hmn16Zb7rQn/aNIYs4U+j7nPkHkwTYF/xdk96SqU+V44DVAYDA3VAYJwETUDVkMK2kBeR2UYzP5oo1PR7madi28GyfjAGQnCLnUmcCXnnNNwDobakI7T1jlovXiKXaNCmdkPM+bRBMH70DmR+7kF6BW9Yun5bXmpdTkDxueasbQSqXgi8zN7YY6uM/1LCg9oCr0+M5pOgSwvO/4fM/iXfYKZmf2DJf+IO79BIgUgTsTWsfnUOJ37OcVBe8+dbjNWLqFCYptseywGCw4JpEWjgjpQFeGIafBEXywxnmiAtwjlFW761quxZvW2UOp6FWoihSyYltPjmZImvL+jdYNa8ZcSXph7XF1sbJz7EH/avRwozAJJS75C0tjK1QizMWkNtVDsxco+30myVoTiDfCSb2m7XoecPUp1u9XmjpZGfSECvOFPYY= 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: Using hardcoded page size values could cause the test to fail on systems that have larger pages, e.g., arm64 with 64kB pages. Use getpagesize() instead. Also, build the guest_memfd selftest for arm64. Reviewed-by: David Hildenbrand Suggested-by: Gavin Shan Reviewed-by: Gavin Shan Signed-off-by: Fuad Tabba --- tools/testing/selftests/kvm/Makefile.kvm | 1 + tools/testing/selftests/kvm/guest_memfd_test.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selftests/kvm/Makefile.kvm index 38b95998e1e6..e11ed9e59ab5 100644 --- a/tools/testing/selftests/kvm/Makefile.kvm +++ b/tools/testing/selftests/kvm/Makefile.kvm @@ -172,6 +172,7 @@ 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 += get-reg-list +TEST_GEN_PROGS_arm64 += guest_memfd_test TEST_GEN_PROGS_arm64 += memslot_modification_stress_test TEST_GEN_PROGS_arm64 += memslot_perf_test TEST_GEN_PROGS_arm64 += mmu_stress_test diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c index ce687f8d248f..341ba616cf55 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -146,24 +146,25 @@ static void test_create_guest_memfd_multiple(struct kvm_vm *vm) { int fd1, fd2, ret; struct stat st1, st2; + size_t page_size = getpagesize(); - fd1 = __vm_create_guest_memfd(vm, 4096, 0); + fd1 = __vm_create_guest_memfd(vm, page_size, 0); 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, 0); 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); -- 2.50.0.rc0.642.g800a2b2222-goog