Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp335400pxv; Thu, 24 Jun 2021 08:58:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzejLboMfm9NuSDCjlOLnVgDMOUpzklOYA5on2YYyrc1+etHZlSaFoxZ4/vUwtQqRGTiS5/ X-Received: by 2002:a50:f10a:: with SMTP id w10mr8207284edl.137.1624550324084; Thu, 24 Jun 2021 08:58:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624550324; cv=none; d=google.com; s=arc-20160816; b=nI+6Qi1QyYiYwzQO/1z4UwJPu1c+4QveoNn7rc0Y0fr4dujVbRd7CZc0JkX8eOhtBg lCwBp5OA/tacQar4fk8NET9tHUtLecma4U/Gt6Fhn7vOlUvnNfya25e/CVGxEtVC7jcI ztkEgU8MFkgGBDBuTvOeESbOW+MHBRUra6duSrPnU8ExgnvMQv+KMKZXoLIRfFv5ysYS tV1gQ+RpBktMqf3Spza19cSPsnQjrrSgTJoZ7jSd9MYV3xJ+heuKhpNAqWG7cehztMJr YJev3CqdR3g1N9AjD8q0Mf5Q3ZfIk45+i8swCqFRchzUkrU+AIvapKrLPnBzptb3XDyl 4DEw== 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=DgMLkxnMrm1ElKh2pKbH6DNaZYR5ugLD1JouEAo1Krw=; b=s6XVTSHes5MC9+xmBAw9ULbrAOrz5j+aNmX2tH+kIaD3uu7fujrwo4d7Rmq2jlXE3q 8wbhVumYBrURcXnpE/TlYBg94WtC7/2kd/g0b08+6S1xVGKHSfyNBROTui6EtZ2iYoeP B8AMde7ExcrbFDPEy+ThxPJ9z8abt+DkaOBG8AhapYszfzvtQrETl1K1QxkeGyAW2Am8 f3oACecERX+bORQdC5dfMjh7x7oYhWIkaasjZXr7xY/7WzMYqmG/pvy2QxqLvohjvmkQ c2QesIFOKwWQytrAFwNrXc9U/boYi787a619UbCV4mGE01ZcCgthKHbbdqCtUOipv9U9 YzGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=CBMnwj3b; 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 d22si3422679edp.25.2021.06.24.08.58.21; Thu, 24 Jun 2021 08:58:44 -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=CBMnwj3b; 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 S232553AbhFXP7M (ORCPT + 99 others); Thu, 24 Jun 2021 11:59:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232562AbhFXP7L (ORCPT ); Thu, 24 Jun 2021 11:59:11 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF63AC06175F for ; Thu, 24 Jun 2021 08:56:51 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id a2so5061880pgi.6 for ; Thu, 24 Jun 2021 08:56:51 -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=DgMLkxnMrm1ElKh2pKbH6DNaZYR5ugLD1JouEAo1Krw=; b=CBMnwj3bqWSxJk9QuIRXj7AXS1rDlhnCorGo2xL5ODh+Y1ZQXuqRVjdQ1sf+NKMF68 LGTA1Lrr3OIkG7vhENTIDNd/H+9BmAfoCOyqiHCsY0TRSuVzsnR4mZ3/RZi0ObYA87bL L7rL4dqepWMHniYpyZxN1LD1FH654rL7Zq2lk= 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=DgMLkxnMrm1ElKh2pKbH6DNaZYR5ugLD1JouEAo1Krw=; b=KTRc/q+NM73sED+cKQlsSJnxC/jQ58/T3tIscSW2LoH1G3XkGfqKIdCZT1/ZzCJpI8 w+/b30b+wztcnRgdwemxPSCOnFNiECCEaBhUZfroAD1ceaZnWiGflFmlUX+hLSDehSYB eDfQJ+jVyXFAMdYPFKtUk055iWExkmr7sgQGDUA2TERpjng1EVIP4iIWdOQ2UQzDbAp5 NQOowJdcFY95LkwxOk9P+dlLWGeNLdfaUKl95+TrNs9tOsbhWm7j3XD9y8Kv0Q2meazj Eb19hvDyi0FB4B6XZj1dKTNo3Bdemov80loXuGQGQpn+NJWIGOA89g9iTq87hT+3zN0s VEaQ== X-Gm-Message-State: AOAM532IQHS4ZepFG6wgyRUGbf9JMHx1i9dNN79MyN8YL6w8EYQ/2b3h pTM/QwjECQvzwC409Qd3vqnOIw== X-Received: by 2002:a62:d41e:0:b029:305:b3ff:4056 with SMTP id a30-20020a62d41e0000b0290305b3ff4056mr5643354pfh.78.1624550211262; Thu, 24 Jun 2021 08:56:51 -0700 (PDT) Received: from localhost ([2401:fa00:95:205:165a:99ec:42d5:d8b]) by smtp.gmail.com with UTF8SMTPSA id s1sm2804633pgg.49.2021.06.24.08.56.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Jun 2021 08:56:50 -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, thomas.lendacky@amd.com, quic_qiancai@quicinc.com Subject: [PATCH v15 08/12] swiotlb: Refactor swiotlb_tbl_unmap_single Date: Thu, 24 Jun 2021 23:55:22 +0800 Message-Id: <20210624155526.2775863-9-tientzu@chromium.org> X-Mailer: git-send-email 2.32.0.288.g62a8d224e6-goog In-Reply-To: <20210624155526.2775863-1-tientzu@chromium.org> References: <20210624155526.2775863-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 Tested-by: Stefano Stabellini Tested-by: Will Deacon --- 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 b41d16e92cf6..93752e752e76 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -557,27 +557,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. @@ -612,6 +600,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.288.g62a8d224e6-goog