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 2DF80C7115B for ; Thu, 26 Jun 2025 08:36:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C67306B00A3; Thu, 26 Jun 2025 04:36:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C17BE6B00A4; Thu, 26 Jun 2025 04:36:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B55446B00A5; Thu, 26 Jun 2025 04:36:25 -0400 (EDT) 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 A0DDD6B00A3 for ; Thu, 26 Jun 2025 04:36:25 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 026E8BC02C for ; Thu, 26 Jun 2025 08:36:24 +0000 (UTC) X-FDA: 83596895130.05.D633299 Received: from mailrelay4-3.pub.mailoutpod3-cph3.one.com (mailrelay4-3.pub.mailoutpod3-cph3.one.com [46.30.212.3]) by imf03.hostedemail.com (Postfix) with ESMTP id 1418220011 for ; Thu, 26 Jun 2025 08:36:22 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=cn5kbwdr; dkim=pass header.d=konsulko.se header.s=ed1 header.b=ioaMVepK ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750926983; 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=mkYpvclAYF6uZDEKl93atoHVzEINRICyZlGgMsyMSN8=; b=pSo2cci6yGqzxXKVA2W1rasfyXPRMcv43A4/cmyGUmEM1N8w01gZDbyDmkmCYJF3fEgeEf 3YqPk1NDRBKaIxkgA1jusgEpVCiRvJ1uCXVDYrTtgCUiBBSIILCLZH3PiZsBQQANpvo3Sv Eft701d/zN5enOX39IiTskG7t4zt1XA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=cn5kbwdr; dkim=pass header.d=konsulko.se header.s=ed1 header.b=ioaMVepK; spf=none (imf03.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.212.3) smtp.mailfrom=vitaly.wool@konsulko.se; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750926983; a=rsa-sha256; cv=none; b=wO1ei8kYM4eMeLrHflVMdvmvPgC9ErROB1BCEWchj757YBrcLSZEaIjc74+EdoiGSUO3Qw RMN2DTBcgpOMKXsDWZ/0bGMdXU0O1PXeabVvKdoBFSy3FQh60h+TbicPMLnOxWRKFwPu0R eIbImI4du/0SzqWddl+JpdNayLta+4c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1750926980; x=1751531780; d=konsulko.se; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=mkYpvclAYF6uZDEKl93atoHVzEINRICyZlGgMsyMSN8=; b=cn5kbwdrF0U0ijbydoKjcGWYj45rESCFlARBFb3a3xk5AeytbkLXtpXygHIvf+GHnFgyry4H/E8Y/ xa4ralAXWUP6A/CaZV2FHo372ysJfkKEB3JEjlOue5PyXGb9aPlmH5MbOLtrmvSeYZ56CzM/IK6eUv siz7vAWhL/TZRX1bxFAWJCuDwUu6l4v8UshLbqzXQumX51vXO2qt4foDLN0oBPkfc5Mb9f2355CIHl pBvlEekquW7MbiOgGNqfZufFOMp+dRrEhAKob6snl06Pahd9At3Gt1Dv8SYa2CbHn12U+Iip7rjlGz XYHEOZwE51SJ++/fOk0KxyHedYLA6vA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1750926980; x=1751531780; d=konsulko.se; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=mkYpvclAYF6uZDEKl93atoHVzEINRICyZlGgMsyMSN8=; b=ioaMVepK/VgZgirl2GI14/87I/2Zw/jDC/YpwE31muFRDbDmhjKabDOkOwivvYa28cZkBVI+JPEim CtS1W+ZAg== X-HalOne-ID: a129904f-5268-11f0-9ab1-29b2d794c87d Received: from localhost.localdomain (host-90-238-19-233.mobileonline.telia.com [90.238.19.233]) by mailrelay4.pub.mailoutpod3-cph3.one.com (Halon) with ESMTPSA id a129904f-5268-11f0-9ab1-29b2d794c87d; Thu, 26 Jun 2025 08:36:20 +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 , rust-for-linux@vger.kernel.org, Vitaly Wool Subject: [PATCHi v4 1/4] mm/vmalloc: allow to set node and align in vrealloc Date: Thu, 26 Jun 2025 10:36:17 +0200 Message-Id: <20250626083617.3596326-1-vitaly.wool@konsulko.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250626083516.3596197-1-vitaly.wool@konsulko.se> References: <20250626083516.3596197-1-vitaly.wool@konsulko.se> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 1418220011 X-Stat-Signature: dtfwutkqch79518bxwb5udzcu67mtf3z X-Rspam-User: X-HE-Tag: 1750926982-786956 X-HE-Meta: U2FsdGVkX192QiB1K0QaqADVazyyC5slBoFCctOqma928stEZ/RmqKqj4UQRV60cQ8IHz9I2jpDUCIuC/zhdWVDRHaEbX6NFviFNUtAD+pEQPPjRT22XKq/yJz6sf6jOvxJ362aRObFfse08Fx76XmXU3T9Gke9VfkYkQGDalL/N5VdFkKYytHtqdTBDYzzkBGbLWS5LjZrYWRKxe7S6f8UEHRxvSgzxmAPrEEEpJezr/Qv6RDaL/tdlkBjyoXOnYXdWY8PZx1RF1YXvQQtJlZ5EICncSt/0spJR11I5gQQl+O9pAvfpa4zpjK6k8oSaI08zp7bpZB4QMfRpIR+QVVPTL6xUzi907yLtL8gudvyUXXQIDLDzPkQeC3NgOTexFQ5+F1V9zgOU9Nd8r2+15imUE/kF7XoVrqUFbqCxwVI4Ac0iOcrmkQ4lk6qH+vI2GUFoxcaMvJFRiY+0Eypwbqe/sk8v0KLSjtvZW6jRibY2SO6B0nEazFu35HkCC2YhSF8cOyFqhxN8yiWExUFs7zNB/h7O/lcUTHLigdXozksYYalrDLdiSJM47/3qgvf4Z9sTn/TDVo6s8EqK7q8Jf6uHhjvKeMkQT9tP0PxPA9UWsbAiOYnZbstrPSV4plw3sKKarfdCZrpv14IEbg+awVq3vAUTc06eLj+HAVkEhcsLht3sbLr8qUmch0nopiM9lbYdPqIIypY5PqV8ZJkFp/AIF0ogRyN72veZsiFct8opc9GfwKjo8+PqHUXKte7EiN2gUsNKw1f+9tuzDGM+7NGGcRH5aWGqIbXBXzy1LgAMQ+pruYJ1ZPbSAMqax0x5HRhvcGsJSvDlsRZsx4wZ9bm23xLIBhc3sVkbQ/DiCIKIWBDRVtm0yUeI/rP879V0a37pgKeQErjCnkY2pazflQqgvGoeJgzjgibnvWu/SnluUH0hJMoNFzkHqZBsgmP2OAjU/sq+bfmjx9v32Gb j4CRgfUi +u6GGJ0BX4GKn+mXILXqJJmniw0AQ+VzcdzrrYpfTCsbfpf3rMElRGqJ3BV9XZgO5NaxIQa64ZDeutPeXt5D+1hZjsAfk0M5G1fGbvNfnzIYSmBtveY6cz7sBK8UFXYW46aD8PW5CyRqHnnNpT9EMB1bGnD9h5fd29ri5ZeFzzZxnUE7/Iy2kPvPmo9W45w0pGw9j9vi0ZfrjTiY= 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() to better match what it actually does now and introduce a macro for vrealloc() for backward compatibility. With that change we also provide the ability for the Rust part of the kernel to set node and aligmnent in its allocations. Signed-off-by: Vitaly Wool Reviewed-by: "Uladzislau Rezki (Sony)" --- include/linux/vmalloc.h | 8 +++++--- mm/nommu.c | 3 ++- mm/vmalloc.c | 16 +++++++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index fdc9aeb74a44..7d5251287687 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -197,9 +197,11 @@ 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_noprof(const void *p, size_t size, + unsigned long align, gfp_t flags, int nid) __realloc_size(2); +#define vrealloc_noprof(p, s, f) vrealloc_node_noprof(p, s, 1, f, NUMA_NO_NODE) +#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..6cec05c3312c 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_noprof(const void *p, size_t size, unsigned long align, + gfp_t flags, int nid) { return krealloc_noprof(p, size, (flags | __GFP_COMP) & ~__GFP_HIGHMEM); } diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 6dbcdceecae1..412bf5b8d3ff 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -4089,10 +4089,12 @@ void *vzalloc_node_noprof(unsigned long size, int node) EXPORT_SYMBOL(vzalloc_node_noprof); /** - * vrealloc - reallocate virtually contiguous memory; contents remain unchanged + * vrealloc_node - 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 id * * 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. @@ -4111,7 +4113,7 @@ 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_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 +4137,13 @@ 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(nid != NUMA_NO_NODE && nid != page_to_nid(vmalloc_to_page(p)), + "vrealloc() has mismatched nids\n")) + return NULL; + if (WARN((uintptr_t)p & (align - 1), + "will not reallocate with a bigger alignment (0x%lx)\n", + align)) + return NULL; } /* @@ -4166,7 +4175,8 @@ void *vrealloc_noprof(const void *p, size_t size, gfp_t flags) } /* 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