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 Subject: [PATCH v3 10/10] iommu: account IOMMU allocated memory Date: Tue, 26 Dec 2023 20:02:05 +0000 [thread overview] Message-ID: <20231226200205.562565-11-pasha.tatashin@soleen.com> (raw) In-Reply-To: <20231226200205.562565-1-pasha.tatashin@soleen.com> In order to be able to limit the amount of memory that is allocated by IOMMU subsystem, the memory must be accounted. Account IOMMU as part of the secondary pagetables as it was discussed at LPC. The value of SecPageTables now contains mmeory allocation by IOMMU and KVM. Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> --- Documentation/admin-guide/cgroup-v2.rst | 2 +- Documentation/filesystems/proc.rst | 4 ++-- drivers/iommu/iommu-pages.h | 2 ++ include/linux/mmzone.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index 3f85254f3cef..e004e05a7cde 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1418,7 +1418,7 @@ PAGE_SIZE multiple when read back. sec_pagetables Amount of memory allocated for secondary page tables, this currently includes KVM mmu allocations on x86 - and arm64. + and arm64 and IOMMU page tables. percpu (npn) Amount of memory used for storing per-cpu kernel diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 49ef12df631b..86f137a9b66b 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -1110,8 +1110,8 @@ KernelStack PageTables Memory consumed by userspace page tables SecPageTables - Memory consumed by secondary page tables, this currently - currently includes KVM mmu allocations on x86 and arm64. + Memory consumed by secondary page tables, this currently includes + KVM mmu and IOMMU allocations on x86 and arm64. NFS_Unstable Always zero. Previous counted pages which had been written to the server, but has not been committed to stable storage. diff --git a/drivers/iommu/iommu-pages.h b/drivers/iommu/iommu-pages.h index 4e70cdf7acac..b4289d577e2c 100644 --- a/drivers/iommu/iommu-pages.h +++ b/drivers/iommu/iommu-pages.h @@ -27,6 +27,7 @@ static inline void __iommu_alloc_account(struct page *page, int order) const long pgcnt = 1l << order; mod_node_page_state(page_pgdat(page), NR_IOMMU_PAGES, pgcnt); + mod_lruvec_page_state(page, NR_SECONDARY_PAGETABLE, pgcnt); } /** @@ -39,6 +40,7 @@ static inline void __iommu_free_account(struct page *page, int order) const long pgcnt = 1l << order; mod_node_page_state(page_pgdat(page), NR_IOMMU_PAGES, -pgcnt); + mod_lruvec_page_state(page, NR_SECONDARY_PAGETABLE, -pgcnt); } /** diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index f0b54c752e22..da68f9977206 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -199,7 +199,7 @@ enum node_stat_item { NR_KERNEL_SCS_KB, /* measured in KiB */ #endif NR_PAGETABLE, /* used for pagetables */ - NR_SECONDARY_PAGETABLE, /* secondary pagetables, e.g. KVM pagetables */ + NR_SECONDARY_PAGETABLE, /* secondary pagetables, KVM & IOMMU */ #ifdef CONFIG_IOMMU_SUPPORT NR_IOMMU_PAGES, /* # of pages allocated by IOMMU */ #endif -- 2.43.0.472.g3155946c3a-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 Subject: [PATCH v3 10/10] iommu: account IOMMU allocated memory Date: Tue, 26 Dec 2023 20:02:05 +0000 [thread overview] Message-ID: <20231226200205.562565-11-pasha.tatashin@soleen.com> (raw) In-Reply-To: <20231226200205.562565-1-pasha.tatashin@soleen.com> In order to be able to limit the amount of memory that is allocated by IOMMU subsystem, the memory must be accounted. Account IOMMU as part of the secondary pagetables as it was discussed at LPC. The value of SecPageTables now contains mmeory allocation by IOMMU and KVM. Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> --- Documentation/admin-guide/cgroup-v2.rst | 2 +- Documentation/filesystems/proc.rst | 4 ++-- drivers/iommu/iommu-pages.h | 2 ++ include/linux/mmzone.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst index 3f85254f3cef..e004e05a7cde 100644 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@ -1418,7 +1418,7 @@ PAGE_SIZE multiple when read back. sec_pagetables Amount of memory allocated for secondary page tables, this currently includes KVM mmu allocations on x86 - and arm64. + and arm64 and IOMMU page tables. percpu (npn) Amount of memory used for storing per-cpu kernel diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 49ef12df631b..86f137a9b66b 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -1110,8 +1110,8 @@ KernelStack PageTables Memory consumed by userspace page tables SecPageTables - Memory consumed by secondary page tables, this currently - currently includes KVM mmu allocations on x86 and arm64. + Memory consumed by secondary page tables, this currently includes + KVM mmu and IOMMU allocations on x86 and arm64. NFS_Unstable Always zero. Previous counted pages which had been written to the server, but has not been committed to stable storage. diff --git a/drivers/iommu/iommu-pages.h b/drivers/iommu/iommu-pages.h index 4e70cdf7acac..b4289d577e2c 100644 --- a/drivers/iommu/iommu-pages.h +++ b/drivers/iommu/iommu-pages.h @@ -27,6 +27,7 @@ static inline void __iommu_alloc_account(struct page *page, int order) const long pgcnt = 1l << order; mod_node_page_state(page_pgdat(page), NR_IOMMU_PAGES, pgcnt); + mod_lruvec_page_state(page, NR_SECONDARY_PAGETABLE, pgcnt); } /** @@ -39,6 +40,7 @@ static inline void __iommu_free_account(struct page *page, int order) const long pgcnt = 1l << order; mod_node_page_state(page_pgdat(page), NR_IOMMU_PAGES, -pgcnt); + mod_lruvec_page_state(page, NR_SECONDARY_PAGETABLE, -pgcnt); } /** diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index f0b54c752e22..da68f9977206 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -199,7 +199,7 @@ enum node_stat_item { NR_KERNEL_SCS_KB, /* measured in KiB */ #endif NR_PAGETABLE, /* used for pagetables */ - NR_SECONDARY_PAGETABLE, /* secondary pagetables, e.g. KVM pagetables */ + NR_SECONDARY_PAGETABLE, /* secondary pagetables, KVM & IOMMU */ #ifdef CONFIG_IOMMU_SUPPORT NR_IOMMU_PAGES, /* # of pages allocated by IOMMU */ #endif -- 2.43.0.472.g3155946c3a-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-12-26 20:02 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-12-26 20:01 [PATCH v3 00/10] IOMMU memory observability Pasha Tatashin 2023-12-26 20:01 ` Pasha Tatashin 2023-12-26 20:01 ` [PATCH v3 01/10] iommu/vt-d: add wrapper functions for page allocations Pasha Tatashin 2023-12-26 20:01 ` Pasha Tatashin 2023-12-27 0:27 ` David Rientjes 2023-12-27 0:27 ` David Rientjes 2023-12-26 20:01 ` [PATCH v3 02/10] iommu/amd: use page allocation function provided by iommu-pages.h Pasha Tatashin 2023-12-26 20:01 ` Pasha Tatashin 2023-12-26 20:01 ` [PATCH v3 03/10] iommu/io-pgtable-arm: " Pasha Tatashin 2023-12-26 20:01 ` Pasha Tatashin 2023-12-26 20:01 ` [PATCH v3 04/10] iommu/io-pgtable-dart: " Pasha Tatashin 2023-12-26 20:01 ` Pasha Tatashin 2023-12-26 20:02 ` [PATCH v3 05/10] iommu/exynos: " Pasha Tatashin 2023-12-26 20:02 ` Pasha Tatashin 2023-12-26 20:02 ` [PATCH v3 06/10] iommu/rockchip: " Pasha Tatashin 2023-12-26 20:02 ` Pasha Tatashin 2023-12-26 20:02 ` [PATCH v3 07/10] iommu/sun50i: " Pasha Tatashin 2023-12-26 20:02 ` Pasha Tatashin 2023-12-26 20:02 ` [PATCH v3 08/10] iommu/tegra-smmu: " Pasha Tatashin 2023-12-26 20:02 ` Pasha Tatashin 2024-01-05 8:20 ` Thierry Reding 2024-01-05 8:20 ` Thierry Reding 2023-12-26 20:02 ` [PATCH v3 09/10] iommu: observability of the IOMMU allocations Pasha Tatashin 2023-12-26 20:02 ` Pasha Tatashin 2023-12-26 20:02 ` Pasha Tatashin [this message] 2023-12-26 20:02 ` [PATCH v3 10/10] iommu: account IOMMU allocated memory Pasha Tatashin 2023-12-27 0:25 ` David Rientjes 2023-12-27 0:25 ` David Rientjes 2024-02-13 13:12 ` Will Deacon 2024-02-13 13:12 ` Will Deacon 2024-02-13 15:44 ` Pasha Tatashin 2024-02-13 15:44 ` Pasha Tatashin 2024-02-16 17:57 ` Will Deacon 2024-02-16 17:57 ` Will Deacon 2024-02-16 19:48 ` Pasha Tatashin 2024-02-16 19:48 ` Pasha Tatashin 2024-02-21 13:29 ` Will Deacon 2024-02-21 13:29 ` Will Deacon 2024-02-22 0:21 ` Jason Gunthorpe 2024-02-22 0:21 ` Jason Gunthorpe 2024-02-22 0:27 ` Pasha Tatashin 2024-02-22 0:27 ` Pasha Tatashin 2023-12-27 10:05 ` [PATCH v3 00/10] IOMMU memory observability Bagas Sanjaya 2023-12-27 10:05 ` Bagas Sanjaya 2023-12-28 14:36 ` Pasha Tatashin 2023-12-28 14:36 ` Pasha Tatashin 2024-01-04 15:31 ` Michal Koutný 2024-01-04 15:31 ` Michal Koutný 2024-01-04 16:29 ` Pasha Tatashin 2024-01-04 16:29 ` Pasha Tatashin 2024-01-04 17:04 ` Michal Koutný 2024-01-04 17:04 ` Michal Koutný 2024-01-04 19:12 ` Pasha Tatashin 2024-01-04 19:12 ` Pasha Tatashin 2024-01-05 9:02 ` Michal Koutný 2024-01-05 9:02 ` Michal Koutný 2024-01-05 15:33 ` Pasha Tatashin 2024-01-05 15:33 ` 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=20231226200205.562565-11-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=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=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.