From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE11EC43461 for ; Tue, 8 Sep 2020 07:32:12 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 20766218AC for ; Tue, 8 Sep 2020 07:32:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 20766218AC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6F67D86538; Tue, 8 Sep 2020 07:32:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mW933DJ70jtd; Tue, 8 Sep 2020 07:32:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9E5F38651A; Tue, 8 Sep 2020 07:32:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5D625C0859; Tue, 8 Sep 2020 07:32:10 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id E87A4C0051 for ; Tue, 8 Sep 2020 07:32:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E3F238651A for ; Tue, 8 Sep 2020 07:32:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id raXttftj-1Y0 for ; Tue, 8 Sep 2020 07:32:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by fraxinus.osuosl.org (Postfix) with ESMTPS id EB80486519 for ; Tue, 8 Sep 2020 07:32:07 +0000 (UTC) Received: by verein.lst.de (Postfix, from userid 2407) id 3E66068AFE; Tue, 8 Sep 2020 09:32:03 +0200 (CEST) Date: Tue, 8 Sep 2020 09:32:03 +0200 From: Christoph Hellwig To: Nicolas Saenz Julienne Subject: Re: [PATCH v11 07/11] device-mapping: Introduce DMA range map, supplanting dma_pfn_offset Message-ID: <20200908073203.GA15176@lst.de> References: <20200902215314.GA881878@ubuntu-n2-xlarge-x86> <20200902223852.GA1786990@ubuntu-n2-xlarge-x86> <6922bc0b-1849-2f2f-ec2f-fe9f0124dcfc@gmail.com> <20200903005240.GA1118@Ryzen-9-3900X.localdomain> <34aa0d6094e7d6fb3492d2cda0fec8ecc04790ed.camel@suse.de> <20200908072935.GA15119@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200908072935.GA15119@lst.de> User-Agent: Mutt/1.5.17 (2007-11-01) Cc: Rich Felker , "open list:SUPERH" , David Airlie , "open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS" , Hanjun Guo , "open list:REMOTE PROCESSOR REMOTEPROC SUBSYSTEM" , "open list:DRM DRIVERS FOR ALLWINNER A10" , Julien Grall , "H. Peter Anvin" , Will Deacon , Christoph Hellwig , "open list:STAGING SUBSYSTEM" , Jean-Philippe Brucker , Florian Fainelli , Yoshinori Sato , Bartosz Golaszewski , Frank Rowand , "maintainer:X86 ARCHITECTURE 32-BIT AND 64-BIT" , Russell King , "open list:ACPI FOR ARM64 ACPI/arm64" , Chen-Yu Tsai , Ingo Molnar , "maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE" , Alan Stern , Len Brown , Ohad Ben-Cohen , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE" , Daniel Vetter , Mauro Carvalho Chehab , Dan Williams , Maxime Ripard , Rob Herring , Borislav Petkov , Yong Deng , Santosh Shilimkar , Bjorn Helgaas , Nathan Chancellor , Andy Shevchenko , "moderated list:ARM PORT" , Felipe Balbi , Saravana Kannan , Greg Kroah-Hartman , "open list:USB SUBSYSTEM" , "Rafael J. Wysocki" , open list , Paul Kocialkowski , "open list:IOMMU DRIVERS" , Thomas Gleixner , Stefano Stabellini , Jim Quinlan , Sudeep Holla , "open list:ALLWINNER A10 CSI DRIVER" , Robin Murphy X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Tue, Sep 08, 2020 at 09:29:35AM +0200, Christoph Hellwig wrote: > FYI, this is what I'd do relative to the patch on the dma-ranges > branch. In fact realizing this makes me want to refactor things a bit > so that the new code can entirely live in the dma-direct code, but please > test this first: And of course this isn't going to work for arm devices without any range, so let's try this instead: diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index c21893f683b585..e913e04d2be8b9 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -35,21 +35,20 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) #ifndef __arch_pfn_to_dma static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) { - if (dev) { - phys_addr_t paddr = PFN_PHYS(pfn); - - pfn -= PFN_DOWN(dma_offset_from_phys_addr(dev, paddr)); - } - return (dma_addr_t)__pfn_to_bus(pfn); + if (!dev) + return (dma_addr_t)__pfn_to_bus(pfn); + if (dev->dma_range_map) + return translate_phys_to_dma(dev, PFN_PHYS(pfn)); + return (dma_addr_t)PFN_PHYS(pfn); } static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) { - unsigned long pfn = __bus_to_pfn(addr); - - if (dev) - pfn += PFN_DOWN(dma_offset_from_dma_addr(dev, addr)); - return pfn; + if (!dev) + return __bus_to_pfn(addr); + if (dev->dma_range_map) + return PFN_DOWN(translate_dma_to_phys(dev, addr)); + return PFN_DOWN(addr); } static inline void *dma_to_virt(struct device *dev, dma_addr_t addr) diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h index 7831ca5b1b5dd6..e624171c4962ad 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -19,12 +19,16 @@ extern unsigned int zone_dma_bits; #else static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) { - return (dma_addr_t)paddr - dma_offset_from_phys_addr(dev, paddr); + if (dev->dma_range_map) + return (dma_addr_t)paddr - translate_phys_to_dma(dev, paddr); + return (dma_addr_t)paddr; } -static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr) +static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dma_addr) { - return (phys_addr_t)dev_addr + dma_offset_from_dma_addr(dev, dev_addr); + if (dev->dma_range_map) + return translate_dma_to_phys(dev, dma_addr); + return (phys_addr_t)dma_addr; } #endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */ diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 4c4646761afee4..3b1ceebb6f2ad5 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -199,29 +199,28 @@ struct bus_dma_region { }; #ifdef CONFIG_HAS_DMA -static inline u64 dma_offset_from_dma_addr(struct device *dev, - dma_addr_t dma_addr) +static inline dma_addr_t translate_phys_to_dma(struct device *dev, + phys_addr_t paddr) { - const struct bus_dma_region *m = dev->dma_range_map; + const struct bus_dma_region *m; - if (m) - for (; m->size; m++) - if (dma_addr >= m->dma_start && - dma_addr - m->dma_start < m->size) - return m->offset; - return 0; + for (m = dev->dma_range_map; m->size; m++) + if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size) + return (dma_addr_t)paddr - m->offset; + + /* make sure dma_capable fails when no translation is available */ + return DMA_MAPPING_ERROR; } -static inline u64 dma_offset_from_phys_addr(struct device *dev, - phys_addr_t paddr) +static inline phys_addr_t translate_dma_to_phys(struct device *dev, + dma_addr_t dma_addr) { - const struct bus_dma_region *m = dev->dma_range_map; + const struct bus_dma_region *m; + + for (m = dev->dma_range_map; m->size; m++) + if (dma_addr >= m->dma_start && dma_addr - m->dma_start < m->size) + return (phys_addr_t)dma_addr + m->offset; - if (m) - for (; m->size; m++) - if (paddr >= m->cpu_start && - paddr - m->cpu_start < m->size) - return m->offset; return 0; } _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu