From nobody Wed Oct 1 23:32:09 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CC402EB5A3 for ; Fri, 26 Sep 2025 16:31:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758904285; cv=none; b=Lpswe9jwj8nhCQDyymvXoBdmVyj41h1c2PxfgNbvgoOdxm3cuvcUfRf+UX/gyJnmXS7t1MNO2y5FkuBmXWVyh8+MSTj9MysAtqlYe/Zwe4O8GUbiXPgfHgPyJC0ZVseXFpK2Iy9PaNeewmZRRi5ZcVsubqdVh+PYl7KPUQMeD58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758904285; c=relaxed/simple; bh=0SQATKFA5gi2ffa5TCQYKJ7IY8wK+LLtm/R1ws10kd0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hBiU5/I5HkA8L2XF0UDGlfl8vYs1DnV1B0x6no6psuSbhUp+jbmZeP2WGcEQYFzSn8DW8RcbMSVlwJ4Pej/KSDuYSK5o+qbY9e2GqtmZBuXaUT2tlaMGILkGTSaAl1jRtETAjI4rPHK5z/jRL3V3Qo9lkHvsWPMzhbI22ApSX/E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XdgwTAyf; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XdgwTAyf" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3307af9b55eso2220244a91.2 for ; Fri, 26 Sep 2025 09:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758904283; x=1759509083; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=Sa4dCKWOiWX52uFMDDYKBgVjziPASjCyYcwrRWASNCs=; b=XdgwTAyfGLOQVsTPqGrCdq96jMfQAMg0sLbq++CckR+g19YmNI0CTWVIQT2V0GqYPY zVG7Thz4Jmsl7O8LpXh3yojrQ1zjgphoImNV3FK5FKCrn2INSVcLj0YWIkFUVCGjsve9 eToTAEOPy41tZ2g/8brKBlJL5amFPaXQAqbe2TyPmqa3IpdPeAoWZNTZME/WnHU/O3KC OSKwCYcvEjSqq+430W0HHDHO0x7KWhaWmnfM/wgmJc6Sy9OzoRZRuponJsCNQxnYZb8k JO44KTv/vLI3t0YpbhkEI99m2URifoCiuniJXclKLn0CQ2N0Q6BVqXUPACtMeI2vjUZD kwcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758904283; x=1759509083; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Sa4dCKWOiWX52uFMDDYKBgVjziPASjCyYcwrRWASNCs=; b=kPQsaYUhWO7esX+ZKUlMyZ6gxn4CmKMZsjHZlFa+3Ta45PjDMk9LIdJNtVQzk8PMKU O2MVCEtLRNKLgWzlF6ZRgS1EZSu6ZYUFSztaN7xaFlwVn2qrT6dQ75cS5PsnsFwcATlu paTh/PXwdJvlN7o1HoSxBliLy2M5DPF83qrO/sjEPo6cpXM2cGMMGA3HO8mAHe3SV/bu b1nHfbhkQLWVswoaDQLDjsWVVupaAtUH/qx/sIgAdcIs/HB94MppmAbo9qZFVRq5939k suT9DUzBiqXH3Zb3X8dKYtv/hqf7v1wa/EFw7dI6DNw7odYBmB/WDYAJrIkCg2uSFUwD K5uA== X-Forwarded-Encrypted: i=1; AJvYcCXyivCw2mrnpPjIqkW6cFrTqyDIsQU6DGZXbXYZuCx1i8Ohm4QrBHGWmXu7ZL8QHSsswJL8EZUAk8H8ZJs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9iFEbERZPUJJGKQg+3muZ6+APiSAUxEu8daPcOtDZmcgMqMab G64AM4OFboGjxm5xeHi/Jg0758zwdIffnb0UQPddwm47938Cir/w0YtT3E6aoy911n+8wdvGhzH Fb+uVcA== X-Google-Smtp-Source: AGHT+IHxkuYFJdCTH53s6GSi6lSMHFNJPOSAv81AidBatI33QbAC/pL6MnFbStGz6ZCbISY/uGwjnu+EBo8= X-Received: from pjdn93.prod.google.com ([2002:a17:90a:2ce6:b0:330:6513:c709]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:e7c1:b0:32b:d8af:b636 with SMTP id 98e67ed59e1d1-3342a2b9556mr8924156a91.19.1758904283515; Fri, 26 Sep 2025 09:31:23 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 26 Sep 2025 09:31:03 -0700 In-Reply-To: <20250926163114.2626257-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250926163114.2626257-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.536.g15c5d4f767-goog Message-ID: <20250926163114.2626257-3-seanjc@google.com> Subject: [PATCH 2/6] KVM: selftests: Stash the host page size in a global in the guest_memfd test From: Sean Christopherson To: Paolo Bonzini , Christian Borntraeger , Janosch Frank , Claudio Imbrenda Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, David Hildenbrand , Fuad Tabba , Sean Christopherson , Ackerley Tng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use a global variable to track the host page size in the guest_memfd test so that the information doesn't need to be constantly passed around. The state is purely a reflection of the underlying system, i.e. can't be set by the test and is constant for a given invocation of the test, and thus explicitly passing the host page size to individual testcases adds no value, e.g. doesn't allow testing different combinations. Making page_size a global will simplify an upcoming change to create a new guest_memfd instance per testcase. No functional change intended. Signed-off-by: Sean Christopherson Reviewed-by: Ackerley Tng Reviewed-by: David Hildenbrand Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba --- .../testing/selftests/kvm/guest_memfd_test.c | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing= /selftests/kvm/guest_memfd_test.c index 81b11a958c7a..8251d019206a 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -24,6 +24,8 @@ #include "test_util.h" #include "ucall_common.h" =20 +static size_t page_size; + static void test_file_read_write(int fd) { char buf[64]; @@ -38,7 +40,7 @@ static void test_file_read_write(int fd) "pwrite on a guest_mem fd should fail"); } =20 -static void test_mmap_supported(int fd, size_t page_size, size_t total_siz= e) +static void test_mmap_supported(int fd, size_t total_size) { const char val =3D 0xaa; char *mem; @@ -78,7 +80,7 @@ void fault_sigbus_handler(int signum) siglongjmp(jmpbuf, 1); } =20 -static void test_fault_overflow(int fd, size_t page_size, size_t total_siz= e) +static void test_fault_overflow(int fd, size_t total_size) { struct sigaction sa_old, sa_new =3D { .sa_handler =3D fault_sigbus_handler, @@ -106,7 +108,7 @@ static void test_fault_overflow(int fd, size_t page_siz= e, size_t total_size) TEST_ASSERT(!ret, "munmap() should succeed."); } =20 -static void test_mmap_not_supported(int fd, size_t page_size, size_t total= _size) +static void test_mmap_not_supported(int fd, size_t total_size) { char *mem; =20 @@ -117,7 +119,7 @@ static void test_mmap_not_supported(int fd, size_t page= _size, size_t total_size) TEST_ASSERT_EQ(mem, MAP_FAILED); } =20 -static void test_file_size(int fd, size_t page_size, size_t total_size) +static void test_file_size(int fd, size_t total_size) { struct stat sb; int ret; @@ -128,7 +130,7 @@ static void test_file_size(int fd, size_t page_size, si= ze_t total_size) TEST_ASSERT_EQ(sb.st_blksize, page_size); } =20 -static void test_fallocate(int fd, size_t page_size, size_t total_size) +static void test_fallocate(int fd, size_t total_size) { int ret; =20 @@ -165,7 +167,7 @@ static void test_fallocate(int fd, size_t page_size, si= ze_t total_size) TEST_ASSERT(!ret, "fallocate to restore punched hole should succeed"); } =20 -static void test_invalid_punch_hole(int fd, size_t page_size, size_t total= _size) +static void test_invalid_punch_hole(int fd, size_t total_size) { struct { off_t offset; @@ -196,8 +198,7 @@ static void test_invalid_punch_hole(int fd, size_t page= _size, size_t total_size) } =20 static void test_create_guest_memfd_invalid_sizes(struct kvm_vm *vm, - uint64_t guest_memfd_flags, - size_t page_size) + uint64_t guest_memfd_flags) { size_t size; int fd; @@ -214,7 +215,6 @@ static void test_create_guest_memfd_multiple(struct kvm= _vm *vm) { int fd1, fd2, ret; struct stat st1, st2; - size_t page_size =3D getpagesize(); =20 fd1 =3D __vm_create_guest_memfd(vm, page_size, 0); TEST_ASSERT(fd1 !=3D -1, "memfd creation should succeed"); @@ -241,7 +241,6 @@ static void test_create_guest_memfd_multiple(struct kvm= _vm *vm) =20 static void test_guest_memfd_flags(struct kvm_vm *vm, uint64_t valid_flags) { - size_t page_size =3D getpagesize(); uint64_t flag; int fd; =20 @@ -265,10 +264,8 @@ static void test_guest_memfd(unsigned long vm_type) uint64_t flags =3D 0; struct kvm_vm *vm; size_t total_size; - size_t page_size; int fd; =20 - page_size =3D getpagesize(); total_size =3D page_size * 4; =20 vm =3D vm_create_barebones_type(vm_type); @@ -277,22 +274,22 @@ static void test_guest_memfd(unsigned long vm_type) flags |=3D GUEST_MEMFD_FLAG_MMAP | GUEST_MEMFD_FLAG_DEFAULT_SHARED; =20 test_create_guest_memfd_multiple(vm); - test_create_guest_memfd_invalid_sizes(vm, flags, page_size); + test_create_guest_memfd_invalid_sizes(vm, flags); =20 fd =3D vm_create_guest_memfd(vm, total_size, flags); =20 test_file_read_write(fd); =20 if (flags & GUEST_MEMFD_FLAG_MMAP) { - test_mmap_supported(fd, page_size, total_size); - test_fault_overflow(fd, page_size, total_size); + test_mmap_supported(fd, total_size); + test_fault_overflow(fd, total_size); } else { - test_mmap_not_supported(fd, page_size, total_size); + test_mmap_not_supported(fd, total_size); } =20 - test_file_size(fd, page_size, total_size); - test_fallocate(fd, page_size, total_size); - test_invalid_punch_hole(fd, page_size, total_size); + test_file_size(fd, total_size); + test_fallocate(fd, total_size); + test_invalid_punch_hole(fd, total_size); =20 test_guest_memfd_flags(vm, flags); =20 @@ -367,6 +364,8 @@ int main(int argc, char *argv[]) =20 TEST_REQUIRE(kvm_has_cap(KVM_CAP_GUEST_MEMFD)); =20 + page_size =3D getpagesize(); + /* * Not all architectures support KVM_CAP_VM_TYPES. However, those that * support guest_memfd have that support for the default VM type. --=20 2.51.0.536.g15c5d4f767-goog