From patchwork Fri Sep 27 16:10:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 2956081 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8A81B9F289 for ; Fri, 27 Sep 2013 16:47:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E95920220 for ; Fri, 27 Sep 2013 16:47:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0049D2021E for ; Fri, 27 Sep 2013 16:47:05 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VPb39-0005QM-Ol; Fri, 27 Sep 2013 16:37:52 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VPb2V-0002Xb-7b; Fri, 27 Sep 2013 16:37:11 +0000 Received: from smtp.citrix.com ([66.165.176.89]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VPb1j-0002PU-OR for linux-arm-kernel@lists.infradead.org; Fri, 27 Sep 2013 16:36:25 +0000 X-IronPort-AV: E=Sophos;i="4.90,994,1371081600"; d="scan'208";a="58131108" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 27 Sep 2013 16:36:02 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Fri, 27 Sep 2013 12:36:01 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1VPacx-0002hO-2C; Fri, 27 Sep 2013 17:10:47 +0100 From: Stefano Stabellini To: Subject: [PATCH v6 17/19] xen: introduce XENMEM_pin Date: Fri, 27 Sep 2013 17:10:05 +0100 Message-ID: <1380298207-29151-17-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130927_123624_003491_12FF7951 X-CRM114-Status: GOOD ( 15.46 ) X-Spam-Score: -9.3 (---------) Cc: Ian.Campbell@citrix.com, Stefano Stabellini , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, konrad.wilk@oracle.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Introduce a new hypercall to pin one or more pages whose machine addresses respect a dma_mask passed as an argument Signed-off-by: Stefano Stabellini --- arch/arm/xen/mm.c | 16 ++++++++++++++++ arch/x86/xen/mmu.c | 7 +++++++ include/xen/interface/memory.h | 32 ++++++++++++++++++++++++++++++++ include/xen/xen-ops.h | 1 + 4 files changed, 56 insertions(+), 0 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index b305b94..146c1c3 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -55,6 +55,22 @@ static int xen_exchange_memory(xen_ulong_t extents_in, return success; } +int xen_pin_page(xen_pfn_t *in_frame, unsigned int address_bits) +{ + struct xen_pin pin = { + .in = { + .nr_extents = 1, + .extent_order = 0, + .domid = DOMID_SELF, + .address_bits = address_bits + }, + }; + set_xen_guest_handle(pin.in.extent_start, in_frame); + + return HYPERVISOR_memory_op(XENMEM_pin, &pin); +} +EXPORT_SYMBOL_GPL(xen_pin_page); + int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, unsigned int address_bits, dma_addr_t *dma_handle) diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 8830883..8f76ce2 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -2568,3 +2568,10 @@ int xen_unmap_domain_mfn_range(struct vm_area_struct *vma, return -EINVAL; } EXPORT_SYMBOL_GPL(xen_unmap_domain_mfn_range); + +int xen_pin_page(xen_pfn_t *in_frame, unsigned int address_bits) +{ + return -ENOSYS; +} +EXPORT_SYMBOL_GPL(xen_pin_page); + diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h index 49db252..66ab578 100644 --- a/include/xen/interface/memory.h +++ b/include/xen/interface/memory.h @@ -314,4 +314,36 @@ struct xen_unpin { }; DEFINE_GUEST_HANDLE_STRUCT(xen_unpin); +/* + * XENMEM_pin pins a set of pages to make sure that the hypervisor does + * not change the p2m mappings for them. + * + */ +#define XENMEM_pin 28 +struct xen_pin { + /* + * [IN/OUT] Details of memory extents to be pinned (GMFN bases). + * Xen copies back the MFNs corresponding to the GMFNs passed in as + * argument. + * @in.address_bits contains the maximum number of bits addressable + * by the caller. If the machine addresses of the pages to be pinned + * are not addressable according to @in.address_bits, the hypercall + * fails and returns an errors. The pages are not pinned. Otherwise + * the hypercall succeeds. + */ + struct xen_memory_reservation in; + + /* + * [OUT] Number of input extents that were successfully pinned. + * 1. The first @nr_pinned input extents were successfully + * pinned. + * 2. All other input extents are untouched. + * 3. If not all input extents are pinned then the return code of this + * command will be non-zero. + */ + xen_ulong_t nr_pinned; +}; +DEFINE_GUEST_HANDLE_STRUCT(xen_pin); + + #endif /* __XEN_PUBLIC_MEMORY_H__ */ diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index fb2ea8f..4cf4fc5 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -22,6 +22,7 @@ extern unsigned long *xen_contiguous_bitmap; int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, unsigned int address_bits, dma_addr_t *dma_handle); +int xen_pin_page(xen_pfn_t *in_frame, unsigned int address_bits); void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order);