From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id AC4BDC433B4
	for <linux-kernel@archiver.kernel.org>; Thu, 13 May 2021 00:36:26 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 7CF60613EE
	for <linux-kernel@archiver.kernel.org>; Thu, 13 May 2021 00:36:26 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S234750AbhEMAhJ (ORCPT <rfc822;linux-kernel@archiver.kernel.org>);
        Wed, 12 May 2021 20:37:09 -0400
Received: from mail.kernel.org ([198.145.29.99]:44716 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S230363AbhEMAd0 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 12 May 2021 20:33:26 -0400
Received: by mail.kernel.org (Postfix) with ESMTPSA id 4E923613DF;
        Thu, 13 May 2021 00:32:13 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org;
        s=korg; t=1620865933;
        bh=NqerZcueDe5Vdup5YWaIr/cMiCRyTzm7WBaBKhWYa7o=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=L00Jcm0ErlbgR36ajW4jCZFAKDnlSvY9k0wYlsDluPw9zlduW/bOD6JVblaQcOt+q
         z46YCVZw8lws+725jTiNN7kC0DWof2X8vMlEDhc1T5+yyuhwo3cRh+uQaGIs4NQBX6
         VKcQn7lVOU3pR8dh+zEbvvU3oM6VTG9J4VaohlS4=
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>
X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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?


From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Subject: Re: [PATCH v5 2/3] mm: memcg/slab: Create a new set of
 kmalloc-cg-<n> caches
Date: Wed, 12 May 2021 17:32:12 -0700
Message-ID: <20210512173212.738f592c36bf0e4c205f628e@linux-foundation.org>
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-Transfer-Encoding: quoted-printable
Return-path: <cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org;
        s=korg; t=1620865933;
        bh=NqerZcueDe5Vdup5YWaIr/cMiCRyTzm7WBaBKhWYa7o=;
        h=Date:From:To:Cc:Subject:In-Reply-To:References:From;
        b=L00Jcm0ErlbgR36ajW4jCZFAKDnlSvY9k0wYlsDluPw9zlduW/bOD6JVblaQcOt+q
         z46YCVZw8lws+725jTiNN7kC0DWof2X8vMlEDhc1T5+yyuhwo3cRh+uQaGIs4NQBX6
         VKcQn7lVOU3pR8dh+zEbvvU3oM6VTG9J4VaohlS4=
In-Reply-To: <0919aaab-cc08-f86d-1f9a-8ddfeed7bb31-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
List-ID: <cgroups.vger.kernel.org>
Content-Type: text/plain; charset="iso-8859-1"
To: Waiman Long <llong-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>, Michal Hocko <mhocko-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Vladimir Davydov <vdavydov.dev-Re5JQEeQqe8AvxtiuMwx3w@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>, Vlastimil Babka <vbabka-AlSwsSmVLrQ@public.gmane.org>, Roman Gushchin <guro-b10kYP2dOMg@public.gmane.org>, Shakeel Butt <shakeelb-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org

On Wed, 12 May 2021 10:54:19 -0400 Waiman Long <llong-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 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-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org?