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 A1CA4C25B77 for ; Wed, 22 May 2024 11:43:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B0ED6B0085; Wed, 22 May 2024 07:43:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1609C6B0089; Wed, 22 May 2024 07:43:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0281C6B008C; Wed, 22 May 2024 07:43:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DA96E6B0085 for ; Wed, 22 May 2024 07:43:17 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 546324028B for ; Wed, 22 May 2024 11:43:17 +0000 (UTC) X-FDA: 82145846034.18.C71EB16 Received: from out-177.mta1.migadu.com (out-177.mta1.migadu.com [95.215.58.177]) by imf01.hostedemail.com (Postfix) with ESMTP id 5274C4000D for ; Wed, 22 May 2024 11:43:13 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="xb7q+M//"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf01.hostedemail.com: domain of kent.overstreet@linux.dev designates 95.215.58.177 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716378193; 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=XxS87BGxX1olD+7CSOfjFsEFgitx6Qy9iXmHFao31+4=; b=kdGanGVG0zPah2H207ogv8drrZbhISpEtAol+JYmzVfYYfzBMhJJhdafkGTto1XJ0VmnsH bZO4zzd0hxvdninOIjMR0CKBkhfno+st8/OdYNr7PCOL3/CS1S8do/iPc7pLAb4+z9aZ0Y r9QQOK0jSHKv27iC6HCAfNe7v7pfOVg= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="xb7q+M//"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf01.hostedemail.com: domain of kent.overstreet@linux.dev designates 95.215.58.177 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716378193; a=rsa-sha256; cv=none; b=2AE8og/eCTREQVGrY+qZD/FF8f3XKeR47HWFwaz4IUgIejSi2NutqLIPbzCG7r5YvFVAt1 rHgAVQLM8jEVTEGTCcDixhXFsraM6ASrdv29eLTDehXUGYZLJ2BUGRyJomndAjwvyar7vv oGBLx32SoH3S6Aoqc7w2sFvtD+9Aj6I= X-Envelope-To: vbabka@suse.cz DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716378190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=XxS87BGxX1olD+7CSOfjFsEFgitx6Qy9iXmHFao31+4=; b=xb7q+M//MYQx0auGzyEOp4hI02NeK7/Qz4bjmTyklWHGQ2ikFLQ8gIBDqv/vX+Qi0yhxau ujx6kCUAurrCfVxq/eqPkeJsOXWNrMVs7oKlqGSMso5V+RglUVxbAerbPyJ2JBrHSRDPzn JTT/nNWrKC5o3JEJiHDpiEAJ0EF1vSA= X-Envelope-To: cl@linux.com X-Envelope-To: rientjes@google.com X-Envelope-To: akpm@linux-foundation.org X-Envelope-To: roman.gushchin@linux.dev X-Envelope-To: 42.hyeyoo@gmail.com X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: surenb@google.com X-Envelope-To: keescook@chromium.org Date: Wed, 22 May 2024 07:43:07 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Kent Overstreet To: Vlastimil Babka Cc: Christoph Lameter , David Rientjes , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Kees Cook Subject: Re: [PATCH] mm, slab: don't wrap internal functions with alloc_hooks() Message-ID: References: <20240522095037.13958-1-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240522095037.13958-1-vbabka@suse.cz> X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 5274C4000D X-Stat-Signature: mj9opahso1agy9e13xccitw99gagx5yo X-HE-Tag: 1716378193-442 X-HE-Meta: U2FsdGVkX1+Zd7VBhAj155ancej7KBE8RHjgBrg6dB34p3muabDfwvJJUeTXYcZhtIUD5DluK/fWwUNG24CRturgswyKAhjzmjZU8WM6xI2IQFuUzszhy0xkQy4/Zj9WKjEUCfzMEkaWKwt7tyJ8qUJ+Sw9CfTv4FiXLBSRFN4kO/Ezfo+x7I3eH5sfldK8BCGIDcuOtMpeUTL1we0xG48WW8vz2kEwUmphFqN6eYzIGiqz0WopzamYjjUPTCnGQCRvhdcvsCdqT0UuJ7kC79Ua7re26T256YKM0IKzGi//LEJ5HbH6GnH9kSrXIFWdKSjQ8e0oDDUQI2PwMB4m6YIWZr9BrcnxryJhUQ5+qp+5OEHJx3DnvfPJFkqtBM/LxZvH+6zYH5TbswreP76Df0M/j62Qb7VZkDJUdnh/CCj08JUD8eS/uTAHSbE6D6hpfXcki5mHiYbmRMIFCB/ioTnizyumhLgy9yQyVX4nesdGFNzdrcS6IP0gE7BRmJ9peW43BslFw0eTwnAph1QHkCODQiN5vUkw2CMTkfHBBDf9t0mfm5HHRlgy8InP7na5ZUy3e/M7G5i+K21Ailx05s0vW8K6292UuvwEGr/vYDG2F2EHp1G/Ae13df6FOk+cBPTaCwA5UPOsX/uUk7rnAyv+E9pY4f4Kn8sHsIv4IN1CIWo1drOPav9TohBBNLsue90I1uvUTLzzeUyMFMUleVS21wovvfseryuqAplgSn9g0mAP0IQiIEKUA4u0Gy22O6sMAbZR+I+nr1hnE3MOoN6+4+VYmtF4eAtGBq4YMuOKb6AvHCr8BUzWnVEWE0ZTqI/WD60oCcw17LzhTVpm9esZkyoNlVsOjf4ZR9MAAr/Th28oRLxg28XOfHGZhZKty065VvIyVrKfO+zTqutiQmGJF1a9L3ynLNjKKrjzf2UDngDnO1kXvN2AUvuzK4Ag62HybVTfMYBouQEkL8Sa QIYs0wK8 z/sUD9gE6HjdwoUcHRPKPW5Lu8S6OC59TGKJcg67C5E/rkwoYPUtHgQjkfSXcmHfhV0cOAFAndRk8ap6hmN2s3u8VRn1DHPZkg7TD5mNEs17DOeE/tUJZP7K3N8B6UDZsqebQOLs6jbIF7wKOYuxgwx22roRlaiI16U085hNSV0c5dWcOqKyHGPkZzgOLenCSKkBHSHosBd8nnEJNBzgVFTfAM/PeTMxZ3P/2Es1YQD7SRX2HR2k/jxIEDwj8fsJo58UCMv4gTLf54oN5GpXyfNtHlOAiSB9gIOT5 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 Wed, May 22, 2024 at 11:50:37AM +0200, Vlastimil Babka wrote: > The functions __kmalloc_noprof(), kmalloc_large_noprof(), > kmalloc_trace_noprof() and their _node variants are all internal to the > implementations of kmalloc_noprof() and kmalloc_node_noprof() and are > only declared in the "public" slab.h and exported so that those > implementations can be static inline and distinguish the build-time > constant size variants. The only other users for some of the internal > functions are slub_kunit and fortify_kunit tests which make very > short-lived allocations. > > Therefore we can stop wrapping them with the alloc_hooks() macro and > drop the _noprof suffix. Instead add a __prefix where missing and a > comment documenting these are internal. Also rename __kmalloc_trace() to > __kmalloc_cache() which is more descriptive - it is a variant of > __kmalloc() where the exact kmalloc cache has been already determined. I agree with dropping the alloc_hooks() wrappers - but can we keep them with the _noprof() suffix? I find it makes the code easier to read, since there are internal slab allocations which we _do_ want accounted locally and thus call non _noprof() functions. > > Reported-by: Kent Overstreet > Cc: Suren Baghdasaryan > Cc: Kees Cook > Signed-off-by: Vlastimil Babka > --- > The intention is to use the slab tree after rc1 if no big conflicts with > mm. > > include/linux/slab.h | 53 ++++++++++++++++++++++---------------------- > lib/slub_kunit.c | 2 +- > mm/slub.c | 32 +++++++++++++------------- > 3 files changed, 43 insertions(+), 44 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index 7247e217e21b..5ce84ffd0423 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -528,9 +528,6 @@ static_assert(PAGE_SHIFT <= 20); > > #include > > -void *__kmalloc_noprof(size_t size, gfp_t flags) __assume_kmalloc_alignment __alloc_size(1); > -#define __kmalloc(...) alloc_hooks(__kmalloc_noprof(__VA_ARGS__)) > - > /** > * kmem_cache_alloc - Allocate an object > * @cachep: The cache to allocate from. > @@ -568,31 +565,33 @@ static __always_inline void kfree_bulk(size_t size, void **p) > kmem_cache_free_bulk(NULL, size, p); > } > > -void *__kmalloc_node_noprof(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment > - __alloc_size(1); > -#define __kmalloc_node(...) alloc_hooks(__kmalloc_node_noprof(__VA_ARGS__)) > - > void *kmem_cache_alloc_node_noprof(struct kmem_cache *s, gfp_t flags, > int node) __assume_slab_alignment __malloc; > #define kmem_cache_alloc_node(...) alloc_hooks(kmem_cache_alloc_node_noprof(__VA_ARGS__)) > > -void *kmalloc_trace_noprof(struct kmem_cache *s, gfp_t flags, size_t size) > - __assume_kmalloc_alignment __alloc_size(3); > +/* > + * The following functions are not to be used directly and are intended only for > + * internal use from kmalloc() and kmalloc_node(), with the exception of kunit > + * tests. > + */ > +void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment > + __alloc_size(1); > + > +void *__kmalloc_node(size_t size, gfp_t flags, int node) > + __assume_kmalloc_alignment __alloc_size(1); > > -void *kmalloc_node_trace_noprof(struct kmem_cache *s, gfp_t gfpflags, > - int node, size_t size) __assume_kmalloc_alignment > - __alloc_size(4); > -#define kmalloc_trace(...) alloc_hooks(kmalloc_trace_noprof(__VA_ARGS__)) > +void *__kmalloc_cache(struct kmem_cache *s, gfp_t flags, size_t size) > + __assume_kmalloc_alignment __alloc_size(3); > > -#define kmalloc_node_trace(...) alloc_hooks(kmalloc_node_trace_noprof(__VA_ARGS__)) > +void *__kmalloc_cache_node(struct kmem_cache *s, gfp_t gfpflags, int node, > + size_t size) __assume_kmalloc_alignment > + __alloc_size(4); > > -void *kmalloc_large_noprof(size_t size, gfp_t flags) __assume_page_alignment > - __alloc_size(1); > -#define kmalloc_large(...) alloc_hooks(kmalloc_large_noprof(__VA_ARGS__)) > +void *__kmalloc_large(size_t size, gfp_t flags) __assume_page_alignment > + __alloc_size(1); > > -void *kmalloc_large_node_noprof(size_t size, gfp_t flags, int node) __assume_page_alignment > - __alloc_size(1); > -#define kmalloc_large_node(...) alloc_hooks(kmalloc_large_node_noprof(__VA_ARGS__)) > +void *__kmalloc_large_node(size_t size, gfp_t flags, int node) > + __assume_page_alignment __alloc_size(1); > > /** > * kmalloc - allocate kernel memory > @@ -654,14 +653,14 @@ static __always_inline __alloc_size(1) void *kmalloc_noprof(size_t size, gfp_t f > unsigned int index; > > if (size > KMALLOC_MAX_CACHE_SIZE) > - return kmalloc_large_noprof(size, flags); > + return __kmalloc_large(size, flags); > > index = kmalloc_index(size); > - return kmalloc_trace_noprof( > + return __kmalloc_cache( > kmalloc_caches[kmalloc_type(flags, _RET_IP_)][index], > flags, size); > } > - return __kmalloc_noprof(size, flags); > + return __kmalloc(size, flags); > } > #define kmalloc(...) alloc_hooks(kmalloc_noprof(__VA_ARGS__)) > > @@ -671,14 +670,14 @@ static __always_inline __alloc_size(1) void *kmalloc_node_noprof(size_t size, gf > unsigned int index; > > if (size > KMALLOC_MAX_CACHE_SIZE) > - return kmalloc_large_node_noprof(size, flags, node); > + return __kmalloc_large_node(size, flags, node); > > index = kmalloc_index(size); > - return kmalloc_node_trace_noprof( > + return __kmalloc_cache_node( > kmalloc_caches[kmalloc_type(flags, _RET_IP_)][index], > flags, node, size); > } > - return __kmalloc_node_noprof(size, flags, node); > + return __kmalloc_node(size, flags, node); > } > #define kmalloc_node(...) alloc_hooks(kmalloc_node_noprof(__VA_ARGS__)) > > @@ -756,7 +755,7 @@ static inline __alloc_size(1, 2) void *kmalloc_array_node_noprof(size_t n, size_ > return NULL; > if (__builtin_constant_p(n) && __builtin_constant_p(size)) > return kmalloc_node_noprof(bytes, flags, node); > - return __kmalloc_node_noprof(bytes, flags, node); > + return __kmalloc_node(bytes, flags, node); > } > #define kmalloc_array_node(...) alloc_hooks(kmalloc_array_node_noprof(__VA_ARGS__)) > > diff --git a/lib/slub_kunit.c b/lib/slub_kunit.c > index 4ce960438806..3b5fea45b8fe 100644 > --- a/lib/slub_kunit.c > +++ b/lib/slub_kunit.c > @@ -140,7 +140,7 @@ static void test_kmalloc_redzone_access(struct kunit *test) > { > struct kmem_cache *s = test_kmem_cache_create("TestSlub_RZ_kmalloc", 32, > SLAB_KMALLOC|SLAB_STORE_USER|SLAB_RED_ZONE); > - u8 *p = kmalloc_trace(s, GFP_KERNEL, 18); > + u8 *p = __kmalloc_cache(s, GFP_KERNEL, 18); > > kasan_disable_current(); > > diff --git a/mm/slub.c b/mm/slub.c > index 0809760cf789..31c25e0ebed8 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -4053,7 +4053,7 @@ EXPORT_SYMBOL(kmem_cache_alloc_node_noprof); > * directly to the page allocator. We use __GFP_COMP, because we will need to > * know the allocation order to free the pages properly in kfree. > */ > -static void *__kmalloc_large_node(size_t size, gfp_t flags, int node) > +static void *___kmalloc_large_node(size_t size, gfp_t flags, int node) > { > struct folio *folio; > void *ptr = NULL; > @@ -4078,25 +4078,25 @@ static void *__kmalloc_large_node(size_t size, gfp_t flags, int node) > return ptr; > } > > -void *kmalloc_large_noprof(size_t size, gfp_t flags) > +void *__kmalloc_large(size_t size, gfp_t flags) > { > - void *ret = __kmalloc_large_node(size, flags, NUMA_NO_NODE); > + void *ret = ___kmalloc_large_node(size, flags, NUMA_NO_NODE); > > trace_kmalloc(_RET_IP_, ret, size, PAGE_SIZE << get_order(size), > flags, NUMA_NO_NODE); > return ret; > } > -EXPORT_SYMBOL(kmalloc_large_noprof); > +EXPORT_SYMBOL(__kmalloc_large); > > -void *kmalloc_large_node_noprof(size_t size, gfp_t flags, int node) > +void *__kmalloc_large_node(size_t size, gfp_t flags, int node) > { > - void *ret = __kmalloc_large_node(size, flags, node); > + void *ret = ___kmalloc_large_node(size, flags, node); > > trace_kmalloc(_RET_IP_, ret, size, PAGE_SIZE << get_order(size), > flags, node); > return ret; > } > -EXPORT_SYMBOL(kmalloc_large_node_noprof); > +EXPORT_SYMBOL(__kmalloc_large_node); > > static __always_inline > void *__do_kmalloc_node(size_t size, gfp_t flags, int node, > @@ -4123,17 +4123,17 @@ void *__do_kmalloc_node(size_t size, gfp_t flags, int node, > return ret; > } > > -void *__kmalloc_node_noprof(size_t size, gfp_t flags, int node) > +void *__kmalloc_node(size_t size, gfp_t flags, int node) > { > return __do_kmalloc_node(size, flags, node, _RET_IP_); > } > -EXPORT_SYMBOL(__kmalloc_node_noprof); > +EXPORT_SYMBOL(__kmalloc_node); > > -void *__kmalloc_noprof(size_t size, gfp_t flags) > +void *__kmalloc(size_t size, gfp_t flags) > { > return __do_kmalloc_node(size, flags, NUMA_NO_NODE, _RET_IP_); > } > -EXPORT_SYMBOL(__kmalloc_noprof); > +EXPORT_SYMBOL(__kmalloc); > > void *kmalloc_node_track_caller_noprof(size_t size, gfp_t flags, > int node, unsigned long caller) > @@ -4142,7 +4142,7 @@ void *kmalloc_node_track_caller_noprof(size_t size, gfp_t flags, > } > EXPORT_SYMBOL(kmalloc_node_track_caller_noprof); > > -void *kmalloc_trace_noprof(struct kmem_cache *s, gfp_t gfpflags, size_t size) > +void *__kmalloc_cache(struct kmem_cache *s, gfp_t gfpflags, size_t size) > { > void *ret = slab_alloc_node(s, NULL, gfpflags, NUMA_NO_NODE, > _RET_IP_, size); > @@ -4152,10 +4152,10 @@ void *kmalloc_trace_noprof(struct kmem_cache *s, gfp_t gfpflags, size_t size) > ret = kasan_kmalloc(s, ret, size, gfpflags); > return ret; > } > -EXPORT_SYMBOL(kmalloc_trace_noprof); > +EXPORT_SYMBOL(__kmalloc_cache); > > -void *kmalloc_node_trace_noprof(struct kmem_cache *s, gfp_t gfpflags, > - int node, size_t size) > +void *__kmalloc_cache_node(struct kmem_cache *s, gfp_t gfpflags, int node, > + size_t size) > { > void *ret = slab_alloc_node(s, NULL, gfpflags, node, _RET_IP_, size); > > @@ -4164,7 +4164,7 @@ void *kmalloc_node_trace_noprof(struct kmem_cache *s, gfp_t gfpflags, > ret = kasan_kmalloc(s, ret, size, gfpflags); > return ret; > } > -EXPORT_SYMBOL(kmalloc_node_trace_noprof); > +EXPORT_SYMBOL(__kmalloc_cache_node); > > static noinline void free_to_partial_list( > struct kmem_cache *s, struct slab *slab, > -- > 2.45.1 >