From: John Garry <john.garry@huawei.com> To: <damien.lemoal@opensource.wdc.com>, <joro@8bytes.org>, <will@kernel.org>, <jejb@linux.ibm.com>, <martin.petersen@oracle.com>, <hch@lst.de>, <m.szyprowski@samsung.com>, <robin.murphy@arm.com> Cc: <linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-ide@vger.kernel.org>, <iommu@lists.linux-foundation.org>, <linux-scsi@vger.kernel.org>, <liyihang6@hisilicon.com>, <chenxiang66@hisilicon.com>, <thunder.leizhen@huawei.com>, John Garry <john.garry@huawei.com> Subject: [PATCH 2/4] dma-iommu: Add iommu_dma_opt_mapping_size() Date: Fri, 20 May 2022 16:23:21 +0800 [thread overview] Message-ID: <1653035003-70312-3-git-send-email-john.garry@huawei.com> (raw) In-Reply-To: <1653035003-70312-1-git-send-email-john.garry@huawei.com> Add the IOMMU callback for DMA mapping API dma_opt_mapping_size(), which allows the drivers to know the optimal mapping limit and thus limit the requested IOVA lengths. This value is based on the IOVA rcache range limit, as IOVAs allocated above this limit must always be newly allocated, which may be quite slow. Signed-off-by: John Garry <john.garry@huawei.com> --- drivers/iommu/dma-iommu.c | 6 ++++++ drivers/iommu/iova.c | 5 +++++ include/linux/iova.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 09f6e1c0f9c0..f619e41b9172 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1442,6 +1442,11 @@ static unsigned long iommu_dma_get_merge_boundary(struct device *dev) return (1UL << __ffs(domain->pgsize_bitmap)) - 1; } +static size_t iommu_dma_opt_mapping_size(void) +{ + return iova_rcache_range(); +} + static const struct dma_map_ops iommu_dma_ops = { .alloc = iommu_dma_alloc, .free = iommu_dma_free, @@ -1462,6 +1467,7 @@ static const struct dma_map_ops iommu_dma_ops = { .map_resource = iommu_dma_map_resource, .unmap_resource = iommu_dma_unmap_resource, .get_merge_boundary = iommu_dma_get_merge_boundary, + .opt_mapping_size = iommu_dma_opt_mapping_size, }; /* diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index db77aa675145..9f00b58d546e 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -26,6 +26,11 @@ static unsigned long iova_rcache_get(struct iova_domain *iovad, static void free_cpu_cached_iovas(unsigned int cpu, struct iova_domain *iovad); static void free_iova_rcaches(struct iova_domain *iovad); +unsigned long iova_rcache_range(void) +{ + return PAGE_SIZE << (IOVA_RANGE_CACHE_MAX_SIZE - 1); +} + static int iova_cpuhp_dead(unsigned int cpu, struct hlist_node *node) { struct iova_domain *iovad; diff --git a/include/linux/iova.h b/include/linux/iova.h index 320a70e40233..c6ba6d95d79c 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -79,6 +79,8 @@ static inline unsigned long iova_pfn(struct iova_domain *iovad, dma_addr_t iova) int iova_cache_get(void); void iova_cache_put(void); +unsigned long iova_rcache_range(void); + void free_iova(struct iova_domain *iovad, unsigned long pfn); void __free_iova(struct iova_domain *iovad, struct iova *iova); struct iova *alloc_iova(struct iova_domain *iovad, unsigned long size, -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: John Garry via iommu <iommu@lists.linux-foundation.org> To: <damien.lemoal@opensource.wdc.com>, <joro@8bytes.org>, <will@kernel.org>, <jejb@linux.ibm.com>, <martin.petersen@oracle.com>, <hch@lst.de>, <m.szyprowski@samsung.com>, <robin.murphy@arm.com> Cc: linux-scsi@vger.kernel.org, linux-doc@vger.kernel.org, liyihang6@hisilicon.com, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, iommu@lists.linux-foundation.org Subject: [PATCH 2/4] dma-iommu: Add iommu_dma_opt_mapping_size() Date: Fri, 20 May 2022 16:23:21 +0800 [thread overview] Message-ID: <1653035003-70312-3-git-send-email-john.garry@huawei.com> (raw) In-Reply-To: <1653035003-70312-1-git-send-email-john.garry@huawei.com> Add the IOMMU callback for DMA mapping API dma_opt_mapping_size(), which allows the drivers to know the optimal mapping limit and thus limit the requested IOVA lengths. This value is based on the IOVA rcache range limit, as IOVAs allocated above this limit must always be newly allocated, which may be quite slow. Signed-off-by: John Garry <john.garry@huawei.com> --- drivers/iommu/dma-iommu.c | 6 ++++++ drivers/iommu/iova.c | 5 +++++ include/linux/iova.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 09f6e1c0f9c0..f619e41b9172 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1442,6 +1442,11 @@ static unsigned long iommu_dma_get_merge_boundary(struct device *dev) return (1UL << __ffs(domain->pgsize_bitmap)) - 1; } +static size_t iommu_dma_opt_mapping_size(void) +{ + return iova_rcache_range(); +} + static const struct dma_map_ops iommu_dma_ops = { .alloc = iommu_dma_alloc, .free = iommu_dma_free, @@ -1462,6 +1467,7 @@ static const struct dma_map_ops iommu_dma_ops = { .map_resource = iommu_dma_map_resource, .unmap_resource = iommu_dma_unmap_resource, .get_merge_boundary = iommu_dma_get_merge_boundary, + .opt_mapping_size = iommu_dma_opt_mapping_size, }; /* diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index db77aa675145..9f00b58d546e 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -26,6 +26,11 @@ static unsigned long iova_rcache_get(struct iova_domain *iovad, static void free_cpu_cached_iovas(unsigned int cpu, struct iova_domain *iovad); static void free_iova_rcaches(struct iova_domain *iovad); +unsigned long iova_rcache_range(void) +{ + return PAGE_SIZE << (IOVA_RANGE_CACHE_MAX_SIZE - 1); +} + static int iova_cpuhp_dead(unsigned int cpu, struct hlist_node *node) { struct iova_domain *iovad; diff --git a/include/linux/iova.h b/include/linux/iova.h index 320a70e40233..c6ba6d95d79c 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -79,6 +79,8 @@ static inline unsigned long iova_pfn(struct iova_domain *iovad, dma_addr_t iova) int iova_cache_get(void); void iova_cache_put(void); +unsigned long iova_rcache_range(void); + void free_iova(struct iova_domain *iovad, unsigned long pfn); void __free_iova(struct iova_domain *iovad, struct iova *iova); struct iova *alloc_iova(struct iova_domain *iovad, unsigned long size, -- 2.26.2 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2022-05-20 8:29 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-20 8:23 [PATCH 0/4] DMA mapping changes for SCSI core John Garry 2022-05-20 8:23 ` John Garry via iommu 2022-05-20 8:23 ` [PATCH 1/4] dma-mapping: Add dma_opt_mapping_size() John Garry 2022-05-20 8:23 ` John Garry via iommu 2022-05-20 23:32 ` Damien Le Moal 2022-05-20 23:32 ` Damien Le Moal via iommu 2022-05-20 8:23 ` John Garry [this message] 2022-05-20 8:23 ` [PATCH 2/4] dma-iommu: Add iommu_dma_opt_mapping_size() John Garry via iommu 2022-05-20 23:33 ` Damien Le Moal 2022-05-20 23:33 ` Damien Le Moal via iommu 2022-05-23 7:01 ` John Garry via iommu 2022-05-23 7:01 ` John Garry 2022-05-23 7:32 ` Damien Le Moal 2022-05-23 7:32 ` Damien Le Moal via iommu 2022-05-23 7:34 ` Damien Le Moal via iommu 2022-05-23 7:34 ` Damien Le Moal 2022-05-20 8:23 ` [PATCH 3/4] scsi: core: Cap shost max_sectors according to DMA optimum mapping limits John Garry 2022-05-20 8:23 ` John Garry via iommu 2022-05-20 23:30 ` Damien Le Moal 2022-05-20 23:30 ` Damien Le Moal via iommu 2022-05-23 6:53 ` John Garry via iommu 2022-05-23 6:53 ` John Garry 2022-05-23 7:33 ` Damien Le Moal 2022-05-23 7:33 ` Damien Le Moal via iommu 2022-05-20 8:23 ` [PATCH 4/4] libata-scsi: Cap ata_device->max_sectors according to shost->max_sectors John Garry 2022-05-20 8:23 ` John Garry via iommu 2022-05-20 23:34 ` Damien Le Moal 2022-05-20 23:34 ` Damien Le Moal via iommu 2022-05-22 13:13 ` [PATCH 0/4] DMA mapping changes for SCSI core Christoph Hellwig 2022-05-22 13:13 ` Christoph Hellwig 2022-05-22 22:22 ` Damien Le Moal 2022-05-22 22:22 ` Damien Le Moal via iommu 2022-05-23 12:00 ` John Garry 2022-05-23 12:00 ` John Garry via iommu 2022-05-24 2:41 ` Martin K. Petersen 2022-05-24 2:41 ` Martin K. Petersen 2022-05-20 21:43 [PATCH 3/4] scsi: core: Cap shost max_sectors according to DMA optimum mapping limits kernel test robot 2022-05-23 11:08 ` Dan Carpenter 2022-05-23 11:08 ` Dan Carpenter 2022-05-23 11:08 ` Dan Carpenter 2022-05-23 11:56 ` John Garry 2022-05-23 11:56 ` John Garry 2022-05-23 11:56 ` John Garry via iommu
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=1653035003-70312-3-git-send-email-john.garry@huawei.com \ --to=john.garry@huawei.com \ --cc=chenxiang66@hisilicon.com \ --cc=damien.lemoal@opensource.wdc.com \ --cc=hch@lst.de \ --cc=iommu@lists.linux-foundation.org \ --cc=jejb@linux.ibm.com \ --cc=joro@8bytes.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-ide@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=liyihang6@hisilicon.com \ --cc=m.szyprowski@samsung.com \ --cc=martin.petersen@oracle.com \ --cc=robin.murphy@arm.com \ --cc=thunder.leizhen@huawei.com \ --cc=will@kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.