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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1946DC4167B for ; Thu, 7 Dec 2023 01:28:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D3646B00A9; Wed, 6 Dec 2023 20:28:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 583156B00AA; Wed, 6 Dec 2023 20:28:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44A646B00AB; Wed, 6 Dec 2023 20:28:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 363D56B00A9 for ; Wed, 6 Dec 2023 20:28:42 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E24DEA01F4 for ; Thu, 7 Dec 2023 01:28:41 +0000 (UTC) X-FDA: 81538287642.13.B83EB76 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf05.hostedemail.com (Postfix) with ESMTP id 1D87F100009 for ; Thu, 7 Dec 2023 01:28:39 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=X7r+Xfpj; spf=pass (imf05.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701912520; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3u1soC42kxxszJtJ9Fi1B4cg1LFazMYjfirO31EmOoI=; b=XyIob/JTC9N+J/4DT/cTUL30nJRE29RP8Hq1/ugO8JFhpGj4SS7NBIivVu4Hs+hTS1f9Wa U/9dnUZ1MdeeYLG4eBCgwqM/Ho5GTJ8x/j77fppXS57fDg3iJlZbyX4bd8yju0MMPFMScY l8d5A1nPrD0cGuJipR+YROYkvAH+esY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=X7r+Xfpj; spf=pass (imf05.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701912520; a=rsa-sha256; cv=none; b=2mndx5XOvcTbSjYkASlNjkuLzRKoOPkHPV/ICK7Itq6w7XftgZRLGl0vyN5tEQ8Fsmxthv oEEwV1gvE3Rj+50TALEbLduqnUlKBivitCmubpIluUMQ7n7TZFaOIBp5Dg6MbFIwYZP8i9 g9wn2e2WWWy41lESiMbQKMOXV5ZZHMU= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1d069b1d127so3008265ad.0 for ; Wed, 06 Dec 2023 17:28:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701912519; x=1702517319; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=3u1soC42kxxszJtJ9Fi1B4cg1LFazMYjfirO31EmOoI=; b=X7r+XfpjTEUUWC5NLC5OeFB2KybeJiCi8h5fVpLQu9+WmdEavJxMIRJmI62x+q0KJR tXjb49QHU0wkURhj3yOXlHm6WkAQFSfzZaJVEI+egFgHrwP4VsnPaxz47fKdbSVGptY/ rb3FLTvJTGqjjDBL6/jMrk/t0nfbxc9QmFx2OvhL9VY89N3qQBtwbGyevodaHdAYlPSW u4qFkw3KZOCMAY8iCM0R9C4lMHNTZ3+XgajnQgJBV693qhADHU5hgvnNWQWGNKCAaepM j6TWlHWGPthcvUVhMDN0J4VgIiklEAgIMvaM4k00dBryA5SJlYEjC25NST7cgBOq8IYN 8sNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701912519; x=1702517319; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3u1soC42kxxszJtJ9Fi1B4cg1LFazMYjfirO31EmOoI=; b=AoLAVS6ZfyJNDCXjwpCPbKICp4pDmNd8S39Cdr5WzTzpElh/ZkpEXGlcF5pt/TILKS Wy1FqmwaIuO21xTTMKbnpMFo475NMF/hwJhJH36KjpQNnWyXx+0o8mfli6uru6BIy9K+ yHzt9aNsIxUeTKUqHHl3VeVnhghjozZN1XvQ9ibNO1LIk/+BKc1YIukwbiP3rrfMaSyu qztLT5Rx4BdTWKwMiLL9BUtobub3l7W9Ef/3XsXcc6lPJ6dfWT7Zt2y2HHR6uF2zEU19 JQAdIjTTQCcfmZlIE5zRW6D1G8gWSzyGxkRhCVk2JsItlY+0Qn0hOwd8E1SS1WOm926o w6FQ== X-Gm-Message-State: AOJu0Yy4NCU24ErnhMMWP7GaQhIMeyZlOPRzjFtFQMO455srOyknuh0k PHw/JXfSRcz0apFfy+lm/CU= X-Google-Smtp-Source: AGHT+IGx09sA3QjHCBqfxN8uUNcuGoNURkGUfVZC/vkcb6H8V+KrZS46H5LXsWB+131aJ1639Rkiog== X-Received: by 2002:a17:902:6bc5:b0:1d0:bfb7:6709 with SMTP id m5-20020a1709026bc500b001d0bfb76709mr1280230plt.24.1701912518601; Wed, 06 Dec 2023 17:28:38 -0800 (PST) Received: from localhost.localdomain ([1.245.180.67]) by smtp.gmail.com with ESMTPSA id p14-20020a170902780e00b001bf8779e051sm89840pll.289.2023.12.06.17.28.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 17:28:37 -0800 (PST) Date: Thu, 7 Dec 2023 10:28:24 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Vlastimil Babka Cc: David Rientjes , Christoph Lameter , Pekka Enberg , Joonsoo Kim , Andrew Morton , Roman Gushchin , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Marco Elver , Johannes Weiner , Michal Hocko , Shakeel Butt , Muchun Song , Kees Cook , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH v2 17/21] mm/slab: move kmalloc_slab() to mm/slab.h Message-ID: References: <20231120-slab-remove-slab-v2-0-9c9c70177183@suse.cz> <20231120-slab-remove-slab-v2-17-9c9c70177183@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231120-slab-remove-slab-v2-17-9c9c70177183@suse.cz> X-Rspamd-Queue-Id: 1D87F100009 X-Rspam-User: X-Stat-Signature: witohp9cd4ohyfj6jzth4eokd9q6z5x6 X-Rspamd-Server: rspam01 X-HE-Tag: 1701912519-515699 X-HE-Meta: U2FsdGVkX1/9maLrIQEeuvfeTPRppGJtJox/fpPRJVsn12hRwgcpPIvpiVAhJ5soG+W4iXMeQF+8WA1Rz/RHKmpFcEBYeMgpPKt2MxbHfcDltU7iJvu8Pz5Ac8kpb+/Rgv0fhNi4/P5HUE8LfEp1GS8d0q4HhxBh+9++gEbW3f7/qhR5uxhVvA6eLQ/ZmWXBnRnJsCdCLOA4YDvzI2ZawB8UecilGtGPkCwcnes0UllG6zAIh1MIoU1U0GCIbVddW1KBjM4zfQCEguGb8RBruLrt2HOmnmg5J1x0Ia8bNwdepmLWtJDOWH5j/EETVtcRV/e7Duiqf7UBIIGRwBMdLvaEj9QHM3o92WmuH4bxxyhmDpbVdUVBpFVM+bw8kr/dVJtIH4JnbuOXN/9+id5pXDIK1ExS56g9gAxKUEnr+d0P+0yhMdMQPO0KGVRO/vETgHJ94Tn7Ff3CoXwVCoxt1RAXxbXwC+DJzW+CO9JyV3WvL+RCptdMQ86AWyCfig5mI5HpxZkGsjs99b/8wzChnmRnOU2+5rniQJ3iYb2pnCzi6GWOP2QC8LDvaGaJ6QrJMYmBm/gx1U+V9tVfaQMRqV0XWL9RyRWAx72wnIDf/5LTsSYnBOuAtrMF3x4rfdIn4milqjTVMT0VLLW0+NcQMUp+wf2517k8JeGaH5SoXZhGyHKrmcURpA+9HkqnIznR4L/Af6I80b6U1jJIkSACpohI6A5QCbnNWctnF5W3oNL/+giet/hRuvu5mqBv1lU5tcD50UCHuEOrpPpC2Cwiobr776rkc/gdgzLpncdXjomuPSldueb/O1hCPVDjNLf14qX9A2LM2AU5PpN8eAUWrUfkB420jGDFTR3tbbI023buTEhTbdavQgNix7twlL+4csmb2z08zREKXT0Vl7UZ0+7GJ1xNvCY7L1db+EW3jvDW/UEc8vXsuQXWH/PdcDjxHPssYDABPm/9iafhRNp /3kC1Y4P o6uLxPkIKowEwY+rYhWdgpTJZdJGyzhxWuBImUp/ooPeX2V0+y8UH+qfgmAU1rTHiXlJacfoJM98Emt/b8q+IlfyuHmReoBDsPztHmzvv9+IL6MoQ1A6jXgVL0FErMAWCuxGzJeRCMouKr2BuoC+4B9E+cIk8KXyASqeqI3mZz/GSTier6CxMBe/J5TLAMAYLyX3IM2l3uZRvp+YfkBetT2KEUECGqtSzmm/hksFocAUpjZ0CIU00Yoz6knubgAzvD5V0i3I2MbX34bn5OefWz8rmzZlJ0DIeweSkrJ4QGWaZC70pYWMexN4e0VdHyZ5UtZIdbpnQar8O5SmkBI7p+U/snVRKYDoCCErv87RbcUuRNNAOL4QV+BUlHw57xhPnyJP7ecR/1e7Qoq6hPBxY8/C/uMfBj8t7xfTsL+p9joA/V5hQCMtcXi3HacUJ+1rye/1Kd7T1b0hVu2wGT2+6loQzUfEMSudrBzn7+ilmNfQotbSzsHCfgHyF6IuIKPRIukf/HUGA/U+n9gRG2XdnxFaZ+9fbX4CQ8iagG5WYy1l7kTtuDRzVP+f4UNhHkeok6MTGmOiuIWBZFs7QAAYozkvKZXIezG4RvydefJAH8A5FG9OSvfXTuN+xgQ== 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: List-Subscribe: List-Unsubscribe: On Mon, Nov 20, 2023 at 07:34:28PM +0100, Vlastimil Babka wrote: > In preparation for the next patch, move the kmalloc_slab() function to > the header, as it will have callers from two files, and make it inline. > To avoid unnecessary bloat, remove all size checks/warnings from > kmalloc_slab() as they just duplicate those in callers, especially after > recent changes to kmalloc_size_roundup(). We just need to adjust handling > of zero size in __do_kmalloc_node(). Also we can stop handling NULL > result from kmalloc_slab() there as that now cannot happen (unless > called too early during boot). > > The size_index array becomes visible so rename it to a more specific > kmalloc_size_index. > > Reviewed-by: Kees Cook > Signed-off-by: Vlastimil Babka > --- > mm/slab.h | 28 ++++++++++++++++++++++++++-- > mm/slab_common.c | 43 ++++++++----------------------------------- > 2 files changed, 34 insertions(+), 37 deletions(-) > > diff --git a/mm/slab.h b/mm/slab.h > index 35a55c4a407d..7d7cc7af614e 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -389,8 +389,32 @@ extern const struct kmalloc_info_struct { > void setup_kmalloc_cache_index_table(void); > void create_kmalloc_caches(slab_flags_t); > > -/* Find the kmalloc slab corresponding for a certain size */ > -struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags, unsigned long caller); > +extern u8 kmalloc_size_index[24]; > + > +static inline unsigned int size_index_elem(unsigned int bytes) > +{ > + return (bytes - 1) / 8; > +} > + > +/* > + * Find the kmem_cache structure that serves a given size of > + * allocation > + * > + * This assumes size is larger than zero and not larger than > + * KMALLOC_MAX_CACHE_SIZE and the caller must check that. > + */ > +static inline struct kmem_cache * > +kmalloc_slab(size_t size, gfp_t flags, unsigned long caller) > +{ > + unsigned int index; > + > + if (size <= 192) > + index = kmalloc_size_index[size_index_elem(size)]; > + else > + index = fls(size - 1); > + > + return kmalloc_caches[kmalloc_type(flags, caller)][index]; > +} > > void *__kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, > int node, size_t orig_size, > diff --git a/mm/slab_common.c b/mm/slab_common.c > index f4f275613d2a..31ade17a7ad9 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -665,7 +665,7 @@ EXPORT_SYMBOL(random_kmalloc_seed); > * of two cache sizes there. The size of larger slabs can be determined using > * fls. > */ > -static u8 size_index[24] __ro_after_init = { > +u8 kmalloc_size_index[24] __ro_after_init = { > 3, /* 8 */ > 4, /* 16 */ > 5, /* 24 */ > @@ -692,33 +692,6 @@ static u8 size_index[24] __ro_after_init = { > 2 /* 192 */ > }; > > -static inline unsigned int size_index_elem(unsigned int bytes) > -{ > - return (bytes - 1) / 8; > -} > - > -/* > - * Find the kmem_cache structure that serves a given size of > - * allocation > - */ > -struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags, unsigned long caller) > -{ > - unsigned int index; > - > - if (size <= 192) { > - if (!size) > - return ZERO_SIZE_PTR; > - > - index = size_index[size_index_elem(size)]; > - } else { > - if (WARN_ON_ONCE(size > KMALLOC_MAX_CACHE_SIZE)) > - return NULL; > - index = fls(size - 1); > - } > - > - return kmalloc_caches[kmalloc_type(flags, caller)][index]; > -} > - > size_t kmalloc_size_roundup(size_t size) > { > if (size && size <= KMALLOC_MAX_CACHE_SIZE) { > @@ -843,9 +816,9 @@ void __init setup_kmalloc_cache_index_table(void) > for (i = 8; i < KMALLOC_MIN_SIZE; i += 8) { > unsigned int elem = size_index_elem(i); > > - if (elem >= ARRAY_SIZE(size_index)) > + if (elem >= ARRAY_SIZE(kmalloc_size_index)) > break; > - size_index[elem] = KMALLOC_SHIFT_LOW; > + kmalloc_size_index[elem] = KMALLOC_SHIFT_LOW; > } > > if (KMALLOC_MIN_SIZE >= 64) { > @@ -854,7 +827,7 @@ void __init setup_kmalloc_cache_index_table(void) > * is 64 byte. > */ > for (i = 64 + 8; i <= 96; i += 8) > - size_index[size_index_elem(i)] = 7; > + kmalloc_size_index[size_index_elem(i)] = 7; > > } > > @@ -865,7 +838,7 @@ void __init setup_kmalloc_cache_index_table(void) > * instead. > */ > for (i = 128 + 8; i <= 192; i += 8) > - size_index[size_index_elem(i)] = 8; > + kmalloc_size_index[size_index_elem(i)] = 8; > } > } > > @@ -977,10 +950,10 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller > return ret; > } > > - s = kmalloc_slab(size, flags, caller); > + if (unlikely(!size)) > + return ZERO_SIZE_PTR; > > - if (unlikely(ZERO_OR_NULL_PTR(s))) > - return s; > + s = kmalloc_slab(size, flags, caller); > > ret = __kmem_cache_alloc_node(s, flags, node, size, caller); > ret = kasan_kmalloc(s, ret, size, flags); > > -- Looks good to me, Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > 2.42.1 > >