[PATCH v4] x86/virt/sev: Revert "Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN"

[PATCH v4] x86/virt/sev: Revert "Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN"

[Tycho Andersen]

From: "Tycho Andersen (AMD)" <tycho@kernel.org>

This reverts commit 99cf1fb58e68 ("x86/virt/sev: Drop WBINVD before setting
MSR_AMD64_SYSCFG_SNP_EN").

Section 8.8 of the SNP spec says:

    Before invoking SNP_INIT_EX with INIT_RMP set to 1, software must
    ensure that no CPUs contain dirty cache lines for the memory containing
    the RMP.

Cachelines can be moved from cache to cache in a dirty state. The
wbinvd_on_all_cpus() before SNP_INIT_EX flushes the caches for each cpu,
but if the IPIs for WBINVD race with this dirty cacheline movement, it is
possible that they may not get flushed violating the firmware requirement.

Doing wbinvd_on_all_cpus() before setting SNPEn is safer since the RMP
table is not yet in use.

[ Heroically bisected by Srikanth. ]
Reported-by: Srikanth Aithal <Srikanth.Aithal@amd.com>
Tested-by: Srikanth Aithal <Srikanth.Aithal@amd.com>
Fixes: 99cf1fb58e68 ("x86/virt/sev: Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN")
Signed-off-by: Tycho Andersen (AMD) <tycho@kernel.org>
---
 arch/x86/virt/svm/sev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c
index 8bcdce98f6dc..cff285d8ad8e 100644
--- a/arch/x86/virt/svm/sev.c
+++ b/arch/x86/virt/svm/sev.c
@@ -536,6 +536,8 @@ int snp_prepare(void)
 		goto unlock;
 	}
 
+	wbinvd_on_all_cpus();
+
 	/*
 	 * MtrrFixDramModEn is not shared between threads on a core,
 	 * therefore it must be set on all CPUs prior to enabling SNP.

base-commit: aa6d9def48ea424a50c21de90ebe609c383cb05d
-- 
2.55.0

Re: [PATCH v4] x86/virt/sev: Revert "Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN"

[Tycho Andersen]

On Tue, Jul 07, 2026 at 09:00:33AM -0600, Tycho Andersen wrote:
> Subject: [PATCH v4]

Ugh, sorry, this is the *public* v1. Got my automation wrong.

Thanks,

Tycho

Re: [PATCH v4] x86/virt/sev: Revert "Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN"

[Tom Lendacky]

On 7/7/26 10:00, Tycho Andersen wrote:
> From: "Tycho Andersen (AMD)" <tycho@kernel.org>
> 
> This reverts commit 99cf1fb58e68 ("x86/virt/sev: Drop WBINVD before setting
> MSR_AMD64_SYSCFG_SNP_EN").
> 
> Section 8.8 of the SNP spec says:
> 
>     Before invoking SNP_INIT_EX with INIT_RMP set to 1, software must
>     ensure that no CPUs contain dirty cache lines for the memory containing
>     the RMP.
> 
> Cachelines can be moved from cache to cache in a dirty state. The
> wbinvd_on_all_cpus() before SNP_INIT_EX flushes the caches for each cpu,
> but if the IPIs for WBINVD race with this dirty cacheline movement, it is
> possible that they may not get flushed violating the firmware requirement.
> 
> Doing wbinvd_on_all_cpus() before setting SNPEn is safer since the RMP
> table is not yet in use.
> 
> [ Heroically bisected by Srikanth. ]
> Reported-by: Srikanth Aithal <Srikanth.Aithal@amd.com>
> Tested-by: Srikanth Aithal <Srikanth.Aithal@amd.com>
> Fixes: 99cf1fb58e68 ("x86/virt/sev: Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN")
> Signed-off-by: Tycho Andersen (AMD) <tycho@kernel.org>

Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>

> ---
>  arch/x86/virt/svm/sev.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c
> index 8bcdce98f6dc..cff285d8ad8e 100644
> --- a/arch/x86/virt/svm/sev.c
> +++ b/arch/x86/virt/svm/sev.c
> @@ -536,6 +536,8 @@ int snp_prepare(void)
>  		goto unlock;
>  	}
>  
> +	wbinvd_on_all_cpus();
> +
>  	/*
>  	 * MtrrFixDramModEn is not shared between threads on a core,
>  	 * therefore it must be set on all CPUs prior to enabling SNP.
> 
> base-commit: aa6d9def48ea424a50c21de90ebe609c383cb05d

[tip: x86/urgent] x86/virt/sev: Revert "Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN"

[tip-bot2 for Tycho Andersen (AMD)]

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     4c2509f3b79756679a02bea649c6a7501b58f52c
Gitweb:        https://git.kernel.org/tip/4c2509f3b79756679a02bea649c6a7501b58f52c
Author:        Tycho Andersen (AMD) <tycho@kernel.org>
AuthorDate:    Tue, 07 Jul 2026 09:00:33 -06:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 07 Jul 2026 09:11:17 -07:00

x86/virt/sev: Revert "Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN"

Revert

  99cf1fb58e68 ("x86/virt/sev: Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN").

Section 8.8 of the SNP spec says:

  Before invoking SNP_INIT_EX with INIT_RMP set to 1, software must ensure
  that no CPUs contain dirty cache lines for the memory containing the RMP.

Cachelines can be moved from cache to cache in a dirty state. The
wbinvd_on_all_cpus() before SNP_INIT_EX flushes the caches for each CPU, but
if the IPIs for WBINVD race with this dirty cacheline movement, it is possible
that they may not get flushed, violating the firmware requirement.

Doing wbinvd_on_all_cpus() before setting SNPEn is safer since the RMP
table is not yet in use.

  [ Heroically bisected by Srikanth. ]
  [ bp: Massage commit message. ]

Fixes: 99cf1fb58e68 ("x86/virt/sev: Drop WBINVD before setting MSR_AMD64_SYSCFG_SNP_EN")
Reported-by: Srikanth Aithal <Srikanth.Aithal@amd.com>
Signed-off-by: Tycho Andersen (AMD) <tycho@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Tested-by: Srikanth Aithal <Srikanth.Aithal@amd.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Cc: <stable@kernel.org>
Link: https://patch.msgid.link/20260707150033.2364758-1-tycho@kernel.org
---
 arch/x86/virt/svm/sev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c
index 8bcdce9..cff285d 100644
--- a/arch/x86/virt/svm/sev.c
+++ b/arch/x86/virt/svm/sev.c
@@ -536,6 +536,8 @@ int snp_prepare(void)
 		goto unlock;
 	}
 
+	wbinvd_on_all_cpus();
+
 	/*
 	 * MtrrFixDramModEn is not shared between threads on a core,
 	 * therefore it must be set on all CPUs prior to enabling SNP.