From patchwork Thu Apr 20 17:41:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 9691045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7FE0660383 for ; Thu, 20 Apr 2017 17:51:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7679B20265 for ; Thu, 20 Apr 2017 17:51:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A0DD284F2; Thu, 20 Apr 2017 17:51:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D48B420265 for ; Thu, 20 Apr 2017 17:51:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 715A821954079; Thu, 20 Apr 2017 10:51:40 -0700 (PDT) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4A02D21954079 for ; Thu, 20 Apr 2017 10:51:39 -0700 (PDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Apr 2017 10:51:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,225,1488873600"; d="scan'208";a="251554052" Received: from sjchrist-ts.jf.intel.com ([10.54.74.20]) by fmsmga004.fm.intel.com with ESMTP; 20 Apr 2017 10:51:38 -0700 From: Sean Christopherson To: intel-sgx-kernel-dev@lists.01.org Date: Thu, 20 Apr 2017 10:41:24 -0700 Message-Id: <1492710084-19371-1-git-send-email-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [intel-sgx-kernel-dev] [PATCH v2] intel_sgx: store va_offset in upper bits of page flags X-BeenThere: intel-sgx-kernel-dev@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Project: Intel® Software Guard Extensions for Linux*: https://01.org/intel-software-guard-extensions" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-sgx-kernel-dev-bounces@lists.01.org Sender: "intel-sgx-kernel-dev" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Sean Christopherson --- drivers/platform/x86/intel_sgx/sgx.h | 17 ++++++++++++++++- drivers/platform/x86/intel_sgx/sgx_ioctl.c | 4 ++-- drivers/platform/x86/intel_sgx/sgx_page_cache.c | 2 +- drivers/platform/x86/intel_sgx/sgx_util.c | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/intel_sgx/sgx.h b/drivers/platform/x86/intel_sgx/sgx.h index e59ff01..430b5f2 100644 --- a/drivers/platform/x86/intel_sgx/sgx.h +++ b/drivers/platform/x86/intel_sgx/sgx.h @@ -101,6 +101,9 @@ static inline void sgx_free_va_slot(struct sgx_va_page *page, enum sgx_encl_page_flags { SGX_ENCL_PAGE_TCS = BIT(0), SGX_ENCL_PAGE_RESERVED = BIT(1), + + SGX_ENCL_PAGE_VA_OFFSET_SHIFT = 20, + SGX_ENCL_PAGE_VA_OFFSET_MASK = GENMASK(31, 20), }; struct sgx_encl_page { @@ -109,9 +112,21 @@ struct sgx_encl_page { struct sgx_epc_page *epc_page; struct list_head load_list; struct sgx_va_page *va_page; - unsigned int va_offset; }; +static inline unsigned int sgx_va_offset(struct sgx_encl_page *page) +{ + unsigned int shifted = (page->flags & SGX_ENCL_PAGE_VA_OFFSET_MASK); + return (shifted >> SGX_ENCL_PAGE_VA_OFFSET_SHIFT); +} + +static inline void sgx_set_va_offset(struct sgx_encl_page *page, + unsigned int va_offset) +{ + page->flags = (page->flags & ~SGX_ENCL_PAGE_VA_OFFSET_MASK) | + (va_offset << SGX_ENCL_PAGE_VA_OFFSET_SHIFT); +} + struct sgx_tgid_ctx { struct pid *tgid; struct kref refcount; diff --git a/drivers/platform/x86/intel_sgx/sgx_ioctl.c b/drivers/platform/x86/intel_sgx/sgx_ioctl.c index ba7c0d2..bca33f5 100644 --- a/drivers/platform/x86/intel_sgx/sgx_ioctl.c +++ b/drivers/platform/x86/intel_sgx/sgx_ioctl.c @@ -439,7 +439,7 @@ static int sgx_init_page(struct sgx_encl *encl, } entry->va_page = va_page; - entry->va_offset = va_offset; + sgx_set_va_offset(entry, va_offset); entry->addr = addr; return 0; @@ -753,7 +753,7 @@ static int __encl_add_page(struct sgx_encl *encl, if (ret) { kfree(req); sgx_free_va_slot(encl_page->va_page, - encl_page->va_offset); + sgx_va_offset(encl_page)); } mutex_unlock(&encl->lock); diff --git a/drivers/platform/x86/intel_sgx/sgx_page_cache.c b/drivers/platform/x86/intel_sgx/sgx_page_cache.c index 59a67cb..47a6221 100644 --- a/drivers/platform/x86/intel_sgx/sgx_page_cache.c +++ b/drivers/platform/x86/intel_sgx/sgx_page_cache.c @@ -290,7 +290,7 @@ static int __sgx_ewb(struct sgx_encl *encl, pginfo.linaddr = 0; pginfo.secs = 0; ret = __ewb(&pginfo, epc, - (void *)((unsigned long)va + encl_page->va_offset)); + (void *)((unsigned long)va + sgx_va_offset(encl_page))); kunmap_atomic((void *)(unsigned long)(pginfo.pcmd - pcmd_offset)); kunmap_atomic((void *)(unsigned long)pginfo.srcpge); diff --git a/drivers/platform/x86/intel_sgx/sgx_util.c b/drivers/platform/x86/intel_sgx/sgx_util.c index 1e9fa18..9cb7dd9 100644 --- a/drivers/platform/x86/intel_sgx/sgx_util.c +++ b/drivers/platform/x86/intel_sgx/sgx_util.c @@ -226,7 +226,7 @@ static int sgx_eldu(struct sgx_encl *encl, ret = __eldu((unsigned long)&pginfo, (unsigned long)epc_ptr, (unsigned long)va_ptr + - encl_page->va_offset); + sgx_va_offset(encl_page)); if (ret) { sgx_err(encl, "ELDU returned %d\n", ret); ret = -EFAULT;