On 5/13/21 2:33 AM, akpm@xxxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxx 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
>
