From nobody Wed Apr 8 04:45:42 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FEF13E9F7F for ; Tue, 10 Mar 2026 20:24:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773174269; cv=none; b=lIDA/SZShbkgQP9D4fPb1n7Vq1RwnvLh9j5kA8i7uPTSmUjYesZZCaD+1lTpO0ZQx4ifOOLnacunvC/hrZlB2oJvpuD3vjHKetd/NfeD8mkUXtHfipeIfElULMTujCkN5U43/DMciRcUz7bh6vjOyXm6cMy1P/SChIAEVvKAx0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773174269; c=relaxed/simple; bh=UVUiXt98QDeNvnqUrAq5eGxYRODlEkBstmozUC7w1fg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u1TQIodWweD7zp4H5M85vGwkU9HyWa63LNRWqRxOjEfI/LNcEl/ToLVnJ22qLoK9QHzojgE3+1x/emB6U+v04q7loITyjYXGWBD39Q1Nd2nW9lKAmYw3E6VFNvG5UqpCVvFCapYhV5kT/PfLyMEh9rch8lK8X3Wf5Mpp8kOGQkI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FTSPmuXX; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Ape8kHsL; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FTSPmuXX"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ape8kHsL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773174267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ISzayfMc5PLVDoc63KqzP7tRn0dS/ZiGeioFlqaIWsk=; b=FTSPmuXX6Lk5gP0FgvKDhOBwFPy83i38BPZFqYSYn+g52iJA6njpCZtvu6YIG/z628wEHq Wi/OTAd4xaze71ctLEtueuXUcarsQS+JizGwpcKqKVFYrRQdFT5S3jDsikfgBHaXOGVlOL 9V4d5pns+lxRTQvxAFbMSNGiYP/EulU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-641-Fxa3g2-xOsWQ-WRT_vho6A-1; Tue, 10 Mar 2026 16:24:26 -0400 X-MC-Unique: Fxa3g2-xOsWQ-WRT_vho6A-1 X-Mimecast-MFC-AGG-ID: Fxa3g2-xOsWQ-WRT_vho6A_1773174265 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4839fc4cef6so2513365e9.0 for ; Tue, 10 Mar 2026 13:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773174264; x=1773779064; 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=ISzayfMc5PLVDoc63KqzP7tRn0dS/ZiGeioFlqaIWsk=; b=Ape8kHsL5NrlH2lcGGrKTfiUO8seuo+9U0Qk6QPResoO66kIoJ7gBQkdigpKadRU0a sZjtq0hKZclWiJWZuXK3hiN3SnVmt3iNw673zuGliwbNBlrIK4bG1GsDlH4Hx/J82G4g w5084MCQUvchjYlWpFnLKYPZv5pUNXEc+rOhAKi3vFAumExQVJHxgDilTo7u6Nwy3AGt 37hB65/pS2QVL2ClcFEvxnp2krFSBuc/ootfAt4usDcRUx1Q/bFTeEpdnJGCdN2uwXam OA68z6z0BMw7moQX/ileJVJwyJNJRdpDpSz29z8x9nnHzHsRTIoALwMS3ZCM3wqfsUr7 H6UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773174264; x=1773779064; 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=ISzayfMc5PLVDoc63KqzP7tRn0dS/ZiGeioFlqaIWsk=; b=HRZ9S1dtJ37LmByz4T56pvkxl7dRrrxJ7F2PhS9NItflY5+/d9XGfz9oiFr/y3986p GnJEpoIJKgFOXcXf2C4wt5Nw7grhvJl5bO2wDRETV4UU0fEGMFRZ2Ae/RfEMfmT+krqn tDJCTi48y2fpi8p9sCBpQFhA0+XRdm7qvHh8ZSe0X/1AFp04jjC5zAfI/SLEHaQkCQnC 9Ivu3EY3Bw/aqXBIghtvfpfVQIcgXQG0PEgTMaltZFW0xdo4D6mvVP/hhVfyO8LCxKzN 4yANVoY/TMJYEE49k52EeNi24mQbaX/R86L7ctLvxBdFqFpYSA8HI0aXE/3GuIZNvch8 qNcw== X-Gm-Message-State: AOJu0Yy+BXXgnzeI6V0YpICti9oTpt+ALBSQ5hc4Kks+Ec9JE3wuGPqk 6pI+0LgB3UyBgBwABH/8GjU/H7NTprYVgbTqRWF1JIKN++RST6Qr8sgE6gI3CK7YA53YIwUsVoo 7hPmjnSItMWyTnoHyfaZFWDsVpjP4Sq6sIVh9oTRXnamhUBJM2GfrUKyLIukzNC/7KKF2YFMd5V XuTR6FDJR+IFs9NYMDzz/06VNtOVjSb/DMR9VmToEbQoedTxbedg== X-Gm-Gg: ATEYQzyEi1yDCPQeGgceCf5YkRof1KA2EVV/Zq6Zh/uGsXlkreHrxH8J/LMFAeaZZ38 QY7vTK8BrkppKnFKDMqTaX0WnzG9PmuZUZzTyaRuAYFmpgWxIRhCFtZUli/3DoQaxESMtDzeWnd kizevnMQIqh1jNHZlsRD2KPBXjRRfdEKghIb6Vp4OqpxfOAIansqD26esKhfadxJU9i7TkhWZB1 HOVVIXAofvq3tRJGLKoktvfvUgRG77NZ13wBciA4K9EzBYjrqeprAU5mOzE4OqxXtop5BqmENUB 1ycMofDPW+Dp96dunIYtNvg2bezSZxCr2dZ/ZFB1hYqN3k81Bvaya5Lz7vo2/CfuGH9sIGUKWHk gZs4pzIy+0ToYziRKVlALUseAtrqSMKvKkx1hk7nvJ9hb9leCabXO6Cw18TCbY1MJFsHyCWbmRX 78m+FQshimQBMmrxVbvYw1R3J1qfI= X-Received: by 2002:a05:600c:81c5:b0:485:3f58:da2 with SMTP id 5b1f17b1804b1-4854b291de0mr284425e9.16.1773174264375; Tue, 10 Mar 2026 13:24:24 -0700 (PDT) X-Received: by 2002:a05:600c:81c5:b0:485:3f58:da2 with SMTP id 5b1f17b1804b1-4854b291de0mr283965e9.16.1773174263824; Tue, 10 Mar 2026 13:24:23 -0700 (PDT) Received: from [192.168.10.48] ([151.95.144.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854a18bcf4sm6851425e9.0.2026.03.10.13.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 13:24:22 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com, xinyang@anthropic.com, stable@vger.kernel.org Subject: [PATCH 3/5] selftests: kvm: extract common functionality out of smm_test.c Date: Tue, 10 Mar 2026 21:24:12 +0100 Message-ID: <20260310202414.406078-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260310202414.406078-1-pbonzini@redhat.com> References: <20260310202414.406078-1-pbonzini@redhat.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" Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini --- tools/testing/selftests/kvm/include/x86/smm.h | 17 ++++++++++++ .../testing/selftests/kvm/lib/x86/processor.c | 26 ++++++++++++++++++ tools/testing/selftests/kvm/x86/smm_test.c | 27 ++----------------- 3 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/x86/smm.h diff --git a/tools/testing/selftests/kvm/include/x86/smm.h b/tools/testing/= selftests/kvm/include/x86/smm.h new file mode 100644 index 000000000000..19337c34f13e --- /dev/null +++ b/tools/testing/selftests/kvm/include/x86/smm.h @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-only +#ifndef SELFTEST_KVM_SMM_H +#define SELFTEST_KVM_SMM_H + +#include "kvm_util.h" + +#define SMRAM_SIZE 65536 +#define SMRAM_MEMSLOT ((1 << 16) | 1) +#define SMRAM_PAGES (SMRAM_SIZE / PAGE_SIZE) + +void setup_smram(struct kvm_vm *vm, struct kvm_vcpu *vcpu, + uint64_t smram_gpa, + const void *smi_handler, size_t handler_size); + +void inject_smi(struct kvm_vcpu *vcpu); + +#endif /* SELFTEST_KVM_SMM_H */ diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testin= g/selftests/kvm/lib/x86/processor.c index fab18e9be66c..23a44941e283 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -8,6 +8,7 @@ #include "kvm_util.h" #include "pmu.h" #include "processor.h" +#include "smm.h" #include "svm_util.h" #include "sev.h" #include "vmx.h" @@ -1444,3 +1445,28 @@ bool kvm_arch_has_default_irqchip(void) { return true; } + +void setup_smram(struct kvm_vm *vm, struct kvm_vcpu *vcpu, + uint64_t smram_gpa, + const void *smi_handler, size_t handler_size) +{ + vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, smram_gpa, + SMRAM_MEMSLOT, SMRAM_PAGES, 0); + TEST_ASSERT(vm_phy_pages_alloc(vm, SMRAM_PAGES, smram_gpa, + SMRAM_MEMSLOT) =3D=3D smram_gpa, + "Could not allocate guest physical addresses for SMRAM"); + + memset(addr_gpa2hva(vm, smram_gpa), 0x0, SMRAM_SIZE); + memcpy(addr_gpa2hva(vm, smram_gpa) + 0x8000, smi_handler, handler_size); + vcpu_set_msr(vcpu, MSR_IA32_SMBASE, smram_gpa); +} + +void inject_smi(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_events events; + + vcpu_events_get(vcpu, &events); + events.smi.pending =3D 1; + events.flags |=3D KVM_VCPUEVENT_VALID_SMM; + vcpu_events_set(vcpu, &events); +} diff --git a/tools/testing/selftests/kvm/x86/smm_test.c b/tools/testing/sel= ftests/kvm/x86/smm_test.c index 55c88d664a94..ade8412bf94a 100644 --- a/tools/testing/selftests/kvm/x86/smm_test.c +++ b/tools/testing/selftests/kvm/x86/smm_test.c @@ -14,13 +14,11 @@ #include "test_util.h" =20 #include "kvm_util.h" +#include "smm.h" =20 #include "vmx.h" #include "svm_util.h" =20 -#define SMRAM_SIZE 65536 -#define SMRAM_MEMSLOT ((1 << 16) | 1) -#define SMRAM_PAGES (SMRAM_SIZE / PAGE_SIZE) #define SMRAM_GPA 0x1000000 #define SMRAM_STAGE 0xfe =20 @@ -113,18 +111,6 @@ static void guest_code(void *arg) sync_with_host(DONE); } =20 -void inject_smi(struct kvm_vcpu *vcpu) -{ - struct kvm_vcpu_events events; - - vcpu_events_get(vcpu, &events); - - events.smi.pending =3D 1; - events.flags |=3D KVM_VCPUEVENT_VALID_SMM; - - vcpu_events_set(vcpu, &events); -} - int main(int argc, char *argv[]) { vm_vaddr_t nested_gva =3D 0; @@ -140,16 +126,7 @@ int main(int argc, char *argv[]) /* Create VM */ vm =3D vm_create_with_one_vcpu(&vcpu, guest_code); =20 - vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, SMRAM_GPA, - SMRAM_MEMSLOT, SMRAM_PAGES, 0); - TEST_ASSERT(vm_phy_pages_alloc(vm, SMRAM_PAGES, SMRAM_GPA, SMRAM_MEMSLOT) - =3D=3D SMRAM_GPA, "could not allocate guest physical addresses?"); - - memset(addr_gpa2hva(vm, SMRAM_GPA), 0x0, SMRAM_SIZE); - memcpy(addr_gpa2hva(vm, SMRAM_GPA) + 0x8000, smi_handler, - sizeof(smi_handler)); - - vcpu_set_msr(vcpu, MSR_IA32_SMBASE, SMRAM_GPA); + setup_smram(vm, vcpu, SMRAM_GPA, smi_handler, sizeof(smi_handler)); =20 if (kvm_has_cap(KVM_CAP_NESTED_STATE)) { if (kvm_cpu_has(X86_FEATURE_SVM)) --=20 2.53.0