From patchwork Fri Aug 1 14:45:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 34706 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E6EF8202A1 for ; Fri, 1 Aug 2014 14:49:11 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id ft15sf25933617pdb.6 for ; Fri, 01 Aug 2014 07:49:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=mnvCvAagbzsRCjV1FqJS5tBcGTpks2hB8JAgT3vOAKw=; b=cvqZb7g6kHmJXqHjk9MuLNHfhrPcP87y9jJdOwzZlE/GFex4Hi61vTcWYuofAosWvt pwEB4P5Igo4LiPDNcfKDp/jD1tYVz+nWWi94AiSivAK+s/vuyLwEtj+nY++wME56JEra cYV3uDvTo2ac/lV2xtlvIwDO6FDC9fWQOsABz4vSCzm6hFtTMrzmQR8NNWomv0vgXpQq rb9MSiGHo7SgXAv38fF2r/KOi/ULfKbj9esEMtSxKBQWQB2EeI+UTpjcGG7VxAc4ibfH 7vznVkQETsqbR1tw4bIolTMTeiGvHay+iAtNDmb3gJUxLLfa20Z8GN1TUnfnM6yAQ5j+ FJRQ== X-Gm-Message-State: ALoCoQnDOMQ22vyWar5Iyl3l3/rFEphqycKXS1qMMQtkLVD1kKd7X7y8YJhGnBp8nMN4waWAOFzN X-Received: by 10.67.23.197 with SMTP id ic5mr2420264pad.24.1406904550878; Fri, 01 Aug 2014 07:49:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.132 with SMTP id o4ls1437062qga.40.gmail; Fri, 01 Aug 2014 07:49:10 -0700 (PDT) X-Received: by 10.221.25.210 with SMTP id rj18mr6848853vcb.5.1406904548618; Fri, 01 Aug 2014 07:49:08 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id fw8si7424567vdc.60.2014.08.01.07.49.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Aug 2014 07:49:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id hy10so6839377vcb.18 for ; Fri, 01 Aug 2014 07:49:08 -0700 (PDT) X-Received: by 10.52.244.81 with SMTP id xe17mr5737101vdc.24.1406904548525; Fri, 01 Aug 2014 07:49:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp116687vcb; Fri, 1 Aug 2014 07:49:07 -0700 (PDT) X-Received: by 10.50.117.106 with SMTP id kd10mr8377486igb.5.1406904547604; Fri, 01 Aug 2014 07:49:07 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id c3si6909790igv.49.2014.08.01.07.49.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 01 Aug 2014 07:49:07 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XDE6w-0007gU-5t; Fri, 01 Aug 2014 14:47:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XDE6u-0007gF-K2 for xen-devel@lists.xensource.com; Fri, 01 Aug 2014 14:47:08 +0000 Received: from [85.158.137.68:23915] by server-5.bemta-3.messagelabs.com id 42/40-30889-B68ABD35; Fri, 01 Aug 2014 14:47:07 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1406904422!11286665!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13416 invoked from network); 1 Aug 2014 14:47:06 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 1 Aug 2014 14:47:06 -0000 X-IronPort-AV: E=Sophos;i="5.01,780,1400025600"; d="scan'208";a="158486352" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Fri, 1 Aug 2014 10:46:39 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XDE6L-0004ti-Ql; Fri, 01 Aug 2014 15:46:33 +0100 From: Stefano Stabellini To: Date: Fri, 1 Aug 2014 15:45:24 +0100 Message-ID: <1406904325-15722-2-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: MIA1 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, JBeulich@suse.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v6 2/3] xen: introduce arch_grant_(un)map_page_identity X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Introduce two arch specific functions to create a new p2m mapping of granted pages at pfn == mfn. We don't an x86 implementation as these functions should never be compiled on x86 (they are called from an if (0) statement). Base the implementation of arm_smmu_(un)map_page on arch_grant_(un)map_page_identity. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Jan Beulich --- Changes in v5: - actually define arch_grant_(un)map_page_identity as extern without implementation on x86. Changes in v4: - declare the x86 implementations as extern; - add ASSERTs to ARM implementations. Changes in v3: - fix commit title; - use p2m_iommu types; - call arch_grant_(un)map_page_identity functions from arm_smmu_(un)map_page. --- xen/arch/arm/p2m.c | 26 ++++++++++++++++++++++++++ xen/drivers/passthrough/arm/smmu.c | 13 ++----------- xen/include/asm-arm/p2m.h | 4 ++++ xen/include/asm-x86/p2m.h | 4 ++++ 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 143199b..c614348 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -874,6 +874,32 @@ void guest_physmap_remove_page(struct domain *d, pfn_to_paddr(mfn), MATTR_MEM, p2m_invalid); } +int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable) +{ + p2m_type_t t; + + ASSERT(is_domain_direct_mapped(d)); + + /* This is not an IOMMU mapping but it is not a regular RAM p2m type + * either. We are using IOMMU p2m types here to prevent the pages + * from being used as grants. */ + if ( writeable ) + t = p2m_iommu_map_rw; + else + t = p2m_iommu_map_ro; + + return guest_physmap_add_entry(d, frame, frame, 0, t); +} + +int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame) +{ + ASSERT(is_domain_direct_mapped(d)); + + guest_physmap_remove_page(d, frame, frame, 0); + return 0; +} + int p2m_alloc_table(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index f4eb2a2..fb0c694 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -1539,8 +1539,6 @@ static void arm_smmu_iommu_domain_teardown(struct domain *d) static int arm_smmu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, unsigned int flags) { - p2m_type_t t; - /* Grant mappings can be used for DMA requests. The dev_bus_addr returned by * the hypercall is the MFN (not the IPA). For device protected by * an IOMMU, Xen needs to add a 1:1 mapping in the domain p2m to @@ -1555,12 +1553,7 @@ static int arm_smmu_map_page(struct domain *d, unsigned long gfn, if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) return -EINVAL; - t = (flags & IOMMUF_writable) ? p2m_iommu_map_rw : p2m_iommu_map_ro; - - /* The function guest_physmap_add_entry replaces the current mapping - * if there is already one... - */ - return guest_physmap_add_entry(d, gfn, mfn, 0, t); + return arch_grant_map_page_identity(d, mfn, flags & IOMMUF_writable); } static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) @@ -1571,9 +1564,7 @@ static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) if ( !is_domain_direct_mapped(d) ) return -EINVAL; - guest_physmap_remove_page(d, gfn, gfn, 0); - - return 0; + return arch_grant_unmap_page_identity(d, gfn); } static const struct iommu_ops arm_smmu_iommu_ops = { diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 06c93a0..1069955 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -195,6 +195,10 @@ static inline int get_page_and_type(struct page_info *page, return rc; } +int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable); +int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame); + #endif /* _XEN_P2M_H */ /* diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 0ddbadb..010e488 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -717,6 +717,10 @@ static inline unsigned int p2m_get_iommu_flags(p2m_type_t p2mt) return flags; } + +extern int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable); +extern int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame); #endif /* _XEN_P2M_H */