Merge tag 'x86_sgx_for_v6.0-2022-08-03.1' of git://git.kernel.org/pub/scm/linux/kerne...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / sgx / main.c

diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 5acd4c54d904c13ae18caa41c8d71cb73af1ab77..515e2a5f25bbc8e4519a177106fcd5777dcade55 100644 (file)
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -257,7 +257,7 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page,
        sgx_encl_put_backing(backing);
 
        if (!encl->secs_child_cnt && test_bit(SGX_ENCL_INITIALIZED, &encl->flags)) {
-               ret = sgx_encl_get_backing(encl, PFN_DOWN(encl->size),
+               ret = sgx_encl_alloc_backing(encl, PFN_DOWN(encl->size),
                                           &secs_backing);
                if (ret)
                        goto out;
@@ -328,7 +328,7 @@ static void sgx_reclaim_pages(void)
                page_index = PFN_DOWN(encl_page->desc - encl_page->encl->base);
 
                mutex_lock(&encl_page->encl->lock);
-               ret = sgx_encl_get_backing(encl_page->encl, page_index, &backing[i]);
+               ret = sgx_encl_alloc_backing(encl_page->encl, page_index, &backing[i]);
                if (ret) {
                        mutex_unlock(&encl_page->encl->lock);
                        goto skip;
@@ -430,6 +430,11 @@ static bool __init sgx_page_reclaimer_init(void)
        return true;
 }
 
+bool current_is_ksgxd(void)
+{
+       return current == ksgxd_tsk;
+}
+
 static struct sgx_epc_page *__sgx_alloc_epc_page_from_node(int nid)
 {
        struct sgx_numa_node *node = &sgx_numa_nodes[nid];