From patchwork Fri Jan 20 22:01:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 9529573 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 8B04B6020B for ; Fri, 20 Jan 2017 22:02:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F61D284F2 for ; Fri, 20 Jan 2017 22:02:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7485F286D9; Fri, 20 Jan 2017 22:02:27 +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 51665284F2 for ; Fri, 20 Jan 2017 22:02:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3C3A681EA3 for ; Fri, 20 Jan 2017 14:02:26 -0800 (PST) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 41B5F81E9F for ; Fri, 20 Jan 2017 14:02:25 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP; 20 Jan 2017 14:01:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,260,1477983600"; d="scan'208";a="215840249" Received: from sjchrist-ts.jf.intel.com ([10.54.74.20]) by fmsmga004.fm.intel.com with ESMTP; 20 Jan 2017 14:01:54 -0800 From: Sean Christopherson To: intel-sgx-kernel-dev@lists.01.org Date: Fri, 20 Jan 2017 14:01:13 -0800 Message-Id: <1484949673-8605-4-git-send-email-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484949673-8605-1-git-send-email-sean.j.christopherson@intel.com> References: <20170116233656.6225-1-jarkko.sakkinen@linux.intel.com> <1484949673-8605-1-git-send-email-sean.j.christopherson@intel.com> Subject: [intel-sgx-kernel-dev] [PATCH FIX 3/3] fixup - intel_sgx: backing storage file for PCMD X-BeenThere: intel-sgx-kernel-dev@lists.01.org X-Mailman-Version: 2.1.21 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 Combine sgx_get/put_backing/pcmd functionality into common utility functions, wrapped by inline helpers for backing and pcmd. Signed-off-by: Sean Christopherson --- drivers/platform/x86/intel_sgx.h | 31 +++++++++++++++++++----- drivers/platform/x86/intel_sgx_util.c | 45 +++++------------------------------ 2 files changed, 31 insertions(+), 45 deletions(-) diff --git a/drivers/platform/x86/intel_sgx.h b/drivers/platform/x86/intel_sgx.h index 1d03606..22bf3be 100644 --- a/drivers/platform/x86/intel_sgx.h +++ b/drivers/platform/x86/intel_sgx.h @@ -195,12 +195,8 @@ long sgx_compat_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); int sgx_test_and_clear_young(struct sgx_encl_page *page, struct sgx_encl *encl); void *sgx_get_epc_page(struct sgx_epc_page *entry); void sgx_put_epc_page(void *epc_page_vaddr); -struct page *sgx_get_backing(struct sgx_encl *encl, - struct sgx_encl_page *entry); -void sgx_put_backing(struct page *backing, bool write); -struct page *sgx_get_pcmd(struct sgx_encl *encl, - struct sgx_encl_page *entry); -void sgx_put_pcmd(struct page *pcmd_page, bool write); +struct page *sgx_get_shmem(struct file *shmem_file, pgoff_t index); +void sgx_put_shmem(struct page *shmem_page, bool write); void sgx_insert_pte(struct sgx_encl *encl, struct sgx_encl_page *encl_page, struct sgx_epc_page *epc_page, @@ -217,6 +213,29 @@ int sgx_find_encl(struct mm_struct *mm, unsigned long addr, void sgx_encl_release(struct kref *ref); void sgx_tgid_ctx_release(struct kref *ref); +static inline struct page *sgx_get_backing(struct sgx_encl *encl, + struct sgx_encl_page *entry) +{ + pgoff_t index = (entry->addr - encl->base) >> PAGE_SHIFT; + return sgx_get_shmem(encl->backing, index); +} +static inline void sgx_put_backing(struct page *backing, bool write) +{ + return sgx_put_shmem(backing, write); +} +static inline struct page *sgx_get_pcmd(struct sgx_encl *encl, + struct sgx_encl_page *entry) +{ + /* 32 PCMD's per page */ + pgoff_t index = (entry->addr - encl->base) >> (PAGE_SHIFT + 5); + return sgx_get_shmem(encl->pcmd, index); +} +static inline void sgx_put_pcmd(struct page *pcmd, bool write) +{ + return sgx_put_shmem(pcmd, write); +} + + /* EPC page cache */ #define SGX_NR_LOW_EPC_PAGES_DEFAULT 32 diff --git a/drivers/platform/x86/intel_sgx_util.c b/drivers/platform/x86/intel_sgx_util.c index 40f5839..c7bf5e1 100644 --- a/drivers/platform/x86/intel_sgx_util.c +++ b/drivers/platform/x86/intel_sgx_util.c @@ -78,58 +78,25 @@ void sgx_put_epc_page(void *epc_page_vaddr) #endif } -struct page *sgx_get_backing(struct sgx_encl *encl, - struct sgx_encl_page *entry) +struct page *sgx_get_shmem(struct file *shmem_file, pgoff_t index) { - struct page *backing; struct inode *inode; struct address_space *mapping; gfp_t gfpmask; - pgoff_t index; - inode = encl->backing->f_path.dentry->d_inode; + inode = shmem_file->f_path.dentry->d_inode; mapping = inode->i_mapping; gfpmask = mapping_gfp_mask(mapping); - index = (entry->addr - encl->base) >> PAGE_SHIFT; - backing = shmem_read_mapping_page_gfp(mapping, index, gfpmask); - - return backing; -} - -void sgx_put_backing(struct page *backing_page, bool write) -{ - if (write) - set_page_dirty(backing_page); - - put_page(backing_page); -} - -struct page *sgx_get_pcmd(struct sgx_encl *encl, - struct sgx_encl_page *entry) -{ - struct page *pcmd; - struct inode *inode; - struct address_space *mapping; - gfp_t gfpmask; - pgoff_t index; - - inode = encl->pcmd->f_path.dentry->d_inode; - mapping = inode->i_mapping; - gfpmask = mapping_gfp_mask(mapping); - /* 32 PCMD's per page */ - index = (entry->addr - encl->base) >> (PAGE_SHIFT + 5); - pcmd = shmem_read_mapping_page_gfp(mapping, index, gfpmask); - - return pcmd; + return shmem_read_mapping_page_gfp(mapping, index, gfpmask); } -void sgx_put_pcmd(struct page *pcmd_page, bool write) +void sgx_put_shmem(struct page *shmem_page, bool write) { if (write) - set_page_dirty(pcmd_page); + set_page_dirty(shmem_page); - put_page(pcmd_page); + put_page(shmem_page); } struct vm_area_struct *sgx_find_vma(struct sgx_encl *encl, unsigned long addr)