From nobody Mon Feb 9 05:59:27 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 BACB432BF4B for ; Tue, 30 Dec 2025 23:02:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767135752; cv=none; b=pssQAePbrSLccUWHRj2thnXAD4ZRNSM44tA2MFCNHntmwuqGTyfZi8n6W6MstL3VW6td7bv8gdRrcgC8FgakFu5+c5Z5k+WH2ykwGZQm7JDB83YLDfDNkdnSxL5GLpcjZp//7M8NrxyaJJ+8JpWMuENMflYEzcy2TP5CZhQoL8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767135752; c=relaxed/simple; bh=Eq5mGpLfTFizGCRwHdHtCNJ7Yw0gxiv2sS6vsyfOLoI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZhIjpZx1rTzMhQv95xL8R4opb2CodETyeQV5dm3CngcIwAqRP17zWQiZ523WPfjHcrBF6Bz3M73DrDzBH5WEab0Hv8pwC2dz7ENX9Mr8a0SfwdhF2FpzHz64by4gY7Em1RncQQ4Zugic1IAf6xCb2P8vS88Hm0zT6dWU/u9/Z0Q= 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=KHJJfccE; arc=none smtp.client-ip=209.85.210.202 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="KHJJfccE" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7d5564057d0so24692336b3a.0 for ; Tue, 30 Dec 2025 15:02:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1767135747; x=1767740547; 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=DkXelmu7bqFxndg8qpo6pKIzfvXDHv9zHII5ienX1m4=; b=KHJJfccEAu9ygfghc1NclStBZFqg2G+X34jOX1BC7x2tVkMyGfJ70S9zZTcMQw8efJ yZw2SWk3JEtm1ah4KcaRwGbHsWS/3nQaZsi/1nnFemLNnXEy43XP6mneOtej3DKMT6UZ TQbTSxwlWePWhHWORKPMxghOiSic6KdOfWg7mj/7TyYwQ8AZ/djoGqPrmtCsb1ZQrA2I XRg0u8mGAqUosc31n0M6crfNVMIfeE9Y6VrHxNbHz8RjjXRXe8v/nl3YWFl7S0BKWpfg 52oQ0AdXq4vmiNnWtsKTEs7+/3U1R02X3fdJZqNDE6fWeFU1XLc8RT5wB9E4oAJB/1HO R2qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767135747; x=1767740547; 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=DkXelmu7bqFxndg8qpo6pKIzfvXDHv9zHII5ienX1m4=; b=QTeR49SbJLGy8xohFOz0mkzlxCraROqCkj2vI0XbaNO1zXFBuGOYNc5Jo5YcoNuAeM jtkAXS6AM5BGw21B5HYmVHLHCDnmQsqpWGvq5dYCmotEnqMjC59nxOR6GJay50OPy3TZ tkI9zOLF7Y3Q6AYIVcNK+VYLZ0LFcTGL1Eh/m1XPEcb/hmV20s4jX5UDQTptfz/lW0xM 8VRry321HqooybWIaepJ0GHfSKp6TTAR6Yx5hHXiY4SglALdBn+/XQAHhD0GJFPetKig ni1ngR2/gBL1pFcJHeVQcquI2oilnq2OaXUBtXh3FuZ6IT5mEZwR6cKWzNmHSkeMoSsx qj+g== X-Forwarded-Encrypted: i=1; AJvYcCWE/pwgga2gmv+j2UT27w8bet1/h8U6Dnu7TvjreRZxpEiWGG5vNeLrNfikAUHxuQd30RlokGU9THGj0Cw=@vger.kernel.org X-Gm-Message-State: AOJu0YwNwKxzyd5e0sVbKsUQPDIAAWjo1VWJjpazSD28EwY/4z94JLIC ahCiAkjrWspcqccLcXsKbaD0qpYRF27S/lUUeb3JuHT2JLg/9CM1rNU9wIoPIdTfl241IDHpP08 Y8NX+Ig== X-Google-Smtp-Source: AGHT+IEInX/hcWFTn62wzbw74nK2yGoqn05dsItc6QCyzO/aFUt0jVk0kLNXelUPHMxHCU04rbTUsERgFgA= X-Received: from pgav5.prod.google.com ([2002:a05:6a02:2dc5:b0:b55:6eb3:fd4]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:7346:b0:319:fc6f:8adf with SMTP id adf61e73a8af0-376a81e2c20mr34940934637.12.1767135747025; Tue, 30 Dec 2025 15:02:27 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 30 Dec 2025 15:01:48 -0800 In-Reply-To: <20251230230150.4150236-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: <20251230230150.4150236-1-seanjc@google.com> X-Mailer: git-send-email 2.52.0.351.gbe84eed79e-goog Message-ID: <20251230230150.4150236-20-seanjc@google.com> Subject: [PATCH v4 19/21] KVM: selftests: Extend memstress to run on nested SVM From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Yosry Ahmed Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yosry Ahmed Add L1 SVM code and generalize the setup code to work for both VMX and SVM. This allows running 'dirty_log_perf_test -n' on AMD CPUs. Signed-off-by: Yosry Ahmed Signed-off-by: Sean Christopherson --- .../testing/selftests/kvm/lib/x86/memstress.c | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86/memstress.c b/tools/testin= g/selftests/kvm/lib/x86/memstress.c index 407abfc34909..86f4c5e4c430 100644 --- a/tools/testing/selftests/kvm/lib/x86/memstress.c +++ b/tools/testing/selftests/kvm/lib/x86/memstress.c @@ -13,6 +13,7 @@ #include "kvm_util.h" #include "memstress.h" #include "processor.h" +#include "svm_util.h" #include "vmx.h" =20 void memstress_l2_guest_code(uint64_t vcpu_id) @@ -29,9 +30,10 @@ __asm__( " ud2;" ); =20 -static void memstress_l1_guest_code(struct vmx_pages *vmx, uint64_t vcpu_i= d) -{ #define L2_GUEST_STACK_SIZE 64 + +static void l1_vmx_code(struct vmx_pages *vmx, uint64_t vcpu_id) +{ unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE]; unsigned long *rsp; =20 @@ -45,10 +47,34 @@ static void memstress_l1_guest_code(struct vmx_pages *v= mx, uint64_t vcpu_id) prepare_vmcs(vmx, memstress_l2_guest_entry, rsp); =20 GUEST_ASSERT(!vmlaunch()); - GUEST_ASSERT(vmreadz(VM_EXIT_REASON) =3D=3D EXIT_REASON_VMCALL); + GUEST_ASSERT_EQ(vmreadz(VM_EXIT_REASON), EXIT_REASON_VMCALL); GUEST_DONE(); } =20 +static void l1_svm_code(struct svm_test_data *svm, uint64_t vcpu_id) +{ + unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE]; + unsigned long *rsp; + + + rsp =3D &l2_guest_stack[L2_GUEST_STACK_SIZE - 1]; + *rsp =3D vcpu_id; + generic_svm_setup(svm, memstress_l2_guest_entry, rsp); + + run_guest(svm->vmcb, svm->vmcb_gpa); + GUEST_ASSERT_EQ(svm->vmcb->control.exit_code, SVM_EXIT_VMMCALL); + GUEST_DONE(); +} + + +static void memstress_l1_guest_code(void *data, uint64_t vcpu_id) +{ + if (this_cpu_has(X86_FEATURE_VMX)) + l1_vmx_code(data, vcpu_id); + else + l1_svm_code(data, vcpu_id); +} + uint64_t memstress_nested_pages(int nr_vcpus) { /* @@ -78,15 +104,17 @@ static void memstress_setup_ept_mappings(struct kvm_vm= *vm) void memstress_setup_nested(struct kvm_vm *vm, int nr_vcpus, struct kvm_vc= pu *vcpus[]) { struct kvm_regs regs; - vm_vaddr_t vmx_gva; + vm_vaddr_t nested_gva; int vcpu_id; =20 - TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX)); TEST_REQUIRE(kvm_cpu_has_tdp()); =20 vm_enable_tdp(vm); for (vcpu_id =3D 0; vcpu_id < nr_vcpus; vcpu_id++) { - vcpu_alloc_vmx(vm, &vmx_gva); + if (kvm_cpu_has(X86_FEATURE_VMX)) + vcpu_alloc_vmx(vm, &nested_gva); + else + vcpu_alloc_svm(vm, &nested_gva); =20 /* The EPTs are shared across vCPUs, setup the mappings once */ if (vcpu_id =3D=3D 0) @@ -99,6 +127,6 @@ void memstress_setup_nested(struct kvm_vm *vm, int nr_vc= pus, struct kvm_vcpu *vc vcpu_regs_get(vcpus[vcpu_id], ®s); regs.rip =3D (unsigned long) memstress_l1_guest_code; vcpu_regs_set(vcpus[vcpu_id], ®s); - vcpu_args_set(vcpus[vcpu_id], 2, vmx_gva, vcpu_id); + vcpu_args_set(vcpus[vcpu_id], 2, nested_gva, vcpu_id); } } --=20 2.52.0.351.gbe84eed79e-goog