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 5D8DAC77B7C for ; Wed, 25 Jun 2025 06:30:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 055F96B00B3; Wed, 25 Jun 2025 02:30:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0065C6B00B4; Wed, 25 Jun 2025 02:30:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E37D26B00B5; Wed, 25 Jun 2025 02:30:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D01F16B00B3 for ; Wed, 25 Jun 2025 02:30:20 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 56F631A18E0 for ; Wed, 25 Jun 2025 06:30:20 +0000 (UTC) X-FDA: 83592948600.02.9A90DDF Received: from mailrelay6-3.pub.mailoutpod3-cph3.one.com (mailrelay6-3.pub.mailoutpod3-cph3.one.com [46.30.212.11]) by imf13.hostedemail.com (Postfix) with ESMTP id A030A20007 for ; Wed, 25 Jun 2025 06:30:18 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=mdHOsk+K; dkim=pass header.d=konsulko.se header.s=ed1 header.b=D4JuP3p3; spf=none (imf13.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.212.11) smtp.mailfrom=vitaly.wool@konsulko.se; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750833018; 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=D0x/pTDcFb9pevSx82X48KOGSgZKiyjVSzlAvoUa5m8=; b=HcxlAvBBfij4HjiGBnZv5yh7yIJOyRLyASanGwU4uJEjo0FuGbofTAGr3ut5FeW5yYyCk/ Ns4LAta0R1LJkuihIQs2iXSyALeYI0XWK6af9GFWEEVZhZHZwZ3z2HdZyWfn46ktXoOC0u AXO3ndrpkONBqp0+M+Ho93XSQHTUMwU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750833018; a=rsa-sha256; cv=none; b=ByIdEQc04nA/RM4I90PY/Axe/Kot6CCmLFz2/0kj+eCWpqSaqSqMex+Hk97YJbWmB1m/vU +qoD3KDjD2WLuq1hC0GcdEur7KKGDaVY65niay+Npw1bvDFkHV6IQw5vF57+W8JzswDPDc 49tKuNgFFzXwo5LfUm5WIxBwnyecMjA= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=mdHOsk+K; dkim=pass header.d=konsulko.se header.s=ed1 header.b=D4JuP3p3; spf=none (imf13.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.212.11) smtp.mailfrom=vitaly.wool@konsulko.se; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1750833016; x=1751437816; d=konsulko.se; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=D0x/pTDcFb9pevSx82X48KOGSgZKiyjVSzlAvoUa5m8=; b=mdHOsk+K5OeP97lLxGWgnLKIr0zfdUY00pO8VkeUHl5J4yZvHK0l1WUZf7QzxbK0movr+tHiUIy4N IunkDRbwiGpDICzRVUz55cpN6T9ggAweEbnVVzMGNdUhHph3xmQeNFZMFOmgkNkSx9yYL5YUOIQ2X+ tgzB2pmtBahZa8locAt037aGaAv8Xw12f5zfTCSAcmyY6LdAZ/xXycvRhs3tg0OnD2qBQ+OnxNbymy ew38oO1m5FiLbqwg1hy0llLBUXm0cFfzsVzBVJbdPMrv7NEXeNsq7K4rL0eLZAdSmon4KytHS1BWis 2mSqRrya3Q6AfMB6DgO/TD1MsJjeyBA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1750833016; x=1751437816; d=konsulko.se; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=D0x/pTDcFb9pevSx82X48KOGSgZKiyjVSzlAvoUa5m8=; b=D4JuP3p3A3CvYIHdITepWPPwZJJgK6lsUPXyNfCfPJbAHtG8G/S2wadzC7MZzGtHKpYLtisVT8oa1 kOFQM6aCw== X-HalOne-ID: dabebd03-518d-11f0-bce5-417246ffdc90 Received: from localhost.localdomain (host-90-238-19-233.mobileonline.telia.com [90.238.19.233]) by mailrelay6.pub.mailoutpod3-cph3.one.com (Halon) with ESMTPSA id dabebd03-518d-11f0-bce5-417246ffdc90; Wed, 25 Jun 2025 06:30:16 +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 v3 1/2] mm/vmalloc: allow to set node and align in vrealloc Date: Wed, 25 Jun 2025 08:30:13 +0200 Message-Id: <20250625063013.3379896-1-vitaly.wool@konsulko.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250625062917.3379804-1-vitaly.wool@konsulko.se> References: <20250625062917.3379804-1-vitaly.wool@konsulko.se> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: A030A20007 X-Stat-Signature: pq1ram5ij7frdmugtzyqnb5p4db7gk85 X-Rspam-User: X-HE-Tag: 1750833018-281187 X-HE-Meta: U2FsdGVkX19x028skwVPG29z8TO4zcmcp+n2zbCkO0O2ieDxYGeaiSxJySG8hJsDwTGPVXuv48Ytg8YbmTKePmbyozo+AGHAotecqTiCld3sQLfS9NMi+Gq9kgsF3ADwj++P3mVRD+U6dj/Qx6JvR2Wi4/Lq8tgJpAfTMIn4RnaHO6xnm0G/Pe+EVFwFikPFjEJugPytfnryaJRMhKnBC9vIoWtJdPZ1vDEAFH/zjC0XHPJ8YLQYesyr/vlSAD+eV9N8l9Ibtnhncuddgplliop5OQTg6hncjagNkVasQJw2zjK6c9KRfIfeXEHVYVVwvx4Rc6ZQkyqlFpzLQ9+IwpstbV1op/BNbDwLxAKTxs/UTDdz0cpHbH1SvsqkafB6i2AsTcZUlte2U9VfL8WSuKNWw8n+k7Bl4hpozDn1nHiXC/qTHhOGoJS+AjJsuKw0Qj1xSwJpvAhC+eqjwvVR5CLBN/K/etNCh/e2LcWLqzpqvqT3ksgnSEhQczNedYBw6BrLT4yr30uNkguxmuph1q4m5/L97Iz49otwrFA+NhfN/6NlTJhE2IFO1PmwzYHlUmsj2TGiFqqilCTrsrXusWZoU7nq+riiyNTsjWETY0WH5JwKKpyEOjv7j9Hv4FOUmFTUmuu1zKOaAFvw9y8U2woeKugtby8pbW4LyE0sYBwjjjjYFdv+K+UMvk1ex/sszP6xasVuKXVQzgLLTeR80xwz5SdI5eWswsLQ0nLP5CR5ITvutdYBjDaCK9ukXw+AHmbHAaH/11rjj4S3nluNdFMEYqklejfU71ruypazYm8UmUn1vDtUllWO9ZQiYcUSruG86wAC863dtaJv8O6LHLig3cksTgrJcbn0G7SdtNxEZrhH2p/IYQZFVS49VLZMVZjJyi7zQJMvon9fksvQlW6MdYc04kKtQbfchHUcayu7+XCvzrsZ1F2GSHmuhfT7o7RPyAKk0+S/h7Hh7if /QWeJz2j GnVp/GRJZ6EySr7jabI9fQi0Ibpmykx2pJa3S217+mBjwssD3UnORIY4rTe/ZAiIsZ5255PEsDF5ecRM5yeuMGgZiiuovjIWMHiekVioC8qgzF2eRJ7NPRBj9+ZqNZVSaaHqY6tm/CfrkQcDkL+1VmMS7zHLY90Gto6SOWWmQydBxz4Yjj+Pizbw79mvvOkep8tJpIz033O79WVMJMFZoMUoH1pR+LRL4pvb6 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/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 b624acec6d2e..ae240115607f 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 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