From patchwork Tue Oct 17 13:24:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 10012051 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 6D48760235 for ; Tue, 17 Oct 2017 13:30:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64AC6285E4 for ; Tue, 17 Oct 2017 13:30:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59408288C6; Tue, 17 Oct 2017 13:30:47 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 89213285E4 for ; Tue, 17 Oct 2017 13:30:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4Ruw-0001WD-Uj; Tue, 17 Oct 2017 13:28:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4Ruv-0001Vj-9w for xen-devel@lists.xenproject.org; Tue, 17 Oct 2017 13:28:21 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id CF/C4-21876-47506E95; Tue, 17 Oct 2017 13:28:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRWlGSWpSXmKPExsXitHSDvW4x67N IgzNTrC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozlO6azF8wzrdh08iBLA2OTRhcjJ4eEgL/E jvNr2EBsNgEdialPL7F2MXJwiAioSNzea9DFyMXBLPCcSeL1hp/sIDXCAgkSkyevZAKpYRFQl Wg4bw9i8grYStx/EQ8xUV5iV9tFVhCbEyj8+t8BZhBbSMBGYtO89awQtorE+qmzwLbyCghKnJ z5hAXEZhaQkDj44gXzBEbeWUhSs5CkFjAyrWJUL04tKkst0jXRSyrKTM8oyU3MzNE1NDDVy00 tLk5MT81JTCrWS87P3cQIDBsGINjBeKvP+RCjJAeTkiivs+GTSCG+pPyUyozE4oz4otKc1OJD jDIcHEoSvM4szyKFBItS01Mr0jJzgAEMk5bg4FES4Y0GSfMWFyTmFmemQ6ROMVpydNy8+4eJY xOY3PD9wR8mIZa8/LxUKXHeTJAGAZCGjNI8uHGwKLvEKCslzMsIdKAQT0FqUW5mCar8K0ZxDk YlYV5lkCk8mXklcFtfAR3EBHTQOqcnIAeVJCKkpBoYxWTmFasGrP+4gOWBjz3/m8yjZ/YvKVD d8fHyzo8VKQyru6ecq/0ZdLmQtf2lX7Lb7uXfY1aoiX3UW3/QfnZ7+6rp83VNimLro41OTj4a VLLjenD1xROf/t5ekXdNS6dg6Y/UTQa32W8e/BT6+ML+pLdZMQof/rDtPuss4RzKsOG48/KZe u3r/iqxFGckGmoxFxUnAgBDKi3rrQIAAA== X-Env-Sender: prvs=4567f63fb=Paul.Durrant@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1508246898!71074874!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34160 invoked from network); 17 Oct 2017 13:28:19 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 17 Oct 2017 13:28:19 -0000 X-IronPort-AV: E=Sophos;i="5.43,391,1503360000"; d="scan'208";a="454571837" From: Paul Durrant To: Date: Tue, 17 Oct 2017 14:24:31 +0100 Message-ID: <20171017132432.24093-11-paul.durrant@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171017132432.24093-1-paul.durrant@citrix.com> References: <20171017132432.24093-1-paul.durrant@citrix.com> MIME-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Paul Durrant , Jan Beulich Subject: [Xen-devel] [PATCH v12 10/11] common: add a new mappable resource type: XENMEM_resource_grant_table X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch allows grant table frames to be mapped using the XENMEM_acquire_resource memory op. Signed-off-by: Paul Durrant --- Cc: Andrew Cooper Cc: George Dunlap Cc: Ian Jackson Cc: Jan Beulich Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Tim Deegan Cc: Wei Liu v12: - Dropped limit checks as requested by Jan. v10: - Addressed comments from Jan. v8: - The functionality was originally incorporated into the earlier patch "x86/mm: add HYPERVISOR_memory_op to acquire guest resources". --- xen/common/grant_table.c | 49 ++++++++++++++++++++++++++++++++++++++----- xen/common/memory.c | 45 ++++++++++++++++++++++++++++++++++++++- xen/include/public/memory.h | 6 ++++++ xen/include/xen/grant_table.h | 4 ++++ 4 files changed, 98 insertions(+), 6 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 6d20b17739..886579a7b0 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3756,13 +3756,12 @@ int mem_sharing_gref_to_gfn(struct grant_table *gt, grant_ref_t ref, } #endif -int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, - mfn_t *mfn) +/* Caller must hold write lock as version may change and table may grow */ +static int gnttab_get_frame(struct domain *d, unsigned long idx, + mfn_t *mfn) { - int rc = 0; struct grant_table *gt = d->grant_table; - - grant_write_lock(gt); + int rc = 0; if ( gt->gt_version == 0 ) gt->gt_version = 1; @@ -3787,6 +3786,18 @@ int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, rc = -EINVAL; } + return rc; +} + +int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, + mfn_t *mfn) +{ + struct grant_table *gt = d->grant_table; + int rc; + + grant_write_lock(gt); + + rc = gnttab_get_frame(d, idx, mfn); if ( !rc ) gnttab_set_frame_gfn(gt, idx, gfn); @@ -3795,6 +3806,34 @@ int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, return rc; } +int gnttab_get_grant_frame(struct domain *d, unsigned long idx, + mfn_t *mfn) +{ + struct grant_table *gt = d->grant_table; + int rc; + + /* write lock required as version may change and/or table may grow */ + grant_write_lock(gt); + rc = gnttab_get_frame(d, idx, mfn); + grant_write_unlock(gt); + + return rc; +} + +int gnttab_get_status_frame(struct domain *d, unsigned long idx, + mfn_t *mfn) +{ + struct grant_table *gt = d->grant_table; + int rc; + + /* write lock required as version may change and/or table may grow */ + grant_write_lock(gt); + rc = gnttab_get_frame(d, idx | XENMAPIDX_grant_table_status, mfn); + grant_write_unlock(gt); + + return rc; +} + static void gnttab_usage_print(struct domain *rd) { int first = 1; diff --git a/xen/common/memory.c b/xen/common/memory.c index b27a71c4f1..ae46d95885 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -965,12 +966,49 @@ static long xatp_permission_check(struct domain *d, unsigned int space) return xsm_add_to_physmap(XSM_TARGET, current->domain, d); } +static int acquire_grant_table(struct domain *d, unsigned int id, + unsigned long frame, + unsigned int nr_frames, + unsigned long mfn_list[]) +{ + unsigned int i = nr_frames; + + /* Iterate backwards in case table needs to grow */ + while ( i-- != 0 ) + { + mfn_t mfn = INVALID_MFN; + int rc; + + switch ( id ) + { + case XENMEM_resource_grant_table_id_grant: + rc = gnttab_get_grant_frame(d, frame + i, &mfn); + break; + + case XENMEM_resource_grant_table_id_status: + rc = gnttab_get_status_frame(d, frame + i, &mfn); + break; + + default: + rc = -EINVAL; + break; + } + + if ( rc ) + return rc; + + mfn_list[i] = mfn_x(mfn); + } + + return 0; +} + static int acquire_resource( XEN_GUEST_HANDLE_PARAM(xen_mem_acquire_resource_t) arg) { struct domain *d, *currd = current->domain; xen_mem_acquire_resource_t xmar; - unsigned long mfn_list[2]; + unsigned long mfn_list[32]; int rc; if ( copy_from_guest(&xmar, arg, 1) ) @@ -1016,6 +1054,11 @@ static int acquire_resource( xmar.nr_frames, mfn_list); break; + case XENMEM_resource_grant_table: + rc = acquire_grant_table(d, xmar.id, xmar.frame, xmar.nr_frames, + mfn_list); + break; + default: rc = -EOPNOTSUPP; break; diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 9596ebf2c7..553304009a 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -611,14 +611,20 @@ struct xen_mem_acquire_resource { uint16_t type; #define XENMEM_resource_ioreq_server 0 +#define XENMEM_resource_grant_table 1 /* * IN - a type-specific resource identifier, which must be zero * unless stated otherwise. * * type == XENMEM_resource_ioreq_server -> id == ioreq server id + * type == XENMEM_resource_grant_table -> id defined below */ uint32_t id; + +#define XENMEM_resource_grant_table_id_grant 0 +#define XENMEM_resource_grant_table_id_status 1 + /* IN/OUT - As an IN parameter number of frames of the resource * to be mapped. However, if the specified value is 0 and * frame_list is NULL then this field will be set to the diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index b3a95fda58..e9125e43e7 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -55,6 +55,10 @@ int mem_sharing_gref_to_gfn(struct grant_table *gt, grant_ref_t ref, int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn, mfn_t *mfn); +int gnttab_get_grant_frame(struct domain *d, unsigned long idx, + mfn_t *mfn); +int gnttab_get_status_frame(struct domain *d, unsigned long idx, + mfn_t *mfn); unsigned int gnttab_dom0_frames(void);