diff options
Diffstat (limited to '0008-x86-sgx-Move-PTE-zap-code-to-new-sgx_zap_enclave_pte.patch')
| -rw-r--r-- | 0008-x86-sgx-Move-PTE-zap-code-to-new-sgx_zap_enclave_pte.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/0008-x86-sgx-Move-PTE-zap-code-to-new-sgx_zap_enclave_pte.patch b/0008-x86-sgx-Move-PTE-zap-code-to-new-sgx_zap_enclave_pte.patch index 7785e277fcb9..d9f052f0eed2 100644 --- a/0008-x86-sgx-Move-PTE-zap-code-to-new-sgx_zap_enclave_pte.patch +++ b/0008-x86-sgx-Move-PTE-zap-code-to-new-sgx_zap_enclave_pte.patch @@ -1,7 +1,7 @@ -From c7cbef91a72ec9afba76d518a2bc3102a13cfdb6 Mon Sep 17 00:00:00 2001 +From 1e61402b92958e49b5cbb4e47fb8238273e279f4 Mon Sep 17 00:00:00 2001 From: Reinette Chatre <reinette.chatre@intel.com> -Date: Thu, 20 May 2021 14:23:58 -0700 -Subject: [PATCH 08/30] x86/sgx: Move PTE zap code to new +Date: Wed, 13 Apr 2022 14:10:08 -0700 +Subject: [PATCH 08/31] x86/sgx: Move PTE zap code to new sgx_zap_enclave_ptes() The SGX reclaimer removes page table entries pointing to pages that are @@ -23,6 +23,7 @@ Place sgx_zap_enclave_ptes() with the rest of the enclave code in encl.c interacting with the page table since this code is no longer unique to the reclaimer. +Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> --- arch/x86/kernel/cpu/sgx/encl.c | 45 +++++++++++++++++++++++++++++++++- @@ -31,10 +32,10 @@ Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> 3 files changed, 47 insertions(+), 31 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c -index 8de9bebc4d81..c77a62432862 100644 +index f241596ba411..a872bd7e953a 100644 --- a/arch/x86/kernel/cpu/sgx/encl.c +++ b/arch/x86/kernel/cpu/sgx/encl.c -@@ -605,7 +605,7 @@ int sgx_encl_mm_add(struct sgx_encl *encl, struct mm_struct *mm) +@@ -562,7 +562,7 @@ int sgx_encl_mm_add(struct sgx_encl *encl, struct mm_struct *mm) spin_lock(&encl->mm_lock); list_add_rcu(&encl_mm->list, &encl->mm_list); @@ -43,7 +44,7 @@ index 8de9bebc4d81..c77a62432862 100644 smp_wmb(); encl->mm_list_version++; spin_unlock(&encl->mm_lock); -@@ -792,6 +792,49 @@ int sgx_encl_test_and_clear_young(struct mm_struct *mm, +@@ -751,6 +751,49 @@ int sgx_encl_test_and_clear_young(struct mm_struct *mm, return ret; } @@ -107,7 +108,7 @@ index e59c2cbf71e2..1b15d22f6757 100644 unsigned int sgx_alloc_va_slot(struct sgx_va_page *va_page); void sgx_free_va_slot(struct sgx_va_page *va_page, unsigned int offset); diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c -index fa33922879bf..ce9e87d5f8ec 100644 +index 60b166bff7b4..06492dcffcf1 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -137,36 +137,9 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page) @@ -150,5 +151,5 @@ index fa33922879bf..ce9e87d5f8ec 100644 mutex_lock(&encl->lock); -- -2.35.1 +2.35.2 |