The previous send was a mistake and contains unfinished work. This is my first flush of fixes and cleanups for v23. Jarkko Sakkinen (11): selftest/x86/sgx: Remove encl_piggy.h x86/sgx: Clean up internal includes x86/sgx: Write backing storage only if EWB is successful x86/sgx: Rename 'j' as 'cnt' in sgx_reclaim_pages() x86/sgx: Turn encls_failed() as inline function x86/sgx: Move sgx_einit() to encls.c x86/sgx: Remove pages in sgx_reclaimer_write() x86/sgx: Calculate page index in sgx_reclaimer_write() x86/sgx: Move SGX_ENCL_DEAD check to sgx_reclaimer_write() x86/sgx: Free VA slot when the EWB flow fails x86/sgx: Call sgx_encl_destroy() when the EWB flow fails arch/x86/kernel/cpu/sgx/driver.c | 2 + arch/x86/kernel/cpu/sgx/driver.h | 3 - arch/x86/kernel/cpu/sgx/encl.c | 2 - arch/x86/kernel/cpu/sgx/encl.h | 1 + arch/x86/kernel/cpu/sgx/encls.c | 54 ++++++-- arch/x86/kernel/cpu/sgx/encls.h | 23 +++- arch/x86/kernel/cpu/sgx/ioctl.c | 2 + arch/x86/kernel/cpu/sgx/main.c | 53 +------- arch/x86/kernel/cpu/sgx/reclaim.c | 133 +++++++++---------- arch/x86/kernel/cpu/sgx/sgx.h | 3 +- tools/testing/selftests/x86/sgx/encl_piggy.h | 14 -- tools/testing/selftests/x86/sgx/main.c | 1 - 12 files changed, 137 insertions(+), 154 deletions(-) delete mode 100644 tools/testing/selftests/x86/sgx/encl_piggy.h -- 2.20.1