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=-20.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 92B1DC07E95 for ; Wed, 7 Jul 2021 07:55:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7CC6F61CBB for ; Wed, 7 Jul 2021 07:55:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231158AbhGGH6X (ORCPT ); Wed, 7 Jul 2021 03:58:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231128AbhGGH6W (ORCPT ); Wed, 7 Jul 2021 03:58:22 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A4C6C06175F for ; Wed, 7 Jul 2021 00:55:37 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id 62so1402723pgf.1 for ; Wed, 07 Jul 2021 00:55:37 -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=ryjYxQ0JHh52qusdGDD6YmKhsPnlyH0BzgDH8DG8KYA=; b=HCYvRR0u9uRITgyFKUecItQ1ExxSU2pwsas15379OwgRyMa1RB3Ngjh9SOu0pR/kZ5 DGhsMSPsZ5LOLuewp7BK4HmEVhawxxQvhKL2ppFOWcYi9kpALDCGcLx09cyGRPHgDwiH UEgjadQbE0q5ni2p2jA3bOh4hJAN7tCUBaWRE= 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=ryjYxQ0JHh52qusdGDD6YmKhsPnlyH0BzgDH8DG8KYA=; b=rrdZPJZC8kyOAAXpRdr+RKO6vg0cYQ1ArUOB6cPWI1qHeSoIEzfqpmUXdxDRFXz9AJ gNpRdb8p1PvYPfchaXXxNXUy3v7HLHUdKMf08ySLxGDrWoyiAw1+jc4EVdi/43wOIe5C sCo7Crz8WMUQ7EQcxkJeU74v8tPEd7YDFAUAgWr+50C4woaLTpbBYA9lggt4NQDRph+f MaBsrXKxl+VctUkKZoFdWkAuDrKH5I8GJLNaLpFd2P3uDknOAEcUeczbSz8iqin1q9bS sQPzvRJH4ydeqyimXQfGmE3WGsNjgqAoqM8CKEy3qLF5xuEOYilLrC7CBUxApIWH0HJ3 CGug== X-Gm-Message-State: AOAM530Zo7zYg2eqfjW+Nb+YlpsuV911WQWPnJ0yWzCH/ZpPcZkJW4I1 uTNP2CSFA63ZjeM7FU/Q/FpGLQ== X-Google-Smtp-Source: ABdhPJzPxmiwH8IIxQAEOI9pm5qxtU1muhDEl8mvQwN5aoarWWGwzFw18SkoHg95qnckFoEh/3hE3Q== X-Received: by 2002:a65:6a45:: with SMTP id o5mr25186342pgu.409.1625644536743; Wed, 07 Jul 2021 00:55:36 -0700 (PDT) Received: from localhost ([2401:fa00:8f:203:355a:c470:1237:e5f4]) by smtp.gmail.com with UTF8SMTPSA id k8sm19181213pfa.142.2021.07.07.00.55.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Jul 2021 00:55:36 -0700 (PDT) From: David Stevens X-Google-Original-From: David Stevens To: Joerg Roedel , Will Deacon Cc: Christoph Hellwig , Sergey Senozhatsky , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, David Stevens Subject: [PATCH 3/4] dma-iommu: expose a few helper functions to module Date: Wed, 7 Jul 2021 16:55:04 +0900 Message-Id: <20210707075505.2896824-4-stevensd@google.com> X-Mailer: git-send-email 2.32.0.93.g670b81a890-goog In-Reply-To: <20210707075505.2896824-1-stevensd@google.com> References: <20210707075505.2896824-1-stevensd@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Stevens Expose a few helper functions from dma-iommu to the rest of the module. Signed-off-by: David Stevens --- drivers/iommu/dma-iommu.c | 27 ++++++++++++++------------- include/linux/dma-iommu.h | 12 ++++++++++++ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 98a5c566a303..48267d9f5152 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -413,7 +413,7 @@ static int dma_info_to_prot(enum dma_data_direction dir, bool coherent, } } -static dma_addr_t iommu_dma_alloc_iova(struct iommu_domain *domain, +dma_addr_t __iommu_dma_alloc_iova(struct iommu_domain *domain, size_t size, u64 dma_limit, struct device *dev) { struct iommu_dma_cookie *cookie = domain->iova_cookie; @@ -453,7 +453,7 @@ static dma_addr_t iommu_dma_alloc_iova(struct iommu_domain *domain, return (dma_addr_t)iova << shift; } -static void iommu_dma_free_iova(struct iommu_dma_cookie *cookie, +void __iommu_dma_free_iova(struct iommu_dma_cookie *cookie, dma_addr_t iova, size_t size, struct page *freelist) { struct iova_domain *iovad = &cookie->iovad; @@ -489,7 +489,7 @@ static void __iommu_dma_unmap(struct device *dev, dma_addr_t dma_addr, if (!cookie->fq_domain) iommu_iotlb_sync(domain, &iotlb_gather); - iommu_dma_free_iova(cookie, dma_addr, size, iotlb_gather.freelist); + __iommu_dma_free_iova(cookie, dma_addr, size, iotlb_gather.freelist); } static void __iommu_dma_unmap_swiotlb(struct device *dev, dma_addr_t dma_addr, @@ -525,12 +525,12 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, size = iova_align(iovad, size + iova_off); - iova = iommu_dma_alloc_iova(domain, size, dma_mask, dev); + iova = __iommu_dma_alloc_iova(domain, size, dma_mask, dev); if (!iova) return DMA_MAPPING_ERROR; if (iommu_map_atomic(domain, iova, phys - iova_off, size, prot)) { - iommu_dma_free_iova(cookie, iova, size, NULL); + __iommu_dma_free_iova(cookie, iova, size, NULL); return DMA_MAPPING_ERROR; } return iova + iova_off; @@ -585,14 +585,14 @@ static dma_addr_t __iommu_dma_map_swiotlb(struct device *dev, phys_addr_t phys, return iova; } -static void __iommu_dma_free_pages(struct page **pages, int count) +void __iommu_dma_free_pages(struct page **pages, int count) { while (count--) __free_page(pages[count]); kvfree(pages); } -static struct page **__iommu_dma_alloc_pages( +struct page **__iommu_dma_alloc_pages( unsigned int count, unsigned long order_mask, unsigned int nid, gfp_t page_gfp, gfp_t kalloc_gfp) { @@ -686,7 +686,8 @@ static struct page **__iommu_dma_alloc_noncontiguous(struct device *dev, return NULL; size = iova_align(iovad, size); - iova = iommu_dma_alloc_iova(domain, size, dev->coherent_dma_mask, dev); + iova = __iommu_dma_alloc_iova(domain, size, + dev->coherent_dma_mask, dev); if (!iova) goto out_free_pages; @@ -712,7 +713,7 @@ static struct page **__iommu_dma_alloc_noncontiguous(struct device *dev, out_free_sg: sg_free_table(sgt); out_free_iova: - iommu_dma_free_iova(cookie, iova, size, NULL); + __iommu_dma_free_iova(cookie, iova, size, NULL); out_free_pages: __iommu_dma_free_pages(pages, count); return NULL; @@ -1063,7 +1064,7 @@ static int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, prev = s; } - iova = iommu_dma_alloc_iova(domain, iova_len, dma_get_mask(dev), dev); + iova = __iommu_dma_alloc_iova(domain, iova_len, dma_get_mask(dev), dev); if (!iova) goto out_restore_sg; @@ -1077,7 +1078,7 @@ static int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, return __finalise_sg(dev, sg, nents, iova); out_free_iova: - iommu_dma_free_iova(cookie, iova, iova_len, NULL); + __iommu_dma_free_iova(cookie, iova, iova_len, NULL); out_restore_sg: __invalidate_sg(sg, nents); return 0; @@ -1370,7 +1371,7 @@ static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev, if (!msi_page) return NULL; - iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev); + iova = __iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev); if (!iova) goto out_free_page; @@ -1384,7 +1385,7 @@ static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev, return msi_page; out_free_iova: - iommu_dma_free_iova(cookie, iova, size, NULL); + __iommu_dma_free_iova(cookie, iova, size, NULL); out_free_page: kfree(msi_page); return NULL; diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 6e75a2d689b4..fc9acc581db0 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -42,6 +42,18 @@ void iommu_dma_free_cpu_cached_iovas(unsigned int cpu, extern bool iommu_dma_forcedac; +struct iommu_dma_cookie; + +struct page **__iommu_dma_alloc_pages( + unsigned int count, unsigned long order_mask, + unsigned int nid, gfp_t page_gfp, gfp_t kalloc_gfp); +void __iommu_dma_free_pages(struct page **pages, int count); +dma_addr_t __iommu_dma_alloc_iova(struct iommu_domain *domain, + size_t size, dma_addr_t dma_limit, + struct device *dev); +void __iommu_dma_free_iova(struct iommu_dma_cookie *cookie, + dma_addr_t iova, size_t size, struct page *freelist); + #else /* CONFIG_IOMMU_DMA */ struct iommu_domain; -- 2.32.0.93.g670b81a890-goog