From patchwork Mon Nov 10 16:14:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 40507 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F0816218DE for ; Mon, 10 Nov 2014 16:16:23 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf5749472eek.9 for ; Mon, 10 Nov 2014 08:16:23 -0800 (PST) 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:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=UdCHNaSd2UIMs/uJVu8hPVqlQkSq7rYSxQlVLqD38Mg=; b=S+vVrhl9L0usMyg7ttP3aqJQ4QSqKm2RkAdoW27UTrb62RIGGV7paaV6p87l6CJP2u UDaI0MiCevB3x83liEZLeIRn3jFBlgU0oUsdMm0m/HG8oxFo49bCF+shQUNSuRRURKt8 S9jSXzxFcnzHAyXcbuD3DvuWRVBDT54IGhNvQOyqceCehcAQRfuUDiC7yuW2rIokkaaz h6UDXTE3IkBCYExp7Jj1b3JM/pnSUetA5buUb89cNICL86SiMTWjnNJrfU1Fb1Y/HkAW Vmj4wQ3EVFkDAqq2c1pSSBUHT5jiHsI4VW/JauUAHZ9mJGh/Qr3jhOa4CdGKMOxLGWEF E1Yg== X-Gm-Message-State: ALoCoQkh22He635A/FVb2LMLDA/6Gy0fxgYLuWbu6OFNbTaaAFW2lcetE8bcgTxuIH1eMJbYVkUh X-Received: by 10.112.50.243 with SMTP id f19mr2000476lbo.1.1415636183036; Mon, 10 Nov 2014 08:16:23 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.97 with SMTP id r1ls172627lar.0.gmail; Mon, 10 Nov 2014 08:16:22 -0800 (PST) X-Received: by 10.112.173.39 with SMTP id bh7mr13464047lbc.53.1415636182771; Mon, 10 Nov 2014 08:16:22 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id ed2si27695730lbc.37.2014.11.10.08.16.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 08:16:22 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id p9so2843453lbv.5 for ; Mon, 10 Nov 2014 08:16:22 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr29802590laz.27.1415636182667; Mon, 10 Nov 2014 08:16:22 -0800 (PST) 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.184.201 with SMTP id ew9csp116226lbc; Mon, 10 Nov 2014 08:16:21 -0800 (PST) X-Received: by 10.66.142.137 with SMTP id rw9mr4793965pab.124.1415636169911; Mon, 10 Nov 2014 08:16:09 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id so6si16871707pac.164.2014.11.10.08.16.09 for ; Mon, 10 Nov 2014 08:16:09 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753458AbaKJQPR (ORCPT + 25 others); Mon, 10 Nov 2014 11:15:17 -0500 Received: from smtp.citrix.com ([66.165.176.89]:48719 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753410AbaKJQPM (ORCPT ); Mon, 10 Nov 2014 11:15:12 -0500 X-IronPort-AV: E=Sophos;i="5.07,353,1413244800"; d="scan'208";a="189798979" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 10 Nov 2014 11:14:23 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Xnrbe-0000Mx-1R; Mon, 10 Nov 2014 16:14:18 +0000 From: Stefano Stabellini To: CC: , , , , , , , Stefano Stabellini Subject: [PATCH v8 08/13] xen/arm: use hypercall to flush caches in map_page Date: Mon, 10 Nov 2014 16:14:00 +0000 Message-ID: <1415636045-24669-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: MIA1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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.174 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-Post: , List-Help: , List-Archive: List-Unsubscribe: , In xen_dma_map_page, if the page is a local page, call the native map_page dma_ops. If the page is foreign, call __xen_dma_map_page that issues any required cache maintenane operations via hypercall. The reason for doing this is that the native dma_ops map_page could allocate buffers than need to be freed. If the page is foreign we don't call the native unmap_page dma_ops function, resulting in a memory leak. Suggested-by: Catalin Marinas Signed-off-by: Stefano Stabellini --- arch/arm/include/asm/xen/page-coherent.h | 9 ++++++++- arch/arm/xen/mm32.c | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/xen/page-coherent.h b/arch/arm/include/asm/xen/page-coherent.h index 25d450c..36b79a8 100644 --- a/arch/arm/include/asm/xen/page-coherent.h +++ b/arch/arm/include/asm/xen/page-coherent.h @@ -5,6 +5,9 @@ #include #include +void __xen_dma_map_page(struct device *hwdev, struct page *page, + dma_addr_t dev_addr, unsigned long offset, size_t size, + enum dma_data_direction dir, struct dma_attrs *attrs); void __xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs); @@ -32,7 +35,11 @@ static inline void xen_dma_map_page(struct device *hwdev, struct page *page, dma_addr_t dev_addr, unsigned long offset, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs) { - __generic_dma_ops(hwdev)->map_page(hwdev, page, offset, size, dir, attrs); + if (PFN_DOWN(dev_addr) == page_to_pfn(page)) { + if (__generic_dma_ops(hwdev)->map_page) + __generic_dma_ops(hwdev)->map_page(hwdev, page, offset, size, dir, attrs); + } else + __xen_dma_map_page(hwdev, page, dev_addr, offset, size, dir, attrs); } void xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle, diff --git a/arch/arm/xen/mm32.c b/arch/arm/xen/mm32.c index 7824498..d611c4b 100644 --- a/arch/arm/xen/mm32.c +++ b/arch/arm/xen/mm32.c @@ -45,6 +45,18 @@ static void __xen_dma_page_cpu_to_dev(struct device *hwdev, dma_addr_t handle, dma_cache_maint(handle & PAGE_MASK, handle & ~PAGE_MASK, size, dir, DMA_MAP); } +void __xen_dma_map_page(struct device *hwdev, struct page *page, + dma_addr_t dev_addr, unsigned long offset, size_t size, + enum dma_data_direction dir, struct dma_attrs *attrs) +{ + if (is_device_dma_coherent(hwdev)) + return; + if (dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs)) + return; + + __xen_dma_page_cpu_to_dev(hwdev, dev_addr, size, dir); +} + void __xen_dma_unmap_page(struct device *hwdev, dma_addr_t handle, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs)