* + mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch added to -mm tree
@ 2021-05-12 23:44 akpm
0 siblings, 0 replies; 6+ messages in thread
From: akpm @ 2021-05-12 23:44 UTC (permalink / raw)
To: cl, guro, hannes, iamjoonsoo.kim, longman, mhocko, mm-commits,
penberg, rientjes, shakeelb, vbabka, vdavydov.dev
The patch titled
Subject: mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
has been added to the -mm tree. Its filename is
mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.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@redhat.com>
Subject: mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
It turns out that the previous patch doesn't work if CONFIG_ZONE_DMA isn't
defined.
Link: https://lkml.kernel.org/r/20210512145107.6208-1-longman@redhat.com
Signed-off-by: Waiman Long <longman@redhat.com>
Suggested-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Roman Gushchin <guro@fb.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/slab.h | 11 ++++++-----
mm/internal.h | 5 -----
mm/memcontrol.c | 2 +-
mm/slab_common.c | 9 ++-------
4 files changed, 9 insertions(+), 18 deletions(-)
--- a/include/linux/slab.h~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
+++ a/include/linux/slab.h
@@ -312,16 +312,17 @@ static inline void __check_heap_object(c
*/
enum kmalloc_cache_type {
KMALLOC_NORMAL = 0,
-#ifdef CONFIG_MEMCG_KMEM
- KMALLOC_CGROUP,
-#else
+#ifndef CONFIG_ZONE_DMA
+ KMALLOC_DMA = KMALLOC_NORMAL,
+#endif
+#ifndef CONFIG_MEMCG_KMEM
KMALLOC_CGROUP = KMALLOC_NORMAL,
+#else
+ KMALLOC_CGROUP,
#endif
KMALLOC_RECLAIM,
#ifdef CONFIG_ZONE_DMA
KMALLOC_DMA,
-#else
- KMALLOC_DMA = KMALLOC_NORMAL,
#endif
NR_KMALLOC_TYPES
};
--- a/mm/internal.h~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
+++ a/mm/internal.h
@@ -116,11 +116,6 @@ extern void putback_lru_page(struct page
extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
/*
- * in mm/memcontrol.c:
- */
-extern bool cgroup_memory_nokmem;
-
-/*
* in mm/page_alloc.c
*/
--- a/mm/memcontrol.c~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
+++ a/mm/memcontrol.c
@@ -83,7 +83,7 @@ DEFINE_PER_CPU(struct mem_cgroup *, int_
static bool cgroup_memory_nosocket;
/* Kernel memory accounting disabled? */
-bool cgroup_memory_nokmem;
+static bool cgroup_memory_nokmem;
/* Whether the swap controller is active */
#ifdef CONFIG_MEMCG_SWAP
--- a/mm/slab_common.c~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
+++ a/mm/slab_common.c
@@ -841,15 +841,10 @@ void __init setup_kmalloc_cache_index_ta
static void __init
new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags)
{
- if (type == KMALLOC_RECLAIM) {
+ if (type == KMALLOC_RECLAIM)
flags |= SLAB_RECLAIM_ACCOUNT;
- } else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP)) {
- if (cgroup_memory_nokmem) {
- kmalloc_caches[type][idx] = kmalloc_caches[KMALLOC_NORMAL][idx];
- return;
- }
+ else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP))
flags |= SLAB_ACCOUNT;
- }
kmalloc_caches[type][idx] = create_kmalloc_cache(
kmalloc_info[idx].name[type],
_
Patches currently in -mm which might be from longman@redhat.com are
mm-memcg-move-mod_objcg_state-to-memcontrolc.patch
mm-memcg-cache-vmstat-data-in-percpu-memcg_stock_pcp.patch
mm-memcg-improve-refill_obj_stock-performance.patch
mm-memcg-optimize-user-context-object-stock-access.patch
mm-memcg-slab-properly-set-up-gfp-flags-for-objcg-pointer-array.patch
mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches.patch
mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
mm-memcg-slab-disable-cache-merging-for-kmalloc_normal-caches.patch
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: + mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch added to -mm tree
2021-05-13 11:44 ` Vlastimil Babka
2021-05-13 13:47 ` Waiman Long
@ 2021-05-13 19:40 ` Andrew Morton
1 sibling, 0 replies; 6+ messages in thread
From: Andrew Morton @ 2021-05-13 19:40 UTC (permalink / raw)
To: Vlastimil Babka
Cc: cl, guro, hannes, iamjoonsoo.kim, longman, mhocko, mm-commits,
penberg, rientjes, sfr, shakeelb, vdavydov.dev
On Thu, 13 May 2021 13:44:29 +0200 Vlastimil Babka <vbabka@suse.cz> wrote:
> undoing
> mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-fix.patch
>
> I guess that wasn't intended?
oop, thanks, sorry, I must have messed up the turn-patch-into-fix-patch
thing.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: + mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch added to -mm tree
2021-05-13 11:44 ` Vlastimil Babka
@ 2021-05-13 13:47 ` Waiman Long
2021-05-13 19:40 ` Andrew Morton
1 sibling, 0 replies; 6+ messages in thread
From: Waiman Long @ 2021-05-13 13:47 UTC (permalink / raw)
To: Vlastimil Babka, akpm, cl, guro, hannes, iamjoonsoo.kim, mhocko,
mm-commits, penberg, rientjes, sfr, shakeelb, vdavydov.dev
On 5/13/21 7:44 AM, Vlastimil Babka wrote:
> On 5/13/21 2:33 AM, akpm@linux-foundation.org wrote:
>> --- a/mm/internal.h~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
>> +++ a/mm/internal.h
>> @@ -116,11 +116,6 @@ extern void putback_lru_page(struct page
>> extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
>>
>> /*
>> - * in mm/memcontrol.c:
>> - */
>> -extern bool cgroup_memory_nokmem;
>> -
>> -/*
> This...
>
>> * in mm/page_alloc.c
>> */
>>
>> --- a/mm/memcontrol.c~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
>> +++ a/mm/memcontrol.c
>> @@ -83,7 +83,7 @@ DEFINE_PER_CPU(struct mem_cgroup *, int_
>> static bool cgroup_memory_nosocket;
>>
>> /* Kernel memory accounting disabled? */
>> -bool cgroup_memory_nokmem;
>> +static bool cgroup_memory_nokmem;
> ...
>
>>
>> /* Whether the swap controller is active */
>> #ifdef CONFIG_MEMCG_SWAP
>> --- a/mm/slab_common.c~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
>> +++ a/mm/slab_common.c
>> @@ -841,15 +841,10 @@ void __init setup_kmalloc_cache_index_ta
>> static void __init
>> new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags)
>> {
>> - if (type == KMALLOC_RECLAIM) {
>> + if (type == KMALLOC_RECLAIM)
>> flags |= SLAB_RECLAIM_ACCOUNT;
>> - } else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP)) {
>> - if (cgroup_memory_nokmem) {
>> - kmalloc_caches[type][idx] = kmalloc_caches[KMALLOC_NORMAL][idx];
>> - return;
>> - }
> ... and this is undoing
> mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-fix.patch
>
> I guess that wasn't intended?
>
>> + else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP))
>> flags |= SLAB_ACCOUNT;
>> - }
>>
>> kmalloc_caches[type][idx] = create_kmalloc_cache(
>> kmalloc_info[idx].name[type],
>> _
>>
>> Patches currently in -mm which might be from longman@redhat.com are
>>
>> mm-memcg-move-mod_objcg_state-to-memcontrolc.patch
>> mm-memcg-cache-vmstat-data-in-percpu-memcg_stock_pcp.patch
>> mm-memcg-improve-refill_obj_stock-performance.patch
>> mm-memcg-optimize-user-context-object-stock-access.patch
>> mm-memcg-slab-properly-set-up-gfp-flags-for-objcg-pointer-array.patch
>> mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches.patch
>> mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
>> mm-memcg-slab-disable-cache-merging-for-kmalloc_normal-caches.patch
>>
I have the same question. Only the first hunk is relevant. The rests are
the revert of Vlastimil's patch.
Thanks,
Longman
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: + mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch added to -mm tree
2021-05-13 0:33 akpm
2021-05-13 1:20 ` Stephen Rothwell
@ 2021-05-13 11:44 ` Vlastimil Babka
2021-05-13 13:47 ` Waiman Long
2021-05-13 19:40 ` Andrew Morton
1 sibling, 2 replies; 6+ messages in thread
From: Vlastimil Babka @ 2021-05-13 11:44 UTC (permalink / raw)
To: akpm, cl, guro, hannes, iamjoonsoo.kim, longman, mhocko,
mm-commits, penberg, rientjes, sfr, shakeelb, vdavydov.dev
On 5/13/21 2:33 AM, akpm@linux-foundation.org wrote:
> --- a/mm/internal.h~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
> +++ a/mm/internal.h
> @@ -116,11 +116,6 @@ extern void putback_lru_page(struct page
> extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
>
> /*
> - * in mm/memcontrol.c:
> - */
> -extern bool cgroup_memory_nokmem;
> -
> -/*
This...
> * in mm/page_alloc.c
> */
>
> --- a/mm/memcontrol.c~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
> +++ a/mm/memcontrol.c
> @@ -83,7 +83,7 @@ DEFINE_PER_CPU(struct mem_cgroup *, int_
> static bool cgroup_memory_nosocket;
>
> /* Kernel memory accounting disabled? */
> -bool cgroup_memory_nokmem;
> +static bool cgroup_memory_nokmem;
...
>
> /* Whether the swap controller is active */
> #ifdef CONFIG_MEMCG_SWAP
> --- a/mm/slab_common.c~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
> +++ a/mm/slab_common.c
> @@ -841,15 +841,10 @@ void __init setup_kmalloc_cache_index_ta
> static void __init
> new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags)
> {
> - if (type == KMALLOC_RECLAIM) {
> + if (type == KMALLOC_RECLAIM)
> flags |= SLAB_RECLAIM_ACCOUNT;
> - } else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP)) {
> - if (cgroup_memory_nokmem) {
> - kmalloc_caches[type][idx] = kmalloc_caches[KMALLOC_NORMAL][idx];
> - return;
> - }
... and this is undoing
mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-fix.patch
I guess that wasn't intended?
> + else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP))
> flags |= SLAB_ACCOUNT;
> - }
>
> kmalloc_caches[type][idx] = create_kmalloc_cache(
> kmalloc_info[idx].name[type],
> _
>
> Patches currently in -mm which might be from longman@redhat.com are
>
> mm-memcg-move-mod_objcg_state-to-memcontrolc.patch
> mm-memcg-cache-vmstat-data-in-percpu-memcg_stock_pcp.patch
> mm-memcg-improve-refill_obj_stock-performance.patch
> mm-memcg-optimize-user-context-object-stock-access.patch
> mm-memcg-slab-properly-set-up-gfp-flags-for-objcg-pointer-array.patch
> mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches.patch
> mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
> mm-memcg-slab-disable-cache-merging-for-kmalloc_normal-caches.patch
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: + mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch added to -mm tree
2021-05-13 0:33 akpm
@ 2021-05-13 1:20 ` Stephen Rothwell
2021-05-13 11:44 ` Vlastimil Babka
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-05-13 1:20 UTC (permalink / raw)
To: akpm
Cc: cl, guro, hannes, iamjoonsoo.kim, longman, mhocko, mm-commits,
penberg, rientjes, shakeelb, vbabka, vdavydov.dev
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
Hi Andrew,
On Wed, 12 May 2021 17:33:26 -0700 akpm@linux-foundation.org wrote:
>
> The patch titled
> Subject: mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
> has been added to the -mm tree. Its filename is
> mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
Added to linux-next.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* + mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch added to -mm tree
@ 2021-05-13 0:33 akpm
2021-05-13 1:20 ` Stephen Rothwell
2021-05-13 11:44 ` Vlastimil Babka
0 siblings, 2 replies; 6+ messages in thread
From: akpm @ 2021-05-13 0:33 UTC (permalink / raw)
To: cl, guro, hannes, iamjoonsoo.kim, longman, mhocko, mm-commits,
penberg, rientjes, sfr, shakeelb, vbabka, vdavydov.dev
The patch titled
Subject: mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
has been added to the -mm tree. Its filename is
mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.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@redhat.com>
Subject: mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
It turns out that the previous patch doesn't work if CONFIG_ZONE_DMA isn't
defined.
Link: https://lkml.kernel.org/r/20210512145107.6208-1-longman@redhat.com
Signed-off-by: Waiman Long <longman@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/linux/slab.h | 11 ++++++-----
mm/internal.h | 5 -----
mm/memcontrol.c | 2 +-
mm/slab_common.c | 9 ++-------
4 files changed, 9 insertions(+), 18 deletions(-)
--- a/include/linux/slab.h~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
+++ a/include/linux/slab.h
@@ -312,16 +312,17 @@ static inline void __check_heap_object(c
*/
enum kmalloc_cache_type {
KMALLOC_NORMAL = 0,
-#ifdef CONFIG_MEMCG_KMEM
- KMALLOC_CGROUP,
-#else
+#ifndef CONFIG_ZONE_DMA
+ KMALLOC_DMA = KMALLOC_NORMAL,
+#endif
+#ifndef CONFIG_MEMCG_KMEM
KMALLOC_CGROUP = KMALLOC_NORMAL,
+#else
+ KMALLOC_CGROUP,
#endif
KMALLOC_RECLAIM,
#ifdef CONFIG_ZONE_DMA
KMALLOC_DMA,
-#else
- KMALLOC_DMA = KMALLOC_NORMAL,
#endif
NR_KMALLOC_TYPES
};
--- a/mm/internal.h~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
+++ a/mm/internal.h
@@ -116,11 +116,6 @@ extern void putback_lru_page(struct page
extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
/*
- * in mm/memcontrol.c:
- */
-extern bool cgroup_memory_nokmem;
-
-/*
* in mm/page_alloc.c
*/
--- a/mm/memcontrol.c~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
+++ a/mm/memcontrol.c
@@ -83,7 +83,7 @@ DEFINE_PER_CPU(struct mem_cgroup *, int_
static bool cgroup_memory_nosocket;
/* Kernel memory accounting disabled? */
-bool cgroup_memory_nokmem;
+static bool cgroup_memory_nokmem;
/* Whether the swap controller is active */
#ifdef CONFIG_MEMCG_SWAP
--- a/mm/slab_common.c~mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5
+++ a/mm/slab_common.c
@@ -841,15 +841,10 @@ void __init setup_kmalloc_cache_index_ta
static void __init
new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags)
{
- if (type == KMALLOC_RECLAIM) {
+ if (type == KMALLOC_RECLAIM)
flags |= SLAB_RECLAIM_ACCOUNT;
- } else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP)) {
- if (cgroup_memory_nokmem) {
- kmalloc_caches[type][idx] = kmalloc_caches[KMALLOC_NORMAL][idx];
- return;
- }
+ else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP))
flags |= SLAB_ACCOUNT;
- }
kmalloc_caches[type][idx] = create_kmalloc_cache(
kmalloc_info[idx].name[type],
_
Patches currently in -mm which might be from longman@redhat.com are
mm-memcg-move-mod_objcg_state-to-memcontrolc.patch
mm-memcg-cache-vmstat-data-in-percpu-memcg_stock_pcp.patch
mm-memcg-improve-refill_obj_stock-performance.patch
mm-memcg-optimize-user-context-object-stock-access.patch
mm-memcg-slab-properly-set-up-gfp-flags-for-objcg-pointer-array.patch
mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches.patch
mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch
mm-memcg-slab-disable-cache-merging-for-kmalloc_normal-caches.patch
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-13 19:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-12 23:44 + mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5.patch added to -mm tree akpm
2021-05-13 0:33 akpm
2021-05-13 1:20 ` Stephen Rothwell
2021-05-13 11:44 ` Vlastimil Babka
2021-05-13 13:47 ` Waiman Long
2021-05-13 19:40 ` Andrew Morton
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.