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 3CA00C7EE31 for ; Fri, 27 Jun 2025 09:35:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B065F6B008C; Fri, 27 Jun 2025 05:35:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB5E56B009C; Fri, 27 Jun 2025 05:35:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A4B06B009E; Fri, 27 Jun 2025 05:35:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 87A296B008C for ; Fri, 27 Jun 2025 05:35:44 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 12AE0160318 for ; Fri, 27 Jun 2025 09:35:44 +0000 (UTC) X-FDA: 83600673408.10.AE97D84 Received: from mailrelay-egress12.pub.mailoutpod2-cph3.one.com (mailrelay-egress12.pub.mailoutpod2-cph3.one.com [46.30.211.187]) by imf10.hostedemail.com (Postfix) with ESMTP id 4B855C000D for ; Fri, 27 Jun 2025 09:35:42 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=YaSWyKXm; dkim=pass header.d=konsulko.se header.s=ed1 header.b=Bzs1mKGt ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751016942; 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=zkwJ4i4dwDao2rWYOJehq905CyIjzLTLMDu2gHmT6vw=; b=r4F8hV/GhQOGcwksmC1kuauEr68D7QClusJUfwfmS9wf8uE1oE6/wriatRmKgXDbIG6NSK 7R7fg3k7NVnSsagYXbRn9WFz41QaNBMmWLK1z8mG0XZP8ecmChPPlrZHyM8OOIzPFJei2S ubryvJTPHK11RQ8+2Kh3THzEx1Rg/7o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751016942; a=rsa-sha256; cv=none; b=jlpiYrSkb/MYuRy/7YgXsij03S32/puz7CggGZu8sErDtdhftehMdigEnrcQTwbwfVXyXV CEzJw7wG8nuquPKhvyRrmReEyKMOfKV1MKlRM/rJ99ZE0vQjr1LkPrRvMRjsLyWhFpr2io q5Tng49501pn2UOdtowUNiY9CWA4UXA= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=YaSWyKXm; dkim=pass header.d=konsulko.se header.s=ed1 header.b=Bzs1mKGt; spf=none (imf10.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.211.187) smtp.mailfrom=vitaly.wool@konsulko.se; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1751016940; x=1751621740; d=konsulko.se; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=zkwJ4i4dwDao2rWYOJehq905CyIjzLTLMDu2gHmT6vw=; b=YaSWyKXmot4ncdE1drt7pMeviwBdIcXqNoGY6NnytCBGbPkJX1xNXgA0MIBpC6okkiNTFDfQ0V8EJ CuekJCuGEPlainh8aj2VEeFrFMXUsjzgjerhC8zO6zOECq5RCUWVr29wSPRU/iHuePLowbM191wn5w B1k6uJQ32mgdd/pUG/mN5UUOWPBIOtfMAqN/AeZorsB3PTj7WKq6jn41HTR3vU701QwHMLl1Fx+unW nFezrdhwhJY96HA99BRw1dwu6VQSPwKIg/rgWBCY56L+sCo1YOh7nBeARmNumwVGe+gGh1LykHx2ls CDncwNGw2R5KujtjU61XzUudSB5tSaw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1751016940; x=1751621740; d=konsulko.se; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=zkwJ4i4dwDao2rWYOJehq905CyIjzLTLMDu2gHmT6vw=; b=Bzs1mKGtY2ZkvDPgn4Jsuquqs4SwAtKFF7QBvPxrxar+jfnNHX/5QUBRHAib5ALJZLOWEY3N11pxU Rle9gJJAQ== X-HalOne-ID: 1567cdf5-533a-11f0-83c2-e90f2b8e16ca Received: from slottsdator.home (host-90-238-19-233.mobileonline.telia.com [90.238.19.233]) by mailrelay2.pub.mailoutpod2-cph3.one.com (Halon) with ESMTPSA id 1567cdf5-533a-11f0-83c2-e90f2b8e16ca; Fri, 27 Jun 2025 09:35:39 +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 v5 1/4] mm/vmalloc: allow to set node and align in vrealloc Date: Fri, 27 Jun 2025 11:35:29 +0200 Message-Id: <20250627093529.389311-1-vitaly.wool@konsulko.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250627092901.356909-1-vitaly.wool@konsulko.se> References: <20250627092901.356909-1-vitaly.wool@konsulko.se> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: m49daba3wotu81xe8771stra7fkqpiea X-Rspamd-Queue-Id: 4B855C000D X-Rspamd-Server: rspam08 X-HE-Tag: 1751016942-178511 X-HE-Meta: U2FsdGVkX18cTZabSBuaccHDTtxrK1JecvwgO2T5AMZkgfkcIcSTzauWKCVcfCUWXQVLWA550nMLq7PI8f1MMVXvg9B58ygZksUimcVbCOYz0wsgM/+/6e8OkCBE9P+rHrAtaS1EgtkLrTef9Srhtuw4xGnbOo1WkoGgIxfcSVD04unhR0DHXSSQ8PP+hOxvK4eGuTF8aJrBx2Cy08JvC/Rz3Nsevc0xdvmaZsvrZBmcbJ7gBJCwic6NRNi3ZumQaofek6vzmr7yEC3gdIzahKti5D8ijQR58uwDPNptXB0iOcUT0uM2w/Hptczr2iehXUsR15MOguZaub+tNTGLa679kvLEEwqzWMdiXUm89KTTSVJpbWyx9BTV17ch4L6onvnZSQg8jeXU60W2iNRAlakQXSlsdk3q5dBQmUyD+/3TrDTRr5opgYxhGfFiSwyV0noutAcVmMDe3AfZ39BjrOrdW9HD3/dJC7Ajbnc97PxRixRhm4/UWI/mt06VLPsi5eAM0nMmlBZmLpJcMKs7mp+3T/hLQjShapzEK2cpOT6SXKdqvHtkmWbMu7pxd8WrpBO1PattplPJv98Y+ywMF+/HDrW/A8OYCKSvO+3KYkqukKTo98in8LaUOqNGojy6bvyK4qrdwqz/k7brv50C98cbDTCGc4fzPfEhibJbeDt9HoprqDacCmUhcVyryfcbYipIWpJjj9HV/o88P2b67DOTqzVQSjCj1SmM1GOOE9rX/CQD3qenzJge/h+/q9W81OR7wkfQ+oJdCSba0rcl5sw734qWydYszIQ4YpanzOwTTNZWILI59afSaaUjqahG4ahADMpsPOXO+wyYyFL3d2zk5QPAgIPmmQ6Afjlhsu1uFnLqFOCzL4Bay9vmZgaIpkG3iu7Ag40QkTOYjn00fxllhgjjWgjwoE7gUgmkmQSkO8+BsIfmAELz7SQp04kOhjLZc3TmbczNsG7O7Ki 1TaIwj1h 6iZZ6WuYIWhm2q8dIGIzI4LEveHJ9D/DXEuCWxe+c5h0ukL6xirJ8LAld5IqMHxLPRA/DasAOB2CnR41J5RcfMsKzABT7gQpQUCJR3rkqozs9UIp0d3ClUMoQeejx6CbNX9iznWl3ra85s7i5ZVrQEvDkZnAiZBZr9BYaZVcf9Xj1LyQhZDseHNhQZrkbWko5xLqD3e/byJ663s8= 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