From nobody Sat Feb 7 15:12:33 2026 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 479813939B7 for ; Tue, 13 Jan 2026 15:27:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768318072; cv=none; b=VFSoGXEixIXwo5Ur9LGvJTnAnkS+EIFoukDCsJytmz8X03GJ0o3f5Sg+yU/29n6vtszeK0XNHEBfu9BsAWsvjPL5kgDp80ooyIiZXsmwzvONTMQxg7JwUMK1xxl+guTewcEB4Ic+pHdIAFXJl5f5DGQOfjlJumH1sMTe5Pn7o00= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768318072; c=relaxed/simple; bh=XoO5KMHdnpZAZi99zA/PXMxt1/PSOD8GRG3MV4pqspk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k5aMIE/JruzrD9LeXjlhZeVLdqQCjh5DmJ7KcH7I1BLbtDRym9pqJlkRy9jjGMLDh7g4oQoKuoGJOwSTWuRyOkMzPBiuAomgmEWLypDF1/5Z1wA6kEOjcCWaruqn1kW7PYUIr5qkAiIJGNqcMYUlfFLZJRzHzRduXU7Par3Lz7M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bZz3Lo8M; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bZz3Lo8M" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-47d59da3d81so29253595e9.0 for ; Tue, 13 Jan 2026 07:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768318065; x=1768922865; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ClV6xb3uKauwGoOx6LpIuCiwNxs8C5+P0pKaRtPxBMQ=; b=bZz3Lo8MKztcPyjAEV9HMqbB+OGMoaorN3IlI+eY2Nl7wm9B2Qdl1L9gaPyHSih3Ol oc1bkD4X2DDqXPeazlEWLav7U0njxP+ib4AZTIcfrpIVseiiZU09YgHT/Ju3YaP02vWc +skLtbII+LzguqY5BAPCTwvp64vtAaEFQ5KRZWrw3KpM8TnMu8LTmPgPJzlvb1Sb/HBN DRIOpzqulydJOQZpNgti7StmLhaN0E4YaSibE1gOLcKavTQfzyAz/qAd7bcIx+Wm8TT8 bAD9hG2maOigd9rNYS7mTj748iOjrtkUuKcp8QpTZMDIXRxuYhh/hseZ/poE49D4jbnd mmgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768318065; x=1768922865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ClV6xb3uKauwGoOx6LpIuCiwNxs8C5+P0pKaRtPxBMQ=; b=QMrqKf7NR83IgPrpVZT2lY9H+PZxH3i7bK1z0u3JWaWQn/pWZeB5cfjFfctB1D6Mom gePkmUzKAqqwFxo9DDmBaph2WjeyLd1+DSzc+IYxNUPdy8G+ncjeTJqHmaL7tSOQVkAj RYxw8WR7cvH/l5SeOGM3OXg2V+v5YBIsQbL5QRADH2mP4FS2hJ6N2587BrGNfuJcHZpw kYmuVx5oyxgmauyaukm6n7N5XvwNBW/EIcZfi9nat4Ws3ai9hcSHB2PuV5T6IcSF8CXB /gltXVxKIHJpraVyXAlKn2WnExB3uFRETwyZ3NuA2J7xHm3WLLpCYdVFhEeF2ycp3QHP sPPg== X-Forwarded-Encrypted: i=1; AJvYcCX8O1vMyt/Y4diY3w+8uOsD4j2kapDHXxvK0IpV66HpAI8iHA7Sj1ZnagXwg8pZZvOsVNuqT9z3GmDSieI=@vger.kernel.org X-Gm-Message-State: AOJu0YxN4IaAiTkCYH5b9hX9EWnD0NcVYs1VcB7J/BHGXacSzD2wSvm1 nyQABWRuO9yrCF+9XNmH97Z76aBFZR9tYLPIRSSKIGyFdSE9ZD7xfOtq X-Gm-Gg: AY/fxX5EdE00MRNInFvdjbefU6FTNCqEb7U0HRItvvAEvPKpx4VPNHM9foPcFzVpG6Q +kdml3YLS9/u7I+1rzU0GNtAsTbGx+uEq1xa+BkEhfEZ/vrocD081bCUdEwzry/JYUb2CGTStYE kQpzz+dDkNFeZSFg5k5nVC5DvJxGDAVuoGuQjZfRz0GUFFV9+RIHIb2nAD3TE6MfQUCeM9+kHa9 NqkXM5JBxHf3pu1O+XeAcBW9smmQuuGh5Gl8YJq6yV5QYkbTKiQMUxGnWEZOov7VgO+f6sFHQZ/ NgJURVoSOnujpaKjt6dH4SXTi4ZiBATg+N9P2tA5ZePx5E9IlFUqpomEqL45TseTEP55DsPSppu aBD3Xfzkt1h6hYJ6ZrL6S6ouFBrqh5RDVoRhiNhOkmxmrLSLyBum+fXWjiP4H4NEaiKbLvoYRfr 9Ze55vgfxfKna2U0z6ZEPxBbNiynXF3K/6AU+QsDXv98sbAYy1fKEipRXcx5dnVDeX5A== X-Google-Smtp-Source: AGHT+IFPYD4aUkgLw+ElK2nCfQAn3fMA8ZdORSxU/HjmPMO8JbFroHKdhuJYQgeH2rPGmtTppuBJ8Q== X-Received: by 2002:a05:600c:1391:b0:477:a219:cdc3 with SMTP id 5b1f17b1804b1-47ed7cccaa3mr41796735e9.12.1768318064610; Tue, 13 Jan 2026 07:27:44 -0800 (PST) Received: from f4d4888f22f2.ant.amazon.com.com ([15.248.2.27]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47d7f68f4ddsm421025325e9.2.2026.01.13.07.27.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Jan 2026 07:27:44 -0800 (PST) From: Jack Thomson To: maz@kernel.org, oliver.upton@linux.dev, pbonzini@redhat.com Cc: joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, shuah@kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, isaku.yamahata@intel.com, xmarcalx@amazon.co.uk, kalyazin@amazon.co.uk, jackabt@amazon.com Subject: [PATCH v4 3/3] KVM: selftests: Add option for different backing in pre-fault tests Date: Tue, 13 Jan 2026 15:26:42 +0000 Message-ID: <20260113152643.18858-4-jackabt.amazon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260113152643.18858-1-jackabt.amazon@gmail.com> References: <20260113152643.18858-1-jackabt.amazon@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jack Thomson Add a -m option to specify different memory backing types for the pre-fault tests (e.g., anonymous, hugetlb), allowing testing of the pre-fault functionality across different memory configurations. Signed-off-by: Jack Thomson --- .../selftests/kvm/pre_fault_memory_test.c | 42 +++++++++++++++---- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/te= sting/selftests/kvm/pre_fault_memory_test.c index be1a84a6c137..1a177f89bc43 100644 --- a/tools/testing/selftests/kvm/pre_fault_memory_test.c +++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c @@ -172,6 +172,7 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64= base_gpa, u64 offset, struct test_params { unsigned long vm_type; bool private; + enum vm_mem_backing_src_type mem_backing_src; }; =20 static void __test_pre_fault_memory(enum vm_guest_mode guest_mode, void *a= rg) @@ -187,14 +188,19 @@ static void __test_pre_fault_memory(enum vm_guest_mod= e guest_mode, void *arg) struct kvm_vm *vm; struct ucall uc; =20 + size_t backing_src_pagesz =3D get_backing_src_pagesz(p->mem_backing_src); + pr_info("Testing guest mode: %s\n", vm_guest_mode_string(guest_mode)); + pr_info("Testing memory backing src type: %s\n", + vm_mem_backing_src_alias(p->mem_backing_src)->name); =20 vm =3D vm_create_shape_with_one_vcpu(shape, &vcpu, guest_code); =20 guest_page_size =3D vm_guest_mode_params[guest_mode].page_size; =20 test_config.page_size =3D guest_page_size; - test_config.test_size =3D TEST_BASE_SIZE + test_config.page_size; + test_config.test_size =3D align_up(TEST_BASE_SIZE + test_config.page_size, + backing_src_pagesz); test_config.test_num_pages =3D vm_calc_num_guest_pages(vm->mode, test_con= fig.test_size); =20 gpa =3D (vm->max_gfn - test_config.test_num_pages) * test_config.page_siz= e; @@ -203,20 +209,23 @@ static void __test_pre_fault_memory(enum vm_guest_mod= e guest_mode, void *arg) #else alignment =3D SZ_2M; #endif + alignment =3D max(alignment, backing_src_pagesz); gpa =3D align_down(gpa, alignment); gva =3D gpa & ((1ULL << (vm->va_bits - 1)) - 1); =20 - vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, + vm_userspace_mem_region_add(vm, p->mem_backing_src, gpa, TEST_SLOT, test_config.test_num_pages, p->private ? KVM_MEM_GUEST_MEMFD : 0); virt_map(vm, gva, gpa, test_config.test_num_pages); =20 if (p->private) vm_mem_set_private(vm, gpa, test_config.test_size); - pre_fault_memory(vcpu, gpa, 0, TEST_BASE_SIZE, 0, p->private); + + pre_fault_memory(vcpu, gpa, 0, test_config.test_size, 0, p->private); /* Test pre-faulting over an already faulted range */ - pre_fault_memory(vcpu, gpa, 0, TEST_BASE_SIZE, 0, p->private); - pre_fault_memory(vcpu, gpa, TEST_BASE_SIZE, + pre_fault_memory(vcpu, gpa, 0, test_config.test_size, 0, p->private); + pre_fault_memory(vcpu, gpa, + test_config.test_size - test_config.page_size, test_config.page_size * 2, test_config.page_size, p->private); pre_fault_memory(vcpu, gpa, test_config.test_size, test_config.page_size, test_config.page_size, p->private); @@ -248,11 +257,13 @@ static void __test_pre_fault_memory(enum vm_guest_mod= e guest_mode, void *arg) kvm_vm_free(vm); } =20 -static void test_pre_fault_memory(unsigned long vm_type, bool private) +static void test_pre_fault_memory(unsigned long vm_type, enum vm_mem_backi= ng_src_type backing_src, + bool private) { struct test_params p =3D { .vm_type =3D vm_type, .private =3D private, + .mem_backing_src =3D backing_src, }; =20 if (vm_type && !(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(vm_type))) { @@ -265,14 +276,27 @@ static void test_pre_fault_memory(unsigned long vm_ty= pe, bool private) =20 int main(int argc, char *argv[]) { + enum vm_mem_backing_src_type backing =3D VM_MEM_SRC_ANONYMOUS; + int opt; + TEST_REQUIRE(kvm_check_cap(KVM_CAP_PRE_FAULT_MEMORY)); =20 guest_modes_append_default(); =20 - test_pre_fault_memory(0, false); + while ((opt =3D getopt(argc, argv, "m:")) !=3D -1) { + switch (opt) { + case 'm': + backing =3D parse_backing_src_type(optarg); + break; + default: + break; + } + } + + test_pre_fault_memory(0, backing, false); #ifdef __x86_64__ - test_pre_fault_memory(KVM_X86_SW_PROTECTED_VM, false); - test_pre_fault_memory(KVM_X86_SW_PROTECTED_VM, true); + test_pre_fault_memory(KVM_X86_SW_PROTECTED_VM, backing, false); + test_pre_fault_memory(KVM_X86_SW_PROTECTED_VM, backing, true); #endif return 0; } --=20 2.43.0