From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: linux-sgx@vger.kernel.org, Andy Lutomirski <luto@kernel.org>
Subject: [PATCH for_v22 3/6] x86/sgx: Move encl_page insertion into tree out of alloc flow
Date: Thu, 8 Aug 2019 15:13:37 -0700 [thread overview]
Message-ID: <20190808221340.29460-4-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20190808221340.29460-1-sean.j.christopherson@intel.com>
Move insertion into the page tree out of sgx_encl_page_alloc() so that
the function can be moved out from under encl->lock. This is a
preparatory step for removing the add page worker, as the encl_page is
needed to allocate its EPC page, and EPC page allocation must be done
without holding encl->lock so that it can trigger reclaim if necessary.
Note, radix_tree_insert() returns -EEXIST if the the slot is already in
use, i.e. there's no need to pre-check via radix_tree_lookup().
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kernel/cpu/sgx/driver/ioctl.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/driver/ioctl.c b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
index 64deab36ed05..126f95afa9a1 100644
--- a/arch/x86/kernel/cpu/sgx/driver/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
@@ -251,10 +251,7 @@ static struct sgx_encl_page *sgx_encl_page_alloc(struct sgx_encl *encl,
u64 page_type)
{
struct sgx_encl_page *encl_page;
- int ret;
- if (radix_tree_lookup(&encl->page_tree, PFN_DOWN(addr)))
- return ERR_PTR(-EEXIST);
encl_page = kzalloc(sizeof(*encl_page), GFP_KERNEL);
if (!encl_page)
return ERR_PTR(-ENOMEM);
@@ -263,12 +260,7 @@ static struct sgx_encl_page *sgx_encl_page_alloc(struct sgx_encl *encl,
encl_page->desc |= SGX_ENCL_PAGE_TCS;
encl_page->encl = encl;
encl_page->vm_prot_bits = calc_vm_prot_bits(prot, 0);
- ret = radix_tree_insert(&encl->page_tree, PFN_DOWN(encl_page->desc),
- encl_page);
- if (ret) {
- kfree(encl_page);
- return ERR_PTR(ret);
- }
+
return encl_page;
}
@@ -539,6 +531,11 @@ static int sgx_encl_add_page(struct sgx_encl *encl, unsigned long addr,
goto err_out_shrink;
}
+ ret = radix_tree_insert(&encl->page_tree, PFN_DOWN(encl_page->desc),
+ encl_page);
+ if (ret)
+ goto err_out_free;
+
ret = __sgx_encl_add_page(encl, encl_page, data, secinfo, mrmask);
if (ret)
goto err_out;
@@ -549,6 +546,7 @@ static int sgx_encl_add_page(struct sgx_encl *encl, unsigned long addr,
err_out:
radix_tree_delete(&encl_page->encl->page_tree,
PFN_DOWN(encl_page->desc));
+err_out_free:
kfree(encl_page);
err_out_shrink:
--
2.22.0
next prev parent reply other threads:[~2019-08-08 22:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-08 22:13 [PATCH for_v22 0/6] x86/sgx: Remove EADD worker and page copy Sean Christopherson
2019-08-08 22:13 ` [PATCH for_v22 1/6] x86/sgx: Validate generic SECINFO immediately after copying from user Sean Christopherson
2019-08-08 22:13 ` [PATCH for_v22 2/6] x86/sgx: Set SGX_ENCL_PAGE_TCS when allocating encl_page Sean Christopherson
2019-08-08 22:13 ` Sean Christopherson [this message]
2019-08-08 22:13 ` [PATCH for_v22 4/6] x86/sgx: Allocate encl_page prior to taking encl->lock Sean Christopherson
2019-08-08 22:13 ` [PATCH for_v22 5/6] x86/sgx: Remove the EADD page worker Sean Christopherson
2019-08-08 22:13 ` [PATCH for_v22 6/6] x86/sgx: Pass userspace source address directly to EADD Sean Christopherson
2019-08-09 16:21 ` [PATCH for_v22 0/6] x86/sgx: Remove EADD worker and page copy Jarkko Sakkinen
2019-08-09 16:22 ` Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190808221340.29460-4-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).