From nobody Wed Apr 8 06:23:50 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 911D33F23CE for ; Tue, 10 Mar 2026 23:48:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773186546; cv=none; b=n1YyFNT/n8YI6oL7TEaTigtX1b9ZVYVbgNwwBmhLgABLZnDHUZuKePEt49xIo7xm6OgiDxjgZYu4qVwYl1pZo1hrLdayAiqJg1Se3txz51vtn9F6WUSAeVRY6l3tkBr4N2q1TbSkoihyxbQFQKTuRzEpueP3AT6EIWcax2ekfmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773186546; c=relaxed/simple; bh=yLT9leD6tbVXClrxr+0/anPB/JESBZGwpnCJuvNlJGU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pPb5apX4qsqeKvgsU0tMWEQaDt9mtUZ9aVy808d6+s5AiXs0QylGn5RlgwR79alwdoyMTZQCLVHFHByGfGYgx5QT5Je6EzWCDDzP5Nx2cjH0JH52y21BK+Cp8772sUPMzABu68qjfNd6hsR65aGbbTk2yKzh1+ViBwPn+hCpYQk= 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=G1tSQs9h; arc=none smtp.client-ip=209.85.214.201 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="G1tSQs9h" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2ae65d5cc57so411469475ad.2 for ; Tue, 10 Mar 2026 16:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1773186538; x=1773791338; 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=yv2t64tdKmKRfKfd/MV+khzQ98ceOtJdslfcnGZwzWg=; b=G1tSQs9hnp0MBiTTkvjLSXehIcjKGFpKHS1Fd0fN3gpVmpkzSnNMpftqDyrGbT90yf nmp17v15sEkNG+3Ur0Flh3Aq2xB4g+tPJHQg/GDSL/UJFXcO3ZAPEqOvc+8uPwqW55mZ T54XMZQfNJLtDb1qBXAezOQ0R7Z/jLqjd7F/j2vKGLRNXgUYRyhj3yMDFgNlk1PSarpL RbqoZH0lKHRnSc0OO0PBznbcaBcY+VTLZB490omsK7fhGlxNHXdzjQy3LY2b4vq8nVW+ vgFukN7Nepuq1aZekTw81B+kzNsxQcq3WFrLmbIb8+fDsd58W0f4anqbcAsnnpiCafYH Bqlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773186538; x=1773791338; 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=yv2t64tdKmKRfKfd/MV+khzQ98ceOtJdslfcnGZwzWg=; b=atbi/pT4C8qAIrIzgKQCHLOMkx37vSwcmEg5sAwv93dB9FUnUOCSc6Aq9niPJ0HZbD UPq9zqGKFEQyQGjQmIiA0k/Lrh751LNd7Xs9RLmPj6ouZ8tU+fSFVhmH0xkt7ZOii7AD a2YaDSA+OBeENAIgn+TDqKIgQRpr2Vnek/vGUcFM3Qd7NyGZ6Mi0N11+KOuZO5ij9HCU 35nUXeBNLROsA6heqiFTUwu3D4iJ0lOkbie/BYSWCdmczRFy6psm9Ui0p2iwhtzglnSz Moc2uzqWaonKaVYTbuQAWakZ6ZWdxafnTG24TRWTbBUNce4xqaGYvDd9/wpQc7Il+oB5 6puQ== X-Forwarded-Encrypted: i=1; AJvYcCWCM54wPK2OL/NCHTeuw4Q5kgV30ZNd376mU41hufuwcewhKZhMbWwoyJ74my0IlmjhYVYGzV9LxVISHb0=@vger.kernel.org X-Gm-Message-State: AOJu0YxbPcmj0Wuc8+1xnb+7wzeSeFOU3oXtitxX2zylq2CrC++9pLDV eFa8yEKv56cIVo2wE3gMD5uRHwkuxeqH+ygceg62vBHzSdvrD48XkXykIgeDw0HzFuJFdxiYVvk bph/VNw== X-Received: from plsl9.prod.google.com ([2002:a17:903:2449:b0:2ae:3d76:eb1b]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2b03:b0:2ae:5b52:3818 with SMTP id d9443c01a7336-2aeae76f543mr5386855ad.8.1773186537997; Tue, 10 Mar 2026 16:48:57 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Mar 2026 16:48:21 -0700 In-Reply-To: <20260310234829.2608037-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: <20260310234829.2608037-1-seanjc@google.com> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog Message-ID: <20260310234829.2608037-14-seanjc@google.com> Subject: [PATCH 13/21] KVM: SEV: Hide "struct kvm_sev_info" behind CONFIG_KVM_AMD_SEV=y From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Jethro Beekman , Alexander Potapenko , "=?UTF-8?q?Carlos=20L=C3=B3pez?=" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bury "struct kvm_sev_info" behind CONFIG_KVM_AMD_SEV=3Dy to make it harder for SEV specific code to sneak into common SVM code. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 2 ++ arch/x86/kvm/svm/svm.h | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 780acd454913..e6691c044913 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4215,8 +4215,10 @@ static void svm_cancel_injection(struct kvm_vcpu *vc= pu) =20 static int svm_vcpu_pre_run(struct kvm_vcpu *vcpu) { +#ifdef CONFIG_KVM_AMD_SEV if (to_kvm_sev_info(vcpu->kvm)->need_init) return -EINVAL; +#endif =20 return 1; } diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 7f28445766b6..58c08ed0819a 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -92,6 +92,7 @@ enum { /* TPR and CR2 are always written before VMRUN */ #define VMCB_ALWAYS_DIRTY_MASK ((1U << VMCB_INTR) | (1U << VMCB_CR2)) =20 +#ifdef CONFIG_KVM_AMD_SEV struct kvm_sev_info { bool active; /* SEV enabled guest */ bool es_active; /* SEV-ES enabled guest */ @@ -117,6 +118,7 @@ struct kvm_sev_info { cpumask_var_t have_run_cpus; /* CPUs that have done VMRUN for this VM. */ bool snp_certs_enabled; /* SNP certificate-fetching support. */ }; +#endif =20 struct kvm_svm { struct kvm kvm; @@ -127,7 +129,9 @@ struct kvm_svm { u64 *avic_physical_id_table; struct hlist_node hnode; =20 +#ifdef CONFIG_KVM_AMD_SEV struct kvm_sev_info sev_info; +#endif }; =20 struct kvm_vcpu; @@ -364,12 +368,12 @@ static __always_inline struct kvm_svm *to_kvm_svm(str= uct kvm *kvm) return container_of(kvm, struct kvm_svm, kvm); } =20 +#ifdef CONFIG_KVM_AMD_SEV static __always_inline struct kvm_sev_info *to_kvm_sev_info(struct kvm *kv= m) { return &to_kvm_svm(kvm)->sev_info; } =20 -#ifdef CONFIG_KVM_AMD_SEV static __always_inline bool ____sev_guest(struct kvm *kvm) { return to_kvm_sev_info(kvm)->active; --=20 2.53.0.473.g4a7958ca14-goog