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

torvalds · torvalds · commit 808f0ab22106 · 2022-02-13T09:22:52.000-08:00
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
diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,8 @@ void sgx_encl_release(struct kref *ref)`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`kfree(entry);`
	`413`	`+ /* Invoke scheduler to prevent soft lockups. */`
	`414`	`+ cond_resched();`
`413`	`415`	`}`
`414`	`416`
`415`	`417`	`xa_destroy(&encl->page_array);`