From nobody Tue Mar 3 05:05:26 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 844213859FD; Mon, 2 Mar 2026 19:14:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772478884; cv=none; b=fQKVQBY+qyLQGApuNj3lnKDBmZN1/KrR30oNQaR5C9+SzUtVGCQzTibgtlxc9oYxrm+BDt449VPaxkeRYo0o9YWh/8RmaQJ1KzQb90TaaInqsr2Bb0FzkPxC4blxkvBXhIxE0HkMzCOsGaIRG/4voNHuyFmH/PHDAmStOCq4ExE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772478884; c=relaxed/simple; bh=scqSkI1wuci+U/aGIgSppjWdI7sQBnMTjpRIS4c6EVE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sxlJ5L4k9vfP0ANKRZOzbWUEorvcRhXaKf60/ICVcI0kS/9vdsTePh2uz6MlWsXDGL6LG0giNjqJybnv6zA51JysjGwe7soVQHg9A0lMK1C7gveKqLjZfc6DKZQ4Nl7uUr5cJQApC3sUv2C/QxAzpvkadtMfOiqgiAZoeLgSpmI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Sb8NCgph; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Sb8NCgph" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2E1FC2BC87; Mon, 2 Mar 2026 19:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772478884; bh=scqSkI1wuci+U/aGIgSppjWdI7sQBnMTjpRIS4c6EVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sb8NCgphYlCeUd/mSHzZDsHBuFknF5UnGuGenyTOsoIIbQT2XvZy+tBJdpI40aV18 wxlT8kmJ9FRfyLbFWNuxAwS0suHU9VJxRpQ21xkAP7tgK/3UOnHqMVhCXj1CmDvtea nx3w9Cc757Xd2jO6yZifCUYJ3ynEwUeAiWBgK50jwe4NCJ9yBBnPZIDFw7/r6RxMoO P8xF3UthUxZ4tZXE5w0eToDdGz9b+GcJzAv1rapvF99C/cVKCRxy1GpK/LuIYhtRUV fZlcd7fWVeFh5v2ev9Afnkfbzb670N5i7xIRKsoY5XYhNo5kXnXEXDz4Xb9FgW5qkq EEOT5ueX+MguQ== From: Tycho Andersen To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Ashish Kalra , Tom Lendacky , John Allen , Herbert Xu , "David S. Miller" , Ard Biesheuvel , Neeraj Upadhyay , Kishon Vijay Abraham I , Alexey Kardashevskiy , Nikunj A Dadhania , "Peter Zijlstra (Intel)" , Kim Phillips , Sean Christopherson Cc: linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org Subject: [PATCH 06/11] x86/snp, crypto: move SNP init to ccp driver Date: Mon, 2 Mar 2026 12:13:29 -0700 Message-ID: <20260302191334.937981-7-tycho@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302191334.937981-1-tycho@kernel.org> References: <20260302191334.937981-1-tycho@kernel.org> 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: "Tycho Andersen (AMD)" Use the new snp_prepare_for_snp_init() to initialize SNP from the ccp driver instead of at boot time. This means that SNP is not enabled unless it is really going to be used (i.e. kvm_amd loads the ccp driver automatically). Signed-off-by: Tycho Andersen (AMD) Reviewed-by: Tom Lendacky --- arch/x86/virt/svm/sev.c | 2 -- drivers/crypto/ccp/sev-dev.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c index 8f50538baf7b..aa784542b32d 100644 --- a/arch/x86/virt/svm/sev.c +++ b/arch/x86/virt/svm/sev.c @@ -549,8 +549,6 @@ int __init snp_rmptable_init(void) if (!setup_rmptable()) return -ENOSYS; =20 - snp_prepare_for_snp_init(); - /* * Setting crash_kexec_post_notifiers to 'true' to ensure that SNP panic * notifier is invoked to do SNP IOMMU shutdown before kdump. diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 096f993974d1..5b1a24b11e3e 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -1375,6 +1375,8 @@ static int __sev_snp_init_locked(int *error, unsigned= int max_snp_asid) return -EOPNOTSUPP; } =20 + snp_prepare_for_snp_init(); + /* SNP_INIT requires MSR_VM_HSAVE_PA to be cleared on all CPUs. */ on_each_cpu(snp_set_hsave_pa, NULL, 1); =20 --=20 2.53.0