From: Pasha Tatashin <pasha.tatashin@soleen.com> To: akpm@linux-foundation.org, 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, jernej.skrabec@gmail.com, jonathanh@nvidia.com, joro@8bytes.org, krzysztof.kozlowski@linaro.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, m.szyprowski@samsung.com, 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, wens@csie.org, will@kernel.org, yu-cheng.yu@intel.com, rientjes@google.com, bagasdotme@gmail.com, mkoutny@suse.com Subject: [PATCH v5 07/11] iommu/rockchip: use page allocation function provided by iommu-pages.h Date: Thu, 22 Feb 2024 17:39:33 +0000 [thread overview] Message-ID: <20240222173942.1481394-8-pasha.tatashin@soleen.com> (raw) In-Reply-To: <20240222173942.1481394-1-pasha.tatashin@soleen.com> Convert iommu/rockchip-iommu.c to use the new page allocation functions provided in iommu-pages.h. Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> Acked-by: David Rientjes <rientjes@google.com> Tested-by: Bagas Sanjaya <bagasdotme@gmail.com> --- drivers/iommu/rockchip-iommu.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 2685861c0a12..e04f22d481d0 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -26,6 +26,8 @@ #include <linux/slab.h> #include <linux/spinlock.h> +#include "iommu-pages.h" + /** MMU register offsets */ #define RK_MMU_DTE_ADDR 0x00 /* Directory table address */ #define RK_MMU_STATUS 0x04 @@ -727,14 +729,14 @@ static u32 *rk_dte_get_page_table(struct rk_iommu_domain *rk_domain, if (rk_dte_is_pt_valid(dte)) goto done; - page_table = (u32 *)get_zeroed_page(GFP_ATOMIC | rk_ops->gfp_flags); + page_table = iommu_alloc_page(GFP_ATOMIC | rk_ops->gfp_flags); if (!page_table) return ERR_PTR(-ENOMEM); pt_dma = dma_map_single(dma_dev, page_table, SPAGE_SIZE, DMA_TO_DEVICE); if (dma_mapping_error(dma_dev, pt_dma)) { dev_err(dma_dev, "DMA mapping error while allocating page table\n"); - free_page((unsigned long)page_table); + iommu_free_page(page_table); return ERR_PTR(-ENOMEM); } @@ -1061,7 +1063,7 @@ static struct iommu_domain *rk_iommu_domain_alloc_paging(struct device *dev) * Each level1 (dt) and level2 (pt) table has 1024 4-byte entries. * Allocate one 4 KiB page for each table. */ - rk_domain->dt = (u32 *)get_zeroed_page(GFP_KERNEL | rk_ops->gfp_flags); + rk_domain->dt = iommu_alloc_page(GFP_KERNEL | rk_ops->gfp_flags); if (!rk_domain->dt) goto err_free_domain; @@ -1083,7 +1085,7 @@ static struct iommu_domain *rk_iommu_domain_alloc_paging(struct device *dev) return &rk_domain->domain; err_free_dt: - free_page((unsigned long)rk_domain->dt); + iommu_free_page(rk_domain->dt); err_free_domain: kfree(rk_domain); @@ -1104,13 +1106,13 @@ static void rk_iommu_domain_free(struct iommu_domain *domain) u32 *page_table = phys_to_virt(pt_phys); dma_unmap_single(dma_dev, pt_phys, SPAGE_SIZE, DMA_TO_DEVICE); - free_page((unsigned long)page_table); + iommu_free_page(page_table); } } dma_unmap_single(dma_dev, rk_domain->dt_dma, SPAGE_SIZE, DMA_TO_DEVICE); - free_page((unsigned long)rk_domain->dt); + iommu_free_page(rk_domain->dt); kfree(rk_domain); } -- 2.44.0.rc0.258.g7320e95886-goog
WARNING: multiple messages have this Message-ID (diff)
From: Pasha Tatashin <pasha.tatashin@soleen.com> To: akpm@linux-foundation.org, 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, jernej.skrabec@gmail.com, jonathanh@nvidia.com, joro@8bytes.org, krzysztof.kozlowski@linaro.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, m.szyprowski@samsung.com, 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, wens@csie.org, will@kernel.org, yu-cheng.yu@intel.com, rientjes@google.com, bagasdotme@gmail.com, mkoutny@suse.com Subject: [PATCH v5 07/11] iommu/rockchip: use page allocation function provided by iommu-pages.h Date: Thu, 22 Feb 2024 17:39:33 +0000 [thread overview] Message-ID: <20240222173942.1481394-8-pasha.tatashin@soleen.com> (raw) In-Reply-To: <20240222173942.1481394-1-pasha.tatashin@soleen.com> Convert iommu/rockchip-iommu.c to use the new page allocation functions provided in iommu-pages.h. Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> Acked-by: David Rientjes <rientjes@google.com> Tested-by: Bagas Sanjaya <bagasdotme@gmail.com> --- drivers/iommu/rockchip-iommu.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 2685861c0a12..e04f22d481d0 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -26,6 +26,8 @@ #include <linux/slab.h> #include <linux/spinlock.h> +#include "iommu-pages.h" + /** MMU register offsets */ #define RK_MMU_DTE_ADDR 0x00 /* Directory table address */ #define RK_MMU_STATUS 0x04 @@ -727,14 +729,14 @@ static u32 *rk_dte_get_page_table(struct rk_iommu_domain *rk_domain, if (rk_dte_is_pt_valid(dte)) goto done; - page_table = (u32 *)get_zeroed_page(GFP_ATOMIC | rk_ops->gfp_flags); + page_table = iommu_alloc_page(GFP_ATOMIC | rk_ops->gfp_flags); if (!page_table) return ERR_PTR(-ENOMEM); pt_dma = dma_map_single(dma_dev, page_table, SPAGE_SIZE, DMA_TO_DEVICE); if (dma_mapping_error(dma_dev, pt_dma)) { dev_err(dma_dev, "DMA mapping error while allocating page table\n"); - free_page((unsigned long)page_table); + iommu_free_page(page_table); return ERR_PTR(-ENOMEM); } @@ -1061,7 +1063,7 @@ static struct iommu_domain *rk_iommu_domain_alloc_paging(struct device *dev) * Each level1 (dt) and level2 (pt) table has 1024 4-byte entries. * Allocate one 4 KiB page for each table. */ - rk_domain->dt = (u32 *)get_zeroed_page(GFP_KERNEL | rk_ops->gfp_flags); + rk_domain->dt = iommu_alloc_page(GFP_KERNEL | rk_ops->gfp_flags); if (!rk_domain->dt) goto err_free_domain; @@ -1083,7 +1085,7 @@ static struct iommu_domain *rk_iommu_domain_alloc_paging(struct device *dev) return &rk_domain->domain; err_free_dt: - free_page((unsigned long)rk_domain->dt); + iommu_free_page(rk_domain->dt); err_free_domain: kfree(rk_domain); @@ -1104,13 +1106,13 @@ static void rk_iommu_domain_free(struct iommu_domain *domain) u32 *page_table = phys_to_virt(pt_phys); dma_unmap_single(dma_dev, pt_phys, SPAGE_SIZE, DMA_TO_DEVICE); - free_page((unsigned long)page_table); + iommu_free_page(page_table); } } dma_unmap_single(dma_dev, rk_domain->dt_dma, SPAGE_SIZE, DMA_TO_DEVICE); - free_page((unsigned long)rk_domain->dt); + iommu_free_page(rk_domain->dt); kfree(rk_domain); } -- 2.44.0.rc0.258.g7320e95886-goog _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2024-02-22 17:39 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-02-22 17:39 [PATCH v5 00/11] IOMMU memory observability Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-02-22 17:39 ` [PATCH v5 01/11] iommu/vt-d: add wrapper functions for page allocations Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-04-04 12:16 ` Linu Cherian 2024-04-04 12:16 ` Linu Cherian 2024-04-04 13:56 ` Pasha Tatashin 2024-04-04 13:56 ` Pasha Tatashin 2024-04-08 2:17 ` Linu Cherian 2024-04-08 2:17 ` Linu Cherian 2024-02-22 17:39 ` [PATCH v5 02/11] iommu/dma: use iommu_put_pages_list() to releae freelist Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-03-15 21:28 ` David Rientjes 2024-03-15 21:28 ` David Rientjes 2024-02-22 17:39 ` [PATCH v5 03/11] iommu/amd: use page allocation function provided by iommu-pages.h Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-02-22 17:39 ` [PATCH v5 04/11] iommu/io-pgtable-arm: " Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-02-22 17:39 ` [PATCH v5 05/11] iommu/io-pgtable-dart: " Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-02-22 17:39 ` [PATCH v5 06/11] iommu/exynos: " Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin [this message] 2024-02-22 17:39 ` [PATCH v5 07/11] iommu/rockchip: " Pasha Tatashin 2024-02-22 17:39 ` [PATCH v5 08/11] iommu/sun50i: " Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-02-22 17:39 ` [PATCH v5 09/11] iommu/tegra-smmu: " Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-02-22 17:39 ` [PATCH v5 10/11] iommu: observability of the IOMMU allocations Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-02-22 17:39 ` [PATCH v5 11/11] iommu: account IOMMU allocated memory Pasha Tatashin 2024-02-22 17:39 ` Pasha Tatashin 2024-03-15 21:33 ` [PATCH v5 00/11] IOMMU memory observability David Rientjes 2024-03-15 21:33 ` David Rientjes 2024-03-15 21:53 ` Joerg Roedel 2024-03-15 21:53 ` Joerg Roedel 2024-04-03 13:18 ` Pasha Tatashin 2024-04-03 13:18 ` Pasha Tatashin 2024-04-04 0:58 ` Linu Cherian 2024-04-04 0:58 ` Linu Cherian 2024-04-04 13:50 ` Pasha Tatashin 2024-04-04 13:50 ` Pasha Tatashin 2024-04-12 10:10 ` Joerg Roedel 2024-04-12 10:10 ` Joerg Roedel 2024-04-12 17:06 ` Pasha Tatashin 2024-04-12 17:06 ` Pasha Tatashin
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=20240222173942.1481394-8-pasha.tatashin@soleen.com \ --to=pasha.tatashin@soleen.com \ --cc=akpm@linux-foundation.org \ --cc=alim.akhtar@samsung.com \ --cc=alyssa@rosenzweig.io \ --cc=asahi@lists.linux.dev \ --cc=bagasdotme@gmail.com \ --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=jernej.skrabec@gmail.com \ --cc=jonathanh@nvidia.com \ --cc=joro@8bytes.org \ --cc=krzysztof.kozlowski@linaro.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=mkoutny@suse.com \ --cc=paulmck@kernel.org \ --cc=rdunlap@infradead.org \ --cc=rientjes@google.com \ --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=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.