From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=ham 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 4D280C433ED for ; Thu, 13 May 2021 00:32:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 99F39613CA for ; Thu, 13 May 2021 00:32:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99F39613CA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0AC606B006C; Wed, 12 May 2021 20:32:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 034C26B006E; Wed, 12 May 2021 20:32:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF0D26B0072; Wed, 12 May 2021 20:32:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0141.hostedemail.com [216.40.44.141]) by kanga.kvack.org (Postfix) with ESMTP id A92B46B006C for ; Wed, 12 May 2021 20:32:15 -0400 (EDT) Received: from smtpin40.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 43BD2180424C3 for ; Thu, 13 May 2021 00:32:15 +0000 (UTC) X-FDA: 78134331030.40.B06D026 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf05.hostedemail.com (Postfix) with ESMTP id 66EBCE000129 for ; Thu, 13 May 2021 00:32:08 +0000 (UTC) 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 To: Waiman Long Cc: Johannes Weiner , Michal Hocko , Vladimir Davydov , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , Roman Gushchin , Shakeel Butt , 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- 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 X-Rspamd-Queue-Id: 66EBCE000129 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=L00Jcm0E; dmarc=none; spf=pass (imf05.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-Rspamd-Server: rspam03 X-Stat-Signature: makt7cftpq6x8th4g3qrm11aswk8bkeq Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf05; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620865928-785772 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, 12 May 2021 10:54:19 -0400 Waiman Long 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?