Commit 808f0ab2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.17_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fix from Borislav Petkov:
 "Prevent softlockups when tearing down large SGX enclaves"

* tag 'x86_urgent_for_v5.17_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/sgx: Silence softlockup detection when releasing large enclaves
parents e9c25787 8795359e

arch/x86/kernel/cpu/sgx/encl.c

+2 −0
Original line number Diff line number Diff line
@@ -410,6 +410,8 @@ void sgx_encl_release(struct kref *ref) 
		}



		kfree(entry);

		/* Invoke scheduler to prevent soft lockups. */

		cond_resched();

	}



	xa_destroy(&encl->page_array);