* [PATCH v2 02/11] gpu: host1x: Add missing DMA API include [not found] <cover.1639157090.git.robin.murphy@arm.com> @ 2021-12-10 17:54 ` Robin Murphy 2021-12-16 8:53 ` Thierry Reding 2021-12-10 17:54 ` [PATCH v2 03/11] drm/tegra: vic: Fix DMA API misuse Robin Murphy 1 sibling, 1 reply; 4+ messages in thread From: Robin Murphy @ 2021-12-10 17:54 UTC (permalink / raw) To: joro, will Cc: john.garry, linux-kernel, willy, Mikko Perttunen, linux-mm, iommu, Thierry Reding, dri-devel, suravee.suthikulpanit, baolu.lu Host1x seems to be relying on picking up dma-mapping.h transitively from iova.h, which has no reason to include it in the first place. Fix the former issue before we totally break things by fixing the latter one. CC: Thierry Reding <thierry.reding@gmail.com> CC: Mikko Perttunen <mperttunen@nvidia.com> CC: dri-devel@lists.freedesktop.org Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- v2: No change drivers/gpu/host1x/bus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 218e3718fd68..881fad5c3307 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -5,6 +5,7 @@ */ #include <linux/debugfs.h> +#include <linux/dma-mapping.h> #include <linux/host1x.h> #include <linux/of.h> #include <linux/seq_file.h> -- 2.28.0.dirty ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 02/11] gpu: host1x: Add missing DMA API include 2021-12-10 17:54 ` [PATCH v2 02/11] gpu: host1x: Add missing DMA API include Robin Murphy @ 2021-12-16 8:53 ` Thierry Reding 0 siblings, 0 replies; 4+ messages in thread From: Thierry Reding @ 2021-12-16 8:53 UTC (permalink / raw) To: Robin Murphy Cc: joro, john.garry, linux-kernel, willy, Mikko Perttunen, linux-mm, iommu, dri-devel, suravee.suthikulpanit, will, baolu.lu [-- Attachment #1: Type: text/plain, Size: 611 bytes --] On Fri, Dec 10, 2021 at 05:54:43PM +0000, Robin Murphy wrote: > Host1x seems to be relying on picking up dma-mapping.h transitively from > iova.h, which has no reason to include it in the first place. Fix the > former issue before we totally break things by fixing the latter one. > > CC: Thierry Reding <thierry.reding@gmail.com> > CC: Mikko Perttunen <mperttunen@nvidia.com> > CC: dri-devel@lists.freedesktop.org > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > > v2: No change > > drivers/gpu/host1x/bus.c | 1 + > 1 file changed, 1 insertion(+) Applied, thanks. Thierry [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 03/11] drm/tegra: vic: Fix DMA API misuse [not found] <cover.1639157090.git.robin.murphy@arm.com> 2021-12-10 17:54 ` [PATCH v2 02/11] gpu: host1x: Add missing DMA API include Robin Murphy @ 2021-12-10 17:54 ` Robin Murphy 2021-12-16 8:55 ` Thierry Reding 1 sibling, 1 reply; 4+ messages in thread From: Robin Murphy @ 2021-12-10 17:54 UTC (permalink / raw) To: joro, will Cc: john.garry, linux-kernel, willy, Mikko Perttunen, linux-mm, iommu, Thierry Reding, dri-devel, suravee.suthikulpanit, baolu.lu Upon failure, dma_alloc_coherent() returns NULL. If that does happen, passing some uninitialised stack contents to dma_mapping_error() - which belongs to a different API in the first place - has precious little chance of detecting it. Also include the correct header, because the fragile transitive inclusion currently providing it is going to break soon. Fixes: 20e7dce255e9 ("drm/tegra: Remove memory allocation from Falcon library") CC: Thierry Reding <thierry.reding@gmail.com> CC: Mikko Perttunen <mperttunen@nvidia.com> CC: dri-devel@lists.freedesktop.org Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- It also doesn't appear to handle failure of the tegra_drm_alloc() path either, but that's a loose thread I have no desire to pull on... ;) v2: Resend as part of the series, originally posted separately here: https://lore.kernel.org/dri-devel/2703882439344010e33bf21ecd63cf9e5e6dc00d.1637781007.git.robin.murphy@arm.com/ drivers/gpu/drm/tegra/vic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index c02010ff2b7f..da4af5371991 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -5,6 +5,7 @@ #include <linux/clk.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <linux/host1x.h> #include <linux/iommu.h> #include <linux/module.h> @@ -232,10 +233,8 @@ static int vic_load_firmware(struct vic *vic) if (!client->group) { virt = dma_alloc_coherent(vic->dev, size, &iova, GFP_KERNEL); - - err = dma_mapping_error(vic->dev, iova); - if (err < 0) - return err; + if (!virt) + return -ENOMEM; } else { virt = tegra_drm_alloc(tegra, size, &iova); } -- 2.28.0.dirty ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 03/11] drm/tegra: vic: Fix DMA API misuse 2021-12-10 17:54 ` [PATCH v2 03/11] drm/tegra: vic: Fix DMA API misuse Robin Murphy @ 2021-12-16 8:55 ` Thierry Reding 0 siblings, 0 replies; 4+ messages in thread From: Thierry Reding @ 2021-12-16 8:55 UTC (permalink / raw) To: Robin Murphy Cc: joro, john.garry, linux-kernel, willy, Mikko Perttunen, linux-mm, iommu, dri-devel, suravee.suthikulpanit, will, baolu.lu [-- Attachment #1: Type: text/plain, Size: 1315 bytes --] On Fri, Dec 10, 2021 at 05:54:44PM +0000, Robin Murphy wrote: > Upon failure, dma_alloc_coherent() returns NULL. If that does happen, > passing some uninitialised stack contents to dma_mapping_error() - which > belongs to a different API in the first place - has precious little > chance of detecting it. > > Also include the correct header, because the fragile transitive > inclusion currently providing it is going to break soon. > > Fixes: 20e7dce255e9 ("drm/tegra: Remove memory allocation from Falcon library") > CC: Thierry Reding <thierry.reding@gmail.com> > CC: Mikko Perttunen <mperttunen@nvidia.com> > CC: dri-devel@lists.freedesktop.org > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > > --- > > It also doesn't appear to handle failure of the tegra_drm_alloc() path > either, but that's a loose thread I have no desire to pull on... ;) > > v2: Resend as part of the series, originally posted separately here: > > https://lore.kernel.org/dri-devel/2703882439344010e33bf21ecd63cf9e5e6dc00d.1637781007.git.robin.murphy@arm.com/ > > drivers/gpu/drm/tegra/vic.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) Applied, thanks. I've also fixed up the missing failure handling for tegra_drm_alloc(), which was actually quite trivial to do. Thierry [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-16 8:55 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <cover.1639157090.git.robin.murphy@arm.com> 2021-12-10 17:54 ` [PATCH v2 02/11] gpu: host1x: Add missing DMA API include Robin Murphy 2021-12-16 8:53 ` Thierry Reding 2021-12-10 17:54 ` [PATCH v2 03/11] drm/tegra: vic: Fix DMA API misuse Robin Murphy 2021-12-16 8:55 ` Thierry Reding
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).