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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 C7ABFC49361 for ; Mon, 14 Jun 2021 06:26:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB4E9613B8 for ; Mon, 14 Jun 2021 06:26:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232495AbhFNG2V (ORCPT ); Mon, 14 Jun 2021 02:28:21 -0400 Received: from verein.lst.de ([213.95.11.211]:42862 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232045AbhFNG2S (ORCPT ); Mon, 14 Jun 2021 02:28:18 -0400 Received: by verein.lst.de (Postfix, from userid 2407) id 1F6F967373; Mon, 14 Jun 2021 08:26:14 +0200 (CEST) Date: Mon, 14 Jun 2021 08:26:13 +0200 From: Christoph Hellwig To: Claire Chang Cc: Rob Herring , mpe@ellerman.id.au, Joerg Roedel , Will Deacon , Frank Rowand , Konrad Rzeszutek Wilk , boris.ostrovsky@oracle.com, jgross@suse.com, Christoph Hellwig , Marek Szyprowski , benh@kernel.crashing.org, paulus@samba.org, "list@263.net:IOMMU DRIVERS" , sstabellini@kernel.org, Robin Murphy , grant.likely@arm.com, xypron.glpk@gmx.de, Thierry Reding , mingo@kernel.org, bauerman@linux.ibm.com, peterz@infradead.org, Greg KH , Saravana Kannan , "Rafael J . Wysocki" , heikki.krogerus@linux.intel.com, Andy Shevchenko , Randy Dunlap , Dan Williams , Bartosz Golaszewski , linux-devicetree , lkml , linuxppc-dev@lists.ozlabs.org, xen-devel@lists.xenproject.org, Nicolas Boichat , Jim Quinlan , tfiga@chromium.org, bskeggs@redhat.com, bhelgaas@google.com, chris@chris-wilson.co.uk, daniel@ffwll.ch, airlied@linux.ie, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, jani.nikula@linux.intel.com, jxgao@google.com, joonas.lahtinen@linux.intel.com, linux-pci@vger.kernel.org, maarten.lankhorst@linux.intel.com, matthew.auld@intel.com, rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com Subject: Re: [PATCH v9 09/14] swiotlb: Refactor swiotlb_tbl_unmap_single Message-ID: <20210614062613.GI28343@lst.de> References: <20210611152659.2142983-1-tientzu@chromium.org> <20210611152659.2142983-10-tientzu@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210611152659.2142983-10-tientzu@chromium.org> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 11, 2021 at 11:26:54PM +0800, Claire Chang wrote: > Add a new function, release_slots, to make the code reusable for supporting > different bounce buffer pools, e.g. restricted DMA pool. > > Signed-off-by: Claire Chang > --- > kernel/dma/swiotlb.c | 35 ++++++++++++++++++++--------------- > 1 file changed, 20 insertions(+), 15 deletions(-) > > diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c > index 364c6c822063..a6562573f090 100644 > --- a/kernel/dma/swiotlb.c > +++ b/kernel/dma/swiotlb.c > @@ -554,27 +554,15 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, phys_addr_t orig_addr, > return tlb_addr; > } > > -/* > - * tlb_addr is the physical address of the bounce buffer to unmap. > - */ > -void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr, > - size_t mapping_size, enum dma_data_direction dir, > - unsigned long attrs) > +static void release_slots(struct device *dev, phys_addr_t tlb_addr) > { > - struct io_tlb_mem *mem = hwdev->dma_io_tlb_mem; > + struct io_tlb_mem *mem = dev->dma_io_tlb_mem; > unsigned long flags; > - unsigned int offset = swiotlb_align_offset(hwdev, tlb_addr); > + unsigned int offset = swiotlb_align_offset(dev, tlb_addr); > int index = (tlb_addr - offset - mem->start) >> IO_TLB_SHIFT; > int nslots = nr_slots(mem->slots[index].alloc_size + offset); > int count, i; > > - /* > - * First, sync the memory before unmapping the entry > - */ > - if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) && > - (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)) > - swiotlb_bounce(hwdev, tlb_addr, mapping_size, DMA_FROM_DEVICE); > - > /* > * Return the buffer to the free list by setting the corresponding > * entries to indicate the number of contiguous entries available. > @@ -609,6 +597,23 @@ void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr, > spin_unlock_irqrestore(&mem->lock, flags); > } > > +/* > + * tlb_addr is the physical address of the bounce buffer to unmap. > + */ > +void swiotlb_tbl_unmap_single(struct device *dev, phys_addr_t tlb_addr, > + size_t mapping_size, enum dma_data_direction dir, > + unsigned long attrs) > +{ > + /* > + * First, sync the memory before unmapping the entry > + */ > + if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) && > + (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)) > + swiotlb_bounce(dev, tlb_addr, mapping_size, DMA_FROM_DEVICE); > + > + release_slots(dev, tlb_addr); Can you give this a swiotlb_ prefix? Otherwise looks good: Reviewed-by: Christoph Hellwig