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 49CA6C83F03 for ; Fri, 4 Jul 2025 10:11:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C7A326B801D; Fri, 4 Jul 2025 06:11:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C2B026B800A; Fri, 4 Jul 2025 06:11:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B40C66B801D; Fri, 4 Jul 2025 06:11:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 9F6346B800A for ; Fri, 4 Jul 2025 06:11:06 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 60E541D00D6 for ; Fri, 4 Jul 2025 10:11:06 +0000 (UTC) X-FDA: 83626164132.03.496701D Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by imf09.hostedemail.com (Postfix) with ESMTP id 62FEA14000A for ; Fri, 4 Jul 2025 10:11:04 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=CuPH7mFO; spf=pass (imf09.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.48 as permitted sender) smtp.mailfrom=urezki@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=1751623864; 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=6hFh51BLuZwCFkzcHxtYDUVh7kL90TvhT7DOkfO+fT4=; b=FZ2XmYG5BalwN1A7W38y5//jBpCYT31sMc9jBF4J8aE1o1OIfFljDXCV6GlWADH5rSi/ED c+oQU5dsdulvKtz9636seydvkzJUU0AGF7qFxOhOaMMecGIFXRfN+91awi3DhlxvIjuxik 9JzfhzzKPfYMYheggavZTAAlWhhOujc= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=CuPH7mFO; spf=pass (imf09.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.48 as permitted sender) smtp.mailfrom=urezki@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751623864; a=rsa-sha256; cv=none; b=n/dN8liNqTVsB3jm6mjIq0RtommbhsKLaU4I81lPqZzRTQLKmvfpj17McXjikcANhwxoeW VXioj/hGIgbSziDRGtrSmTiHnkOvR0vHOi0mKLiPlhXsnzQXukD7KSrnFra9ZmWFQW8gmz 2XO/h07peiJsfoM0iUmUOh5alGpw+qQ= Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-555163cd09aso758487e87.3 for ; Fri, 04 Jul 2025 03:11:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751623863; x=1752228663; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=6hFh51BLuZwCFkzcHxtYDUVh7kL90TvhT7DOkfO+fT4=; b=CuPH7mFOjNl6wG6OnlN0LquijPR/6arYgSm4ixPtQEELPunNddEMmR7m4uVraruaYD i+ywY+HLOhV4KoJTyn5WS7zQrw6+LHQyHIE35XsCo8wQMRJ642mMEH8X5YoInzw/NlYj vmgls1onDxJ3M3Awm9SuBC6aYkNj3LdGy4FcYt4hE7PzyfO+Mt1hEKps+o2splJGzQYS wUSNtJWoOw6Y8/oPIGk8ygRxbpQXUO+b13dKJYCt4AgMybb2hHQ/2N4KAYW9r76nzaHh 5aW8CxCFTfh118AG+T/NKXEWyAxlRZCSe3pNWYbFOCqzHIz2L2IobFVlDAJ1oxO1eU6j 2hsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751623863; x=1752228663; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6hFh51BLuZwCFkzcHxtYDUVh7kL90TvhT7DOkfO+fT4=; b=Z2N5SD50ax04C8AUncWWca+2Ia4jRgVxMaZbBAucIXTT9UItJury5t50Osw0uxZNk4 4Qc0sfh1yy7PjDZzhZu8PrOJ2cPk5bB7t19zohfh3iRpUqXad2utVc9SDd6UypEP+5lC 942AVJibjFoLzYpt2ON1a26UNe/DPMGa3k0ATvIKMgSP3q8tm0U2WnjtQ5RipKlpPm8g HN9VnDvj3kUUlo5Xmg/kO15oLpSkjv3NRnbh4i45tedpEKQYWfmiMMLM3sEJDSVwCDNv Q0aFFQTuuPyuUP2BUqsow83HSCtVmzeZgP8nO4e9qPcPcaXR6jLZq25gohH7otZcfs41 O2pQ== X-Gm-Message-State: AOJu0YzE+ZYlYaZoqpj0KgeVhfyhVQzItlF8s5XOIFr9NowK8VATJtk1 K5CiSasMmHvmBW8IJwjjiQF/Aa0DAWkqI8kHLXuYdQgr+vVoTl2vUew0pYmu7A== X-Gm-Gg: ASbGnctoqmbWdkzNve0GvBpTxoJQkspl+wUUsLPuL18ktsAm3CQMzPDMSUk7Mq+eW/B IQBlOh7V8URpVPW9OVFuGNrRKZUH++l2SpPG/iX4s2I8Qrmqvit5QUz4OMnwCC4jxPrjg/hksW0 +VGRqKGJt0QMnovA9c+c8CaSkaNHXVxQLvfEwhECwHLLzka0xyScI7NQBlCr6hw++8TdxqkL2dx +//nrqupeiKnI19Oa/Hz9cp0pSZvIt1sg2rmky5Fc1y2xjjpztGRLpjE3IR/q7DmlhIch6XLYHw lY3GrtlVEqUYc0yO8mVPSjTiTEXNW4VSv4On6GmSlqRYhEDk24ed/rTl2eVUQ1Qm/S6d6pRsBeR ++QPRZkSwu0ZHbA== X-Google-Smtp-Source: AGHT+IEPipxgigrzCJYt18EpBU6h7oYOkJ72QENXkAwAV5zTFI/u66qor5gv6Sk3B2jTSy9z5DRvrg== X-Received: by 2002:a05:6512:3b1f:b0:553:a469:3fed with SMTP id 2adb3069b0e04-556dc2653b3mr561385e87.11.1751623862368; Fri, 04 Jul 2025 03:11:02 -0700 (PDT) Received: from pc636 (host-78-77-210-196.mobileonline.telia.com. [78.77.210.196]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-556384b83a3sm209662e87.199.2025.07.04.03.11.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jul 2025 03:11:01 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Fri, 4 Jul 2025 12:10:59 +0200 To: Vitaly Wool Cc: linux-mm@kvack.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, Uladzislau Rezki , Danilo Krummrich , Alice Ryhl , rust-for-linux@vger.kernel.org Subject: Re: [PATCH v10 1/4] mm/vmalloc: allow to set node and align in vrealloc Message-ID: References: <20250702160758.3609992-1-vitaly.wool@konsulko.se> <20250702160824.3610055-1-vitaly.wool@konsulko.se> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250702160824.3610055-1-vitaly.wool@konsulko.se> X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 62FEA14000A X-Rspam-User: X-Stat-Signature: wcn9jaxqrxdwf6x33pzn7oni9fxg1nb6 X-HE-Tag: 1751623864-456744 X-HE-Meta: U2FsdGVkX180Ei1OlZSz8gmiH4uE0b2ss+yK60ebjTBT9hbX9iSxlU9f19/ih06kUc4c/MMNjHpNFHDhVLjZ0vO42Z+lp6y5+CXC6TQERZ90cJsVxaBH2QQX9gngjqntyD5Yw4ZiDLgkyq84q8ydBGUkOeWt/h7h4er4X5MIOtGXSC941mO7dNBXZnFT5dwKZG3T9gvu1ojEtGtEm3/iP/rYF2EP1tuU7DLjtTBYwqAVN/j88imAH3Pf4QA2tcWiGSdN7MzoVIbZdROFkAHMLCVuCLwBSyI6gWcOdvG36H2yiXpKubCa5o76Eo2YGaA4YXOmInzxXPmOATMC6+gLBFL6jZcYYedAdODkMd0zjrJ+J+Y0emxWqhxaxbaB/nc6yevPbqUtvy1FCa258QHB8reDPu2TsUtQxYKQregVCaaPA9jPaaDvODrCqd5KnBDGcjE+2hv6NobXvzgygnCFPiUl7HdesCSveuuXY/+/4hHPa0Hiv3ca8Yt2hou8RXL1i/9Ra3aw/vMGmYDEw63zOcSwahs1RaIKBht92PgtR9DthjVVQ4C5oG9DodIU5JOh4jgWqdLDDIHyk5AM8RIyY8o4JOedIu5mR8+gY/tNzsolUtXcHicKHef4iTzTXYK8U0T7Y60emkzRRTGIJ4USKntprdZfr8b6Ijgx9BmUk0TiF9MbahmzI7bKRyEwnVcvLYCjdnEQBNrLB3p/y5dXq2DX9CUaKrRf9QG5f7ce0J+SkNbeYPoVTJSqbgoBELInuPB41PkNzAoGwR7l0LRQyqwYTqRbvOSWjQw7pHTbCChO5DZcUfHclz8cqMRnJ1KClN9W6D7+VFIDScIxpV4j2R7pM6uvT9sxrLF0W2+ThjptSznSyzSbHN3JCggCC9kq/g3NrQY0hegTm0GO6MY7rrI5AS9eSj2MYdGdf/srxU4FmJ52Cv++2vxPG2K/nceBejY2NoJuPUf/4lWH1xM ecQsfNH8 qErW5ypMODo7kPnAN8BHwt1ZuXHE5M3VPtQ8F32Et3OWepfBJqBTQwnN4fvSe2VTEARt4ScIRT+u9rHMVOW2JdGSIjgF/UOFTu+S509lTCX/uCBtBdxtLlOUv7Q9Qk7nLd+Fm0ikHgjnQ+KMetVikw8jSqibcAFvmSFZ/+YEZJ77deODeY93aMjlD+EDMvdVpc1jUcJo/vryJT5C1zcYf84HXQ3MCQU8OVzdsfQZNVX49Glt/ROgKom70nvq1MPZRNePbQKedMTHq6aVNmYtIfYpN7rrPFI/9DQyFz0eEU+4NXmNsBcfQtZ6rjxNpsc3UxqTUKGhMIvvCXVMjEayyVx6WuPjyReUFDEl7rKxMQtFxRAAt/831IDeQEtbDbfMHp3fG5YlhWpLFRvmT8nH5u2/Ms1z6Wpocio/6vgHdz2yVNg3inycQ41O9z+qYBdYFJWY38y4q/ajOkRREiIHcx+IT4viURx7s4l/jpgYyVNO9imU= 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, Jul 02, 2025 at 06:08:24PM +0200, Vitaly Wool wrote: > Reimplement vrealloc() to be able to set node and alignment should > a user need to do so. Rename the function to vrealloc_node_align() > to better match what it actually does now and introduce macros for > vrealloc() and friends for backward compatibility. > > With that change we also provide the ability for the Rust part of > the kernel to set node and alignment in its allocations. > > Signed-off-by: Vitaly Wool > --- > include/linux/vmalloc.h | 12 +++++++++--- > mm/nommu.c | 3 ++- > mm/vmalloc.c | 28 +++++++++++++++++++++++----- > 3 files changed, 34 insertions(+), 9 deletions(-) > > diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h > index fdc9aeb74a44..68791f7cb3ba 100644 > --- a/include/linux/vmalloc.h > +++ b/include/linux/vmalloc.h > @@ -197,9 +197,15 @@ extern void *__vcalloc_noprof(size_t n, size_t size, gfp_t flags) __alloc_size(1 > extern void *vcalloc_noprof(size_t n, size_t size) __alloc_size(1, 2); > #define vcalloc(...) alloc_hooks(vcalloc_noprof(__VA_ARGS__)) > > -void * __must_check vrealloc_noprof(const void *p, size_t size, gfp_t flags) > - __realloc_size(2); > -#define vrealloc(...) alloc_hooks(vrealloc_noprof(__VA_ARGS__)) > +void *__must_check vrealloc_node_align_noprof(const void *p, size_t size, > + unsigned long align, gfp_t flags, int nid) __realloc_size(2); > +#define vrealloc_node_noprof(_p, _s, _f, _nid) \ > + vrealloc_node_align_noprof(_p, _s, 1, _f, _nid) > +#define vrealloc_noprof(_p, _s, _f) \ > + vrealloc_node_align_noprof(_p, _s, 1, _f, NUMA_NO_NODE) > +#define vrealloc_node_align(...) alloc_hooks(vrealloc_node_align_noprof(__VA_ARGS__)) > +#define vrealloc_node(...) alloc_hooks(vrealloc_node_noprof(__VA_ARGS__)) > +#define vrealloc(...) alloc_hooks(vrealloc_noprof(__VA_ARGS__)) > > extern void vfree(const void *addr); > extern void vfree_atomic(const void *addr); > diff --git a/mm/nommu.c b/mm/nommu.c > index 87e1acab0d64..8359b2025b9f 100644 > --- a/mm/nommu.c > +++ b/mm/nommu.c > @@ -119,7 +119,8 @@ void *__vmalloc_noprof(unsigned long size, gfp_t gfp_mask) > } > EXPORT_SYMBOL(__vmalloc_noprof); > > -void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) > +void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align, > + gfp_t flags, int node) > { > return krealloc_noprof(p, size, (flags | __GFP_COMP) & ~__GFP_HIGHMEM); > } > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 6dbcdceecae1..412664656870 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -4089,13 +4089,22 @@ void *vzalloc_node_noprof(unsigned long size, int node) > EXPORT_SYMBOL(vzalloc_node_noprof); > > /** > - * vrealloc - reallocate virtually contiguous memory; contents remain unchanged > + * vrealloc_node_align_noprof - reallocate virtually contiguous memory; contents > + * remain unchanged > * @p: object to reallocate memory for > * @size: the size to reallocate > + * @align: requested alignment > * @flags: the flags for the page level allocator > + * @nid: node number of the target node > + * > + * If @p is %NULL, vrealloc_XXX() behaves exactly like vmalloc(). If @size is > + * 0 and @p is not a %NULL pointer, the object pointed to is freed. > * > - * If @p is %NULL, vrealloc() behaves exactly like vmalloc(). If @size is 0 and > - * @p is not a %NULL pointer, the object pointed to is freed. > + * if @nid is not NUMA_NO_NODE, this function will try to allocate memory on > + * the given node. 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 __GFP_ZERO logic is requested, callers must ensure that, starting with the > * initial memory allocation, every subsequent call to this API for the same > @@ -4111,7 +4120,8 @@ EXPORT_SYMBOL(vzalloc_node_noprof); > * Return: pointer to the allocated memory; %NULL if @size is zero or in case of > * failure > */ > -void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) > +void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align, > + gfp_t flags, int nid) > { > struct vm_struct *vm = NULL; > size_t alloced_size = 0; > @@ -4135,6 +4145,12 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) > if (WARN(alloced_size < old_size, > "vrealloc() has mismatched area vs requested sizes (%p)\n", p)) > return NULL; > + if (WARN(!IS_ALIGNED((unsigned long)p, align), > + "will not reallocate with a bigger alignment (0x%lx)\n", align)) > + return NULL; > + if (unlikely(flags & __GFP_THISNODE) && nid != NUMA_NO_NODE && > + nid != page_to_nid(vmalloc_to_page(p))) > + goto need_realloc; > } > > /* > @@ -4165,8 +4181,10 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) > return (void *)p; > } > > +need_realloc: > /* TODO: Grow the vm_area, i.e. allocate and map additional pages. */ > - n = __vmalloc_noprof(size, flags); > + n = __vmalloc_node_noprof(size, align, flags, nid, __builtin_return_address(0)); > + > if (!n) > return NULL; > > -- > 2.39.2 > This one LGTM. Let's see what folk think about SLUB changes. We need to be aligned with naming and approach on both sides. Reviewed-by: "Uladzislau Rezki (Sony)" -- Uladzislau Rezki