From: Pasha Tatashin <pasha.tatashin@soleen.com> To: akpm@linux-foundation.org, alex.williamson@redhat.com, alim.akhtar@samsung.com, alyssa@rosenzweig.io, asahi@lists.linux.dev, baolu.lu@linux.intel.com, bhelgaas@google.com, cgroups@vger.kernel.org, corbet@lwn.net, david@redhat.com, dwmw2@infradead.org, hannes@cmpxchg.org, heiko@sntech.de, iommu@lists.linux.dev, jasowang@redhat.com, jernej.skrabec@gmail.com, jgg@ziepe.ca, jonathanh@nvidia.com, joro@8bytes.org, kevin.tian@intel.com, krzysztof.kozlowski@linaro.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-rockchip@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, lizefan.x@bytedance.com, marcan@marcan.st, mhiramat@kernel.org, mst@redhat.com, m.szyprowski@samsung.com, netdev@vger.kernel.org, pasha.tatashin@soleen.com, paulmck@kernel.org, rdunlap@infradead.org, robin.murphy@arm.com, samuel@sholland.org, suravee.suthikulpanit@amd.com, sven@svenpeter.dev, thierry.reding@gmail.com, tj@kernel.org, tomas.mudrunka@gmail.com, vdumpa@nvidia.com, virtualization@lists.linux.dev, wens@csie.org, will@kernel.org, yu-cheng.yu@intel.com Subject: [PATCH 05/16] iommu/io-pgtable-arm-v7s: use page allocation function provided by iommu-pages.h Date: Tue, 28 Nov 2023 20:49:27 +0000 [thread overview] Message-ID: <20231128204938.1453583-6-pasha.tatashin@soleen.com> (raw) In-Reply-To: <20231128204938.1453583-1-pasha.tatashin@soleen.com> Convert iommu/io-pgtable-arm-v7s.c to use the new page allocation functions provided in iommu-pages.h. Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> --- drivers/iommu/io-pgtable-arm-v7s.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 75f244a3e12d..3d494ca1f671 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -34,6 +34,7 @@ #include <linux/types.h> #include <asm/barrier.h> +#include "iommu-pages.h" /* Struct accessors */ #define io_pgtable_to_data(x) \ @@ -255,7 +256,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, GFP_KERNEL : ARM_V7S_TABLE_GFP_DMA; if (lvl == 1) - table = (void *)__get_free_pages(gfp_l1 | __GFP_ZERO, get_order(size)); + table = iommu_alloc_pages(gfp_l1, get_order(size)); else if (lvl == 2) table = kmem_cache_zalloc(data->l2_tables, gfp); @@ -283,6 +284,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, } if (lvl == 2) kmemleak_ignore(table); + return table; out_unmap: @@ -290,7 +292,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, dma_unmap_single(dev, dma, size, DMA_TO_DEVICE); out_free: if (lvl == 1) - free_pages((unsigned long)table, get_order(size)); + iommu_free_pages(table, get_order(size)); else kmem_cache_free(data->l2_tables, table); return NULL; @@ -306,8 +308,9 @@ static void __arm_v7s_free_table(void *table, int lvl, if (!cfg->coherent_walk) dma_unmap_single(dev, __arm_v7s_dma_addr(table), size, DMA_TO_DEVICE); + if (lvl == 1) - free_pages((unsigned long)table, get_order(size)); + iommu_free_pages(table, get_order(size)); else kmem_cache_free(data->l2_tables, table); } -- 2.43.0.rc2.451.g8631bc7472-goog
WARNING: multiple messages have this Message-ID (diff)
From: Pasha Tatashin <pasha.tatashin@soleen.com> To: akpm@linux-foundation.org, alex.williamson@redhat.com, alim.akhtar@samsung.com, alyssa@rosenzweig.io, asahi@lists.linux.dev, baolu.lu@linux.intel.com, bhelgaas@google.com, cgroups@vger.kernel.org, corbet@lwn.net, david@redhat.com, dwmw2@infradead.org, hannes@cmpxchg.org, heiko@sntech.de, iommu@lists.linux.dev, jasowang@redhat.com, jernej.skrabec@gmail.com, jgg@ziepe.ca, jonathanh@nvidia.com, joro@8bytes.org, kevin.tian@intel.com, krzysztof.kozlowski@linaro.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-rockchip@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, lizefan.x@bytedance.com, marcan@marcan.st, mhiramat@kernel.org, mst@redhat.com, m.szyprowski@samsung.com, netdev@vger.kernel.org, pasha.tatashin@soleen.com, paulmck@kernel.org, rdunlap@infradead.org, robin.murphy@arm.com, samuel@sholland.org, suravee.suthikulpanit@amd.com, sven@svenpeter.dev, thierry.reding@gmail.com, tj@kernel.org, tomas.mudrunka@gmail.com, vdumpa@nvidia.com, virtualization@lists.linux.dev, wens@csie.org, will@kernel.org, yu-cheng.yu@intel.com Subject: [PATCH 05/16] iommu/io-pgtable-arm-v7s: use page allocation function provided by iommu-pages.h Date: Tue, 28 Nov 2023 20:49:27 +0000 [thread overview] Message-ID: <20231128204938.1453583-6-pasha.tatashin@soleen.com> (raw) In-Reply-To: <20231128204938.1453583-1-pasha.tatashin@soleen.com> Convert iommu/io-pgtable-arm-v7s.c to use the new page allocation functions provided in iommu-pages.h. Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> --- drivers/iommu/io-pgtable-arm-v7s.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 75f244a3e12d..3d494ca1f671 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -34,6 +34,7 @@ #include <linux/types.h> #include <asm/barrier.h> +#include "iommu-pages.h" /* Struct accessors */ #define io_pgtable_to_data(x) \ @@ -255,7 +256,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, GFP_KERNEL : ARM_V7S_TABLE_GFP_DMA; if (lvl == 1) - table = (void *)__get_free_pages(gfp_l1 | __GFP_ZERO, get_order(size)); + table = iommu_alloc_pages(gfp_l1, get_order(size)); else if (lvl == 2) table = kmem_cache_zalloc(data->l2_tables, gfp); @@ -283,6 +284,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, } if (lvl == 2) kmemleak_ignore(table); + return table; out_unmap: @@ -290,7 +292,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, dma_unmap_single(dev, dma, size, DMA_TO_DEVICE); out_free: if (lvl == 1) - free_pages((unsigned long)table, get_order(size)); + iommu_free_pages(table, get_order(size)); else kmem_cache_free(data->l2_tables, table); return NULL; @@ -306,8 +308,9 @@ static void __arm_v7s_free_table(void *table, int lvl, if (!cfg->coherent_walk) dma_unmap_single(dev, __arm_v7s_dma_addr(table), size, DMA_TO_DEVICE); + if (lvl == 1) - free_pages((unsigned long)table, get_order(size)); + iommu_free_pages(table, get_order(size)); else kmem_cache_free(data->l2_tables, table); } -- 2.43.0.rc2.451.g8631bc7472-goog _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2023-11-28 20:49 UTC|newest] Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-28 20:49 [PATCH 00/16] IOMMU memory observability Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 01/16] iommu/vt-d: add wrapper functions for page allocations Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 02/16] iommu/amd: use page allocation function provided by iommu-pages.h Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 03/16] iommu/io-pgtable-arm: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 04/16] iommu/io-pgtable-dart: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-29 7:49 ` Janne Grunau 2023-11-29 7:49 ` Janne Grunau 2023-11-29 21:49 ` Pasha Tatashin 2023-11-29 21:49 ` Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin [this message] 2023-11-28 20:49 ` [PATCH 05/16] iommu/io-pgtable-arm-v7s: " Pasha Tatashin 2023-11-28 22:46 ` Robin Murphy 2023-11-28 22:46 ` Robin Murphy 2023-11-28 22:55 ` Pasha Tatashin 2023-11-28 22:55 ` Pasha Tatashin 2023-11-28 23:07 ` Robin Murphy 2023-11-28 23:07 ` Robin Murphy 2023-11-28 23:32 ` Pasha Tatashin 2023-11-28 23:32 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 06/16] iommu/dma: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 22:33 ` Robin Murphy 2023-11-28 22:33 ` Robin Murphy 2023-11-28 22:50 ` Pasha Tatashin 2023-11-28 22:50 ` Pasha Tatashin 2023-11-28 22:59 ` Robin Murphy 2023-11-28 22:59 ` Robin Murphy 2023-11-28 23:06 ` Pasha Tatashin 2023-11-28 23:06 ` Pasha Tatashin 2023-11-28 23:08 ` Pasha Tatashin 2023-11-28 23:08 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 07/16] iommu/exynos: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 08/16] iommu/fsl: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 22:53 ` Robin Murphy 2023-11-28 22:53 ` Robin Murphy 2023-11-28 23:00 ` Pasha Tatashin 2023-11-28 23:00 ` Pasha Tatashin 2023-11-28 23:50 ` Jason Gunthorpe 2023-11-28 23:50 ` Jason Gunthorpe 2023-11-29 16:48 ` Robin Murphy 2023-11-29 16:48 ` Robin Murphy 2023-11-29 19:45 ` Pasha Tatashin 2023-11-29 19:45 ` Pasha Tatashin 2023-11-29 20:03 ` Jason Gunthorpe 2023-11-29 20:03 ` Jason Gunthorpe 2023-11-29 20:44 ` Pasha Tatashin 2023-11-29 20:44 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 09/16] iommu/iommufd: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 23:52 ` Jason Gunthorpe 2023-11-28 23:52 ` Jason Gunthorpe 2023-11-29 21:59 ` Pasha Tatashin 2023-11-29 21:59 ` Pasha Tatashin 2023-11-30 0:02 ` Jason Gunthorpe 2023-11-30 0:02 ` Jason Gunthorpe 2023-11-28 20:49 ` [PATCH 10/16] iommu/rockchip: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 11/16] iommu/sun50i: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 12/16] iommu/tegra-smmu: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 13/16] iommu: observability of the IOMMU allocations Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-30 14:03 ` kernel test robot 2023-11-30 14:03 ` kernel test robot 2023-11-30 14:03 ` kernel test robot 2023-11-28 20:49 ` [PATCH 14/16] iommu: account IOMMU allocated memory Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 15/16] vhost-vdpa: account iommu allocations Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-12-25 16:09 ` Michael S. Tsirkin 2023-12-25 16:09 ` Michael S. Tsirkin 2023-12-26 18:23 ` Pasha Tatashin 2023-12-26 18:23 ` Pasha Tatashin 2023-11-28 20:49 ` [PATCH 16/16] vfio: " Pasha Tatashin 2023-11-28 20:49 ` Pasha Tatashin 2023-11-28 23:53 ` Jason Gunthorpe 2023-11-28 23:53 ` Jason Gunthorpe 2023-11-29 21:36 ` Pasha Tatashin 2023-11-29 21:36 ` Pasha Tatashin 2023-11-28 21:33 ` [PATCH 00/16] IOMMU memory observability Yosry Ahmed 2023-11-28 21:33 ` Yosry Ahmed 2023-11-28 22:31 ` Pasha Tatashin 2023-11-28 22:31 ` Pasha Tatashin 2023-11-28 23:03 ` Yosry Ahmed 2023-11-28 23:03 ` Yosry Ahmed 2023-11-28 23:52 ` Jason Gunthorpe 2023-11-28 23:52 ` Jason Gunthorpe 2023-11-29 0:25 ` Yosry Ahmed 2023-11-29 0:25 ` Yosry Ahmed 2023-11-29 0:28 ` Jason Gunthorpe 2023-11-29 0:28 ` Jason Gunthorpe 2023-11-29 0:30 ` Yosry Ahmed 2023-11-29 0:30 ` Yosry Ahmed 2023-11-29 0:54 ` Jason Gunthorpe 2023-11-29 0:54 ` 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=20231128204938.1453583-6-pasha.tatashin@soleen.com \ --to=pasha.tatashin@soleen.com \ --cc=akpm@linux-foundation.org \ --cc=alex.williamson@redhat.com \ --cc=alim.akhtar@samsung.com \ --cc=alyssa@rosenzweig.io \ --cc=asahi@lists.linux.dev \ --cc=baolu.lu@linux.intel.com \ --cc=bhelgaas@google.com \ --cc=cgroups@vger.kernel.org \ --cc=corbet@lwn.net \ --cc=david@redhat.com \ --cc=dwmw2@infradead.org \ --cc=hannes@cmpxchg.org \ --cc=heiko@sntech.de \ --cc=iommu@lists.linux.dev \ --cc=jasowang@redhat.com \ --cc=jernej.skrabec@gmail.com \ --cc=jgg@ziepe.ca \ --cc=jonathanh@nvidia.com \ --cc=joro@8bytes.org \ --cc=kevin.tian@intel.com \ --cc=krzysztof.kozlowski@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux-sunxi@lists.linux.dev \ --cc=linux-tegra@vger.kernel.org \ --cc=lizefan.x@bytedance.com \ --cc=m.szyprowski@samsung.com \ --cc=marcan@marcan.st \ --cc=mhiramat@kernel.org \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=paulmck@kernel.org \ --cc=rdunlap@infradead.org \ --cc=robin.murphy@arm.com \ --cc=samuel@sholland.org \ --cc=suravee.suthikulpanit@amd.com \ --cc=sven@svenpeter.dev \ --cc=thierry.reding@gmail.com \ --cc=tj@kernel.org \ --cc=tomas.mudrunka@gmail.com \ --cc=vdumpa@nvidia.com \ --cc=virtualization@lists.linux.dev \ --cc=wens@csie.org \ --cc=will@kernel.org \ --cc=yu-cheng.yu@intel.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 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.