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 4D909C369C1 for ; Wed, 16 Apr 2025 16:29:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18BA8280012; Wed, 16 Apr 2025 12:29:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 13B94280001; Wed, 16 Apr 2025 12:29:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1BF4280012; Wed, 16 Apr 2025 12:29:29 -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 CCE5B280001 for ; Wed, 16 Apr 2025 12:29:29 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1DF6C5BF60 for ; Wed, 16 Apr 2025 16:29:31 +0000 (UTC) X-FDA: 83340442542.21.BD28B33 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by imf23.hostedemail.com (Postfix) with ESMTP id 391C5140002 for ; Wed, 16 Apr 2025 16:29:28 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=FYiL1+TY; dkim=pass header.d=linutronix.de header.s=2020e header.b=4YQN6KEf; dmarc=pass (policy=none) header.from=linutronix.de; spf=pass (imf23.hostedemail.com: domain of bigeasy@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=bigeasy@linutronix.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744820969; a=rsa-sha256; cv=none; b=7NM2q1oJzrf4WNe9pTvGsI6qHRmoF8WEsM0Rrj5RxFNAXPDsX/47BX+3LtkSapGM6lRz5U ob4Lh8sX+7iq1hpsxIXZRU+g414eW6i+069Pq1bMbvjBdKZATMzGidll6BlxLZDtBB3gSJ mudKI8Jx92bLdQrBmHQwcJ8PBOXQXcM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=FYiL1+TY; dkim=pass header.d=linutronix.de header.s=2020e header.b=4YQN6KEf; dmarc=pass (policy=none) header.from=linutronix.de; spf=pass (imf23.hostedemail.com: domain of bigeasy@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=bigeasy@linutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744820969; 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=EFjLkUBfrv1CMSOWzb8FLBMLP/IiFlr/2OIA58wlNKjGrbES0+FgfD2Mbzss7TZd1Cpq2o hFDTkVt68RvwP8bzJWvf8U5F+akqUx8hTTz4DYF+LJTUNq4CFeqJaGVsD4sZYhZ3sttYl+ 6Lhi/QMfyNFIQJwKtM8kFbss69TJi4U= From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1744820966; 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=FYiL1+TYQ8tEQe9ZtUrNyXWmN/WiT0weoz/rxxGcm7E+XGSTvSyoKSsnmA1Atb1Y0w4dPA jqBwqXbAzseEwenTHPpODXE/vtTgaEPBHGhp8GiurcDIbM6oTPjl33V0H6/Q398W7ZvfIf uG4QsTZJju2ZSpsFTzSt83wC9idmjZBZ2nRijvyQJWeSPf7xjTRLgB280+kHNpGn2Hb56Y 3jrGHJa+vCZdLhdl07YZoKs/kSsgCBS2laBBJ4SmP7jm5gORLsVNP3dHmTMQGkQrpjJKP1 0uu9HSQ5F/JHPgRbL6tsVs8HGOoNAVgq95qlSmiSIIOc7C1eDI0yE0w4KIO4EA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1744820966; 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=4YQN6KEfhrxlBEtSSaBsINXO0S5yFl8y0Vkf2hGlHqZ/K/ENUN5VYzAZ34OHTMY113CWuF VkWkt7hr42Yi/PCg== To: linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Andr=C3=A9=20Almeida?= , 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 v12 02/21] mm: Add vmalloc_huge_node() Date: Wed, 16 Apr 2025 18:29:02 +0200 Message-ID: <20250416162921.513656-3-bigeasy@linutronix.de> In-Reply-To: <20250416162921.513656-1-bigeasy@linutronix.de> References: <20250416162921.513656-1-bigeasy@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 391C5140002 X-Stat-Signature: iougz187o8uznmkxeyembn3jmymrpc96 X-HE-Tag: 1744820968-157662 X-HE-Meta: U2FsdGVkX18eOoE3MIia6B905BgvLHjhQlxRoYb9+qwA1pJvTPbD7ttPGvmtNqKbdSWkL4DZL0cYVMHkDFeBYhbpj3rzcX7VaaYtEAps+yn3YhL0LUshGOq8/gMAYYFhGv0jbp72D6rp4gpG0SBqjWc1dFPHNmG8dw186eGC3+E5yEOIKzEe3+2ItBzxWyL0rD0OjSAm/tr7aTe1s5PPJTCteczy8EbSWH3kD8+57IobgS6A1dL97Kszx2TKYx/uBABpiDPUui2zeZuKQt0km29gVx492p93F7v3mFiHrRrnneCIjDldDyOCewY/kW19Hxu2IdYkUFYC2HFEA3LlcLP6G7TqeT/iJ6jfJcAQ0Awrcbe8gH256fQK6tstfrA9Ao5YZcoCU39hqwcVKeAJnncAAc7P7n2bzhoobjAEriEZLrJlI/OASgAvVZNH5ZWf2BoRQD9zDVf9TO3agtR2f9vwWBvmI7taD8XNU9/Wf8RI0qVlOUlL3grp4LcBtIbUlis/swt4sgPne4X05nwvJ8SDh9ObK/AwUaScuXbuALWVb08Qr9dazbUi3FTnYVpRfRdazqMdGHvdiBbwQKH+0qPfMK+/bKYdswrdZOstylRPt0ImGruge4dCphWUBkNyVMjFQi/0tBYwI9xzKrGdfqoo3IKVJASezFInQsKBgvFavo5M5iZoLI57injDFCQgn4XbMokz7h9VBlVKbqZ+ueRXfjg3WCs/hUr2/SZHI7NQRsNJxiaLSDeciYIR5ybD6JCfI1Ft3qgTjaaEklM+wkrufTHQmAD/CCxGPvbMgSWOxh//WiN93SG1eV0eX9QnE9LBCpjYvH9CmXZ+oGysb3+4LukBQI+xpV1n3C/lf4wlCNRppoD9/EldSohB0rxGjpCvc8rTon/c3Ofo7avU/hKxbl43LiHuvcNKPPNdOXubbrfFGhOoItR+KwRTCuVIliQaQsUzBYomqMgHmBr Yzg0HqKi wdBHHJrLtgeNRrx2HsutqjdwxDqZWCl/P1cuOBVpVAs52JHC1MN3DfTh/m6/6WV3/6l63lP4EkMKjr8EV/NljV+BBqrVy9Mp2iZRHgHwgzmm9xxn1PfFBm+XJKZUoEuPOTzUJnb+6P8bUtfV+gyO8REJ5cz0AsJuKGMjw1N7rIeOEHh7XQ6jBaIF/NzOb/nEUarFgxJzr/3elDeq3Z3E0tqegVSV93jP330Awgv49iMtJiZnhTHfohkGoSICDv5YTIjUcgWAWrciBFSgWbi2r31ityfOBHfA1n0tpjZ8lpoVb/2s84uJVNS1M38AsW4PGDKJISGn9pPQLAieNaIIt8Et1OclYqLeps6CFpHSkiA+pMFnRTKlN+odEztp71I82soKvK2L5a8rTA/pW9B1ai/K89cvmHcEB/ki19e3jxhU+SIU= 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, unsign= ed long align, gfp_t gfp_m int node, const void *caller) __alloc_size(1); #define __vmalloc_node(...) alloc_hooks(__vmalloc_node_noprof(__VA_ARGS__)) =20 -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 nod= e) __alloc_size(1); +#define vmalloc_huge_node(...) alloc_hooks(vmalloc_huge_node_noprof(__VA_A= RGS__)) + +static inline void *vmalloc_huge(unsigned long size, gfp_t gfp_mask) +{ + return vmalloc_huge_node(size, gfp_mask, NUMA_NO_NODE); +} =20 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); =20 -void *vmalloc_huge_noprof(unsigned long size, gfp_t gfp_mask) __weak __ali= as(__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 nod= e) +{ + return __vmalloc_noprof(size, gfp_mask); +} =20 /* * 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); =20 /** - * vmalloc_huge - allocate virtually contiguous memory, allow huge pages + * vmalloc_huge_node - allocate virtually contiguous memory, allow huge pa= ges * @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 nod= e) { 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); =20 /** * vzalloc - allocate virtually contiguous memory with zero fill --=20 2.49.0