From nobody Thu Oct 2 21:40:08 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 1F7B8337688 for ; Thu, 11 Sep 2025 13:49:53 +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=1757598595; cv=none; b=oIIY3MT1Yrs9hrykbl/gF2hfH2idXHWiQI/xGjGCkD1ZCzpInQ7AV0F+s5hQVASPSmp5EwJR20ryr3iXSOQAHnk8uA5ZhAgpHu3z1ow2eTDKc2E+ydKE1Bi8bHpIWyK4ddA8SNxBS16LtiT8DBtIZ3l5iwDusexOLQTp7VyN1GE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757598595; c=relaxed/simple; bh=lTDjButRkJ3Cx5uU/JAtEV++5t/e00mS8oYnDCNnkjk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M/FQfzDjO8Plw3CSMQfmaWY0T/2qYUmNFZz9MsASGlheAi6aoemx7u2PmWwOFRC35L3sWA1ZRlapY4bNoaeL62hpgSPn4reMXswemXJT3zQpPSJZkoFZQjuy+QTSlgHpHK7ib4K0oopivx+F1DwZryr1wRfwuy9C7jsOxzIqnwo= 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=HUMeFhcj; 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="HUMeFhcj" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-45df7cb7f6bso3695575e9.3 for ; Thu, 11 Sep 2025 06:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757598592; x=1758203392; 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=HUMeFhcjYYsZJejKwpxOD0SKQe1xS7h6nV8mkDunU4ZJvCnxyFiJqQoqYTIwtiHfCy RrMWKw2AmhS/UpDOcQwQ8mS5FpTR4SxVPGmi9d9f1EUZ/08UhgVOycJA+52Gc1k1boLk mK0oWUOZUVOhAOuui2zIqTifLxSJiujM34Jxq1mesEAOhXne+IUkn2yLPDlQ/b3XOXUR g0SfASRwi/3SDSbZbbEIk/aUKI9oPdOl09FIkYCB2hG5zHyT+AFkmsuIrft43m/EsQta JsrK+JzuAOhkXnCKYUhCpOxhsz/wp2PrBJ5JQpZhUzk1tcUVaQjRRKHwWmsC/s6veS8b Cb8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757598592; x=1758203392; 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=tN9r+G08Fn58aQcTybYJvxYYKuOPlfHBYBmCFsCmc1w2j/JVvF2O6RyGJ1LYMy1E3B 1S3h7a/iL7R6stDVA+oF5ZY2unNPjDcjnmaEo0Gi3o7/p+EDiwHEKeYuV7iUANVL5CRx 1h1WrRplXnFfBD2MJNVC49vJf4fUaBqrrgEBWHJ+1o9iCO2cjnEaxu5/4/a47NsPeAMZ 7BfmqIkwG1LlF8YwZ+vvLwS1h2ZszNiDGwhlTRcTaZ74IQQt/N1qm2FZ1A+6RVW65VUH v6t1FvwX9AlyDH4R7QR9CDY+KlYcqPK+ZZEkLcGKrKx0xNGMH7hNy4zwCxsIx+BhLs+J m8xA== X-Forwarded-Encrypted: i=1; AJvYcCW0ztW174keKst68VXqbCLKWUnotdOGNaF4ZU5WLiOPsOv+T823FJIYoszgYCSqq7hi3p9HuEVOwvHO2gM=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9fRHVcGCLcplx5g8GGgZ80xhqdTBIQuDry8/voxYTSCwkSyWD vUGqbe6tK+OvuUBdUAFPmQ2j0mrQYWL+v7RMhwzBKW4eT/NjYONngaFx X-Gm-Gg: ASbGncuNIYSVqHPmD1lKPjEMZxN69lBdDagPQcBF+PMSvp7WO7JIsb46uZ0bslXkHoo hMzQUVo9FgvjGwLvd64s+SToqy/b42cZzz8h1gQVNpA/LMRmsNNNOKSf+/3hEayXba5maUblA1A Kvi7QNjZZC13NfE8qfkmK2FJvgsnMXKzvpSHMd1Zo0Sxy8vO1+J7nwUFiHpf2wFSj95ao5to9Qu hRzK0AWIbLu3bSEIsFCrbBaAfs1ABH5CkXj0kxlYF+GpG3ppa1ai1DkCETciPatSPZMhIYzkBqQ cikZUaljUQfuznVaERVjgpuXbWDEiGCCx8DNUBJYzeddfnXD823LbTy+D/FFhHQOOtdEpZidQ4P AtEcV3whUCtYrLs0biMILEyv3jwchfdWHOZNaOjX7Uit6lXe2560n86YANHIVh7dzSy/w1Kqt X-Google-Smtp-Source: AGHT+IH842Sw/0yXJovz2FflrQNKNRtbIPTzYOgGi48h59M9xzXKWI2UOrLl/gvL8P7iUFl+9U+RTQ== X-Received: by 2002:a05:600c:a43:b0:45b:81ad:336 with SMTP id 5b1f17b1804b1-45dddea520dmr244204245e9.16.1757598592074; Thu, 11 Sep 2025 06:49:52 -0700 (PDT) Received: from f4d4888f22f2.ant.amazon.com.com ([15.248.2.27]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e760778915sm2608361f8f.12.2025.09.11.06.49.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 11 Sep 2025 06:49:51 -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 5/6] KVM: selftests: Enable pre_fault_memory_test for arm64 Date: Thu, 11 Sep 2025 14:46:47 +0100 Message-Id: <20250911134648.58945-6-jackabt.amazon@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250911134648.58945-1-jackabt.amazon@gmail.com> References: <20250911134648.58945-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