Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp182071pxj; Tue, 15 Jun 2021 23:25:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/qbVOEgCaR5bPaZ/0I2Ufwa8ieWN53V5HJs0bopiw20F7AJYlyYlwi7uEY1bvkJuLZhSu X-Received: by 2002:a17:906:fcaa:: with SMTP id qw10mr3531683ejb.233.1623824715308; Tue, 15 Jun 2021 23:25:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623824715; cv=none; d=google.com; s=arc-20160816; b=ua2k61B01fRs6X014oMxfJGK44AvxHW7L7paz/s7TdMof1Eqsc0oPbtdvLsdICxDlR JvyjI932RxBnzm+1tn/VJ7DkXkgnFQ/25Gb9nsBLyjZyVhre+QRIW6p6OfNTWRRjO6hR hcnjanb/UyZhH5EC3DWx4hZyhS9/P618GW5N6xNpXaWZN4T962TIrpAielk53INAipfE MBjY9UdTbvG4XeFTaBOsyIfnoRapwdiF4cCYJwPu3mxWY+3BouGb1UX1iAXGSXgak80O nPeA679lK7Vfhe6OIlnY8hZW4scIYodch/2QWWzpVpEAG+X60eFcNGO8409KQ7hJOga+ coVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4uQkI0iLfUCijuOepwUkiZcSLaj5vr9UchvXk27nRw0=; b=TcniQZn242pfO3pWzujYutqSgBfTO/vgtroV9ndXS8M3TC4fHKlnwuV64n3SMQICUz T3JEnWzdipAimGSSlj1Kqf0DVPTT8SFfbHr4WCHbzTWNBFPYFRVHhFUraW6rCjOu/fYl cBKhWYnDwkC8HUT7jDlxXkExlBQwojbCTTODpOvtW4SXwqBT7hV21aWajZLG1s8wmjQ8 qGOuLqOdV7PZ9IZJURKpIx9OuLv9MkmNNWyxaWDKNXBqm/QFd/WBFV2C1fQzPd7R9edJ QB2EmIPbaAqsgiu5M+bP0Y0kEeRpD06kUhCURWY1hsMA9kjNZ+b3bQKP2WnOOfAzSKb5 dX0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=i8vpfgPJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bx3si1409121ejc.106.2021.06.15.23.24.53; Tue, 15 Jun 2021 23:25:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=i8vpfgPJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231560AbhFPGZZ (ORCPT + 99 others); Wed, 16 Jun 2021 02:25:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231530AbhFPGZZ (ORCPT ); Wed, 16 Jun 2021 02:25:25 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 596CCC06175F for ; Tue, 15 Jun 2021 23:23:18 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id c12so1356182pfl.3 for ; Tue, 15 Jun 2021 23:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4uQkI0iLfUCijuOepwUkiZcSLaj5vr9UchvXk27nRw0=; b=i8vpfgPJ9bPz7Z1Al2l+J6+mN/Xl35Xu1XE2A22X8XR/Zq8Z0ZAIZW1TRjKf3ok7nZ cVehop1oa/YF7qhuElQsqUmYkYcuOfcjTbNEd4KCXAUWVnRRY2/VoP7cICHlXtOyLHuZ HdMm+p5xlQYTdItRv/hg6efoNr1CAhA7jHk00= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4uQkI0iLfUCijuOepwUkiZcSLaj5vr9UchvXk27nRw0=; b=G6HXy43yruwJPCI+dmvsOogqPajUNus/lp8tJP46DB3B/l2726t+t+OHh5+O6T2OiM aAxDSg+JGwwfwz6GUmxpZlD9dqCQDKyz3gNRrrEvrdyKQXPklqe630jfW8Fej7sIXo1U osngKydNcErKmMkAKn88ZSMb7a18tIrKCvnsblsYhdlVOKeykcXqSm9D0F3Z8oLPtzIv USUuwV5o9xFX2rwOOiWeVDUiNUwI7UB7ohsuby3Yfk87lycSHOVuYa1/0qVkCrzADoPT lPrcKHEGAz/N488ZyZ3NY2Gz3WOxBDyB630CdyMzSU/mHnnPzj6wwlnTVEb2j1peu9gQ HgEA== X-Gm-Message-State: AOAM532hP2XqEaUCwQ8Niz1M9Klr96kBcD+LN59CO3tnD0Jsgysoz1G3 v1jmfc1OIZ2dqOCGZDjjU8mYnA== X-Received: by 2002:aa7:9118:0:b029:2eb:2ef3:f197 with SMTP id 24-20020aa791180000b02902eb2ef3f197mr7844722pfh.27.1623824597932; Tue, 15 Jun 2021 23:23:17 -0700 (PDT) Received: from localhost ([2401:fa00:95:205:3d52:f252:7393:1992]) by smtp.gmail.com with UTF8SMTPSA id a187sm943813pfb.66.2021.06.15.23.23.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jun 2021 23:23:17 -0700 (PDT) From: Claire Chang To: 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 Cc: 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, tientzu@chromium.org, 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: [PATCH v12 08/12] swiotlb: Refactor swiotlb_tbl_unmap_single Date: Wed, 16 Jun 2021 14:21:53 +0800 Message-Id: <20210616062157.953777-9-tientzu@chromium.org> X-Mailer: git-send-email 2.32.0.272.g935e593368-goog In-Reply-To: <20210616062157.953777-1-tientzu@chromium.org> References: <20210616062157.953777-1-tientzu@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new function, swiotlb_release_slots, to make the code reusable for supporting different bounce buffer pools. Signed-off-by: Claire Chang Reviewed-by: Christoph Hellwig --- 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 b59e689aa79d..688c6e0c43ff 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -555,27 +555,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 swiotlb_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. @@ -610,6 +598,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); + + swiotlb_release_slots(dev, tlb_addr); +} + void swiotlb_sync_single_for_device(struct device *dev, phys_addr_t tlb_addr, size_t size, enum dma_data_direction dir) { -- 2.32.0.272.g935e593368-goog