From patchwork Mon Oct 23 09:05:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Lagerwall X-Patchwork-Id: 10022187 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 4A6C7603D7 for ; Mon, 23 Oct 2017 09:07:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D9872880C for ; Mon, 23 Oct 2017 09:07:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31CEE28811; Mon, 23 Oct 2017 09:07:30 +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 CC4422880C for ; Mon, 23 Oct 2017 09:07:29 +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 1e6Yfn-0007NU-3b; Mon, 23 Oct 2017 09:05:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e6Yfl-0007LA-L9 for xen-devel@lists.xen.org; Mon, 23 Oct 2017 09:05:25 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 31/D1-02146-4D0BDE95; Mon, 23 Oct 2017 09:05:24 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHSDve6VDW8 jDeZNkrVY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDN2LHvNWnBdouL6vONMDYyvRLoYOTkkBPwl Diy7zgRiswkYSNy69J0ZxBYRkJVY3TWHHcRmFiiXOLH9MBuILSwQLjH37nOwehYBVYkLy48wd jFycPAK2EpcPu4GMVJOYs/FGWCtnAJ2Es/+LmcFsYWASvbs+sECYatJvF1+BszmFRCUODnzCQ vEKgmJgy9eME9g5J2FJDULSWoBI9MqRo3i1KKy1CJdI2O9pKLM9IyS3MTMHF1DA1O93NTi4sT 01JzEpGK95PzcTYzA0KlnYGDcwbij3e8QoyQHk5Io7++ct5FCfEn5KZUZicUZ8UWlOanFhxhl ODiUJHifrAfKCRalpqdWpGXmAIMYJi3BwaMkwjsVJM1bXJCYW5yZDpE6xajL0XHz7h8mIZa8/ LxUKXHe9yBFAiBFGaV5cCNgEXWJUVZKmJeRgYFBiKcgtSg3swRV/hWjOAejkjDvfZApPJl5JX CbXgEdwQR0hKz9G5AjShIRUlINjK5PHTTtMmc1fOTQm29+yaHqsP2JJ193TeC2aG97ybfj1h6 T+atdTQo7eg9OsuvMMb60O0rc97L7vOpF/Tx3ReNnqh2uaub/0qlqct54lufc9TwiZo+6cu9/ y475KXvA0+CbrpgQ05du781zbOuXpL6+d/jcUak9cXJB1Ztssy5pnDyo+ULjkBJLcUaioRZzU XEiAGwo9tyjAgAA X-Env-Sender: prvs=462d8fd40=ross.lagerwall@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1508749521!71898222!3 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 61061 invoked from network); 23 Oct 2017 09:05:24 -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; 23 Oct 2017 09:05:24 -0000 X-IronPort-AV: E=Sophos;i="5.43,422,1503360000"; d="scan'208";a="455507306" From: Ross Lagerwall To: Date: Mon, 23 Oct 2017 10:05:08 +0100 Message-ID: <20171023090509.4338-5-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171023090509.4338-1-ross.lagerwall@citrix.com> References: <20171023090509.4338-1-ross.lagerwall@citrix.com> MIME-Version: 1.0 Cc: Ross Lagerwall , Ian Jackson , Wei Liu Subject: [Xen-devel] [PATCH v2 4/5] tools: libxendevicemodel: Provide xendevicemodel_add_to_physmap 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 Signed-off-by: Ross Lagerwall Acked-by: Ian Jackson Reviewed-by: Paul Durrant --- Changed in v2: * Make it operate on a range. tools/libs/devicemodel/Makefile | 2 +- tools/libs/devicemodel/core.c | 21 +++++++++++++++++++++ tools/libs/devicemodel/include/xendevicemodel.h | 15 +++++++++++++++ tools/libs/devicemodel/libxendevicemodel.map | 5 +++++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile index 342371a..5b2df7a 100644 --- a/tools/libs/devicemodel/Makefile +++ b/tools/libs/devicemodel/Makefile @@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 -MINOR = 1 +MINOR = 2 SHLIB_LDFLAGS += -Wl,--version-script=libxendevicemodel.map CFLAGS += -Werror -Wmissing-prototypes diff --git a/tools/libs/devicemodel/core.c b/tools/libs/devicemodel/core.c index b66d4f9..07953d3 100644 --- a/tools/libs/devicemodel/core.c +++ b/tools/libs/devicemodel/core.c @@ -564,6 +564,27 @@ int xendevicemodel_shutdown( return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); } +int xendevicemodel_add_to_physmap( + xendevicemodel_handle *dmod, domid_t domid, uint16_t size, uint64_t idx, + uint64_t gpfn) +{ + struct xen_dm_op op; + struct xen_dm_op_add_to_physmap *data; + + memset(&op, 0, sizeof(op)); + + op.op = XEN_DMOP_add_to_physmap; + data = &op.u.add_to_physmap; + + data->size = size; + data->pad0 = 0; + data->pad1 = 0; + data->idx = idx; + data->gpfn = gpfn; + + return xendevicemodel_op(dmod, domid, 1, &op, sizeof(op)); +} + int xendevicemodel_restrict(xendevicemodel_handle *dmod, domid_t domid) { return osdep_xendevicemodel_restrict(dmod, domid); diff --git a/tools/libs/devicemodel/include/xendevicemodel.h b/tools/libs/devicemodel/include/xendevicemodel.h index dda0bc7..6967e58 100644 --- a/tools/libs/devicemodel/include/xendevicemodel.h +++ b/tools/libs/devicemodel/include/xendevicemodel.h @@ -326,6 +326,21 @@ int xendevicemodel_shutdown( xendevicemodel_handle *dmod, domid_t domid, unsigned int reason); /** + * Sets the GPFNs at which a page range appears in the domain's + * pseudophysical address space. + * + * @parm dmod a handle to an open devicemodel interface. + * @parm domid the domain id to be serviced + * @parm size Number of GMFNs to process + * @parm idx Index into GMFN space + * @parm gpfn Starting GPFN where the GMFNs should appear + * @return 0 on success, -1 on failure. + */ +int xendevicemodel_add_to_physmap( + xendevicemodel_handle *dmod, domid_t domid, uint16_t size, uint64_t idx, + uint64_t gpfn); + +/** * This function restricts the use of this handle to the specified * domain. * diff --git a/tools/libs/devicemodel/libxendevicemodel.map b/tools/libs/devicemodel/libxendevicemodel.map index cefd32b..4a19ecb 100644 --- a/tools/libs/devicemodel/libxendevicemodel.map +++ b/tools/libs/devicemodel/libxendevicemodel.map @@ -27,3 +27,8 @@ VERS_1.1 { global: xendevicemodel_shutdown; } VERS_1.0; + +VERS_1.2 { + global: + xendevicemodel_add_to_physmap; +} VERS_1.1;