From: Waiman Long <longman@redhat.com>
To: Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Vladimir Davydov <vdavydov.dev@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
David Rientjes <rientjes@google.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Vlastimil Babka <vbabka@suse.cz>, Roman Gushchin <guro@fb.com>,
Shakeel Butt <shakeelb@google.com>
Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org,
linux-mm@kvack.org, Waiman Long <longman@redhat.com>
Subject: [PATCH v4 3/3] mm: memcg/slab: Disable cache merging for KMALLOC_NORMAL caches
Date: Wed, 5 May 2021 16:06:10 -0400 [thread overview]
Message-ID: <20210505200610.13943-4-longman@redhat.com> (raw)
In-Reply-To: <20210505200610.13943-1-longman@redhat.com>
The KMALLOC_NORMAL (kmalloc-<n>) caches are for unaccounted objects only
when CONFIG_MEMCG_KMEM is enabled. To make sure that this condition
remains true, we will have to prevent KMALOC_NORMAL caches to merge
with other kmem caches. This is now done by setting its refcount to -1
right after its creation.
Suggested-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Waiman Long <longman@redhat.com>
---
mm/slab_common.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/mm/slab_common.c b/mm/slab_common.c
index bbaf41a7c77e..a0ff8e1d8b67 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -841,6 +841,13 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags)
kmalloc_info[idx].name[type],
kmalloc_info[idx].size, flags, 0,
kmalloc_info[idx].size);
+
+ /*
+ * If CONFIG_MEMCG_KMEM is enabled, disable cache merging for
+ * KMALLOC_NORMAL caches.
+ */
+ if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_NORMAL))
+ kmalloc_caches[type][idx]->refcount = -1;
}
/*
--
2.18.1
next prev parent reply other threads:[~2021-05-05 20:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 20:06 [PATCH v4 0/3] mm: memcg/slab: Fix objcg pointer array handling problem Waiman Long
2021-05-05 20:06 ` [PATCH v4 1/3] mm: memcg/slab: Properly set up gfp flags for objcg pointer array Waiman Long
2021-05-05 20:35 ` Roman Gushchin
2021-05-06 15:37 ` Vlastimil Babka
2021-05-05 20:06 ` [PATCH v4 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches Waiman Long
2021-05-05 20:37 ` Roman Gushchin
2021-05-05 21:41 ` Vlastimil Babka
2021-05-05 23:19 ` Waiman Long
2021-05-06 16:00 ` Vlastimil Babka
2021-05-06 16:07 ` Shakeel Butt
2021-05-06 19:30 ` Roman Gushchin
2021-05-07 18:45 ` Waiman Long
2021-05-05 20:06 ` Waiman Long [this message]
2021-05-05 20:38 ` [PATCH v4 3/3] mm: memcg/slab: Disable cache merging for KMALLOC_NORMAL caches Roman Gushchin
2021-05-05 20:39 ` Shakeel Butt
2021-05-06 16:02 ` Vlastimil Babka
2021-05-12 14:51 ` [PATCH v5 2/3] mm: memcg/slab: Create a new set of kmalloc-cg-<n> caches Waiman Long
2021-05-12 14:54 ` Waiman Long
2021-05-13 0:32 ` Andrew Morton
2021-05-13 8:40 ` Vlastimil Babka
2021-05-13 16:22 ` Waiman Long
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=20210505200610.13943-4-longman@redhat.com \
--to=longman@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=cl@linux.com \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=iamjoonsoo.kim@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
--cc=shakeelb@google.com \
--cc=vbabka@suse.cz \
--cc=vdavydov.dev@gmail.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: 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).