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 01AD1C71130 for ; Mon, 7 Jul 2025 16:49:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D0876B03FA; Mon, 7 Jul 2025 12:49:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9814C6B03FC; Mon, 7 Jul 2025 12:49:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BDF26B03FD; Mon, 7 Jul 2025 12:49:01 -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 7D29F6B03FA for ; Mon, 7 Jul 2025 12:49:01 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F378D10844D for ; Mon, 7 Jul 2025 16:49:00 +0000 (UTC) X-FDA: 83638053240.03.E8A8E5E Received: from mailrelay-egress16.pub.mailoutpod3-cph3.one.com (mailrelay-egress16.pub.mailoutpod3-cph3.one.com [46.30.212.3]) by imf30.hostedemail.com (Postfix) with ESMTP id 413C180006 for ; Mon, 7 Jul 2025 16:48:59 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=hAytTvgW; dkim=pass header.d=konsulko.se header.s=ed1 header.b=9vTdHmBm ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751906939; a=rsa-sha256; cv=none; b=rRMedO9tecTyjB9fyfwOtp3eEdoFMpSvbNQ2A5ROE8DZfecUnmXRpsBVnXdvLPNbzKGTHg ZaRIYAFwGYfgfussOh01DhwQNvn97jUeT0YFDK0soPpqKAnXsMRaPcIxpbvILOm4Maa2PX gCn2MfuDGssVUOtFwIqFAiq5pF5gIXs= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=hAytTvgW; dkim=pass header.d=konsulko.se header.s=ed1 header.b=9vTdHmBm; dmarc=none; spf=none (imf30.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.212.3) smtp.mailfrom=vitaly.wool@konsulko.se ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751906939; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OLXfbJyhoKxoT4YykcPTKSb3/uR3jlHoqcpTBeW4v6s=; b=VN9BvXI/0fj8vDlK5uce+HWdrphDarVoNMuSFMBOiGET694dT64uVQIgJV7WZrjYHy3UtN y2wMukVthSGLYP0//0yHu2ISmWXKZDrMFXsKXklYyFXwMGbUTZvMqeDvNHxVQ+6t8xKHGb xV62tl7Y1GSeCIax5b3pjFF0LF2MBEA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1751906937; x=1752511737; d=konsulko.se; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=OLXfbJyhoKxoT4YykcPTKSb3/uR3jlHoqcpTBeW4v6s=; b=hAytTvgWOQ+f8qXBb95id/65h68KdMw9zaVtKyUO4PE/Z8ylrYWwVuGfHjiqbR2t4Eyn5mF2sPd9B 3GBbKzCuGyKhoohLz6ltdFb0vx6ql6Qcxk8jZlvK67paSoFcG5aMyj7rdSdhIVK5WR7VadCRbpPKWs 9VryaLZxdrwmlCLr3L8IdqsRKsO5b22IGzVkRb4rsbTR+yfK4hz3dh5l98kpqay0P7CIssb5vWwvGi aswksDWNFcN2/4eB/DM3aXD+5vXWst9XXeYgEqlD3AGNzyzhWPh+0z9B1RUHtr+wVOQAANsoA5uYoV v+ZqE/pPPMUnFT/YzKGtpg21QbSSlvw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1751906937; x=1752511737; d=konsulko.se; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=OLXfbJyhoKxoT4YykcPTKSb3/uR3jlHoqcpTBeW4v6s=; b=9vTdHmBmlIVZbVo5hc4c4dNwJBc+CTTBJpgQ3K+SwHd5blvdgKl2Gv2ZbgUKZjnDwxG250o3gcPNj lJl9G/qDQ== X-HalOne-ID: 459027f8-5b52-11f0-8ca0-81a63d10fb2d Received: from localhost.localdomain (host-90-238-19-233.mobileonline.telia.com [90.238.19.233]) by mailrelay5.pub.mailoutpod3-cph3.one.com (Halon) with ESMTPSA id 459027f8-5b52-11f0-8ca0-81a63d10fb2d; Mon, 07 Jul 2025 16:48:57 +0000 (UTC) From: Vitaly Wool To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, Uladzislau Rezki , Danilo Krummrich , Alice Ryhl , Vlastimil Babka , rust-for-linux@vger.kernel.org, Vitaly Wool Subject: [PATCH v11 1/4] mm/vmalloc: allow to set node and align in vrealloc Date: Mon, 7 Jul 2025 18:48:43 +0200 Message-Id: <20250707164843.631434-1-vitaly.wool@konsulko.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250707164755.631374-1-vitaly.wool@konsulko.se> References: <20250707164755.631374-1-vitaly.wool@konsulko.se> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 413C180006 X-Stat-Signature: d94wufcsmq6bphjfgre5zzgcc1nyigkg X-Rspam-User: X-HE-Tag: 1751906939-640915 X-HE-Meta: U2FsdGVkX18n2qnZBRJUq+meEu7p2jbpRs/YbcDywVzcmoE/tZMO6K0kwav35GGNYue5G2CWxrFh4QQPyfSkmO6i4HnQnTjL2r0tUUTqUgQ79Yp6+Bw31O1WB2tnoKQ2quyVuCF3wHz1ABhw6rErD1iW7KOoy2f2pcxiQ4AwXQH6akFdndef0S4VAOpSSaJgPC9lqPHemM6jn9av0UBjGKsCma0mVqLogZ0ewMc8iCkd5wXW44+lZ7Hfw4jyHnEPOKK21FjsnZvoBRjTM6vlSlOMI8IrazpwDoJwfq3vamoG0THhc6RXzvtuv1wfJNd1wd/XZeyaie0iPDRULLsXmozsmrwWmhl7UQ/ukeQ4vav5bd9lBeNbMx9OkwUJNZ1iJRHLggjfSEz7N+fyg9BHHO3kdSbQX1z/d3SDT37GIyx/BY4MojK0hj1s4XrDIm7PAVlEeWQYRVvu1sLPCNWvYl0AWdOsKw5SgXzFJLdGsPjOpj6nW8pOMMH21VmyzKEAm2ARS4ldibg1eczDarmZlAkpUdlVtrZ+dOT98ZC9zqM6VrdSNmxft3Pdg8QZVZcKwj9QWhByXA0SOMzpuzrr7HmT7HDv4MALt8AFkv7FXiB4Cghw3eECu0xH91TFFKbkXJ9OTZoXYyxQIetJ6Cd5GA7DZE8+sgl6qAEcXTIWU3AsyQNAfdFxOLvDluoIs6503KyvWB0Zl6Oy4jab980Ks46WcD1SRhxMBbYEi2KBm5wemADRaclw9W2vhT0lWky8/+M/RBAg4svbKav7Qhy2NC34S8lql3YtEEu+3WeQUvCQrxojPcr0XhVsdshgpU0p7OE3t7h0Cn/ArurIbo0Tsvte2PNMuUSOBWCxPrrYmuR/ClgMZJMzp6hS/TuyBhQZWZ3ngOoLkgHrIko9o+tcDUVy3EE7aChOitnrP6o4pP2Zw7XOOWzuilARDonLJS54TDXW7TCwDEK8QV9nRqq eJ1uqlqs j48icSdRsmz83jrYfceSI/K2r0qN7K/zXOIL43P+p7xP6Z1uqpRQ+M6I30aYmQtoxBEZcYrJwX50fVl7gLw36bgL+DXN5pwdh0IRmD/9EELzMI7Cz8hGLqshE+Z9I+uWBtgS5O3HsBwXln1Hvo/gZcjzEVL5p8FprkcrRZDL5hmxqyYlNOuw6o6Sc/99Xo+th8fshHW9q3xBveW4= 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: 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 Reviewed-by: Uladzislau Rezki (Sony) --- 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