diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 19:16:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 19:16:02 -0800 |
| commit | b9cdab6820ae740dad1e87e609d78dbea7a297f2 (patch) | |
| tree | 2140824696f5270bc6903cc2b29c1ae2b8896f59 | |
| parent | 4bf0b820d146682d997248ff1d49665475f9df16 (diff) | |
| parent | 62a08a7193dc9107904aaa51a04ba3ba2959f745 (diff) | |
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
| -rw-r--r-- | arch/x86/mm/mem_encrypt.c | 5 |
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(); |