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 A862BC77B7F for ; Tue, 24 Jun 2025 09:51:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EB6A8D0002; Tue, 24 Jun 2025 05:51:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39B748D0001; Tue, 24 Jun 2025 05:51:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28B398D0002; Tue, 24 Jun 2025 05:51:38 -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 1509D8D0001 for ; Tue, 24 Jun 2025 05:51:38 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BC3891A032A for ; Tue, 24 Jun 2025 09:51:37 +0000 (UTC) X-FDA: 83589827034.06.AC184B5 Received: from mailrelay2-3.pub.mailoutpod3-cph3.one.com (mailrelay2-3.pub.mailoutpod3-cph3.one.com [46.30.212.1]) by imf16.hostedemail.com (Postfix) with ESMTP id B731A18000C for ; Tue, 24 Jun 2025 09:51:35 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=xb2dolm7; dkim=pass header.d=konsulko.se header.s=ed1 header.b=6hNG98yt; dmarc=none; spf=none (imf16.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.212.1) smtp.mailfrom=vitaly.wool@konsulko.se ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750758696; a=rsa-sha256; cv=none; b=gv5G3Yu0iFlYySMW5gfvSXzecxSEbPdbeyYZDLuQlnJ4Fwp4Mrmfy0h8S2jdBjrX3m59Fs iUx0wqTrtlFog/A6AAr045TM672D84zzsdzM4mnhFnBWnse2rjhMPcAOCkFBcpHnsv0/sE 6+oSJEPw+85nsliS9fcu2AfrdrcqgHs= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=xb2dolm7; dkim=pass header.d=konsulko.se header.s=ed1 header.b=6hNG98yt; dmarc=none; spf=none (imf16.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.212.1) smtp.mailfrom=vitaly.wool@konsulko.se ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750758696; 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:references:dkim-signature; bh=Y2ViI0m6Ko/2vCWgWrN+qyTDBaY8p8ed02QkoJAaUgU=; b=uexcDXCtTvMJqaJ5RBDA7b1KBueI5ornJGcTw/mkHt++U0q5c9sWJ1FsLmBG4kFQnWR9i+ pMvvox44mxQHH5jsvYsjw0OCkmSqji/iecXbBQf2fmhvlatVvMkc74zIHj0TR+m6DtwV6c hRoFDfpXceyifqNxGxj2Ju/Wx2DJhqc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1750758693; x=1751363493; d=konsulko.se; s=rsa1; h=content-transfer-encoding:mime-version:message-id:date:subject:cc:to:from: from; bh=Y2ViI0m6Ko/2vCWgWrN+qyTDBaY8p8ed02QkoJAaUgU=; b=xb2dolm77e4o92saCnwSqyWpYW9GAv3uL4RlOkuUBjwsNbue22f0cRtCdJsd2htSG5QfloSi5BicU K2vHl7Ki2kTNG+gg/n2Af4gF/60s+q64vAb8DiVr4sG8v5RBE7sj1fF6I9ESqldRIpLZKF2hPc4Rlf 2Wt+h/wMtVXkL0qH/mC6FZLINkVzjU4qJSoa51HNHv7VJj7AHpwXm5g2exIGo7uoOjmsMkkwlb3Mtm KrW6wbHNAX7tsbKGMGAV8KO12Cc+Hx0g4R0T0kTiG9pCl4idcB05z2vvkTsZKQkNnazTAn5G4dqMha KZCYMMMpuhADBp22uTamHK3rsqAcGOA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1750758693; x=1751363493; d=konsulko.se; s=ed1; h=content-transfer-encoding:mime-version:message-id:date:subject:cc:to:from: from; bh=Y2ViI0m6Ko/2vCWgWrN+qyTDBaY8p8ed02QkoJAaUgU=; b=6hNG98ytp9OfWzzNVSjeBjQl0/oyu15lMqzPrsfOmom+8QOlJLCEQZpFo1W5VC1uL+GugOOoZ/T1R nFD5FalAg== X-HalOne-ID: ce8fdaae-50e0-11f0-b958-b37c246f863f Received: from localhost.localdomain (host-90-238-19-233.mobileonline.telia.com [90.238.19.233]) by mailrelay2.pub.mailoutpod3-cph3.one.com (Halon) with ESMTPSA id ce8fdaae-50e0-11f0-b958-b37c246f863f; Tue, 24 Jun 2025 09:51:33 +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: [PATCH] mm/vmalloc: allow to set node and align in vrealloc Date: Tue, 24 Jun 2025 11:51:21 +0200 Message-Id: <20250624095121.3243540-1-vitaly.wool@konsulko.se> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: B731A18000C X-Stat-Signature: jfb89wyzmmm6yymm66tfjphtj1c5jcik X-Rspam-User: X-HE-Tag: 1750758695-99921 X-HE-Meta: U2FsdGVkX1+X7S3QEs3CzlK/34NB+m6iVIPv7NACd9lwSaosZZlXW3JUDMB+1WpERmIHmypNBFxJhMpjuF+UVfBUl8QxLKMujNKhD9qvQPT9IdNLPWLbAe2J9NpQiJkIowEZFYhFK+i7CIcKFlqWMaxw6T0P46aa0C9d3scGg0pq7uaGRjFoDFy+G/xmfxoGrOYk3K20kGQMdC95ehyGJP6YshDmh0AYKLNZRttWpCSEzXX8rfVe0C2kmdupti/YarJT04/C3dbQ6psi0ptRWf3PpgSOs7lpacFhsALTX2fDcolqzJVnPuzpjZsqR9yAf89gDHhpCGAGonQgwjh0e91RmGVB3JWdKfmXyB2ghhAracTFRsnbspjC5mpanIrNWNfx0qkTuyJGqwA22gFbt04uyU07/N702+tpXYc6VBmaKmVjQtzuLVNrgrFJwNmsOgrlilZmQikcpN1KpdjGwMOvtFKSGxsmz6bDw0ZBxZDKtPJUM6ml5KNoWljAf6z0M4SxlXLB3H6HSWHF05ALSYIvCb+RwulvrW0BRVAPYvZjy+vqGh9IQXGt4iaH1PtoGGqGsmYdFQ/sU8/9CusEphLVtSuvudx5GtmYJ7D7ZDqU21WOTaUYd1Vm4DeuTZkBDhyz8ML/g8YgVY4y7C3iLMP2IW8FZhLYV+yJVs5b25froQY3nl5DLMFya0KG8EIKwCAlkWCfvxWKw8SGcTw0XT0Dw9VZks4Sne8jP4Hii1+OUdDyFFQ25DhDB9eTpB2GbR1p9ragU0W/i3rfqqeJ2FeTKlYbVwHRQIbfkTcbwOZdhOjowdob2NEuKsSIam22MqGEoz/6OI4cEbyfxDt/mLhFpyPse2G34wdobUjevI4CDt0vUGOQAh0UHAbuhK6ATo0426miYj2qXlG5VZNW4H7d++jegBFh 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 --- include/linux/vmalloc.h | 8 +++++--- mm/vmalloc.c | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 6 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/vmalloc.c b/mm/vmalloc.c index ab986dd09b6a..117894301db1 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -4081,10 +4081,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. @@ -4103,7 +4105,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; @@ -4127,6 +4129,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; } /* @@ -4158,7 +4167,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