From nobody Fri Dec 19 15:29:47 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 3192030E0DD for ; Mon, 13 Oct 2025 15:15:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368539; cv=none; b=JAsMIcUA+cfLYIDIO7OC2lIoJ1ymts0MOyMT3toYOqAzPpJWWOYmDcUMQkLQdTMN7JWFVyLQUb4rlQoNL03zi285+DSxka5FdqAMetyfFDYpIy8DiMNJeFr9I3RMvET4DbbVl47OBp/HE8eULfi9hJr1EJU8NayqyHrjgTMVecw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368539; c=relaxed/simple; bh=Dswut1G5DDjWHJ+VMwG3xofi3zOAgNz/greVPQp+nQQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jGS+pS+c//KNuBp+xgG127VOcSG/St5Bssms/V/ebU16oWKFcUf2IjQIbxoFfrCZGwsZEZebK3GAkE0qIdmmRsXY04/71+KjCz4UfUnDkQzfICqyQq9V88eFao2C5hJDZuSGXBboDQIl30IbyXFm5fws99CCY4t8kD+duHFBK1I= 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=NwOCzf7/; arc=none smtp.client-ip=209.85.128.51 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="NwOCzf7/" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-46e4ad36541so46224005e9.0 for ; Mon, 13 Oct 2025 08:15:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760368534; x=1760973334; 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=f+OYsx4qVrjFLJooxBU/tije1VKpZvCGcY9McxgoCoE=; b=NwOCzf7/EfpU8upwK34SnlBAuKNRw2tqOiKOCRbwKa1OwcCJ16WwkI6y6SqmmxIkvY UAKVIzN2yD+VEHCPzy3hewysoY9jKz9+OeQD9rpCeTIh2ilRIc0hkqijXDMyklqlBpA+ N53hXEz81nIsyfaYMNXBYSjnfsO1P8X03Ye7+xfLRyQ5UBdUfgvqJ6lu+JnfIVcr4W1i PSakbUAYaJowm39Qvyq5pc4WD3yDC0IgrBMNnC1x45ryJr3TIYI4QDiSgsGoF8aZqtDD shyFa0KVjL/jwJZ9tAxxMpQf3NJjEg5dEdCWXOLWHHBmtnsW5xOqYYnD91rqu1GrEIwy S3gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760368534; x=1760973334; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f+OYsx4qVrjFLJooxBU/tije1VKpZvCGcY9McxgoCoE=; b=Kp4RqdOOSkS17FzwkyypR96cui494W9pGQFDbkE+q52+86rCPzrvS+rLoMFY/ZZIkk ALwymAOVwytu08Hy7olRx5nD0ldIp5MOxrclUQB9jawAU6d8NtYczbwyssWUvG+jYwlw fkNEp/9tE38L16qqjZq8gIX690zQ3zii0sKh3rU0Pl0fD4tptvbRHFZvoLbYZiwIuGPJ IPdIIYiIFLQ0DV7t2NQREeGT+wtCNone1q8uhYFoWuxDm9QMKDFD4iSqSa5q0FN0S2Cp E114KAN/vqGh0TJj/KLL+ggnmnWvavuARcM84Etc7wltExWPQfGQ5KxqwrfhdRblVL5p y8cg== X-Forwarded-Encrypted: i=1; AJvYcCWdp/WKchbXaUP5UUEfnXYqehnFAaYFMYyWJVXd1+DXAVhalsjHyNq1n8ZhYHzE8KjixntSYw5dTNs/IUs=@vger.kernel.org X-Gm-Message-State: AOJu0YwUi7fkD3qjUlT52I8WV2eQQ6iskgM9MybDnkwQDzxb6fuchQED GglE9P5H/wY80dXssCZKxJaKmjWV82icHksEjmsiGJa4BZeXG8LSRUDc X-Gm-Gg: ASbGnctFo8qVALnsqTPuqQbvTknuE2BkjMvgsPajcLYwJua5VJtGyxGkHQn6alddjfG d0no9/fjwqxllZHXYdpHF0aOtiOAYVjabCc+7hA9yAZ9xfgjk2qY3RdusVizf8K9XYMqmr1B6OX 4/Zs3/PQuJe0FU/jFEWuqxT6XkqACLESOSkpoinXV6uYg6gq6Tg/VCkkTH59kTb5nJ/FTWiamJT vQMFjfslmyzk+lwlw6841dCKBL470gXHSKWx98jMdZ8z1AN4kyQ5bdfK6LNmOdf7zCDH5EBMzOb 7QzCDkCPSDSq1JyzhtY93i2Elp0f8jk3JamyXNjvzE4CGf2+Lg9CIzpLcuqnMb7q/jUgNo7r1bc 6+y6Oe4nvTSF+E6PEzdMLLVlaC6+IlnId7XIxnWHhBNY73EhzyIm/FJHNOPyNPqlgqL4Hcdzh5y AFAEsV X-Google-Smtp-Source: AGHT+IG8YKjqV8/Bcai3s9JU+QHESTLB1iWcAO0SGLhAlri+L595vz6YBO/3o6gN4/HNAHvPqWUe0g== X-Received: by 2002:a05:600c:8b42:b0:45d:e6b6:55fe with SMTP id 5b1f17b1804b1-46fa9b16607mr164819835e9.34.1760368534209; Mon, 13 Oct 2025 08:15:34 -0700 (PDT) Received: from f4d4888f22f2.ant.amazon.com.com ([15.248.3.91]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fab36a773sm135545825e9.0.2025.10.13.08.15.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 08:15:34 -0700 (PDT) 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, roypat@amazon.co.uk, kalyazin@amazon.co.uk, jackabt@amazon.com Subject: [PATCH v2 1/4] KVM: arm64: Add pre_fault_memory implementation Date: Mon, 13 Oct 2025 16:14:58 +0100 Message-ID: <20251013151502.6679-2-jackabt.amazon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251013151502.6679-1-jackabt.amazon@gmail.com> References: <20251013151502.6679-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 kvm_arch_vcpu_pre_fault_memory() for arm64. The implementation hands off the stage-2 faulting logic to either gmem_abort() or user_mem_abort(). Add an optional page_size output parameter to user_mem_abort() to return the VMA page size, which is needed when pre-faulting. Update the documentation to clarify x86 specific behaviour. Signed-off-by: Jack Thomson --- Documentation/virt/kvm/api.rst | 3 +- arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/arm.c | 1 + arch/arm64/kvm/mmu.c | 73 ++++++++++++++++++++++++++++++++-- 4 files changed, 73 insertions(+), 5 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index c17a87a0a5ac..9e8cc4eb505d 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -6461,7 +6461,8 @@ Errors: KVM_PRE_FAULT_MEMORY populates KVM's stage-2 page tables used to map memory for the current vCPU state. KVM maps memory as if the vCPU generated a stage-2 read page fault, e.g. faults in memory as needed, but doesn't break -CoW. However, KVM does not mark any newly created stage-2 PTE as Accessed. +CoW. However, on x86, KVM does not mark any newly created stage-2 PTE as +Accessed. =20 In the case of confidential VM types where there is an initial set up of private guest memory before the guest is 'finalized'/measured, this ioctl diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index bff62e75d681..1ac0605f86cb 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -25,6 +25,7 @@ menuconfig KVM select HAVE_KVM_CPU_RELAX_INTERCEPT select KVM_MMIO select KVM_GENERIC_DIRTYLOG_READ_PROTECT + select KVM_GENERIC_PRE_FAULT_MEMORY select KVM_XFER_TO_GUEST_WORK select KVM_VFIO select HAVE_KVM_DIRTY_RING_ACQ_REL diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 888f7c7abf54..65654a742864 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -322,6 +322,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long = ext) case KVM_CAP_IRQFD_RESAMPLE: case KVM_CAP_COUNTER_OFFSET: case KVM_CAP_ARM_WRITABLE_IMP_ID_REGS: + case KVM_CAP_PRE_FAULT_MEMORY: r =3D 1; break; case KVM_CAP_SET_GUEST_DEBUG2: diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index a36426ccd9b5..82f122e4b08c 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1597,8 +1597,8 @@ static int gmem_abort(struct kvm_vcpu *vcpu, phys_add= r_t fault_ipa, =20 static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, struct kvm_s2_trans *nested, - struct kvm_memory_slot *memslot, unsigned long hva, - bool fault_is_perm) + struct kvm_memory_slot *memslot, long *page_size, + unsigned long hva, bool fault_is_perm) { int ret =3D 0; bool topup_memcache; @@ -1871,6 +1871,9 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys= _addr_t fault_ipa, kvm_release_faultin_page(kvm, page, !!ret, writable); kvm_fault_unlock(kvm); =20 + if (page_size) + *page_size =3D vma_pagesize; + /* Mark the page dirty only if the fault is handled successfully */ if (writable && !ret) mark_page_dirty_in_slot(kvm, memslot, gfn); @@ -2069,8 +2072,8 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) ret =3D gmem_abort(vcpu, fault_ipa, nested, memslot, esr_fsc_is_permission_fault(esr)); else - ret =3D user_mem_abort(vcpu, fault_ipa, nested, memslot, hva, - esr_fsc_is_permission_fault(esr)); + ret =3D user_mem_abort(vcpu, fault_ipa, nested, memslot, NULL, + hva, esr_fsc_is_permission_fault(esr)); if (ret =3D=3D 0) ret =3D 1; out: @@ -2446,3 +2449,65 @@ void kvm_toggle_cache(struct kvm_vcpu *vcpu, bool wa= s_enabled) =20 trace_kvm_toggle_cache(*vcpu_pc(vcpu), was_enabled, now_enabled); } + +long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, + struct kvm_pre_fault_memory *range) +{ + int ret, idx; + hva_t hva; + phys_addr_t end; + struct kvm_memory_slot *memslot; + struct kvm_vcpu_fault_info stored_fault, *fault_info; + + long page_size =3D PAGE_SIZE; + phys_addr_t ipa =3D range->gpa; + gfn_t gfn =3D gpa_to_gfn(range->gpa); + + idx =3D srcu_read_lock(&vcpu->kvm->srcu); + + if (ipa >=3D kvm_phys_size(vcpu->arch.hw_mmu)) { + ret =3D -ENOENT; + goto out_unlock; + } + + memslot =3D gfn_to_memslot(vcpu->kvm, gfn); + if (!memslot) { + ret =3D -ENOENT; + goto out_unlock; + } + + fault_info =3D &vcpu->arch.fault; + stored_fault =3D *fault_info; + + /* Generate a synthetic abort for the pre-fault address */ + fault_info->esr_el2 =3D FIELD_PREP(ESR_ELx_EC_MASK, ESR_ELx_EC_DABT_CUR); + fault_info->esr_el2 &=3D ~ESR_ELx_ISV; + fault_info->esr_el2 |=3D ESR_ELx_FSC_FAULT_L(KVM_PGTABLE_LAST_LEVEL); + + fault_info->hpfar_el2 =3D HPFAR_EL2_NS | + FIELD_PREP(HPFAR_EL2_FIPA, ipa >> 12); + + if (kvm_slot_has_gmem(memslot)) { + ret =3D gmem_abort(vcpu, ipa, NULL, memslot, false); + } else { + hva =3D gfn_to_hva_memslot_prot(memslot, gfn, NULL); + if (kvm_is_error_hva(hva)) { + ret =3D -EFAULT; + goto out; + } + ret =3D user_mem_abort(vcpu, ipa, NULL, memslot, &page_size, hva, + false); + } + + if (ret < 0) + goto out; + + end =3D (range->gpa & ~(page_size - 1)) + page_size; + ret =3D min(range->size, end - range->gpa); + +out: + *fault_info =3D stored_fault; +out_unlock: + srcu_read_unlock(&vcpu->kvm->srcu, idx); + return ret; +} --=20 2.43.0 From nobody Fri Dec 19 15:29:47 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 83090261B7F for ; Mon, 13 Oct 2025 15:15:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368542; cv=none; b=DcFT+2GTGOgbtTH5xfjRB95MwEyGfAiIF4EQS4c3IlO3A8hmqRoPZCjd1RJ5yJMqG+KhqM1oGSU8udljJDy97IDrMgbBK632qUXOJQ7heEjgtPo8BlcOq6uTAkSNFHFreE4+5H7tG+4wXxo7KDFfZtD4a3p2ZX7Qo3wmveZvftY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368542; c=relaxed/simple; bh=2UhKxpWUkIifGUgfHcgz/LXU79xXY7bzYokZjULRNnc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JwLMm7LFH8/A4rrm3A9HHrNTNEf6X1hfjGoNJWqRiXtHD8EsjEhr7MY4uZbsT0Ib4CQhn2PNsumSacvROHLZJMoDkeyeF7W2uUQqkUgTxwImgYlkmegUp7Zc+OO9UwrdUi1zdtoq1pxY6LdXFYEaxzDJWt2k/oBIcVFcsMdDE8A= 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=bK90y1O3; arc=none smtp.client-ip=209.85.128.49 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="bK90y1O3" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-46e52279279so30694785e9.3 for ; Mon, 13 Oct 2025 08:15:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760368539; x=1760973339; 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=GDn63HL1kwJS/kY3r585sacU2JfuR+fJZeZdcH4A9XQ=; b=bK90y1O35TGA1PtbYgnjynZom88ttaHqOKQzkYqP+sU+Q6LOSOKUIQCA44d6Cy9Lkr dHuZXhtLOFiQz3g/BrVWT9cKaTQIhtEGH7uf7oz4hlEPqf8wO76N0AMdab1pa5LelKKE heMdkK/b+QxI4/auVhOBd+UvnBGNv2iEVSrNLFaUj2Io+EDANFJYHBLgT98EPVt7Rvkc AMMsLaO88ltcm3m0jQs0x58I3bEig6w+LnWHGc5QdYwa82Xl1Vc8CAcwzkBk6YROfu19 rS/W3lhDEviaKW48gfGQpwmd8iMgP53lwjwl0KaIMzvurgv/2/CshxWwzvNwSbmbE+B4 APVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760368539; x=1760973339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GDn63HL1kwJS/kY3r585sacU2JfuR+fJZeZdcH4A9XQ=; b=lMrNy9A5pdphYNSXMLb+YYD7HCZSmSZBjn8Jzpg6FLHODAQnlg1RPEwLEzHnO7Vp5X glFadZlsQY436bSISnggKn7kw762VT9ZIup7A5gEes8WlNAtr3vzbiPVGkfgm8HJ18Kt TEbB8EamM1mX/KDGXJqh13D/gKjC2mI5qUSDv3fm5OLsZSYOoMRxKWDi4K7RQ8xznBrk w0UfKGqtmAdNYbvxQ4UbEadfdYolm2BV4thhpbgQv5Hh5dHGcgGbnoUIRMIjsf48hjv8 Bi4bS0X0hsoFxbz0wcGjaB4y3+a3QWNdxP5hRlKjn1PF75CQ1n1RGjD5z07PB8tkgnZF hgEw== X-Forwarded-Encrypted: i=1; AJvYcCW17uAelBLtYXXJv3R96S8I2zUrWJm8KVhANkbSXiMHy3oWEdM/hqUeDJIxhERHfLAFjhx6Rvwu43A3LCc=@vger.kernel.org X-Gm-Message-State: AOJu0YxnKALXrV4oLfPokv8sfpKY7se0bD14cGh7oXWtBTRpE61eFlhK wL4W5sQY/PjwqSMsisdLUCIdJ8bLK1CtGBCpOYB5AWkRpYaTUCnDv5YL X-Gm-Gg: ASbGnctwzdtQM0FN1xQXYZD0fxO8a5Wo5C7Xuh29ShdnBnCS7U2v9w1p/JCkVoRgi9t Pbcnr8NiCo+cdV0oJm58gvXcCh4IVe+MULLHGfWanUPVs4k2JCotJt5gIisJqop31yWzRQ6TnFX oYB7gzbdGXFBv3zAzD6bKkXmtGDGF8prYAdhJBk2XluZbIVTxC8nKR+G77dhmvOEGHxfZHjP/oR BVL1QFTkgRz8ed9NO1O/phN7i1f7NfP50rXKDLe12Gjj8I5P+/e1Dubiq2lRwN/iVGcOfHmZR3O pNTHnZ1J1S0v/lYMj009+r+O7YH2SpOEO/f16/1aFLOhUq08dYDMrzgmzlakRBN2UAGn16ESAw5 /sYSYbFUIrNpM3ND7J7kCgAFdE3GOX2sgeYEo5Ycj2w7z8xA1kwYt7yZgy+ORZ4ucmyo2i1RZ+p EZxi9k X-Google-Smtp-Source: AGHT+IGwJqj5PmL4e2MI1le7nNOJW+jd0SIfBCswYBmaCJKr1jrFAghd2jBuPptFtHUN4Hmx6R2roQ== X-Received: by 2002:a05:600c:4752:b0:46e:49fb:4776 with SMTP id 5b1f17b1804b1-46fa9a9f05emr138719385e9.11.1760368538589; Mon, 13 Oct 2025 08:15:38 -0700 (PDT) Received: from f4d4888f22f2.ant.amazon.com.com ([15.248.3.91]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fab36a773sm135545825e9.0.2025.10.13.08.15.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 08:15:38 -0700 (PDT) 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, roypat@amazon.co.uk, kalyazin@amazon.co.uk, jackabt@amazon.com Subject: [PATCH v2 2/4] KVM: selftests: Fix unaligned mmap allocations Date: Mon, 13 Oct 2025 16:14:59 +0100 Message-ID: <20251013151502.6679-3-jackabt.amazon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251013151502.6679-1-jackabt.amazon@gmail.com> References: <20251013151502.6679-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 When creating a VM using mmap with huge pages, and the memory amount does not align with the underlying page size. The stored mmap_size value does not account for the fact that mmap will automatically align the length to a multiple of the underlying page size. During the teardown of the test, munmap is used. However, munmap requires the length to be a multiple of the underlying page size. Update the vm_mem_add method to ensure the mmap_size is aligned to the underlying page size. Signed-off-by: Jack Thomson --- tools/testing/selftests/kvm/lib/kvm_util.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c index c3f5142b0a54..b106fbed999c 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1051,7 +1051,6 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backin= g_src_type src_type, /* Allocate and initialize new mem region structure. */ region =3D calloc(1, sizeof(*region)); TEST_ASSERT(region !=3D NULL, "Insufficient Memory"); - region->mmap_size =3D mem_size; =20 #ifdef __s390x__ /* On s390x, the host address must be aligned to 1M (due to PGSTEs) */ @@ -1060,6 +1059,11 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backi= ng_src_type src_type, alignment =3D 1; #endif =20 + alignment =3D max(backing_src_pagesz, alignment); + region->mmap_size =3D align_up(mem_size, alignment); + + TEST_ASSERT_EQ(guest_paddr, align_up(guest_paddr, backing_src_pagesz)); + /* * When using THP mmap is not guaranteed to returned a hugepage aligned * address so we have to pad the mmap. Padding is not needed for HugeTLB @@ -1067,12 +1071,6 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backi= ng_src_type src_type, * page size. */ if (src_type =3D=3D VM_MEM_SRC_ANONYMOUS_THP) - alignment =3D max(backing_src_pagesz, alignment); - - TEST_ASSERT_EQ(guest_paddr, align_up(guest_paddr, backing_src_pagesz)); - - /* Add enough memory to align up if necessary */ - if (alignment > 1) region->mmap_size +=3D alignment; =20 region->fd =3D -1; --=20 2.43.0 From nobody Fri Dec 19 15:29:47 2025 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 A38EC30E829 for ; Mon, 13 Oct 2025 15:15:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368546; cv=none; b=m2JsL4HJhZ1LGP1Iw1E09beJUPHpuhjjT6jlICyxhGqQ7wgebF4Q0YvYu6Namsu+xXC4iRNgNX8a4AzY25qShyQcFWLz8CUPgqe4IpEK6eEDgYud/3b2rI6QtEBrw2R4esPPZJsSvyQPeaSmYcIQMZ6rPaMMZhurCeZhSKf+UkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368546; c=relaxed/simple; bh=lTDjButRkJ3Cx5uU/JAtEV++5t/e00mS8oYnDCNnkjk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=haYp6QeUw0wSUvUDKpx5S9NXIzOyBcDkmSt8foWoyjRMaIQUbMZNsr5jqibRneTYQ4vrsXQBlqtT47O5RspqsVafaZHDbi3gC6TIe3OP+dXVYdqk3bW1Yk1fpHeB1+5RHFtDbZQhnw96DyDBpJ2yPu/XL/s19OT+oAIN98uhfPQ= 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=kTK9m1xA; arc=none smtp.client-ip=209.85.128.43 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="kTK9m1xA" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-46e2c3b6d4cso32229815e9.3 for ; Mon, 13 Oct 2025 08:15:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760368543; x=1760973343; 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=YCSrMFeSurFqrsJ2giFUs5nVIkyf5eYx9hKkmNRZA3A=; b=kTK9m1xARwH2mQR/z2EuwHWBt+hbFrAXbuSLonnzyI4pegEQKYqhjEggDDjLkkeZnW SYPYDzKDR6YpHOy4SAcBryllUMY9quUNTvuESSOLyJW3JfU+knwCwHDkYQfgfUN1TUkY G0oX3wcxVAfwtpNDnbUuZBFLOYHAYO9aXtCcLTipKFKDU55xal1HLXIK+VmwQu0mojeR Zrw6AIv/HMiR42zB6UUAI6SMTL6pmKLA0L8QvP0+4LgJa/QI1mWgCVMUb+a43+hWYl69 uAa4WcJ7bHxDMzAF8vPtFFjIcRkO/9AApi/sKXXSDAlGkIR224OrLqF9gqyVIG8sivTp oeug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760368543; x=1760973343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YCSrMFeSurFqrsJ2giFUs5nVIkyf5eYx9hKkmNRZA3A=; b=WAVKu3yy6RCctumgvB+dDq+CV9DCZgEet5LcA1g32LYRmRgQmMkHWPt0qpBL2EWVuQ t2Bm0jq9Dt0K3kiJ45dis194AhI5rkctFXbrUYnXq+BAHEhIuPtT24rBnVvpNslvYfyV c6q7bExhSS3mA5dQlPSDEzURN2o2BcOaFepqyNV0wSJRHzi0E3SuzswXJWDMTdy+tvCu f6zrn9lNUBG5zqpKojaLACVd7/XFh0MigHJFu1Of1hZWticTghEv/XAZp/jZFP3dhuoC uIMfzo0LEIfxbCd7d7QZ58zZes0OXKwoJiuQHlNpzgJCj21/3IIrXk2G2fgNfTGwven3 dKHg== X-Forwarded-Encrypted: i=1; AJvYcCU1Gb6FSpKlkuTkrnlwlZz1GabOFK5r9FjPM1VANrCUpm5z7x+JUcwDjro3FTXiYDQtlNo61WWeJrFElNU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2QNoM2bgNKlbRkfZdjbdmxr+T0olRFFUQR5LXp/bi655/eAct TUJ0Hs+0KTmTBtpl1ZwNHBU5iEEeyFyzzxJ6NlU9uOpaoGH+RwXKSOZU X-Gm-Gg: ASbGncuWqvuRJHrSkfDyhBjeAelEMJAQPhORBbJY7Sp7plkR0fM30pZIR/Oa62NH56D c3BChhrmuU4kxZP6qRoTsHf8evUdKnaX+srWh78ExW4Y6KkA1KwGnVf5G8wwWr0LFheKip2LN7y 11wJCf/L2d0rqDI+hoc7RchJt0Wupr6aqk64a22UsA99YLvVEYO+EDp6KS2PO68JNqWqAPcR5K8 hViVA1sUB/9ptBpFHJkyJPwKaTl8QNTAyUvUO0YXhRgh8VZIbOmRP+agwxyAchIqOT0OvrRclDl T/IKUOVmxOd+wIB0SCIEr3HT2UVPFnHBWZnI0JXjZalvscwJO34CSTa0IbEBBnKdiQGPXfjjdEp cEs8Ldn0qR52ByMmNszNOVifqswbVig7RCLHwi9fQR045K6k5vI7QN3P7ejyW5IXu/BGaYFyxso HbN7FmamAMMxr4gtk= X-Google-Smtp-Source: AGHT+IEt3rxThBLWKGN/jwmns/gxZmIihkaAQISXuC9Iitep8SFGSh4XAnm8RXbIElBPhI6EpEA2fw== X-Received: by 2002:a05:600c:8487:b0:45b:79fd:cb3d with SMTP id 5b1f17b1804b1-46fa9b13ab7mr150449805e9.36.1760368542783; Mon, 13 Oct 2025 08:15:42 -0700 (PDT) Received: from f4d4888f22f2.ant.amazon.com.com ([15.248.3.91]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fab36a773sm135545825e9.0.2025.10.13.08.15.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 08:15:42 -0700 (PDT) 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, roypat@amazon.co.uk, kalyazin@amazon.co.uk, jackabt@amazon.com Subject: [PATCH v2 3/4] KVM: selftests: Enable pre_fault_memory_test for arm64 Date: Mon, 13 Oct 2025 16:15:00 +0100 Message-ID: <20251013151502.6679-4-jackabt.amazon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251013151502.6679-1-jackabt.amazon@gmail.com> References: <20251013151502.6679-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 Enable the pre_fault_memory_test to run on arm64 by making it work with different guest page sizes and testing multiple guest configurations. Update the test_assert to compare against the UCALL_EXIT_REASON, for portability, as arm64 exits with KVM_EXIT_MMIO while x86 uses KVM_EXIT_IO. Signed-off-by: Jack Thomson --- tools/testing/selftests/kvm/Makefile.kvm | 1 + .../selftests/kvm/pre_fault_memory_test.c | 79 ++++++++++++++----- 2 files changed, 59 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selft= ests/kvm/Makefile.kvm index 90f03f00cb04..4db1737fad04 100644 --- a/tools/testing/selftests/kvm/Makefile.kvm +++ b/tools/testing/selftests/kvm/Makefile.kvm @@ -180,6 +180,7 @@ TEST_GEN_PROGS_arm64 +=3D memslot_perf_test TEST_GEN_PROGS_arm64 +=3D mmu_stress_test TEST_GEN_PROGS_arm64 +=3D rseq_test TEST_GEN_PROGS_arm64 +=3D steal_time +TEST_GEN_PROGS_arm64 +=3D pre_fault_memory_test =20 TEST_GEN_PROGS_s390 =3D $(TEST_GEN_PROGS_COMMON) TEST_GEN_PROGS_s390 +=3D s390/memop diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/te= sting/selftests/kvm/pre_fault_memory_test.c index 0350a8896a2f..ed9848a8af60 100644 --- a/tools/testing/selftests/kvm/pre_fault_memory_test.c +++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c @@ -10,19 +10,29 @@ #include #include #include +#include =20 /* Arbitrarily chosen values */ -#define TEST_SIZE (SZ_2M + PAGE_SIZE) -#define TEST_NPAGES (TEST_SIZE / PAGE_SIZE) +#define TEST_BASE_SIZE SZ_2M #define TEST_SLOT 10 =20 +/* Storage of test info to share with guest code */ +struct test_config { + int page_size; + uint64_t test_size; + uint64_t test_num_pages; +}; + +struct test_config test_config; + static void guest_code(uint64_t base_gpa) { volatile uint64_t val __used; + struct test_config *config =3D &test_config; int i; =20 - for (i =3D 0; i < TEST_NPAGES; i++) { - uint64_t *src =3D (uint64_t *)(base_gpa + i * PAGE_SIZE); + for (i =3D 0; i < config->test_num_pages; i++) { + uint64_t *src =3D (uint64_t *)(base_gpa + i * config->page_size); =20 val =3D *src; } @@ -63,11 +73,17 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64= gpa, u64 size, "KVM_PRE_FAULT_MEMORY", ret, vcpu->vm); } =20 -static void __test_pre_fault_memory(unsigned long vm_type, bool private) +struct test_params { + unsigned long vm_type; + bool private; +}; + +static void __test_pre_fault_memory(enum vm_guest_mode guest_mode, void *a= rg) { + struct test_params *p =3D arg; const struct vm_shape shape =3D { - .mode =3D VM_MODE_DEFAULT, - .type =3D vm_type, + .mode =3D guest_mode, + .type =3D p->vm_type, }; struct kvm_vcpu *vcpu; struct kvm_run *run; @@ -78,10 +94,17 @@ static void __test_pre_fault_memory(unsigned long vm_ty= pe, bool private) uint64_t guest_test_virt_mem; uint64_t alignment, guest_page_size; =20 + pr_info("Testing guest mode: %s\n", vm_guest_mode_string(guest_mode)); + vm =3D vm_create_shape_with_one_vcpu(shape, &vcpu, guest_code); =20 - alignment =3D guest_page_size =3D vm_guest_mode_params[VM_MODE_DEFAULT].p= age_size; - guest_test_phys_mem =3D (vm->max_gfn - TEST_NPAGES) * guest_page_size; + guest_page_size =3D vm_guest_mode_params[guest_mode].page_size; + + test_config.page_size =3D guest_page_size; + test_config.test_size =3D TEST_BASE_SIZE + test_config.page_size; + test_config.test_num_pages =3D vm_calc_num_guest_pages(vm->mode, test_con= fig.test_size); + + guest_test_phys_mem =3D (vm->max_gfn - test_config.test_num_pages) * test= _config.page_size; #ifdef __s390x__ alignment =3D max(0x100000UL, guest_page_size); #else @@ -91,22 +114,31 @@ static void __test_pre_fault_memory(unsigned long vm_t= ype, bool private) guest_test_virt_mem =3D guest_test_phys_mem & ((1ULL << (vm->va_bits - 1)= ) - 1); =20 vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, - guest_test_phys_mem, TEST_SLOT, TEST_NPAGES, - private ? KVM_MEM_GUEST_MEMFD : 0); - virt_map(vm, guest_test_virt_mem, guest_test_phys_mem, TEST_NPAGES); - - if (private) - vm_mem_set_private(vm, guest_test_phys_mem, TEST_SIZE); - pre_fault_memory(vcpu, guest_test_phys_mem, SZ_2M, 0); - pre_fault_memory(vcpu, guest_test_phys_mem + SZ_2M, PAGE_SIZE * 2, PAGE_S= IZE); - pre_fault_memory(vcpu, guest_test_phys_mem + TEST_SIZE, PAGE_SIZE, PAGE_S= IZE); + guest_test_phys_mem, TEST_SLOT, test_config.test_num_pages, + p->private ? KVM_MEM_GUEST_MEMFD : 0); + virt_map(vm, guest_test_virt_mem, guest_test_phys_mem, test_config.test_n= um_pages); + + if (p->private) + vm_mem_set_private(vm, guest_test_phys_mem, test_config.test_size); + pre_fault_memory(vcpu, guest_test_phys_mem, TEST_BASE_SIZE, 0); + /* Test pre-faulting over an already faulted range */ + pre_fault_memory(vcpu, guest_test_phys_mem, TEST_BASE_SIZE, 0); + pre_fault_memory(vcpu, guest_test_phys_mem + TEST_BASE_SIZE, + test_config.page_size * 2, test_config.page_size); + pre_fault_memory(vcpu, guest_test_phys_mem + test_config.test_size, + test_config.page_size, test_config.page_size); =20 vcpu_args_set(vcpu, 1, guest_test_virt_mem); + + /* Export the shared variables to the guest. */ + sync_global_to_guest(vm, test_config); + vcpu_run(vcpu); =20 run =3D vcpu->run; - TEST_ASSERT(run->exit_reason =3D=3D KVM_EXIT_IO, - "Wanted KVM_EXIT_IO, got exit reason: %u (%s)", + TEST_ASSERT(run->exit_reason =3D=3D UCALL_EXIT_REASON, + "Wanted %s, got exit reason: %u (%s)", + exit_reason_str(UCALL_EXIT_REASON), run->exit_reason, exit_reason_str(run->exit_reason)); =20 switch (get_ucall(vcpu, &uc)) { @@ -130,7 +162,12 @@ static void test_pre_fault_memory(unsigned long vm_typ= e, bool private) return; } =20 - __test_pre_fault_memory(vm_type, private); + struct test_params p =3D { + .vm_type =3D vm_type, + .private =3D private, + }; + + for_each_guest_mode(__test_pre_fault_memory, &p); } =20 int main(int argc, char *argv[]) --=20 2.43.0 From nobody Fri Dec 19 15:29:47 2025 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 7CB9630E835 for ; Mon, 13 Oct 2025 15:15:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368550; cv=none; b=d2djzQuW5MX1hEmQIt9tlQSTCb/nZc0AnK314cepYg1pXt75TZ6ks/6Y7DYAQSl4WwzLEl3EUUBX7WFrd5psvUOzyLrzrCSbEZYVH1kb5TjO2xJqCcbErkgkCu8QbdYeYrk6cLjR1t/bwCnysEn+ZsE4ZW5bTWjoFKz25btO2kU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368550; c=relaxed/simple; bh=AfUKt9Y64nk4DJCkkE4xk0dAPQmcJX1fmTUpYECF7XQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gc/cJLK0xlk/GOKfmM8BxjFchhrQ6wQXSdcq0h7HEUsla3tVa8DMeBBj3K4UzzituRc+oqYWRzadj1K5a8fyo/HUUQ1Kqc+VRZ+vBztE1bgOsCVmI9MygFIE6QDd9XFLU0wxbbwiLPXi+RR37Xp/OGz9uVr6n3HONY41E0euMTw= 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=BgnmrADV; arc=none smtp.client-ip=209.85.128.43 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="BgnmrADV" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-46e6c8bc46eso28134505e9.3 for ; Mon, 13 Oct 2025 08:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760368547; x=1760973347; 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=mzQnDluOQWqcbRXyu07+4Pf89SEymkI9ph5TfK7+5co=; b=BgnmrADVG8gUrQACGHOnlAuw3ZUzfD5DdKxuFfhmStZ6yxMKplWDpwZnCFRgcGG8yu tkAbRXxegbx1xF3+VVzCWjJnr82WRf/oiU6+qrvGdC2eoMFVWjNw0AVneVmmIVG4hCyp +3JZ+jyeVhm8X/CJCkutqaFfYGC0j0XxLXnvNSphOdrMhvNaTmdEJRZLu6dlWAQBjEiX e3cJIjGNgZBWi80wN6N3NMg9CaIqFgyqF1ytintQt3Rtg9BODNXLkiY7kZ6hsw9XnduD WHaPBDy7rKK0mUT720K8uTsDZ65QThBssvARIT7pY/ZLPL0euKwbnU3ftczS7JOY1j3f yl9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760368547; x=1760973347; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mzQnDluOQWqcbRXyu07+4Pf89SEymkI9ph5TfK7+5co=; b=HcBdwqdPsozUK81JNSOYhF9WaLRtIZm73u2/v/VZCdv56dlZgDx8TN9J3GjdnKP1HI NTlpsf1Ujt9/HfeaJNT00wvmqGWUAWvkhq5+lY9DzhpwlXhFMQhIsHTRHmj3qfGj9VEa B2hstYvr6PjoPBg6p1XUEjfAeKI9qnuF0tH3KefdLVugWaJZ00/RYs1qv+A1hIUQA8me U5deR4Ihn8XDbfu8mZU1++lVh3RULNox4wdBItKz/AKoY5bN8lO6HffG76QDPg6Dafo3 7OUYJ5jt0r/vewmU3MaKwtn3h0+3q1BaqtMlWIf6lEEVg9FgfwxPD6I1W4A0srnO/ip5 Q/ug== X-Forwarded-Encrypted: i=1; AJvYcCVJ77yUk0s0sHK1Go5LzuiurW6BkU+WBK0GzwcSi03K/ooberwDPrRdDVU82w0R6tGOH6TJE+uwBFcf7CA=@vger.kernel.org X-Gm-Message-State: AOJu0YxpRMyokFL1AF2kvHLN6ojFSNL4TyOEXSExUVh0BK2BCUqOLyk2 yrhcpKHP0q47mmxC45Hs7/70OSA0otkQZHZDd3tY5MJlRADtl93yXYO4 X-Gm-Gg: ASbGncv97nzOr0SRBXOyh3AWIhHawRHwhlEe+DvvsSNhZYCLOAhIvNUmWwaNO62zfUs sOaes31CmSNMXOn88rAmCGdkEs1+7UNiM5j5hmH4obuRrCb+bm4pWyHZ0azMvzjkCQDmjxAeYC5 9xHiqA/0WkQAHKMkQ7IJs5vnC/+W2a0kJD4PVKlD9/LGDIf+TCb6ewmWdN7NjvN3fULnQ8OePOf rN4KSqlHj1Ajp9LG4dDZKf9owYiSIhlWCkh3EvY0oNMPu+eYPjf0NjPxKqYUDfNl7Gw0hUPmcgO Qpfxfo7zKWDuvPzMPJl8g2C2hgJt9wrW7hKJMHEXoiaDr3jQC30GhZgyQZhw+aE1dDS7qBlha2g zd1WppjbpBFwEPn0nu4P9QVWjvyoupaedHsw/1XVuFbd2vfzs6ImVcN13k9PXM2B/4/LE0c29Bk 8uqr91SiqI7Df/CZc5shQdLhZ43w== X-Google-Smtp-Source: AGHT+IHgTeXKHH2vcpsvzOcBDeWFCxx7j6NWXF765EtO+25xvlfpvrezTIu3A7FfM3RO5CiMYA9Vog== X-Received: by 2002:a05:600c:1e85:b0:46e:39e4:1721 with SMTP id 5b1f17b1804b1-46fa9aa261amr141333095e9.12.1760368546663; Mon, 13 Oct 2025 08:15:46 -0700 (PDT) Received: from f4d4888f22f2.ant.amazon.com.com ([15.248.3.91]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fab36a773sm135545825e9.0.2025.10.13.08.15.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Oct 2025 08:15:46 -0700 (PDT) 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, roypat@amazon.co.uk, kalyazin@amazon.co.uk, jackabt@amazon.com Subject: [PATCH v2 4/4] KVM: selftests: Add option for different backing in pre-fault tests Date: Mon, 13 Oct 2025 16:15:01 +0100 Message-ID: <20251013151502.6679-5-jackabt.amazon@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251013151502.6679-1-jackabt.amazon@gmail.com> References: <20251013151502.6679-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 | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 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 ed9848a8af60..22e2e53945d9 100644 --- a/tools/testing/selftests/kvm/pre_fault_memory_test.c +++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c @@ -76,6 +76,7 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 g= pa, u64 size, 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) @@ -94,7 +95,11 @@ static void __test_pre_fault_memory(enum vm_guest_mode g= uest_mode, void *arg) uint64_t guest_test_virt_mem; uint64_t alignment, guest_page_size; =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 @@ -110,10 +115,11 @@ 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); guest_test_phys_mem =3D align_down(guest_test_phys_mem, alignment); guest_test_virt_mem =3D guest_test_phys_mem & ((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, guest_test_phys_mem, TEST_SLOT, test_config.test_num_pages, p->private ? KVM_MEM_GUEST_MEMFD : 0); virt_map(vm, guest_test_virt_mem, guest_test_phys_mem, test_config.test_n= um_pages); @@ -155,7 +161,8 @@ static void __test_pre_fault_memory(enum vm_guest_mode = 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) { if (vm_type && !(kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(vm_type))) { pr_info("Skipping tests for vm_type 0x%lx\n", vm_type); @@ -165,6 +172,7 @@ static void test_pre_fault_memory(unsigned long vm_type= , bool private) struct test_params p =3D { .vm_type =3D vm_type, .private =3D private, + .mem_backing_src =3D backing_src, }; =20 for_each_guest_mode(__test_pre_fault_memory, &p); @@ -174,10 +182,23 @@ int main(int argc, char *argv[]) { TEST_REQUIRE(kvm_check_cap(KVM_CAP_PRE_FAULT_MEMORY)); =20 - test_pre_fault_memory(0, false); + int opt; + enum vm_mem_backing_src_type backing =3D VM_MEM_SRC_ANONYMOUS; + + 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