From patchwork Tue Oct 10 16:31:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 9998079 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 A0CDE603B5 for ; Tue, 10 Oct 2017 22:13:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94033287BD for ; Tue, 10 Oct 2017 22:13:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88D83287DB; Tue, 10 Oct 2017 22:13:36 +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=-2.6 required=2.0 tests=BAYES_00, DATE_IN_PAST_03_06, 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 0D20B287BD for ; Tue, 10 Oct 2017 22:13:36 +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 1e22k4-0005Jy-H6; Tue, 10 Oct 2017 22:11:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e22k3-0005IH-C6 for xen-devel@lists.xenproject.org; Tue, 10 Oct 2017 22:11:11 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id F6/24-28075-E754DD95; Tue, 10 Oct 2017 22:11:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRWlGSWpSXmKPExsXitHRDpG6N691 Ig2n7zC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oybW5YwFuw2r7j+fAdbA+N2zS5GTg4JAX+J 9r4WJhCbTUBHYurTS6xdjBwcIgIqErf3GnQxcnEwCzxnkni94Sc7SI2wQILE1ht9TCA1LAKqE k9OcoGEeQVsJKaducEOMVJeYlfbRVYQmxMo/nBJCyOILSRgLbHudSMThK0isX7qLDaIXkGJkz OfsIDYzAISEgdfvGCewMg7C0lqFpLUAkamVYwaxalFZalFuoaGeklFmekZJbmJmTm6hgbGerm pxcWJ6ak5iUnFesn5uZsYgaHDAAQ7GFf/djrEKMnBpCTK+1r9bqQQX1J+SmVGYnFGfFFpTmrx IUYZDg4lCd5EF6CcYFFqempFWmYOMIhh0hIcPEoivKHOQGne4oLE3OLMdIjUKUZLjo6bd/8wc WwCkxu+P/jDJMSSl5+XKiXOWwQyTwCkIaM0D24cLNIuMcpKCfMyAh0oxFOQWpSbWYIq/4pRnI NRSZg3CGQKT2ZeCdzWV0AHMQEdJJp2B+SgkkSElFQD44HEPXOel/Au6zD6MXkey65gfb1Tadu NWW0WCpoV6m3PXWf92/CuTtixTzs8JUOeFiz4pL19+e3WO4wv7d33lf7K1LjUlSwaqX5Tk/1r 1sNpTc26OnlzMqvsxL+rVzUff+t3jHem5L+yL8/j+75lPo/47ZxaVp7Vl39mPcOxpwa7A/hDv p9rVWIpzkg01GIuKk4EAM3RZqivAgAA X-Env-Sender: prvs=4497f262f=Paul.Durrant@citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1507673456!108982716!8 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42704 invoked from network); 10 Oct 2017 22:11:08 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-10.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 10 Oct 2017 22:11:08 -0000 X-IronPort-AV: E=Sophos;i="5.43,359,1503360000"; d="scan'208";a="444965540" From: Paul Durrant To: Date: Tue, 10 Oct 2017 17:31:25 +0100 Message-ID: <20171010163126.2558-11-paul.durrant@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171010163126.2558-1-paul.durrant@citrix.com> References: <20171010163126.2558-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 v10 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 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 | 63 ++++++++++++++++++++++++++++++++++++++----- xen/common/memory.c | 44 +++++++++++++++++++++++++++++- xen/include/public/memory.h | 6 +++++ xen/include/xen/grant_table.h | 4 +++ 4 files changed, 110 insertions(+), 7 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 6d20b17739..e42c1b6bf3 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1608,7 +1608,8 @@ fault: } static int -gnttab_populate_status_frames(struct domain *d, struct grant_table *gt, +gnttab_populate_status_frames(struct domain *d, + struct grant_table *gt, unsigned int req_nr_frames) { unsigned i; @@ -3756,13 +3757,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 +3787,19 @@ 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 +3808,44 @@ 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 = (gt->gt_version == 2 && + idx > XENMAPIDX_grant_table_status) ? + -EINVAL : + 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 = (gt->gt_version != 2 || + idx > XENMAPIDX_grant_table_status) ? + -EINVAL : + 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 6f01cc9663..42d5440979 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -965,10 +966,46 @@ 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; + + 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(const xen_mem_acquire_resource_t *xmar) { struct domain *d, *currd = current->domain; - unsigned long mfn_list[2]; + unsigned long mfn_list[32]; int rc; if ( xmar->nr_frames == 0 || xmar->pad != 0 ) @@ -992,6 +1029,11 @@ static int acquire_resource(const xen_mem_acquire_resource_t *xmar) 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 1322527490..2c7832c411 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 - number of (4K) frames of the resource to be mapped */ uint32_t nr_frames; uint32_t pad; 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);