From: Vlastimil Babka <vbabka@suse.cz> To: Waiman Long <longman@redhat.com>, 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>, Roman Gushchin <guro@fb.com>, Shakeel Butt <shakeelb@google.com> Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v4 1/3] mm: memcg/slab: Properly set up gfp flags for objcg pointer array Date: Thu, 6 May 2021 17:37:24 +0200 [thread overview] Message-ID: <46fb83c8-d875-9f85-da2c-ac2ba4847c07@suse.cz> (raw) In-Reply-To: <20210505200610.13943-2-longman@redhat.com> On 5/5/21 10:06 PM, Waiman Long wrote: > Since the merging of the new slab memory controller in v5.9, the page > structure may store a pointer to obj_cgroup pointer array for slab pages. > Currently, only the __GFP_ACCOUNT bit is masked off. However, the array > is not readily reclaimable and doesn't need to come from the DMA buffer. > So those GFP bits should be masked off as well. > > Do the flag bit clearing at memcg_alloc_page_obj_cgroups() to make sure > that it is consistently applied no matter where it is called. > > Fixes: 286e04b8ed7a ("mm: memcg/slab: allocate obj_cgroups for non-root slab pages") > Signed-off-by: Waiman Long <longman@redhat.com> > Reviewed-by: Shakeel Butt <shakeelb@google.com> Reviewed-by: Vlastimil Babka <vbabka@suse.cz> > --- > mm/memcontrol.c | 8 ++++++++ > mm/slab.h | 1 - > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index c100265dc393..5e3b4f23b830 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2863,6 +2863,13 @@ static struct mem_cgroup *get_mem_cgroup_from_objcg(struct obj_cgroup *objcg) > } > > #ifdef CONFIG_MEMCG_KMEM > +/* > + * The allocated objcg pointers array is not accounted directly. > + * Moreover, it should not come from DMA buffer and is not readily > + * reclaimable. So those GFP bits should be masked off. > + */ > +#define OBJCGS_CLEAR_MASK (__GFP_DMA | __GFP_RECLAIMABLE | __GFP_ACCOUNT) > + > int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s, > gfp_t gfp, bool new_page) > { > @@ -2870,6 +2877,7 @@ int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s, > unsigned long memcg_data; > void *vec; > > + gfp &= ~OBJCGS_CLEAR_MASK; > vec = kcalloc_node(objects, sizeof(struct obj_cgroup *), gfp, > page_to_nid(page)); > if (!vec) > diff --git a/mm/slab.h b/mm/slab.h > index 18c1927cd196..b3294712a686 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -309,7 +309,6 @@ static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s, > if (!memcg_kmem_enabled() || !objcg) > return; > > - flags &= ~__GFP_ACCOUNT; > for (i = 0; i < size; i++) { > if (likely(p[i])) { > page = virt_to_head_page(p[i]); >
WARNING: multiple messages have this Message-ID (diff)
From: Vlastimil Babka <vbabka-AlSwsSmVLrQ@public.gmane.org> To: Waiman Long <longman-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>, Michal Hocko <mhocko-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Vladimir Davydov <vdavydov.dev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>, Christoph Lameter <cl-vYTEC60ixJUAvxtiuMwx3w@public.gmane.org>, Pekka Enberg <penberg-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, David Rientjes <rientjes-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>, Joonsoo Kim <iamjoonsoo.kim-Hm3cg6mZ9cc@public.gmane.org>, Roman Gushchin <guro-b10kYP2dOMg@public.gmane.org>, Shakeel Butt <shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org Subject: Re: [PATCH v4 1/3] mm: memcg/slab: Properly set up gfp flags for objcg pointer array Date: Thu, 6 May 2021 17:37:24 +0200 [thread overview] Message-ID: <46fb83c8-d875-9f85-da2c-ac2ba4847c07@suse.cz> (raw) In-Reply-To: <20210505200610.13943-2-longman-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> On 5/5/21 10:06 PM, Waiman Long wrote: > Since the merging of the new slab memory controller in v5.9, the page > structure may store a pointer to obj_cgroup pointer array for slab pages. > Currently, only the __GFP_ACCOUNT bit is masked off. However, the array > is not readily reclaimable and doesn't need to come from the DMA buffer. > So those GFP bits should be masked off as well. > > Do the flag bit clearing at memcg_alloc_page_obj_cgroups() to make sure > that it is consistently applied no matter where it is called. > > Fixes: 286e04b8ed7a ("mm: memcg/slab: allocate obj_cgroups for non-root slab pages") > Signed-off-by: Waiman Long <longman-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > Reviewed-by: Shakeel Butt <shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> Reviewed-by: Vlastimil Babka <vbabka-AlSwsSmVLrQ@public.gmane.org> > --- > mm/memcontrol.c | 8 ++++++++ > mm/slab.h | 1 - > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index c100265dc393..5e3b4f23b830 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2863,6 +2863,13 @@ static struct mem_cgroup *get_mem_cgroup_from_objcg(struct obj_cgroup *objcg) > } > > #ifdef CONFIG_MEMCG_KMEM > +/* > + * The allocated objcg pointers array is not accounted directly. > + * Moreover, it should not come from DMA buffer and is not readily > + * reclaimable. So those GFP bits should be masked off. > + */ > +#define OBJCGS_CLEAR_MASK (__GFP_DMA | __GFP_RECLAIMABLE | __GFP_ACCOUNT) > + > int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s, > gfp_t gfp, bool new_page) > { > @@ -2870,6 +2877,7 @@ int memcg_alloc_page_obj_cgroups(struct page *page, struct kmem_cache *s, > unsigned long memcg_data; > void *vec; > > + gfp &= ~OBJCGS_CLEAR_MASK; > vec = kcalloc_node(objects, sizeof(struct obj_cgroup *), gfp, > page_to_nid(page)); > if (!vec) > diff --git a/mm/slab.h b/mm/slab.h > index 18c1927cd196..b3294712a686 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -309,7 +309,6 @@ static inline void memcg_slab_post_alloc_hook(struct kmem_cache *s, > if (!memcg_kmem_enabled() || !objcg) > return; > > - flags &= ~__GFP_ACCOUNT; > for (i = 0; i < size; i++) { > if (likely(p[i])) { > page = virt_to_head_page(p[i]); >
next prev parent reply other threads:[~2021-05-06 15:39 UTC|newest] Thread overview: 41+ 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-05 20:35 ` Roman Gushchin 2021-05-06 15:37 ` Vlastimil Babka [this message] 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:06 ` Waiman Long 2021-05-05 20:37 ` Roman Gushchin 2021-05-05 20:37 ` Roman Gushchin 2021-05-05 21:41 ` Vlastimil Babka 2021-05-05 23:19 ` Waiman Long 2021-05-05 23:19 ` Waiman Long 2021-05-06 16:00 ` Vlastimil Babka 2021-05-06 16:00 ` Vlastimil Babka 2021-05-06 16:07 ` Shakeel Butt 2021-05-06 16:07 ` Shakeel Butt 2021-05-06 16:07 ` Shakeel Butt 2021-05-06 19:30 ` Roman Gushchin 2021-05-06 19:30 ` Roman Gushchin 2021-05-07 18:45 ` Waiman Long 2021-05-07 18:45 ` Waiman Long 2021-05-05 20:06 ` [PATCH v4 3/3] mm: memcg/slab: Disable cache merging for KMALLOC_NORMAL caches Waiman Long 2021-05-05 20:06 ` Waiman Long 2021-05-05 20:38 ` Roman Gushchin 2021-05-05 20:38 ` Roman Gushchin 2021-05-05 20:39 ` Shakeel Butt 2021-05-05 20:39 ` Shakeel Butt 2021-05-05 20:39 ` Shakeel Butt 2021-05-06 16:02 ` Vlastimil Babka 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:51 ` Waiman Long 2021-05-12 14:54 ` Waiman Long 2021-05-12 14:54 ` Waiman Long 2021-05-13 0:32 ` Andrew Morton 2021-05-13 0:32 ` Andrew Morton 2021-05-13 8:40 ` Vlastimil Babka 2021-05-13 8:40 ` Vlastimil Babka 2021-05-13 16:22 ` Waiman Long 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=46fb83c8-d875-9f85-da2c-ac2ba4847c07@suse.cz \ --to=vbabka@suse.cz \ --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=longman@redhat.com \ --cc=mhocko@kernel.org \ --cc=penberg@kernel.org \ --cc=rientjes@google.com \ --cc=shakeelb@google.com \ --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: 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.