From: Roman Gushchin <guro@fb.com>
To: Mike Rapoport <rppt@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Borislav Petkov <bp@alien8.de>,
Catalin Marinas <catalin.marinas@arm.com>,
Christopher Lameter <cl@linux.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
David Hildenbrand <david@redhat.com>,
Elena Reshetova <elena.reshetova@intel.com>,
"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
James Bottomley <jejb@linux.ibm.com>,
"Kirill A. Shutemov" <kirill@shutemov.name>,
Matthew Wilcox <willy@infradead.org>,
Mark Rutland <mark.rutland@arm.com>,
Mike Rapoport <rppt@linux.ibm.com>,
Michael Kerrisk <mtk.manpages@gmail.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Peter Zijlstra <peterz@infradead.org>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
Shuah Khan <shuah@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Tycho Andersen <tycho@tycho.ws>, Will Deacon <will@kernel.org>,
linux-ap i@vger.kernel.org, linux-arch@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-nvdimm@lists.01.org, linux-riscv@lists.infradead.org,
x86@kernel.org
Subject: Re: [PATCH v9 6/9] secretmem: add memcg accounting
Date: Tue, 17 Nov 2020 11:33:58 -0800 [thread overview]
Message-ID: <20201117193358.GB109785@carbon.dhcp.thefacebook.com> (raw)
In-Reply-To: <20201117162932.13649-7-rppt@kernel.org>
On Tue, Nov 17, 2020 at 06:29:29PM +0200, Mike Rapoport wrote:
> From: Mike Rapoport <rppt@linux.ibm.com>
>
> Account memory consumed by secretmem to memcg. The accounting is updated
> when the memory is actually allocated and freed.
>
> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Hi Mike!
I like this version so much more, thank you for fixing it.
Please, feel free to add
Acked-by: Roman Gushchin <guro@fb.com> .
Thanks!
> ---
> mm/filemap.c | 3 ++-
> mm/secretmem.c | 36 +++++++++++++++++++++++++++++++++++-
> 2 files changed, 37 insertions(+), 2 deletions(-)
>
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 249cf489f5df..cf7f1dc9f4b8 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -42,6 +42,7 @@
> #include <linux/psi.h>
> #include <linux/ramfs.h>
> #include <linux/page_idle.h>
> +#include <linux/secretmem.h>
> #include "internal.h"
>
> #define CREATE_TRACE_POINTS
> @@ -844,7 +845,7 @@ static noinline int __add_to_page_cache_locked(struct page *page,
> page->mapping = mapping;
> page->index = offset;
>
> - if (!huge) {
> + if (!huge && !page_is_secretmem(page)) {
> error = mem_cgroup_charge(page, current->mm, gfp);
> if (error)
> goto error;
> diff --git a/mm/secretmem.c b/mm/secretmem.c
> index d4c44fc568a4..abf6ecdf70cb 100644
> --- a/mm/secretmem.c
> +++ b/mm/secretmem.c
> @@ -18,6 +18,7 @@
> #include <linux/memblock.h>
> #include <linux/pseudo_fs.h>
> #include <linux/secretmem.h>
> +#include <linux/memcontrol.h>
> #include <linux/set_memory.h>
> #include <linux/sched/signal.h>
>
> @@ -50,6 +51,32 @@ struct secretmem_ctx {
>
> static struct cma *secretmem_cma;
>
> +static int secretmem_account_pages(struct page *page, gfp_t gfp, int order)
> +{
> + int err;
> +
> + err = memcg_kmem_charge_page(page, gfp, order);
> + if (err)
> + return err;
> +
> + /*
> + * seceremem caches are unreclaimable kernel allocations, so treat
^^^^^^^^^
secretmem?
> + * them as unreclaimable slab memory for VM statistics purposes
> + */
> + mod_node_page_state(page_pgdat(page), NR_SLAB_UNRECLAIMABLE_B,
> + PAGE_SIZE << order);
> +
> + return 0;
> +}
> +
> +static void secretmem_unaccount_pages(struct page *page, int order)
> +{
> +
> + mod_node_page_state(page_pgdat(page), NR_SLAB_UNRECLAIMABLE_B,
> + -PAGE_SIZE << order);
> + memcg_kmem_uncharge_page(page, order);
> +}
> +
> static int secretmem_pool_increase(struct secretmem_ctx *ctx, gfp_t gfp)
> {
> unsigned long nr_pages = (1 << PMD_PAGE_ORDER);
> @@ -62,10 +89,14 @@ static int secretmem_pool_increase(struct secretmem_ctx *ctx, gfp_t gfp)
> if (!page)
> return -ENOMEM;
>
> - err = set_direct_map_invalid_noflush(page, nr_pages);
> + err = secretmem_account_pages(page, gfp, PMD_PAGE_ORDER);
> if (err)
> goto err_cma_release;
>
> + err = set_direct_map_invalid_noflush(page, nr_pages);
> + if (err)
> + goto err_memcg_uncharge;
> +
> addr = (unsigned long)page_address(page);
> err = gen_pool_add(pool, addr, PMD_SIZE, NUMA_NO_NODE);
> if (err)
> @@ -82,6 +113,8 @@ static int secretmem_pool_increase(struct secretmem_ctx *ctx, gfp_t gfp)
> * won't fail
> */
> set_direct_map_default_noflush(page, nr_pages);
> +err_memcg_uncharge:
> + secretmem_unaccount_pages(page, PMD_PAGE_ORDER);
> err_cma_release:
> cma_release(secretmem_cma, page, nr_pages);
> return err;
> @@ -312,6 +345,7 @@ static void secretmem_cleanup_chunk(struct gen_pool *pool,
> int i;
>
> set_direct_map_default_noflush(page, nr_pages);
> + secretmem_unaccount_pages(page, PMD_PAGE_ORDER);
>
> for (i = 0; i < nr_pages; i++)
> clear_highpage(page + i);
> --
> 2.28.0
>
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
next prev parent reply other threads:[~2020-11-17 19:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-17 16:29 [PATCH v9 0/9] mm: introduce memfd_secret system call to create "secret" memory areas Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 1/9] mm: add definition of PMD_PAGE_ORDER Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 2/9] mmap: make mlock_future_check() global Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 3/9] set_memory: allow set_direct_map_*_noflush() for multiple pages Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 4/9] mm: introduce memfd_secret system call to create "secret" memory areas Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 5/9] secretmem: use PMD-size pages to amortize direct map fragmentation Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 6/9] secretmem: add memcg accounting Mike Rapoport
2020-11-17 19:33 ` Roman Gushchin [this message]
2020-11-17 20:02 ` Shakeel Butt
2020-11-18 6:55 ` Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 7/9] PM: hibernate: disable when there are active secretmem users Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 8/9] arch, mm: wire up memfd_secret system call were relevant Mike Rapoport
2020-11-17 17:15 ` Catalin Marinas
2020-11-18 6:57 ` Mike Rapoport
2020-11-17 16:29 ` [PATCH v9 9/9] secretmem: test: add basic selftest for memfd_secret(2) Mike Rapoport
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=20201117193358.GB109785@carbon.dhcp.thefacebook.com \
--to=guro@fb.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=elena.reshetova@intel.com \
--cc=hpa@zytor.com \
--cc=jejb@linux.ibm.com \
--cc=kirill@shutemov.name \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=mtk.manpages@gmail.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=peterz@infradead.org \
--cc=rick.p.edgecombe@intel.com \
--cc=rppt@kernel.org \
--cc=rppt@linux.ibm.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=tycho@tycho.ws \
--cc=viro@zeniv.linux.org.uk \
--cc=will@kernel.org \
--cc=willy@infradead.org \
/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: link
Be 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).