@@ -222,26 +222,15 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page)
static int __sgx_encl_ewb(struct sgx_encl *encl, struct sgx_epc_page *epc_page,
struct sgx_va_page *va_page, unsigned int va_offset,
- unsigned int pt)
+ unsigned int page_index)
{
- struct sgx_encl_page *encl_page = epc_page->owner;
struct sgx_pageinfo pginfo;
unsigned long pcmd_offset;
struct page *backing;
- pgoff_t page_index;
pgoff_t pcmd_index;
struct page *pcmd;
int ret;
- if (pt != SGX_SECINFO_SECS && pt != SGX_SECINFO_TCS &&
- pt != SGX_SECINFO_REG)
- return -EINVAL;
-
- if (pt == SGX_SECINFO_SECS)
- page_index = PFN_DOWN(encl->size);
- else
- page_index = SGX_ENCL_PAGE_INDEX(encl_page);
-
pcmd_index = sgx_pcmd_index(encl, page_index);
pcmd_offset = sgx_pcmd_offset(page_index);
@@ -308,7 +297,8 @@ static const cpumask_t *sgx_encl_ewb_cpumask(struct sgx_encl *encl)
return cpumask;
}
-static void sgx_encl_ewb(struct sgx_epc_page *epc_page, unsigned int pt)
+static void sgx_encl_ewb(struct sgx_epc_page *epc_page,
+ unsigned int page_index)
{
struct sgx_encl_page *encl_page = epc_page->owner;
struct sgx_encl *encl = encl_page->encl;
@@ -325,7 +315,8 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page, unsigned int pt)
if (sgx_va_page_full(va_page))
list_move_tail(&va_page->list, &encl->va_pages);
- ret = __sgx_encl_ewb(encl, epc_page, va_page, va_offset, pt);
+ ret = __sgx_encl_ewb(encl, epc_page, va_page, va_offset,
+ page_index);
if (ret == SGX_NOT_TRACKED) {
ret = __etrack(sgx_epc_addr(encl->secs.epc_page));
if (ret) {
@@ -335,7 +326,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page, unsigned int pt)
}
ret = __sgx_encl_ewb(encl, epc_page, va_page, va_offset,
- pt);
+ page_index);
if (ret == SGX_NOT_TRACKED) {
/*
* Slow path, send IPIs to kick cpus out of the
@@ -347,7 +338,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page, unsigned int pt)
on_each_cpu_mask(sgx_encl_ewb_cpumask(encl),
sgx_ipi_cb, NULL, 1);
ret = __sgx_encl_ewb(encl, epc_page, va_page,
- va_offset, pt);
+ va_offset, page_index);
}
}
@@ -364,17 +355,11 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page)
{
struct sgx_encl_page *encl_page = epc_page->owner;
struct sgx_encl *encl = encl_page->encl;
- unsigned int pt;
int ret;
- if (encl_page->desc & SGX_ENCL_PAGE_TCS)
- pt = SGX_SECINFO_TCS;
- else
- pt = SGX_SECINFO_REG;
-
mutex_lock(&encl->lock);
- sgx_encl_ewb(epc_page, pt);
+ sgx_encl_ewb(epc_page, SGX_ENCL_PAGE_INDEX(encl_page));
if (atomic_read(&encl->flags) & SGX_ENCL_DEAD) {
ret = __eremove(sgx_epc_addr(epc_page));
WARN(ret, "EREMOVE returned %d\n", ret);
@@ -386,7 +371,7 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page)
if (!encl->secs_child_cnt &&
(atomic_read(&encl->flags) &
(SGX_ENCL_DEAD | SGX_ENCL_INITIALIZED))) {
- sgx_encl_ewb(encl->secs.epc_page, SGX_SECINFO_SECS);
+ sgx_encl_ewb(encl->secs.epc_page, PFN_DOWN(encl->size));
sgx_free_page(encl->secs.epc_page);
encl->secs.epc_page = NULL;
Move page index calculation for backing storage to sgx_reclaimer_write() as it somewhat simplifies the flow and makes it also easier to control as the high level write logic is consolidated to a single function. Cc: Sean Christopherson <sean.j.christopherson@intel.com> Cc: Shay Katz-zamir <shay.katz-zamir@intel.com> Cc: Serge Ayoun <serge.ayoun@intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- arch/x86/kernel/cpu/sgx/reclaim.c | 33 +++++++++---------------------- 1 file changed, 9 insertions(+), 24 deletions(-)