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 8E6E8C77B7F for ; Fri, 27 Jun 2025 18:16:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 254B96B00A1; Fri, 27 Jun 2025 14:16:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1DE666B00A3; Fri, 27 Jun 2025 14:16:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11B686B00A4; Fri, 27 Jun 2025 14:16:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 04AD56B00A1 for ; Fri, 27 Jun 2025 14:16:15 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A44C01402C0 for ; Fri, 27 Jun 2025 18:16:14 +0000 (UTC) X-FDA: 83601985068.05.6BBE980 Received: from mailrelay3-3.pub.mailoutpod3-cph3.one.com (mailrelay3-3.pub.mailoutpod3-cph3.one.com [46.30.212.2]) by imf13.hostedemail.com (Postfix) with ESMTP id 9BC182001B for ; Fri, 27 Jun 2025 18:16:12 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=tymEKEXF; dkim=pass header.d=konsulko.se header.s=ed1 header.b=G+Yo+f4t ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751048172; a=rsa-sha256; cv=none; b=WbCF528Ll5BTc3T4Yf7cn5qILMqA3n8ZIx+zBM4p+lOFmho3cYuqIkMlN6hHB7WPdmiz2h GpD7UrdqlxV1IIz4GiyGcVMfiZC+Rcn+WKf49e//8VDm/L+/AO6DtCgzOJTNrl0aUm4E8+ 3KfH8kIl+Fv+glHulnv6HkLJ8Nim9SU= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=konsulko.se header.s=rsa1 header.b=tymEKEXF; dkim=pass header.d=konsulko.se header.s=ed1 header.b=G+Yo+f4t; spf=none (imf13.hostedemail.com: domain of vitaly.wool@konsulko.se has no SPF policy when checking 46.30.212.2) 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=1751048172; 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=cg6Mb0y63NoDrvRbc/wKLzTLQZaf3be1Lhc8PUfhwzc=; b=cfOXfUkNSRLBGmQ1IpkKBErL6WUKCUcFQIVA7DxjXzlZ6L23PvJ2W06VnBG2axb/X3//5l g5Fh5eFxNayUcrBVkejk27ofDevUo7LmlDYUwJozXUIBZdE9zMXuohEdPwBuGvLaE3HvaY tYYmmAxdrUDzOhzqUNZ7yZlGZwXz6YI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1751048170; x=1751652970; d=konsulko.se; s=rsa1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=cg6Mb0y63NoDrvRbc/wKLzTLQZaf3be1Lhc8PUfhwzc=; b=tymEKEXFcvYmZXy0KkwgIZaGf2UBDbK1uB2G4E2TAKayCcyQpyRiSDwqSBkQ99b/gOd902CvNC/0m xYPGgqCAv9hZkUPaQ4PN6a+YVXeSIFNOXoniGJ7oJnU4fwBY6uhVOyDzc/NHrQzxlr8gOCTR0oEP6y ece5dpImWn7tbu1x///kauMWs1F7RVfrWVGd+iryHoxmVyeCSgtApKQMPSTxt0Qzirw9+HkeiMTVN/ wXIlI97ITYvzSJHpOBU0Sy2WXGVgWSCPU1JNjDNNlZiKF3liBP1U28JlhhUtRL5eV7Ty8wxyJ2KiFD X29eY0iAaVkAFJ30LKkxG/WF/u3JYjQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1751048170; x=1751652970; d=konsulko.se; s=ed1; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=cg6Mb0y63NoDrvRbc/wKLzTLQZaf3be1Lhc8PUfhwzc=; b=G+Yo+f4t+036wEfcSqr7KWcHT8T3kqaezBLHKVaG3rOqVNSs8aiCsMzeBcGf3eYiD4zhMVyLCQj5n xalVbuGCw== X-HalOne-ID: cc06b684-5382-11f0-a377-2b8368a4d5c5 Received: from slottsdator.home (host-90-238-19-233.mobileonline.telia.com [90.238.19.233]) by mailrelay3.pub.mailoutpod3-cph3.one.com (Halon) with ESMTPSA id cc06b684-5382-11f0-a377-2b8368a4d5c5; Fri, 27 Jun 2025 18:16:10 +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 v6 1/4] mm/vmalloc: allow to set node and align in vrealloc Date: Fri, 27 Jun 2025 20:16:08 +0200 Message-Id: <20250627181608.2081032-1-vitaly.wool@konsulko.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250627181505.2080916-1-vitaly.wool@konsulko.se> References: <20250627181505.2080916-1-vitaly.wool@konsulko.se> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: fj9xnas436ttksm8ej4hs7nupe4ijggd X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 9BC182001B X-Rspam-User: X-HE-Tag: 1751048172-751134 X-HE-Meta: U2FsdGVkX1/nIL8szoGdnS5mXX1GkrY1SmZhnJ5FRVX5oiHjDCnQcS+0O/R7ibTxw+PRlxxQGmAmjWpUI3tPUhZT5ct4bKVPnoK7z2rE+RE/gAg+3TK345W1FT5vr+ZWMZSten71lUTrwtkYC0rJUu0srxxvy1lFMK3tVXynzTFsT0oMB3ZyYw31Mdn8knm6BBB80rKLE9rmqrDkUmrNjQ4W3ULXEjE5PYgab2Xn3wYmhuWLZQ5XuUpE8xFhM23803bzvFRcOHjM6YdK8/vJSSn6u9l1fI6SvfKKViA0v2Z77RuaVUE4ga0IYqfGtplfJh9m5AdIL//exnthba6N974n8JeaZeWB+jtolfZ4lvkCFuookm1fyeI4bJgMdAlmumtcuOx/QzPHL0++EWyjS0qCQjaaY3tG5ZvWg5E8oxsFneDm5gM05wP2P3LJ9t6A/SqnPO8vghPRdYyYtguxMpaxLrPFze2B2sypFyXg8TM/xI3SMkiKXkgzXFwBhUD69HNWWmCess/zBiVVov070DGdSB56z5Fizrx1eiS1ZYHJMS5utzJGdQd0WSUcBKmGgw1HM6oJyLIhWH++k9WAn3rxPxwLyXcvsAomgHMMk97V1v3XeFc43JVnWEZ2NNRQu5ElNL0iykoqcOq1Vkrpzu6Skq97GyyWCxsu2kL5RCWxEv7HisjjZe8Dp6RbHcTs3tiE+u5Ea+ApAQIRxPXeYMLhCHkMJjoF5QT0Lt6Su3pUrppqVYK5r9fg6dshkuRWuaVFmOKnQi6rnwXi2OvNaog9jeKiBmLaAc4mPce/PI6N8M8tW88lN9p/NQPd3cK3NQG14McryH5LgDO8kN9Y1LyK2QPg0KyX0EdhesNq0joT9tAHwyY4PvXnpC3YFWOSwIWgciRQu5YrWdzmLojavUpbM1E91RxIlz5FQvvlQefD12uq1olksOIW7QWvK5PJ/J7u48OzpptoTNQ/EU9 Snb1ILdr 9J4WC3MhsXNNw6oz6lw1x5rKbXce/ZKpAgZZnWBzdD1r+i+XpBqO6K22puFaAUEgYGf2gboWPTlErtoManSxGjDIjJaVGvyljU3SRw8JQ46L8pBsi/VT/bTIY4V+H4LfkMav/YXNiobrK6RXQOG3aOdeM7Y6jwwEEazufg98zwv7NV2o= 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 aligmnent in its allocations. Signed-off-by: Vitaly Wool --- include/linux/vmalloc.h | 12 +++++++++--- mm/vmalloc.c | 20 ++++++++++++++++---- 2 files changed, 25 insertions(+), 7 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/vmalloc.c b/mm/vmalloc.c index 6dbcdceecae1..d633ac0ff977 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -4089,12 +4089,15 @@ 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 id * - * If @p is %NULL, vrealloc() behaves exactly like vmalloc(). If @size is 0 and + * 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 __GFP_ZERO logic is requested, callers must ensure that, starting with the @@ -4111,7 +4114,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 +4139,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 +4177,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