From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: linux-sgx@vger.kernel.org, Dave Hansen <dave.hansen@intel.com>,
Cedric Xing <cedric.xing@intel.com>,
Andy Lutomirski <luto@kernel.org>,
Jethro Beekman <jethro@fortanix.com>,
"Dr . Greg Wettstein" <greg@enjellic.com>
Subject: [PATCH 6/7] x86/sgx: Use the actual zero page as the source when adding zero pages
Date: Wed, 5 Jun 2019 12:48:44 -0700 [thread overview]
Message-ID: <20190605194845.926-7-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20190605194845.926-1-sean.j.christopherson@intel.com>
Using the zero page avoids dirtying the backing page, inserting TLB
entries, the cost of memset, etc... For some enclaves, e.g. an enclave
with a small code footprint and a large working set, this results in a
20%+ reduction in enclave build time.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kernel/cpu/sgx/driver/ioctl.c | 50 ++++++++++++++++----------
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/driver/ioctl.c b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
index c35264ea0c93..e05a539e96fc 100644
--- a/arch/x86/kernel/cpu/sgx/driver/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
@@ -19,6 +19,7 @@ struct sgx_add_page_req {
struct sgx_secinfo secinfo;
unsigned long mrmask;
struct list_head list;
+ bool zero_page;
};
static int sgx_encl_grow(struct sgx_encl *encl)
@@ -76,6 +77,7 @@ static bool sgx_process_add_page_req(struct sgx_add_page_req *req,
struct sgx_pageinfo pginfo;
struct page *backing;
unsigned long addr;
+ void *contents;
int ret;
int i;
@@ -84,9 +86,15 @@ static bool sgx_process_add_page_req(struct sgx_add_page_req *req,
addr = SGX_ENCL_PAGE_ADDR(encl_page);
- backing = sgx_encl_get_backing_page(encl, page_index);
- if (IS_ERR(backing))
- return false;
+ if (!req->zero_page) {
+ backing = sgx_encl_get_backing_page(encl, page_index);
+ if (IS_ERR(backing))
+ return false;
+ contents = kmap_atomic(backing);
+ } else {
+ backing = NULL;
+ contents = __va(page_to_pfn(ZERO_PAGE(0)) << PAGE_SHIFT);
+ }
/*
* The SECINFO field must be 64-byte aligned, copy it to a local
@@ -99,11 +107,13 @@ static bool sgx_process_add_page_req(struct sgx_add_page_req *req,
pginfo.secs = (unsigned long)sgx_epc_addr(encl->secs.epc_page);
pginfo.addr = addr;
pginfo.metadata = (unsigned long)&secinfo;
- pginfo.contents = (unsigned long)kmap_atomic(backing);
+ pginfo.contents = (unsigned long)contents;
ret = __eadd(&pginfo, sgx_epc_addr(epc_page));
- kunmap_atomic((void *)(unsigned long)pginfo.contents);
- put_page(backing);
+ if (backing) {
+ kunmap_atomic(contents);
+ put_page(backing);
+ }
if (ret) {
if (encls_failed(ret))
@@ -506,18 +516,20 @@ static int sgx_encl_queue_page(struct sgx_encl *encl,
if (!req)
return -ENOMEM;
- backing = sgx_encl_get_backing_page(encl, page_index);
- if (IS_ERR(backing)) {
- kfree(req);
- return PTR_ERR(backing);
- }
+ if (data) {
+ backing = sgx_encl_get_backing_page(encl, page_index);
+ if (IS_ERR(backing)) {
+ kfree(req);
+ return PTR_ERR(backing);
+ }
- backing_ptr = kmap(backing);
- if (data)
+ backing_ptr = kmap(backing);
memcpy(backing_ptr, data, PAGE_SIZE);
- else
- memset(backing_ptr, 0, PAGE_SIZE);
- kunmap(backing);
+ kunmap(backing);
+ } else {
+ backing = NULL;
+ req->zero_page = true;
+ }
if (page_type == SGX_SECINFO_TCS)
encl_page->desc |= SGX_ENCL_PAGE_TCS;
memcpy(&req->secinfo, secinfo, sizeof(*secinfo));
@@ -529,8 +541,10 @@ static int sgx_encl_queue_page(struct sgx_encl *encl,
list_add_tail(&req->list, &encl->add_page_reqs);
if (empty)
queue_work(sgx_encl_wq, &encl->work);
- set_page_dirty(backing);
- put_page(backing);
+ if (backing) {
+ set_page_dirty(backing);
+ put_page(backing);
+ }
return 0;
}
--
2.21.0
next prev parent reply other threads:[~2019-06-05 19:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-05 19:48 [PATCH 0/7] x86/sgx: Clean up and enhance add pages ioctl Sean Christopherson
2019-06-05 19:48 ` [PATCH 1/7] x86/sgx: Remove dead code to handle non-existent IOR ioctl Sean Christopherson
2019-06-05 19:48 ` [PATCH 2/7] x86/sgx: Remove unnecessary @cmd parameter from ioctl helpers Sean Christopherson
2019-06-05 19:48 ` [PATCH 3/7] x86/sgx: Let ioctl helpers do copy to/from user Sean Christopherson
2019-06-05 19:48 ` [PATCH 4/7] x86/sgx: Allow userspace to add multiple pages in single ioctl() Sean Christopherson
2019-06-06 15:47 ` Jarkko Sakkinen
2019-06-13 0:43 ` Jethro Beekman
2019-06-13 16:51 ` Sean Christopherson
2019-06-13 19:05 ` Andy Lutomirski
2019-06-13 19:15 ` Sean Christopherson
2019-06-13 19:45 ` Xing, Cedric
2019-06-05 19:48 ` [PATCH 5/7] x86/sgx: Add flag to zero added region instead of copying from source Sean Christopherson
2019-06-06 17:20 ` Andy Lutomirski
2019-06-06 17:32 ` Sean Christopherson
2019-06-07 19:32 ` Andy Lutomirski
2019-06-10 17:06 ` Jarkko Sakkinen
2019-06-10 18:09 ` Xing, Cedric
2019-06-10 18:41 ` Sean Christopherson
2019-06-10 18:53 ` Sean Christopherson
2019-06-13 0:38 ` Jethro Beekman
2019-06-13 13:46 ` Sean Christopherson
2019-06-13 16:16 ` Andy Lutomirski
2019-06-13 16:54 ` Sean Christopherson
2019-06-05 19:48 ` Sean Christopherson [this message]
2019-06-05 19:48 ` [PATCH 7/7] x86/sgx: Add a reserved field to sgx_enclave_add_region to drop 'packed' Sean Christopherson
2019-06-05 19:59 ` Dave Hansen
2019-06-05 20:00 ` Andy Lutomirski
2019-06-12 15:14 ` Jarkko Sakkinen
2019-06-12 15:23 ` Sean Christopherson
2019-06-13 0:44 ` Jethro Beekman
2019-06-13 15:38 ` Jarkko Sakkinen
2019-06-12 15:16 ` [PATCH 0/7] x86/sgx: Clean up and enhance add pages ioctl Jarkko Sakkinen
2019-06-12 18:14 ` Jarkko Sakkinen
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=20190605194845.926-7-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=cedric.xing@intel.com \
--cc=dave.hansen@intel.com \
--cc=greg@enjellic.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jethro@fortanix.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).