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 EA3ECC8303C for ; Tue, 8 Jul 2025 12:52:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F7A46B010D; Tue, 8 Jul 2025 08:52:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 55AC46B010A; Tue, 8 Jul 2025 08:52:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3ADCB6B00FF; Tue, 8 Jul 2025 08:52:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1C9256B00F5 for ; Tue, 8 Jul 2025 08:52:50 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id DF85FBA521 for ; Tue, 8 Jul 2025 12:52:49 +0000 (UTC) X-FDA: 83641086858.25.97A8BB0 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf29.hostedemail.com (Postfix) with ESMTP id 5A64D120011 for ; Tue, 8 Jul 2025 12:52:47 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=wOz8J1zA; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="b7Fp/wpn"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=wOz8J1zA; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="b7Fp/wpn"; spf=pass (imf29.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751979167; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=u5MDak1uUHlCPQAyXAZzrdGQnFgldSEs0l5aw63CNaI=; b=MqpFQ26W+GaCEOsnrKJNVNrlWOyfA5WYca1EDxlssEv8ApqrPUFtW8ch/Q19xhKcyVGGKJ EQnqiRSqYv5UI4OFUlUO4Ir74RMxVGCJLVRDHxtWXvUhAIc62JjoB6dCIG4gD+B7SVk+2B MX6ooYunFcsOhLcGxWoLQOEgAjL+Y50= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=wOz8J1zA; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="b7Fp/wpn"; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=wOz8J1zA; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="b7Fp/wpn"; spf=pass (imf29.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751979167; a=rsa-sha256; cv=none; b=eW3Xyl9ewU5zQOjgJUjkoJLoqzcxGK8IIZgUWS0sPHa10liNScqsDZqEzhKqTQi4Co6PPZ x16V5ctLJdYBGwmEqomq2zeRqx6lCbLx3UNM9PtVHYgSuKfXcRsNoH0Y17d0qDEsGhWtAY EA/koW7fUtvPyv9ce7+fPMH571g/1yw= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9E0521F785; Tue, 8 Jul 2025 12:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1751979165; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=u5MDak1uUHlCPQAyXAZzrdGQnFgldSEs0l5aw63CNaI=; b=wOz8J1zA9U5/sCL1T3lw5mNTDp+tzVlMI81GMZLul/FAvlFnFf+qgb+nS5IhXBsb6RihHe 2TmBDfCM3Z05QUz0kP6i6k6s+5KO0RcAy1Wvz2Aey4r/7dB9w59hzJga02C2qQSdYKdk1J J+bg/tudz5qoraPO2hmPBuQiMCUk44o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1751979165; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=u5MDak1uUHlCPQAyXAZzrdGQnFgldSEs0l5aw63CNaI=; b=b7Fp/wpnexbhB7PDzUmYDULO3cS1CYk+lWA7tlt5qAu2XWIeg+GXNxhbzXbsoRmVR09HCz S0T7FcyI1b5MHkBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1751979165; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=u5MDak1uUHlCPQAyXAZzrdGQnFgldSEs0l5aw63CNaI=; b=wOz8J1zA9U5/sCL1T3lw5mNTDp+tzVlMI81GMZLul/FAvlFnFf+qgb+nS5IhXBsb6RihHe 2TmBDfCM3Z05QUz0kP6i6k6s+5KO0RcAy1Wvz2Aey4r/7dB9w59hzJga02C2qQSdYKdk1J J+bg/tudz5qoraPO2hmPBuQiMCUk44o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1751979165; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=u5MDak1uUHlCPQAyXAZzrdGQnFgldSEs0l5aw63CNaI=; b=b7Fp/wpnexbhB7PDzUmYDULO3cS1CYk+lWA7tlt5qAu2XWIeg+GXNxhbzXbsoRmVR09HCz S0T7FcyI1b5MHkBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8018D13A68; Tue, 8 Jul 2025 12:52:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id mEu7Hp0UbWiKKwAAD6G6ig (envelope-from ); Tue, 08 Jul 2025 12:52:45 +0000 Message-ID: <4c5852cc-2ca5-432b-8426-01c108df66cb@suse.cz> Date: Tue, 8 Jul 2025 14:52:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v11 2/4] mm/slub: allow to set node and align in k[v]realloc Content-Language: en-US To: Vitaly Wool , linux-mm@kvack.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, Uladzislau Rezki , Danilo Krummrich , Alice Ryhl , rust-for-linux@vger.kernel.org, Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin , Lorenzo Stoakes , "Liam R. Howlett" References: <20250707164755.631374-1-vitaly.wool@konsulko.se> <20250707164908.631462-1-vitaly.wool@konsulko.se> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 m6M14QORSWTLRg== In-Reply-To: <20250707164908.631462-1-vitaly.wool@konsulko.se> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Action: no action X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 5A64D120011 X-Rspam-User: X-Stat-Signature: 3d8e5pzxr49ruz8ksi7rsaqwozddnobk X-HE-Tag: 1751979167-277500 X-HE-Meta: U2FsdGVkX194YqtB1uKD0xgaTwIpOyPlXLr/wc+L0Ip9B/Esodsy9WJIPXClSvddNtqrthTOS/pgc3YgKGQsP6zdQkNo3q+HF7aJo/CcanD579hgJ8Z/gNV38xN1rSO3qSk8gzVC0mUhgH7NpkiZpXdQf5i6jVOCDJLPQcR+E7NgfsRX8ixWf/yGmDmB50vehqLMXpNYYsegiFipB17X0FnnakN3pZr1FKsVU08hBtCJvIrRlBWdOdgNKp7dMwXlcoa9wbN3UCQW8UXGFLdIWfenymdPHrP1WhP0I4uTmJ+NdmJqcwfvAByRooUU8SPLv4kToSiL+/BRkYrrdmccCTdj4AmmtWHUL9qpOd+Kqbs9YIDqptlVP+MuaBcje4lxtuu8PbZ1j/Q4W8yld/G4lYwq5NAZIC6in2HxP3h+dOPFGq1cYX5lr1K196iNM/WgAtx+Y8EDZFQuk3AF3xDof9PISUwwLOeAIxzjL1GTVyhM1Fs/9L4Fl+55Ipn8vOM/v5A2x1/DXqVLduOhnO/ODvxR3uNr9b8JF9EeCDAMCyMLYER16KJdPkljh/efnk9SDciAGKkF7bKsKhvI7sOs9D7mfUiapQQRIFfkAJfsBr9SvG5AXbdX+hzxuMJHGVOcBOfeqHRc4bKYBSEviJln3vTQxxVrz+2CDnMu4hCh1N6Ebhsx+21uZDo54V0z10SjY+Bsyyx+yQum3hwLWWrc5D+++TzBPGMjIB0FQYs4rZU1D4OEmsr1Vh9+udAd2iIMSHQ2S4kKZmUJvARCGzFz1DpDK6cx8ggfznwp9R2ITZz/GYZyvuWapKhyGmjFtE0zLfgMkdvJl5GeqLBks3kV+eeJxoHM+CHv8pW1HJ4dDFK4+7YLTjNNECLfIw3+1++eWhIjyWMRHzcVY29PPuT4RY0ROrwXHP4uzjJ1ra3eYdiaecCR2SZtXgMTY/FoGob5TawFMQsd8L/A9d9/LJF UM8fd970 WAQc04F3abAZxGXRJ1WKQk8/VUp1owm6Q1Rg+/AW7USrQio/KREfTAE72IbN3ss8P51FO7VD24d/77urJEvLJZrEB34Y/Cos66Fnkq6u5TZ0eAbbu4yyI6RjFBN7i95/JDB3rlQoGDuj8bAuhfDMV5kpkJcoY1cvG9eStfPltrWt7FEDTea7rdlBGezN3OtEPnDroaE25YNaV6Wcy0C1cZLRJ2VRk0AWZz0AFu+jTpi17JUo/QP8Db5eoHm5I0u3aaGouWpFMiKZqz76clIfu4Y4JhWfXEEd7h61Egp68lo1XkljmYYWwBbAs09OEdNGlWQvOYDF2yCy3bL2+DTTdPwGbv+Mgzsq4uGiZkLe5Q+a8yGAGm8elmRwdiSQiLvwJQUgf44ohfrgQSug= 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 7/7/25 18:49, Vitaly Wool wrote: > Reimplement k[v]realloc_node() to be able to set node and > alignment should a user need to do so. In order to do that while > retaining the maximal backward compatibility, add > k[v]realloc_node_align() functions and redefine the rest of API > using these new ones. > > With that change we also provide the ability for the Rust part of > the kernel to set node and alignment in its K[v]xxx > [re]allocations. > > Signed-off-by: Vitaly Wool > --- > include/linux/slab.h | 40 ++++++++++++++++++--------- > mm/slub.c | 64 ++++++++++++++++++++++++++++++-------------- > 2 files changed, 71 insertions(+), 33 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index d5a8ab98035c..13abcf4ada22 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -465,9 +465,15 @@ int kmem_cache_shrink(struct kmem_cache *s); > /* > * Common kmalloc functions provided by all allocators > */ > -void * __must_check krealloc_noprof(const void *objp, size_t new_size, > - gfp_t flags) __realloc_size(2); > -#define krealloc(...) alloc_hooks(krealloc_noprof(__VA_ARGS__)) > +void * __must_check krealloc_node_align_noprof(const void *objp, size_t new_size, > + unsigned long align, > + gfp_t flags, int nid) __realloc_size(2); > +#define krealloc_node_noprof(_p, _s, _f, _n) \ > + krealloc_node_align_noprof(_p, _s, 1, _f, _n) > +#define krealloc_noprof(...) krealloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE) > +#define krealloc_node_align(...) alloc_hooks(krealloc_node_align_noprof(__VA_ARGS__)) > +#define krealloc_node(...) alloc_hooks(krealloc_node_noprof(__VA_ARGS__)) > +#define krealloc(...) alloc_hooks(krealloc_noprof(__VA_ARGS__)) Hm wonder if krealloc() and krealloc_node_align() would be enough. Is krealloc_node() only used between patch 3 and 4? Also perhaps it would be more concise to only have krealloc_node_align_noprof() with alloc_hooks wrappers filling the NUMA_NO_NODE (and 1), so we don't need to #define the _noprof variant of everything. The _noprof callers are rare so they can just always use krealloc_node_align_noprof() directly and also fill in the NUMA_NO_NODE (and 1). > void kfree(const void *objp); > void kfree_sensitive(const void *objp); > @@ -1041,18 +1047,23 @@ static inline __alloc_size(1) void *kzalloc_noprof(size_t size, gfp_t flags) > #define kzalloc(...) alloc_hooks(kzalloc_noprof(__VA_ARGS__)) > #define kzalloc_node(_size, _flags, _node) kmalloc_node(_size, (_flags)|__GFP_ZERO, _node) > > -void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), gfp_t flags, int node) __alloc_size(1); > -#define kvmalloc_node_noprof(size, flags, node) \ > - __kvmalloc_node_noprof(PASS_BUCKET_PARAMS(size, NULL), flags, node) > +void *__kvmalloc_node_noprof(DECL_BUCKET_PARAMS(size, b), unsigned long align, > + gfp_t flags, int node) __alloc_size(1); > +#define kvmalloc_node_align_noprof(_size, _align, _flags, _node) \ > + __kvmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, NULL), _align, _flags, _node) > +#define kvmalloc_node_noprof(_size, _flags, _node) \ > + kvmalloc_node_align_noprof(_size, 1, _flags, _node) > +#define kvmalloc_node_align(...) \ > + alloc_hooks(kvmalloc_node_align_noprof(__VA_ARGS__)) > #define kvmalloc_node(...) alloc_hooks(kvmalloc_node_noprof(__VA_ARGS__)) Ditto. > > -#define kvmalloc(_size, _flags) kvmalloc_node(_size, _flags, NUMA_NO_NODE) > -#define kvmalloc_noprof(_size, _flags) kvmalloc_node_noprof(_size, _flags, NUMA_NO_NODE) > +#define kvmalloc_noprof(...) kvmalloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE) > +#define kvmalloc(...) alloc_hooks(kvmalloc_noprof(__VA_ARGS__)) > #define kvzalloc(_size, _flags) kvmalloc(_size, (_flags)|__GFP_ZERO) > > -#define kvzalloc_node(_size, _flags, _node) kvmalloc_node(_size, (_flags)|__GFP_ZERO, _node) > +#define kvzalloc_node(_s, _f, _n) kvmalloc_node(_s, (_f)|__GFP_ZERO, _n) > #define kmem_buckets_valloc(_b, _size, _flags) \ > - alloc_hooks(__kvmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, _b), _flags, NUMA_NO_NODE)) > + alloc_hooks(__kvmalloc_node_noprof(PASS_BUCKET_PARAMS(_size, _b), 1, _flags, NUMA_NO_NODE)) > > static inline __alloc_size(1, 2) void * > kvmalloc_array_node_noprof(size_t n, size_t size, gfp_t flags, int node) > @@ -1068,13 +1079,16 @@ kvmalloc_array_node_noprof(size_t n, size_t size, gfp_t flags, int node) > #define kvmalloc_array_noprof(...) kvmalloc_array_node_noprof(__VA_ARGS__, NUMA_NO_NODE) > #define kvcalloc_node_noprof(_n,_s,_f,_node) kvmalloc_array_node_noprof(_n,_s,(_f)|__GFP_ZERO,_node) > #define kvcalloc_noprof(...) kvcalloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE) > - > #define kvmalloc_array(...) alloc_hooks(kvmalloc_array_noprof(__VA_ARGS__)) > #define kvcalloc_node(...) alloc_hooks(kvcalloc_node_noprof(__VA_ARGS__)) > #define kvcalloc(...) alloc_hooks(kvcalloc_noprof(__VA_ARGS__)) > > -void *kvrealloc_noprof(const void *p, size_t size, gfp_t flags) > - __realloc_size(2); > +void *kvrealloc_node_align_noprof(const void *p, size_t size, unsigned long align, > + gfp_t flags, int nid) __realloc_size(2); > +#define kvrealloc_node_align(...) kvrealloc_node_align_noprof(__VA_ARGS__) > +#define kvrealloc_node_noprof(_p, _s, _f, _n) kvrealloc_node_align_noprof(_p, _s, 1, _f, _n) > +#define kvrealloc_node(...) alloc_hooks(kvrealloc_node_noprof(__VA_ARGS__)) > +#define kvrealloc_noprof(...) kvrealloc_node_noprof(__VA_ARGS__, NUMA_NO_NODE) > #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__)) Ditto. > extern void kvfree(const void *addr); > diff --git a/mm/slub.c b/mm/slub.c > index c4b64821e680..881244c357dd 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -4845,7 +4845,7 @@ void kfree(const void *object) > EXPORT_SYMBOL(kfree); > > static __always_inline __realloc_size(2) void * > -__do_krealloc(const void *p, size_t new_size, gfp_t flags) > +__do_krealloc(const void *p, size_t new_size, unsigned long align, gfp_t flags, int nid) > { > void *ret; > size_t ks = 0; > @@ -4859,6 +4859,20 @@ __do_krealloc(const void *p, size_t new_size, gfp_t flags) > if (!kasan_check_byte(p)) > return NULL; > > + /* refuse to proceed if alignment is bigger than what kmalloc() provides */ > + if (!IS_ALIGNED((unsigned long)p, align) || new_size < align) > + return NULL; > + > + /* > + * If reallocation is not necessary (e. g. the new size is less > + * than the current allocated size), the current allocation will be > + * preserved unless __GFP_THISNODE is set. In the latter case a new > + * allocation on the requested node will be attempted. > + */ > + if (unlikely(flags & __GFP_THISNODE) && nid != NUMA_NO_NODE && > + nid != page_to_nid(vmalloc_to_page(p))) We need virt_to_page() here not vmalloc_to_page(). > + goto alloc_new; > + > if (is_kfence_address(p)) { > ks = orig_size = kfence_ksize(p); > } else {