From patchwork Mon Sep 9 06:47:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13795959 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 13136CE7AB0 for ; Mon, 9 Sep 2024 06:48:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 726426B00AA; Mon, 9 Sep 2024 02:48:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AFEB6B00AC; Mon, 9 Sep 2024 02:48:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 529686B00AE; Mon, 9 Sep 2024 02:48:29 -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 3237E6B00AA for ; Mon, 9 Sep 2024 02:48:29 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A02C7141E54 for ; Mon, 9 Sep 2024 06:48:28 +0000 (UTC) X-FDA: 82544271096.13.6221A4D Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf29.hostedemail.com (Postfix) with ESMTP id 11192120011 for ; Mon, 9 Sep 2024 06:48:26 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PYI0f7XX; spf=pass (imf29.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725864456; 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=4+/ziKRuaKuWojekn/jGc5BdErtoYihuf167rUpztYo=; b=ko2Qz1bZd/tW0OYUP9O6HFIhr50DBCXbvT5349yM7yAX2GQf1OA6cH/kU2fOnk4N6A7bG8 Fmqlaw2sx9KskPnpYjj7czCo86MFQl5/QWM95I3+I2xQ/qmyOfTHJwcztNHutUuVTRDSyb NWZ8MWswMC0YVj8hU+8xGJKH76blExg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PYI0f7XX; spf=pass (imf29.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725864456; a=rsa-sha256; cv=none; b=gCLp7UbeXKJk03TwblK52Xr9zJeJ9dMEyG3jSI6a3EIohbKECqAyJUGH72dtJge40htkEr o1R0lZAkLUlHjbnWoLPfNJOjagUjfTVQjOaCe73uInCUF+jxUFEYOZXAV2iBMZmeeuqHCB zZxuAJF8q4P5YBVN9kiMikb+WK1LDw8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 60485A42722; Mon, 9 Sep 2024 06:48:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFF6CC4CECE; Mon, 9 Sep 2024 06:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725864505; bh=diG+Fv3wDftGRjrnWBdO8lGUovRExvU5pHk1HsKnyW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PYI0f7XXtb9IXPNGiea/h4fGD99CF60HMjieaexM2yoL8zPpSzdFJvOzXcPM4ZbW+ qW1DYS4dRYAl9aSVOznmi4EFI2YlU8K2WiL8DUJlTfcjmi8tmSSZvhRqpII5qUqDgF ByEKU1W4ipty5gGX3a0TnMk4aQWv/199I8KqIfZbMMpuWvdU9erJQljQ2oBiAX1G6f kDiZQKFgamrltHXyLuUJb54e2pwXGqtqjb8p9DIQ+kHnakm7bY5jN/JvrwXzm8g1/m oXBQM/zWx+TDu4QNrUJ9GPMzxJHJFfbGHnKF76P9WbIutT29m8MSW6aLdsPfJU0Ojk ej4bByKdSLxyw== From: Mike Rapoport To: Andrew Morton Cc: Andreas Larsson , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Christoph Hellwig , Christophe Leroy , Dave Hansen , Dinh Nguyen , Geert Uytterhoeven , Guo Ren , Helge Deller , Huacai Chen , Ingo Molnar , Johannes Berg , John Paul Adrian Glaubitz , Kent Overstreet , "Liam R. Howlett" , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Oleg Nesterov , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Song Liu , Stafford Horne , Steven Rostedt , Thomas Bogendoerfer , Thomas Gleixner , Uladzislau Rezki , Vineet Gupta , Will Deacon , bpf@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-um@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org Subject: [PATCH v3 2/8] mm: vmalloc: don't account for number of nodes for HUGE_VMAP allocations Date: Mon, 9 Sep 2024 09:47:24 +0300 Message-ID: <20240909064730.3290724-3-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240909064730.3290724-1-rppt@kernel.org> References: <20240909064730.3290724-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 11192120011 X-Stat-Signature: isffxynowjbet1urfh9eb8aywrejyqqf X-HE-Tag: 1725864506-837255 X-HE-Meta: U2FsdGVkX1/PdI7VnxOBjbXayDn3S85JCZYhnMUjxqDhN2CNmWGk6HdUl5AaC8BcXwUnN1jj49NJDia2IdzLz+IBAWgPNwXW5Cl14TPv6q7XgGRzgwwxZgGbkNLE3dTTwhAYpcV79JzCdTcNQL2W4uA73iHNYm4s2Ydo+2Bq1/z0LyHpsr47rOuagEOPnK8xPsgxZ60LAmwXB7srqDx6GuEalJdulPnpB6aCnMsI2CkeDPN+Cen0+8yx6yuTdm/2sFDiayROWyOma1keJlRgJXeYJPYr9Nr3KLaQB7sIYufzAxw6GjEhJSiGzbn96ABS/tyHlUIrPBo9lGBQZXSVFin+bFBWcPiFAVhbFLu4UgzCFbS4BASEPCR/Rmz+lmVjBZrRazKTFzWgHgocqNCdUHmztgXTm500Q0wDNLMfHfymTYeOUvjmWOYrUYkIWDs16Ce1W/uRaRqoz+Ff9sB2hukrqIlFcKqx5F/qQt8DZJhPVpvUIGspLbOk8j4KD1N6f4NQUxrLY0oyEY6mFvVvzcgnVOmSt4ueluAQm4HZGYD1ZOtQtERImZRxDCIRsoUc4PVobimfIQvzQg5OqR3sNWbCQf0LKomYM3NzE8H5IXPqjYCwBJiPlhWuWAYCZAfEWX6/7tMhoOn1X9Jlfn4CHgH+TgspNYTYoaGtvQz3uiHxFGmM0FnbIw92fpBLcqvnEZ03GsZ0axOnDpSvwwFY6JanxZ2maPTnFeOAtuf9YCxfUN07TgXJ8TLrGfVPXA32FBvRQHzimBcK8TJawvVu8d71bl65ruKXoms/S6U7DLHt8y8eCp7bX6jlPTkJzBctAy4PoTmQuYqdNVAhKNNx1fhXDSQ1wqINabgy7r4F6lArP6jZ3U8wL3JkuCqRA8Fq3Ly8kDPuhhaitgb32vAahs2HKcL39MrLvUYIRz/SsGuTf6urtJ8Z2IB1Y3R8xms64f4LeDgDjcxBmuk6Tdi xey34Rna d6nj9c3PBcUCZrEPbfIlWrquVGHF4seArDCVzIRD5taYlFPBVNAzH270eBhQnkgf1frccrYAKGrNkcR4540B/zHKjlFMHhPodB6flu3MDpIpe9eMhdvYaIhQXLGW09bh1aWobgFjJpXO/YeRoq8dH3Mxqkyr84/vL8mGrq9UHcrx4TbrbzzeJZ6QC289FBEU+JqPJHDu5T1S3ZZWw4FuBJrWMF9mAsUmvByWoaR+yvgO4+w36YlMKeN1uxG1SDQE9D21pkMq8vOQuCORE74WFM9x39g== 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: "Mike Rapoport (Microsoft)" vmalloc allocations with VM_ALLOW_HUGE_VMAP that do not explicitly specify node ID will use huge pages only if size_per_node is larger than a huge page. Still the actual allocated memory is not distributed between nodes and there is no advantage in such approach. On the contrary, BPF allocates SZ_2M * num_possible_nodes() for each new bpf_prog_pack, while it could do with a single huge page per pack. Don't account for number of nodes for VM_ALLOW_HUGE_VMAP with NUMA_NO_NODE and use huge pages whenever the requested allocation size is larger than a huge page. Signed-off-by: Mike Rapoport (Microsoft) --- mm/vmalloc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index af2de36549d6..d0fbe6b2b73c 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3769,8 +3769,6 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, } if (vmap_allow_huge && (vm_flags & VM_ALLOW_HUGE_VMAP)) { - unsigned long size_per_node; - /* * Try huge pages. Only try for PAGE_KERNEL allocations, * others like modules don't yet expect huge pages in @@ -3778,13 +3776,10 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, * supporting them. */ - size_per_node = size; - if (node == NUMA_NO_NODE) - size_per_node /= num_online_nodes(); - if (arch_vmap_pmd_supported(prot) && size_per_node >= PMD_SIZE) + if (arch_vmap_pmd_supported(prot) && size >= PMD_SIZE) shift = PMD_SHIFT; else - shift = arch_vmap_pte_supported_shift(size_per_node); + shift = arch_vmap_pte_supported_shift(size); align = max(real_align, 1UL << shift); size = ALIGN(real_size, 1UL << shift);