From: Tom Murphy <tmurphy@arista.com> To: iommu@lists.linux-foundation.org Cc: murphyt7@tcd.ie, Tom Murphy <tmurphy@arista.com>, Joerg Roedel <joro@8bytes.org>, Will Deacon <will.deacon@arm.com>, Robin Murphy <robin.murphy@arm.com>, Marek Szyprowski <m.szyprowski@samsung.com>, Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, David Woodhouse <dwmw2@infradead.org>, Andy Gross <andy.gross@linaro.org>, David Brown <david.brown@linaro.org>, Matthias Brugger <matthias.bgg@gmail.com>, Rob Clark <robdclark@gmail.com>, Heiko Stuebner <heiko@sntech.de>, Gerald Schaefer <gerald.schaefer@de.ibm.com>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v3 2/4] iommu/dma-iommu: Handle deferred devices Date: Mon, 6 May 2019 19:52:04 +0100 [thread overview] Message-ID: <20190506185207.31069-3-tmurphy@arista.com> (raw) In-Reply-To: <20190506185207.31069-1-tmurphy@arista.com> Handle devices which defer their attach to the iommu in the dma-iommu api Signed-off-by: Tom Murphy <tmurphy@arista.com> --- drivers/iommu/dma-iommu.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 7a96c2c8f56b..b383498e2dc3 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -22,6 +22,7 @@ #include <linux/pci.h> #include <linux/scatterlist.h> #include <linux/vmalloc.h> +#include <linux/crash_dump.h> struct iommu_dma_msi_page { struct list_head list; @@ -322,6 +323,22 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, return iova_reserve_iommu_regions(dev, domain); } +static int handle_deferred_device(struct device *dev) +{ + struct iommu_domain *domain; + const struct iommu_ops *ops; + + if (!is_kdump_kernel()) + return 0; + + domain = iommu_get_domain_for_dev(dev); + ops = domain->ops; + if (ops->is_attach_deferred && ops->is_attach_deferred(domain, dev)) + return iommu_attach_device(domain, dev); + + return 0; +} + /** * dma_info_to_prot - Translate DMA API directions and attributes to IOMMU API * page flags. @@ -835,7 +852,10 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, bool coherent = dev_is_dma_coherent(dev); dma_addr_t dma_handle; - dma_handle =__iommu_dma_map(dev, phys, size, + if (unlikely(handle_deferred_device(dev))) + return DMA_MAPPING_ERROR; + + dma_handle = __iommu_dma_map(dev, phys, size, dma_info_to_prot(dir, coherent, attrs), iommu_get_dma_domain(dev)); if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) && @@ -953,6 +973,9 @@ static int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, unsigned long mask = dma_get_seg_boundary(dev); int i; + if (unlikely(handle_deferred_device(dev))) + return 0; + if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) iommu_dma_sync_sg_for_device(dev, sg, nents, dir); @@ -1056,6 +1079,9 @@ static void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle, static void *iommu_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) { + if (unlikely(handle_deferred_device(dev))) + return NULL; + gfp |= __GFP_ZERO; #ifdef CONFIG_DMA_DIRECT_REMAP -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Tom Murphy <tmurphy@arista.com> To: iommu@lists.linux-foundation.org Cc: murphyt7@tcd.ie, Tom Murphy <tmurphy@arista.com>, Joerg Roedel <joro@8bytes.org>, Will Deacon <will.deacon@arm.com>, Robin Murphy <robin.murphy@arm.com>, Marek Szyprowski <m.szyprowski@samsung.com>, Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, David Woodhouse <dwmw2@infradead.org>, Andy Gross <andy.gross@linaro.org>, David Brown <david.brown@linaro.org>, Matthias Brugger <matthias.bgg@gmail.com>, Rob Clark <robdclark@gmail.com>, Heiko Stuebner <heiko@sntech.de>, Gerald Schaefer <gerald.schaefer@de.ibm.com>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-s390@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH v3 2/4] iommu/dma-iommu: Handle deferred devices Date: Mon, 6 May 2019 19:52:04 +0100 [thread overview] Message-ID: <20190506185207.31069-3-tmurphy@arista.com> (raw) Message-ID: <20190506185204.ZvS2AL_Q_1vD_dXou-BjHfsZuzQ-v2T2xcLyBdTZFp4@z> (raw) In-Reply-To: <20190506185207.31069-1-tmurphy@arista.com> Handle devices which defer their attach to the iommu in the dma-iommu api Signed-off-by: Tom Murphy <tmurphy@arista.com> --- drivers/iommu/dma-iommu.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 7a96c2c8f56b..b383498e2dc3 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -22,6 +22,7 @@ #include <linux/pci.h> #include <linux/scatterlist.h> #include <linux/vmalloc.h> +#include <linux/crash_dump.h> struct iommu_dma_msi_page { struct list_head list; @@ -322,6 +323,22 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, return iova_reserve_iommu_regions(dev, domain); } +static int handle_deferred_device(struct device *dev) +{ + struct iommu_domain *domain; + const struct iommu_ops *ops; + + if (!is_kdump_kernel()) + return 0; + + domain = iommu_get_domain_for_dev(dev); + ops = domain->ops; + if (ops->is_attach_deferred && ops->is_attach_deferred(domain, dev)) + return iommu_attach_device(domain, dev); + + return 0; +} + /** * dma_info_to_prot - Translate DMA API directions and attributes to IOMMU API * page flags. @@ -835,7 +852,10 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, bool coherent = dev_is_dma_coherent(dev); dma_addr_t dma_handle; - dma_handle =__iommu_dma_map(dev, phys, size, + if (unlikely(handle_deferred_device(dev))) + return DMA_MAPPING_ERROR; + + dma_handle = __iommu_dma_map(dev, phys, size, dma_info_to_prot(dir, coherent, attrs), iommu_get_dma_domain(dev)); if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) && @@ -953,6 +973,9 @@ static int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, unsigned long mask = dma_get_seg_boundary(dev); int i; + if (unlikely(handle_deferred_device(dev))) + return 0; + if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) iommu_dma_sync_sg_for_device(dev, sg, nents, dir); @@ -1056,6 +1079,9 @@ static void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle, static void *iommu_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) { + if (unlikely(handle_deferred_device(dev))) + return NULL; + gfp |= __GFP_ZERO; #ifdef CONFIG_DMA_DIRECT_REMAP -- 2.17.1
next prev parent reply other threads:[~2019-05-06 18:52 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-06 18:52 [PATCH v3 0/4] iommu/amd: Convert the AMD iommu driver to the dma-iommu api Tom Murphy via iommu 2019-05-06 18:52 ` Tom Murphy 2019-05-06 18:52 ` Tom Murphy [this message] 2019-05-06 18:52 ` [PATCH v3 2/4] iommu/dma-iommu: Handle deferred devices Tom Murphy 2019-05-07 6:40 ` Christoph Hellwig 2019-05-07 6:40 ` Christoph Hellwig 2019-05-15 12:46 ` Tom Murphy [not found] ` <20190506185207.31069-1-tmurphy-nzgTgzXrdUbQT0dZR+AlfA@public.gmane.org> 2019-05-06 18:52 ` [PATCH v3 1/4] iommu: Add gfp parameter to iommu_ops::map Tom Murphy via iommu 2019-05-06 18:52 ` Tom Murphy 2019-06-04 18:11 ` Robin Murphy 2019-06-04 20:55 ` Tom Murphy 2019-06-04 21:24 ` Rob Clark 2019-06-05 5:50 ` Christoph Hellwig 2019-05-06 18:52 ` [PATCH v3 3/4] iommu/dma-iommu: Use the dev->coherent_dma_mask Tom Murphy via iommu 2019-05-06 18:52 ` Tom Murphy 2019-05-06 18:52 ` [PATCH v3 4/4] iommu/amd: Convert AMD iommu driver to the dma-iommu api Tom Murphy 2019-05-06 18:52 ` Tom Murphy 2019-06-03 10:51 ` [PATCH v3 0/4] iommu/amd: Convert the " Joerg Roedel 2019-06-03 11:27 ` Tom Murphy
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=20190506185207.31069-3-tmurphy@arista.com \ --to=tmurphy@arista.com \ --cc=andy.gross@linaro.org \ --cc=david.brown@linaro.org \ --cc=dwmw2@infradead.org \ --cc=gerald.schaefer@de.ibm.com \ --cc=heiko@sntech.de \ --cc=iommu@lists.linux-foundation.org \ --cc=jonathanh@nvidia.com \ --cc=joro@8bytes.org \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=matthias.bgg@gmail.com \ --cc=murphyt7@tcd.ie \ --cc=robdclark@gmail.com \ --cc=robin.murphy@arm.com \ --cc=thierry.reding@gmail.com \ --cc=will.deacon@arm.com \ /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 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).