From patchwork Mon Apr 7 15:57:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 14041188 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 863C8C369A2 for ; Mon, 7 Apr 2025 15:57:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E33C6B000E; Mon, 7 Apr 2025 11:57:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 492F56B0010; Mon, 7 Apr 2025 11:57:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35AAC6B0011; Mon, 7 Apr 2025 11:57:52 -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 163EC6B000E for ; Mon, 7 Apr 2025 11:57:52 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 820FA14128A for ; Mon, 7 Apr 2025 15:57:53 +0000 (UTC) X-FDA: 83307703626.16.D852FAA Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by imf08.hostedemail.com (Postfix) with ESMTP id A7BC3160004 for ; Mon, 7 Apr 2025 15:57:51 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=yWLgnoFv; dkim=pass header.d=linutronix.de header.s=2020e header.b=nloc9rNr; spf=pass (imf08.hostedemail.com: domain of bigeasy@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=bigeasy@linutronix.de; dmarc=pass (policy=none) header.from=linutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744041472; 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=Ixf69cvPKcltCaDhuFinxelm76iWpbIm6Qn87X50Bzo=; b=qBjLTfkA0Babcy5wRsIdBA/Klxmnfm4DhIDSQM6AD46I4ENuldn3PyguQgyCa4DOlqeErl ZKHbAb3pWUhLRFkAUSdCxwVfI0/j4REzMwq2ncoE7PTurfoUmy/eSqixMoIZP+zZnjKL1K w0OCnByVO7pP8RNtjkppC3lsCU8fLTM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744041472; a=rsa-sha256; cv=none; b=2HA2mByoanTe+w0H30qb27ZyjpwX4F16Y+hMR5xd/p2oHeLEiJ0PYCuQrdmpifFANFTlWc ttDkXKJ8YJ3C/xglfQGtp606wHY+hNs0mTvbfJUSJFQKc/RAQrzjDYbpeYZnn73/Ol+StK 8NfpsTStzmqTt7hsOrtumy5lwfBhNac= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=yWLgnoFv; dkim=pass header.d=linutronix.de header.s=2020e header.b=nloc9rNr; spf=pass (imf08.hostedemail.com: domain of bigeasy@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=bigeasy@linutronix.de; dmarc=pass (policy=none) header.from=linutronix.de From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1744041469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ixf69cvPKcltCaDhuFinxelm76iWpbIm6Qn87X50Bzo=; b=yWLgnoFvUPICOhPatPB/D7LzrfxS1bzSu6i/gRACpAjDKr7RcAQ0Hpyc1WDl9e/gRSaEnA BUMvsPTUH9gDl+Nvh80aWqqbuKqI9Tv69y5S4jruKaL5pXV2MmlPHG6PJ2uBah7q045xBx K83WurKW8xN2NeXqmkFQPC9g4EQolM1VVfmvfDExR3BX4EeIU6/QyXxVS8qWYRXdJM1GoK D7uHjTX24rAW62i9W60zqfs7Mz35FkmFfPSPyGkjr7RWDZpkvBixuiYzS1APFpDYdfu1j7 VpW4x6ABscJAYnY36PhJ3P8eO+pdZDyc58jIGOW3UzfqeaxJhmVUYyhu+BoyQA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1744041469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ixf69cvPKcltCaDhuFinxelm76iWpbIm6Qn87X50Bzo=; b=nloc9rNrZ+pC/KMdcnegwHHTagOYm1U2SfqCc48eOnF6y5mnw0ffVcp06QwDu9OvAkmHAO hI9u57NGNYk497BQ== To: linux-kernel@vger.kernel.org Cc: =?utf-8?q?Andr=C3=A9_Almeida?= , Darren Hart , Davidlohr Bueso , Ingo Molnar , Juri Lelli , Peter Zijlstra , Thomas Gleixner , Valentin Schneider , Waiman Long , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , linux-mm@kvack.org, Christoph Hellwig , Sebastian Andrzej Siewior Subject: [PATCH v11 02/19] mm: Add vmalloc_huge_node() Date: Mon, 7 Apr 2025 17:57:25 +0200 Message-ID: <20250407155742.968816-3-bigeasy@linutronix.de> In-Reply-To: <20250407155742.968816-1-bigeasy@linutronix.de> References: <20250407155742.968816-1-bigeasy@linutronix.de> MIME-Version: 1.0 X-Stat-Signature: ti1nq9843fpkodcw4twymzws84atwjan X-Rspam-User: X-Rspamd-Queue-Id: A7BC3160004 X-Rspamd-Server: rspam08 X-HE-Tag: 1744041471-302174 X-HE-Meta: U2FsdGVkX1+yp04Gv2eBZSozkYd5Zkw82JdCONJvKbbZGRK1xXeetZ5k19/uP65jcVTy/8XPCipT7lXAJqJmPwr7I6wTXEUN6yW1l7U6AjSZen3G1CF0Me0I2KNEg7aQI6NWvjn05fZtV2qbcvRBmb/wHHnHRKzjZ/N3/tGSBnmhZ+LOoulFQCYq+YYRhlauHw2/qo9vz4u2V11EMvVc46Bh4rVulyGmP7O9wR0NZV20347ZoAbE6nvRUSKTwZ6IlEwmDflO1AzXkNTZq5wEl9Armw1FU2AT+EnFgO7lzYkSmxHoRfMDEfayWmNgVfOUaKdo9qAaB4wPSsekuLDoj7cXH1pcSaB2G36a50ADoQ3q8DSFxB4TD+CzCAsVx2/AX9t8LNKeWnqKHJRJBoDQqfaTOtbEFfJkESnO5jzW0JIovuRZQTU+aL+o86bOfvwhl9bbngOKT8ZUD4QYWhY107T93STdUE34jo22D00tUvrxwvSLKsAJYPEjP2n39oZDvKsIcap0GmwmandS7Vpmt4VXXq5Rl84fb+9qFyWGA4GKV4ANDtrzG9IaeTXOFRIpYP3JUV9bsA1038p1kroOzZhzR0E+h970TamlTMq6a49pt1bY3M1R+Y6wTyEaGrfDEl21fOBzCUIqGu2Ws+M5Rc/1IuCjnSqKOoBqwLT/HS4kdiwgSKvc+endCaI2YtrellT4ujI2yNlXv1629HQfz4xMH4d4xjnoBrbosnW57hQ8TroVqpDcxuPBVxzPVVa7zyUIRL1SES/uzSgEeOw89Wr9H+3L5cPZVxiEvb7+IR+usWgK9ADdtvFq3lBio36ofPLzEBsDdBJBIqeTkDQaxqS+LbtH+PKe/48EqKpJNdHC2kLTmdSKXdgb/C93kuvlOaNGlV/u+WgnH2FqNKDwqeThLZXRYe/CbUMh+Jmdh1KKteJXxUByiP4pWoNmpb0lzXVlniutjO5zeQjW1Ql I9ujtHEz c/90B7I3M47wa3s134JJwOQTrSF2IItbWLUqd2zblmL0nMianIwjgoP7fXxTte1AddBkPJ8BGr1/eOmU9b/5xYl8DepGwEmOR6Y7n4VgsL++4Yv6i5N3FG7JkV4LM/A6mQ3lSKOi4dtRpNA/aWZWWfLDfFMsfCilYg8FeTIMLQnz1RGUQxtXt5zuQLUjrNDbVPBjLW3A/Mj+4WzrvXOx6PWja0Qswq91qZ8rdnBey0XSZOCjKCPwAwGpyOm3FUhWYHCH/m0NnbBdzkchjUPAJZ4+n2t8BqvZLXT9aMDrsKGBOorOLHco1dcMYgLTia/ayvp1iMUYiBPT3htvEVMg85NqGmjCzLSgkob92M5ZvkXBsLtoSBJzaMo+jUk2ddQzViFiHwl5E8QvplJuBYarYqRGaIuRSrTjmejF0m2oW21gL6mg= 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: From: Peter Zijlstra To enable node specific hash-tables using huge pages if possible. [bigeasy: use __vmalloc_node_range_noprof(), add nommu bits, inline vmalloc_huge] Cc: Andrew Morton Cc: Uladzislau Rezki Cc: Christoph Hellwig Cc: linux-mm@kvack.org Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Christoph Hellwig Signed-off-by: Sebastian Andrzej Siewior --- include/linux/vmalloc.h | 9 +++++++-- mm/nommu.c | 18 +++++++++++++++++- mm/vmalloc.c | 11 ++++++----- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 31e9ffd936e39..de95794777ad6 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -168,8 +168,13 @@ void *__vmalloc_node_noprof(unsigned long size, unsigned long align, gfp_t gfp_m int node, const void *caller) __alloc_size(1); #define __vmalloc_node(...) alloc_hooks(__vmalloc_node_noprof(__VA_ARGS__)) -void *vmalloc_huge_noprof(unsigned long size, gfp_t gfp_mask) __alloc_size(1); -#define vmalloc_huge(...) alloc_hooks(vmalloc_huge_noprof(__VA_ARGS__)) +void *vmalloc_huge_node_noprof(unsigned long size, gfp_t gfp_mask, int node) __alloc_size(1); +#define vmalloc_huge_node(...) alloc_hooks(vmalloc_huge_node_noprof(__VA_ARGS__)) + +static inline void *vmalloc_huge(unsigned long size, gfp_t gfp_mask) +{ + return vmalloc_huge_node(size, gfp_mask, NUMA_NO_NODE); +} extern void *__vmalloc_array_noprof(size_t n, size_t size, gfp_t flags) __alloc_size(1, 2); #define __vmalloc_array(...) alloc_hooks(__vmalloc_array_noprof(__VA_ARGS__)) diff --git a/mm/nommu.c b/mm/nommu.c index 617e7ba8022f5..70f92f9a7fab3 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -200,7 +200,23 @@ void *vmalloc_noprof(unsigned long size) } EXPORT_SYMBOL(vmalloc_noprof); -void *vmalloc_huge_noprof(unsigned long size, gfp_t gfp_mask) __weak __alias(__vmalloc_noprof); +/* + * vmalloc_huge_node - allocate virtually contiguous memory, on a node + * + * @size: allocation size + * @gfp_mask: flags for the page level allocator + * @node: node to use for allocation or NUMA_NO_NODE + * + * Allocate enough pages to cover @size from the page level + * allocator and map them into contiguous kernel virtual space. + * + * Due to NOMMU implications the node argument and HUGE page attribute is + * ignored. + */ +void *vmalloc_huge_node_noprof(unsigned long size, gfp_t gfp_mask, int node) +{ + return __vmalloc_noprof(size, gfp_mask); +} /* * vzalloc - allocate virtually contiguous memory with zero fill diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 3ed720a787ecd..8b9f6d3c099dd 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3943,9 +3943,10 @@ void *vmalloc_noprof(unsigned long size) EXPORT_SYMBOL(vmalloc_noprof); /** - * vmalloc_huge - allocate virtually contiguous memory, allow huge pages + * vmalloc_huge_node - allocate virtually contiguous memory, allow huge pages * @size: allocation size * @gfp_mask: flags for the page level allocator + * @node: node to use for allocation or NUMA_NO_NODE * * Allocate enough pages to cover @size from the page level * allocator and map them into contiguous kernel virtual space. @@ -3954,13 +3955,13 @@ EXPORT_SYMBOL(vmalloc_noprof); * * Return: pointer to the allocated memory or %NULL on error */ -void *vmalloc_huge_noprof(unsigned long size, gfp_t gfp_mask) +void *vmalloc_huge_node_noprof(unsigned long size, gfp_t gfp_mask, int node) { return __vmalloc_node_range_noprof(size, 1, VMALLOC_START, VMALLOC_END, - gfp_mask, PAGE_KERNEL, VM_ALLOW_HUGE_VMAP, - NUMA_NO_NODE, __builtin_return_address(0)); + gfp_mask, PAGE_KERNEL, VM_ALLOW_HUGE_VMAP, + node, __builtin_return_address(0)); } -EXPORT_SYMBOL_GPL(vmalloc_huge_noprof); +EXPORT_SYMBOL_GPL(vmalloc_huge_node_noprof); /** * vzalloc - allocate virtually contiguous memory with zero fill