From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> To: <x86@kernel.org>, <platform-driver-x86@vger.kernel.org>, <linux-sgx@vger.kernel.org> Cc: <dave.hansen@intel.com>, <sean.j.christopherson@intel.com>, <nhorman@redhat.com>, <npmccallum@redhat.com>, <serge.ayoun@intel.com>, <shay.katz-zamir@intel.com>, <haitao.huang@intel.com>, <mark.shanahan@intel.com>, <andriy.shevchenko@linux.intel.com>, "Jarkko Sakkinen" <jarkko.sakkinen@linux.intel.com>, Darren Hart <dvhart@infradead.org>, Andy Shevchenko <andy@infradead.org>, Suresh Siddha <suresh.b.siddha@intel.com>, open list <linux-kernel@vger.kernel.org> Subject: [PATCH v15 22/23] platform/x86: ptrace() support for the SGX driver Date: Sat, 3 Nov 2018 01:11:21 +0200 [thread overview] Message-ID: <20181102231320.29164-23-jarkko.sakkinen@linux.intel.com> (raw) In-Reply-To: <20181102231320.29164-1-jarkko.sakkinen@linux.intel.com> Add VMA callbacks for ptrace() that can be used with debug enclaves. With debug enclaves data can be read and write the memory word at a time by using ENCLS(EDBGRD) and ENCLS(EDBGWR) leaf instructions. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- drivers/platform/x86/intel_sgx/sgx_vma.c | 109 +++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/drivers/platform/x86/intel_sgx/sgx_vma.c b/drivers/platform/x86/intel_sgx/sgx_vma.c index cc0993b4fd40..df604e4d0d0a 100644 --- a/drivers/platform/x86/intel_sgx/sgx_vma.c +++ b/drivers/platform/x86/intel_sgx/sgx_vma.c @@ -51,8 +51,117 @@ static int sgx_vma_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; } +static int sgx_edbgrd(struct sgx_encl *encl, struct sgx_encl_page *page, + unsigned long addr, void *data) +{ + unsigned long offset; + int ret; + + offset = addr & ~PAGE_MASK; + + if ((page->desc & SGX_ENCL_PAGE_TCS) && + offset > offsetof(struct sgx_tcs, gs_limit)) + return -ECANCELED; + + ret = __edbgrd(sgx_epc_addr(page->epc_page) + offset, data); + if (ret) { + sgx_dbg(encl, "EDBGRD returned %d\n", ret); + return encls_to_err(ret); + } + + return 0; +} + +static int sgx_edbgwr(struct sgx_encl *encl, struct sgx_encl_page *page, + unsigned long addr, void *data) +{ + unsigned long offset; + int ret; + + offset = addr & ~PAGE_MASK; + + /* Writing anything else than flags will cause #GP */ + if ((page->desc & SGX_ENCL_PAGE_TCS) && + offset != offsetof(struct sgx_tcs, flags)) + return -ECANCELED; + + ret = __edbgwr(sgx_epc_addr(page->epc_page) + offset, data); + if (ret) { + sgx_dbg(encl, "EDBGWR returned %d\n", ret); + return encls_to_err(ret); + } + + return 0; +} + +static int sgx_vma_access(struct vm_area_struct *vma, unsigned long addr, + void *buf, int len, int write) +{ + struct sgx_encl *encl = vma->vm_private_data; + struct sgx_encl_page *entry = NULL; + unsigned long align; + char data[sizeof(unsigned long)]; + int offset; + int cnt; + int ret = 0; + int i; + + /* If process was forked, VMA is still there but vm_private_data is set + * to NULL. + */ + if (!encl) + return -EFAULT; + + if (!(encl->flags & SGX_ENCL_DEBUG) || + !(encl->flags & SGX_ENCL_INITIALIZED) || + (encl->flags & SGX_ENCL_DEAD)) + return -EFAULT; + + for (i = 0; i < len; i += cnt) { + if (!entry || !((addr + i) & (PAGE_SIZE - 1))) { + if (entry) + entry->desc &= ~SGX_ENCL_PAGE_RESERVED; + + entry = sgx_fault_page(vma, (addr + i) & PAGE_MASK, + true); + if (IS_ERR(entry)) { + ret = PTR_ERR(entry); + entry = NULL; + break; + } + } + + /* Locking is not needed because only immutable fields of the + * page are accessed and page itself is reserved so that it + * cannot be swapped out in the middle. + */ + + align = ALIGN_DOWN(addr + i, sizeof(unsigned long)); + offset = (addr + i) & (sizeof(unsigned long) - 1); + cnt = sizeof(unsigned long) - offset; + cnt = min(cnt, len - i); + + ret = sgx_edbgrd(encl, entry, align, data); + if (ret) + break; + if (write) { + memcpy(data + offset, buf + i, cnt); + ret = sgx_edbgwr(encl, entry, align, data); + if (ret) + break; + } else + memcpy(buf + i, data + offset, cnt); + } + + if (entry) + entry->desc &= ~SGX_ENCL_PAGE_RESERVED; + + return ret < 0 ? ret : i; +} + const struct vm_operations_struct sgx_vm_ops = { .close = sgx_vma_close, .open = sgx_vma_open, .fault = sgx_vma_fault, + .access = sgx_vma_access, }; -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> To: x86@kernel.org, platform-driver-x86@vger.kernel.org, linux-sgx@vger.kernel.org Cc: dave.hansen@intel.com, sean.j.christopherson@intel.com, nhorman@redhat.com, npmccallum@redhat.com, serge.ayoun@intel.com, shay.katz-zamir@intel.com, haitao.huang@intel.com, mark.shanahan@intel.com, andriy.shevchenko@linux.intel.com, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Darren Hart <dvhart@infradead.org>, Andy Shevchenko <andy@infradead.org>, Suresh Siddha <suresh.b.siddha@intel.com>, linux-kernel@vger.kernel.org (open list) Subject: [PATCH v15 22/23] platform/x86: ptrace() support for the SGX driver Date: Sat, 3 Nov 2018 01:11:21 +0200 [thread overview] Message-ID: <20181102231320.29164-23-jarkko.sakkinen@linux.intel.com> (raw) Message-ID: <20181102231121.IKJqa1FT9hQj9VNa16t1Uc4VABoWgJIRGywG4GLGaqA@z> (raw) In-Reply-To: <20181102231320.29164-1-jarkko.sakkinen@linux.intel.com> Add VMA callbacks for ptrace() that can be used with debug enclaves. With debug enclaves data can be read and write the memory word at a time by using ENCLS(EDBGRD) and ENCLS(EDBGWR) leaf instructions. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- drivers/platform/x86/intel_sgx/sgx_vma.c | 109 +++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/drivers/platform/x86/intel_sgx/sgx_vma.c b/drivers/platform/x86/intel_sgx/sgx_vma.c index cc0993b4fd40..df604e4d0d0a 100644 --- a/drivers/platform/x86/intel_sgx/sgx_vma.c +++ b/drivers/platform/x86/intel_sgx/sgx_vma.c @@ -51,8 +51,117 @@ static int sgx_vma_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; } +static int sgx_edbgrd(struct sgx_encl *encl, struct sgx_encl_page *page, + unsigned long addr, void *data) +{ + unsigned long offset; + int ret; + + offset = addr & ~PAGE_MASK; + + if ((page->desc & SGX_ENCL_PAGE_TCS) && + offset > offsetof(struct sgx_tcs, gs_limit)) + return -ECANCELED; + + ret = __edbgrd(sgx_epc_addr(page->epc_page) + offset, data); + if (ret) { + sgx_dbg(encl, "EDBGRD returned %d\n", ret); + return encls_to_err(ret); + } + + return 0; +} + +static int sgx_edbgwr(struct sgx_encl *encl, struct sgx_encl_page *page, + unsigned long addr, void *data) +{ + unsigned long offset; + int ret; + + offset = addr & ~PAGE_MASK; + + /* Writing anything else than flags will cause #GP */ + if ((page->desc & SGX_ENCL_PAGE_TCS) && + offset != offsetof(struct sgx_tcs, flags)) + return -ECANCELED; + + ret = __edbgwr(sgx_epc_addr(page->epc_page) + offset, data); + if (ret) { + sgx_dbg(encl, "EDBGWR returned %d\n", ret); + return encls_to_err(ret); + } + + return 0; +} + +static int sgx_vma_access(struct vm_area_struct *vma, unsigned long addr, + void *buf, int len, int write) +{ + struct sgx_encl *encl = vma->vm_private_data; + struct sgx_encl_page *entry = NULL; + unsigned long align; + char data[sizeof(unsigned long)]; + int offset; + int cnt; + int ret = 0; + int i; + + /* If process was forked, VMA is still there but vm_private_data is set + * to NULL. + */ + if (!encl) + return -EFAULT; + + if (!(encl->flags & SGX_ENCL_DEBUG) || + !(encl->flags & SGX_ENCL_INITIALIZED) || + (encl->flags & SGX_ENCL_DEAD)) + return -EFAULT; + + for (i = 0; i < len; i += cnt) { + if (!entry || !((addr + i) & (PAGE_SIZE - 1))) { + if (entry) + entry->desc &= ~SGX_ENCL_PAGE_RESERVED; + + entry = sgx_fault_page(vma, (addr + i) & PAGE_MASK, + true); + if (IS_ERR(entry)) { + ret = PTR_ERR(entry); + entry = NULL; + break; + } + } + + /* Locking is not needed because only immutable fields of the + * page are accessed and page itself is reserved so that it + * cannot be swapped out in the middle. + */ + + align = ALIGN_DOWN(addr + i, sizeof(unsigned long)); + offset = (addr + i) & (sizeof(unsigned long) - 1); + cnt = sizeof(unsigned long) - offset; + cnt = min(cnt, len - i); + + ret = sgx_edbgrd(encl, entry, align, data); + if (ret) + break; + if (write) { + memcpy(data + offset, buf + i, cnt); + ret = sgx_edbgwr(encl, entry, align, data); + if (ret) + break; + } else + memcpy(buf + i, data + offset, cnt); + } + + if (entry) + entry->desc &= ~SGX_ENCL_PAGE_RESERVED; + + return ret < 0 ? ret : i; +} + const struct vm_operations_struct sgx_vm_ops = { .close = sgx_vma_close, .open = sgx_vma_open, .fault = sgx_vma_fault, + .access = sgx_vma_access, }; -- 2.19.1
next prev parent reply other threads:[~2018-11-03 8:28 UTC|newest] Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-02 23:10 [PATCH v15 00/23] Intel SGX1 Jarkko Sakkinen 2018-11-02 23:10 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 01/23] x86/sgx: Update MAINTAINERS Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 02/23] x86/cpufeatures: Add Intel-defined SGX feature bit Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:33 ` Borislav Petkov 2018-11-02 23:33 ` Borislav Petkov 2018-11-02 23:55 ` Jarkko Sakkinen 2018-11-02 23:55 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 03/23] x86/cpufeatures: Add SGX sub-features (as Linux-defined bits) Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 04/23] x86/msr: Add IA32_FEATURE_CONTROL.SGX_ENABLE definition Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 05/23] x86/cpu/intel: Detect SGX support and update caps appropriately Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 13:05 ` Andy Shevchenko 2018-11-03 13:05 ` Andy Shevchenko 2018-11-05 14:09 ` Jarkko Sakkinen 2018-11-05 14:09 ` Jarkko Sakkinen 2018-11-05 14:11 ` Jarkko Sakkinen 2018-11-05 14:11 ` Jarkko Sakkinen 2018-11-05 14:31 ` Andy Shevchenko 2018-11-05 14:31 ` Andy Shevchenko 2018-11-02 23:11 ` [PATCH v15 06/23] x86/mm: x86/sgx: Add new 'PF_SGX' page fault error code bit Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 07/23] x86/mm: x86/sgx: Signal SIGSEGV for userspace #PFs w/ PF_SGX Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 08/23] x86/sgx: Define SGX1 and SGX2 ENCLS leafs Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 09/23] x86/sgx: Add ENCLS architectural error codes Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 10/23] x86/sgx: Add SGX1 and SGX2 architectural data structures Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 11/23] x86/sgx: Add definitions for SGX's CPUID leaf and variable sub-leafs Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 13:11 ` Andy Shevchenko 2018-11-03 13:11 ` Andy Shevchenko 2018-11-05 14:35 ` Jarkko Sakkinen 2018-11-05 14:35 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 12/23] x86/cpufeatures: Add Intel-defined SGX_LC feature bit Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 13/23] x86/msr: Add SGX Launch Control MSR definitions Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 14/23] x86/cpu/intel: Clear SGX_LC capability if not enabled in FEATURE_CONTROL Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 13:15 ` Andy Shevchenko 2018-11-03 13:15 ` Andy Shevchenko 2018-11-05 14:37 ` Jarkko Sakkinen 2018-11-05 14:37 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 15/23] x86/sgx: Add wrappers for ENCLS leaf functions Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 13:17 ` Andy Shevchenko 2018-11-03 13:17 ` Andy Shevchenko 2018-11-05 17:30 ` Jarkko Sakkinen 2018-11-05 17:30 ` Jarkko Sakkinen 2018-11-05 20:39 ` Andy Shevchenko 2018-11-05 20:39 ` Andy Shevchenko 2018-11-06 12:03 ` Jarkko Sakkinen 2018-11-06 12:03 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 16/23] x86/sgx: Enumerate and track EPC sections Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 1:07 ` Jethro Beekman 2018-11-03 1:07 ` Jethro Beekman 2018-11-05 17:31 ` Jarkko Sakkinen 2018-11-05 17:31 ` Jarkko Sakkinen 2018-11-03 13:22 ` Andy Shevchenko 2018-11-03 13:22 ` Andy Shevchenko 2018-11-05 17:35 ` Jarkko Sakkinen 2018-11-05 17:35 ` Jarkko Sakkinen 2018-11-06 12:10 ` Jarkko Sakkinen 2018-11-06 12:10 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 17/23] x86/sgx: Add functions to allocate and free EPC pages Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 18/23] x86/sgx: Add sgx_einit() for initializing enclaves Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 19/23] platform/x86: Intel SGX driver Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 20/23] platform/x86: sgx: Add swapping functionality to the " Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 21/23] x86/sgx: Add a simple swapper for the EPC memory manager Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen [this message] 2018-11-02 23:11 ` [PATCH v15 22/23] platform/x86: ptrace() support for the SGX driver Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 23/23] x86/sgx: Driver documentation Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-04 8:15 ` Mike Rapoport 2018-11-04 8:15 ` Mike Rapoport 2018-11-05 17:39 ` Jarkko Sakkinen 2018-11-05 17:39 ` Jarkko Sakkinen 2018-11-05 20:27 ` Dave Hansen 2018-11-05 20:27 ` Dave Hansen 2018-11-06 5:49 ` Jarkko Sakkinen 2018-11-06 5:49 ` Jarkko Sakkinen 2018-11-06 6:20 ` Jarkko Sakkinen 2018-11-06 6:20 ` Jarkko Sakkinen 2018-11-06 16:45 ` Dave Hansen 2018-11-06 16:45 ` Dave Hansen 2018-11-07 16:30 ` Jarkko Sakkinen 2018-11-07 16:30 ` Jarkko Sakkinen 2018-11-07 17:09 ` Dave Hansen 2018-11-07 17:09 ` Dave Hansen 2018-11-08 14:39 ` Jarkko Sakkinen 2018-11-08 14:39 ` Jarkko Sakkinen 2018-11-08 19:20 ` Jarkko Sakkinen 2018-11-08 19:20 ` Jarkko Sakkinen 2018-11-13 15:13 ` Jarkko Sakkinen 2018-11-06 6:26 ` Jarkko Sakkinen 2018-11-06 6:26 ` 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=20181102231320.29164-23-jarkko.sakkinen@linux.intel.com \ --to=jarkko.sakkinen@linux.intel.com \ --cc=andriy.shevchenko@linux.intel.com \ --cc=andy@infradead.org \ --cc=dave.hansen@intel.com \ --cc=dvhart@infradead.org \ --cc=haitao.huang@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sgx@vger.kernel.org \ --cc=mark.shanahan@intel.com \ --cc=nhorman@redhat.com \ --cc=npmccallum@redhat.com \ --cc=platform-driver-x86@vger.kernel.org \ --cc=sean.j.christopherson@intel.com \ --cc=serge.ayoun@intel.com \ --cc=shay.katz-zamir@intel.com \ --cc=suresh.b.siddha@intel.com \ --cc=x86@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: linkBe 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).