+ mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2.patch added to -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2
has been added to the -mm tree.  Its filename is
     mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Waiman Long <longman@xxxxxxxxxx>
Subject: mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2

set the flag in the common code as suggested by Roman

Link: http://lkml.kernel.org/r/20190627184324.5875-1-longman@xxxxxxxxxx
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
Reviewed-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Acked-by: Roman Gushchin <guro@xxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/slab.c        |    1 -
 mm/slab_common.c |    1 +
 mm/slub.c        |    1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

--- a/mm/slab.c~mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2
+++ a/mm/slab.c
@@ -2237,7 +2237,6 @@ int __kmem_cache_shrink(struct kmem_cach
 #ifdef CONFIG_MEMCG
 void __kmemcg_cache_deactivate(struct kmem_cache *cachep)
 {
-	cachep->flags |= SLAB_DEACTIVATED;
 	__kmem_cache_shrink(cachep);
 }
 
--- a/mm/slab_common.c~mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2
+++ a/mm/slab_common.c
@@ -771,6 +771,7 @@ static void kmemcg_cache_deactivate(stru
 		return;
 
 	__kmemcg_cache_deactivate(s);
+	s->flags |= SLAB_DEACTIVATED;
 
 	/*
 	 * memcg_kmem_wq_lock is used to synchronize memcg_params.dying
--- a/mm/slub.c~mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2
+++ a/mm/slub.c
@@ -4024,7 +4024,6 @@ void __kmemcg_cache_deactivate(struct km
 	 */
 	slub_set_cpu_partial(s, 0);
 	s->min_partial = 0;
-	s->flags |= SLAB_DEACTIVATED;
 }
 #endif	/* CONFIG_MEMCG */
 
_

Patches currently in -mm which might be from longman@xxxxxxxxxx are

mm-memcg-add-a-memcg_slabinfo-debugfs-file.patch
mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo.patch
mm-memcg-add-deact-tag-for-reparented-kmem-caches-in-memcg_slabinfo-v2.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux