summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-21 06:16:02 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-21 06:16:02 +0300
commitb9cdab6820ae740dad1e87e609d78dbea7a297f2 (patch)
tree2140824696f5270bc6903cc2b29c1ae2b8896f59 /arch
parent4bf0b820d146682d997248ff1d49665475f9df16 (diff)
parent62a08a7193dc9107904aaa51a04ba3ba2959f745 (diff)
downloadlinux-b9cdab6820ae740dad1e87e609d78dbea7a297f2.tar.xz
Merge tag 'x86_seves_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 SEV-ES fix from Borislav Petkov: "Do not unroll string I/O for SEV-ES guests because they support it" * tag 'x86_seves_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/sev-es: Do not unroll string I/O for SEV-ES guests
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/mem_encrypt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index c3d5f0236f35..4b01f7dbaf30 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -475,9 +475,10 @@ void __init mem_encrypt_init(void)
swiotlb_update_mem_attributes();
/*
- * With SEV, we need to unroll the rep string I/O instructions.
+ * With SEV, we need to unroll the rep string I/O instructions,
+ * but SEV-ES supports them through the #VC handler.
*/
- if (sev_active())
+ if (sev_active() && !sev_es_active())
static_branch_enable(&sev_enable_key);
print_mem_encrypt_feature_info();