Commit b9cdab68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4bf0b820 62a08a71

arch/x86/mm/mem_encrypt.c

+3 −2
Original line number Diff line number Diff line
@@ -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();