Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 12 May 2021 17:32:12 -0700
From:   Andrew Morton <akpm@linux-foundation.org>
To:     Waiman Long <llong@redhat.com>
Cc:     Johannes Weiner <hannes@cmpxchg.org>,
        Michal Hocko <mhocko@kernel.org>,
        Vladimir Davydov <vdavydov.dev@gmail.com>,
        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>,
        linux-kernel@vger.kernel.org, cgroups@vger.kernel.org,
        linux-mm@kvack.org
Subject: Re: [PATCH v5 2/3] mm: memcg/slab: Create a new set of
 kmalloc-cg-<n> caches
Message-Id: <20210512173212.738f592c36bf0e4c205f628e@linux-foundation.org>
In-Reply-To: <0919aaab-cc08-f86d-1f9a-8ddfeed7bb31@redhat.com>
References: <20210505200610.13943-1-longman@redhat.com>
        <20210512145107.6208-1-longman@redhat.com>
        <0919aaab-cc08-f86d-1f9a-8ddfeed7bb31@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, 12 May 2021 10:54:19 -0400 Waiman Long <llong@redhat.com> wrote:

> >   include/linux/slab.h | 42 +++++++++++++++++++++++++++++++++---------
> >   mm/slab_common.c     | 25 +++++++++++++++++--------
> >   2 files changed, 50 insertions(+), 17 deletions(-)
>=20
> The following are the diff's from previous version. It turns out that=20
> the previous patch doesn't work if CONFIG_ZONE_DMA isn't defined.
>=20
> diff --git a/include/linux/slab.h b/include/linux/slab.h
> index a51cad5f561c..aa7f6c222a60 100644
> --- a/include/linux/slab.h
> +++ b/include/linux/slab.h
> @@ -312,16 +312,17 @@ static inline void __check_heap_object(const void=20
> *ptr, un
> signed long n,
>  =A0 */
>  =A0enum kmalloc_cache_type {
>  =A0=A0=A0=A0 KMALLOC_NORMAL =3D 0,
> -#ifdef CONFIG_MEMCG_KMEM
> -=A0=A0=A0 KMALLOC_CGROUP,
> -#else
> +#ifndef CONFIG_ZONE_DMA
> +=A0=A0=A0 KMALLOC_DMA =3D KMALLOC_NORMAL,
> +#endif
> +#ifndef CONFIG_MEMCG_KMEM
>  =A0=A0=A0=A0 KMALLOC_CGROUP =3D KMALLOC_NORMAL,
> +#else
> +=A0=A0=A0 KMALLOC_CGROUP,
>  =A0#endif
>  =A0=A0=A0=A0 KMALLOC_RECLAIM,
>  =A0#ifdef CONFIG_ZONE_DMA
>  =A0=A0=A0=A0 KMALLOC_DMA,
> -#else
> -=A0=A0=A0 KMALLOC_DMA =3D KMALLOC_NORMAL,
>  =A0#endif
>  =A0=A0=A0=A0 NR_KMALLOC_TYPES
>  =A0};

I assume this fixes
https://lkml.kernel.org/r/20210512152806.2492ca42@canb.auug.org.au?