From patchwork Thu Oct 16 14:45:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 38830 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7CE7920973 for ; Thu, 16 Oct 2014 14:51:45 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id d1sf2139137wiv.2 for ; Thu, 16 Oct 2014 07:51:44 -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=j89SJP5TGXby6NsXPGIDtB85fhff8e7zrSrYCIDGTTo=; b=Q0BLR+IsaTY0EY0t1VMcfSH8hYEdNt24frK8c6bnbdRAPYcNtltVq21RBfOQ8e4G8w uzNWbVZKeXyvXRFoi085UlRyRcDaJwYtafur6aEYIhJdebSFS58k1ToIqeZJhA1WVXKD 9WaQCUKSpAHp6CJpaLprmpBQ0IM9BMVqC4KEYMixDjIUZNqRstAJ7XmpaeX8fpdWUOBM 7AZHALnfo9dLUFNcFhVK3gQJsnutZE3udYPbiVAuRN5+EC0LQytDCfpzf74dtQc0kq6O z+24BzzG93J2xJEh+VeoTAKaf1pGTerDFPuqMGqFco8RJFg7EokpHmVr0LPZYU14qGqE nr9w== X-Gm-Message-State: ALoCoQmbc0olDRLaMHhe2KmvtHNqZivGcGOFZgVYZmhTYq4IhJ+Ss2L563bJAOdxYaqxEYNdxKFx X-Received: by 10.152.29.134 with SMTP id k6mr112338lah.9.1413471104657; Thu, 16 Oct 2014 07:51:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.131 with SMTP id w3ls186550lad.79.gmail; Thu, 16 Oct 2014 07:51:44 -0700 (PDT) X-Received: by 10.152.204.103 with SMTP id kx7mr2176320lac.7.1413471104373; Thu, 16 Oct 2014 07:51:44 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by mx.google.com with ESMTPS id qh5si1912303lbb.111.2014.10.16.07.51.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Oct 2014 07:51:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so2904444lbv.7 for ; Thu, 16 Oct 2014 07:51:44 -0700 (PDT) X-Received: by 10.152.29.8 with SMTP id f8mr2229521lah.56.1413471104263; Thu, 16 Oct 2014 07:51:44 -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.112.84.229 with SMTP id c5csp53531lbz; Thu, 16 Oct 2014 07:51:43 -0700 (PDT) X-Received: by 10.50.20.130 with SMTP id n2mr22244996ige.44.1413471102884; Thu, 16 Oct 2014 07:51:42 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id n6si8580170igk.26.2014.10.16.07.51.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 16 Oct 2014 07:51:42 -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 1XemM0-0002Tm-IC; Thu, 16 Oct 2014 14:48:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XemLz-0002T6-0N for xen-devel@lists.xensource.com; Thu, 16 Oct 2014 14:48:35 +0000 Received: from [193.109.254.147:9965] by server-6.bemta-14.messagelabs.com id EE/56-01867-2CADF345; Thu, 16 Oct 2014 14:48:34 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1413470906!13195141!5 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3792 invoked from network); 16 Oct 2014 14:48:33 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 16 Oct 2014 14:48:33 -0000 X-IronPort-AV: E=Sophos;i="5.04,732,1406592000"; d="scan'208";a="181975782" 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; Thu, 16 Oct 2014 10:48:22 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XemLh-00040J-7n; Thu, 16 Oct 2014 15:48:17 +0100 From: Stefano Stabellini To: Date: Thu, 16 Oct 2014 15:45:55 +0100 Message-ID: <1413470755-30991-8-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 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v6 8/8] Revert "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.217.176 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: This reverts commit e25a5f4d8cf3b55718048abdd21c7d0de64ae54c. Signed-off-by: Stefano Stabellini Reviewed-by: Julien Grall --- 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, 11 insertions(+), 36 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 20bcc9e..6b7569a 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -982,32 +982,6 @@ 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 9a95ac9..42bde75 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -1539,6 +1539,8 @@ 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 @@ -1553,7 +1555,12 @@ static int arm_smmu_map_page(struct domain *d, unsigned long gfn, if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) return -EINVAL; - return arch_grant_map_page_identity(d, mfn, flags & IOMMUF_writable); + 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); } static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) @@ -1564,7 +1571,9 @@ static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) if ( !is_domain_direct_mapped(d) ) return -EINVAL; - return arch_grant_unmap_page_identity(d, gfn); + guest_physmap_remove_page(d, gfn, gfn, 0); + + return 0; } 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 10bf111..da36504 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -214,10 +214,6 @@ 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); - /* get host p2m table */ #define p2m_get_hostp2m(d) (&(d)->arch.p2m) diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 90ddd15..5f7fe71 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -709,10 +709,6 @@ 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 */ /*