From: Jason Gunthorpe <jgg@nvidia.com>
To: Lu Baolu <baolu.lu@linux.intel.com>,
Joerg Roedel <joro@8bytes.org>, Kevin Tian <kevin.tian@intel.com>,
Matthew Rosato <mjrosato@linux.ibm.com>,
Robin Murphy <robin.murphy@arm.com>
Cc: linux-s390@vger.kernel.org, kvm@vger.kernel.org,
nouveau@lists.freedesktop.org, linux-rdma@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
Niklas Schnelle <schnelle@linux.ibm.com>,
linux-remoteproc@vger.kernel.org, iommu@lists.linux.dev,
dri-devel@lists.freedesktop.org,
linux-stm32@st-md-mailman.stormreply.com,
Alex Williamson <alex.williamson@redhat.com>,
netdev@vger.kernel.org, ath10k@lists.infradead.org,
linux-wireless@vger.kernel.org, linux-tegra@vger.kernel.org,
Christian Borntraeger <borntraeger@linux.ibm.com>,
virtualization@lists.linux-foundation.org,
ath11k@lists.infradead.org, linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org
Subject: [Nouveau] [PATCH v2 02/10] iommu: Remove iommu_map_atomic()
Date: Wed, 18 Jan 2023 14:00:36 -0400 [thread overview]
Message-ID: <2-v2-ce66f632bd0d+484-iommu_map_gfp_jgg@nvidia.com> (raw)
In-Reply-To: <0-v2-ce66f632bd0d+484-iommu_map_gfp_jgg@nvidia.com>
There is only one call site and it can now just pass the GFP_ATOMIC to the
normal iommu_map().
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
drivers/iommu/dma-iommu.c | 2 +-
drivers/iommu/iommu.c | 7 -------
include/linux/iommu.h | 9 ---------
3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 8bdb65e7686ff9..7016db569f81fc 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -713,7 +713,7 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,
if (!iova)
return DMA_MAPPING_ERROR;
- if (iommu_map_atomic(domain, iova, phys - iova_off, size, prot)) {
+ if (iommu_map(domain, iova, phys - iova_off, size, prot, GFP_ATOMIC)) {
iommu_dma_free_iova(cookie, iova, size, NULL);
return DMA_MAPPING_ERROR;
}
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7dac062b58f039..9412b420d07257 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2381,13 +2381,6 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova,
}
EXPORT_SYMBOL_GPL(iommu_map);
-int iommu_map_atomic(struct iommu_domain *domain, unsigned long iova,
- phys_addr_t paddr, size_t size, int prot)
-{
- return iommu_map(domain, iova, paddr, size, prot, GFP_ATOMIC);
-}
-EXPORT_SYMBOL_GPL(iommu_map_atomic);
-
static size_t __iommu_unmap_pages(struct iommu_domain *domain,
unsigned long iova, size_t size,
struct iommu_iotlb_gather *iotlb_gather)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index d2020994f292db..521cd79700f4d8 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -468,8 +468,6 @@ extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev);
extern struct iommu_domain *iommu_get_dma_domain(struct device *dev);
extern int iommu_map(struct iommu_domain *domain, unsigned long iova,
phys_addr_t paddr, size_t size, int prot, gfp_t gfp);
-extern int iommu_map_atomic(struct iommu_domain *domain, unsigned long iova,
- phys_addr_t paddr, size_t size, int prot);
extern size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova,
size_t size);
extern size_t iommu_unmap_fast(struct iommu_domain *domain,
@@ -778,13 +776,6 @@ static inline int iommu_map(struct iommu_domain *domain, unsigned long iova,
return -ENODEV;
}
-static inline int iommu_map_atomic(struct iommu_domain *domain,
- unsigned long iova, phys_addr_t paddr,
- size_t size, int prot)
-{
- return -ENODEV;
-}
-
static inline size_t iommu_unmap(struct iommu_domain *domain,
unsigned long iova, size_t size)
{
--
2.39.0
next prev parent reply other threads:[~2023-01-18 18:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 18:00 [Nouveau] [PATCH v2 00/10] Let iommufd charge IOPTE allocations to the memory cgroup Jason Gunthorpe
2023-01-18 18:00 ` [Nouveau] [PATCH v2 01/10] iommu: Add a gfp parameter to iommu_map() Jason Gunthorpe
2023-01-19 3:45 ` Tian, Kevin
2023-01-18 18:00 ` Jason Gunthorpe [this message]
2023-01-19 3:45 ` [Nouveau] [PATCH v2 02/10] iommu: Remove iommu_map_atomic() Tian, Kevin
2023-01-18 18:00 ` [Nouveau] [PATCH v2 03/10] iommu: Add a gfp parameter to iommu_map_sg() Jason Gunthorpe
2023-01-19 3:46 ` Tian, Kevin
2023-01-18 18:00 ` [Nouveau] [PATCH v2 04/10] iommu/dma: Use the gfp parameter in __iommu_dma_alloc_noncontiguous() Jason Gunthorpe
2023-01-19 3:47 ` Tian, Kevin
2023-01-20 19:28 ` Robin Murphy
2023-01-20 20:38 ` Jason Gunthorpe
2023-01-23 13:58 ` Jason Gunthorpe
2023-01-18 18:00 ` [Nouveau] [PATCH v2 05/10] iommufd: Use GFP_KERNEL_ACCOUNT for iommu_map() Jason Gunthorpe
2023-01-19 3:48 ` Tian, Kevin
2023-01-18 18:00 ` [Nouveau] [PATCH v2 06/10] iommu/intel: Add a gfp parameter to alloc_pgtable_page() Jason Gunthorpe
2023-01-19 3:49 ` Tian, Kevin
2023-01-19 11:47 ` Baolu Lu
2023-01-18 18:00 ` [Nouveau] [PATCH v2 07/10] iommu/intel: Support the gfp argument to the map_pages op Jason Gunthorpe
2023-01-19 3:50 ` Tian, Kevin
2023-01-19 11:57 ` Baolu Lu
2023-01-19 11:59 ` Baolu Lu
2023-01-18 18:00 ` [Nouveau] [PATCH v2 08/10] iommu/intel: Use GFP_KERNEL in sleepable contexts Jason Gunthorpe
2023-01-19 3:52 ` Tian, Kevin
2023-01-19 12:00 ` Baolu Lu
2023-01-18 18:00 ` [Nouveau] [PATCH v2 09/10] iommu/s390: Push the gfp parameter to the kmem_cache_alloc()'s Jason Gunthorpe
2023-01-18 18:00 ` [Nouveau] [PATCH v2 10/10] iommu/s390: Use GFP_KERNEL in sleepable contexts Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2-v2-ce66f632bd0d+484-iommu_map_gfp_jgg@nvidia.com \
--to=jgg@nvidia.com \
--cc=alex.williamson@redhat.com \
--cc=ath10k@lists.infradead.org \
--cc=ath11k@lists.infradead.org \
--cc=baolu.lu@linux.intel.com \
--cc=borntraeger@linux.ibm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=robin.murphy@arm.com \
--cc=schnelle@linux.ibm.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).