From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30D48434E55 for ; Wed, 15 Jul 2026 12:08:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784117336; cv=none; b=b88qejG2gkeI6j5jHG44nXpi2hCyTNEROUpkuhV6OpNyHYlqZKbGT9GNG4SQVjksBH9TAvdCsswUzuWB6txjIdZlhIwOnF7wD12t0Idg1aE4gI0DJYUXopcZE6wJsfgKa/O1+h/yBFUZNQq89pFZ7tTzn8mLKMx/xgQa8mUylcs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784117336; c=relaxed/simple; bh=hCQPPrwoDsRjRg0GuJC1eZcI0rSRl6mPEj6BujTcWVM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=do/g/WtgtNVUlvPZcLr6H6nskjdCVpBvoFG3ghHFH/rjOmd3+Kd7PbONkxCeV9osiPxZvkogXOmTqsXWNadHSxTmTSJbY0pM+inGn0ZByM1cnHZLspEwRG3qn10D8YZQXadgkNzfry7SW1fQFlgRbVWyOb8xkKPKiaKB6TaWbRM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GlU4BswG; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GlU4BswG" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2ccf2360620so17611835ad.3 for ; Wed, 15 Jul 2026 05:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784117331; x=1784722131; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=E3pHMdsibx37YzyzqXGwFL/dQqT2DUhJgZdMFQuT3hs=; b=GlU4BswGwaV1Uz1zkSoN8r291k6g3c5C2tCEtePShQ/uGlV+OQnL0c8sqhkm5pw/+z FBG7pL6ZBza5QJpt6FkBSjxjKDhJ8P4a7t6LxkH87SHhKYkd66m/eI4bi98UV26H9dme 4b5FsGxjZJDXiTdMJujQYO22tpo83JeP2lF8aQiaLJmTucjA58rBPmnN4pcrOiVSJmv2 AgrzvxwiDAoy3X4QIZqumpRZfeXUEL0sM74Rl2nTlY2Vyo90CjJwsxsOSaB78vThZqou 7Y2SogtmmooGkF0HFMCIVEQtY4qxncSP7jBYGeUEcRi41Ol8UwoYVnQW6YRQaq4fc00H I/VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784117331; x=1784722131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=E3pHMdsibx37YzyzqXGwFL/dQqT2DUhJgZdMFQuT3hs=; b=MSTHsxk0glwdqRNHQgIm1fsuG0otNkhh29IVR1cXpjr3RNnY11gWVClnSRp+UMkQjz cyIBgdm17tfnypNGq+Dz7VZRUxGIrcNaeLBKEOrG3Wm/yJ0W/l4tjitcSiI8Ms/cH6Vy 3+QUy5PmTiaaLKBo94pT6hdLoTk8e6LrE3a9K+6qlpQ4f+ilnuwPh0Xh5yL2d1xHrhs+ LQkgXhycDz+clAyH8eEuTYCK33OWbIqIZcSbghIUIxLp7WxI547lrgFX48lWsA8Ztz+o 2UtiitkyLAP5JAPQBTfuwJjWYEJu0fA91CcbL68PPgBKK5/cJfGWAUcXvSDLJYF0nV+s X5ow== X-Forwarded-Encrypted: i=1; AHgh+RpdCyn57tcKh+2zroJzyEKXjth3TR3Mg33P0qBvih44R/GPe+dwLuZQnunej2LghZ7Va183eEX5xGOFeZU=@vger.kernel.org X-Gm-Message-State: AOJu0Yzuu+Q1Y8kfRnXFYweISayD14EZo3fVsLrBc9bM/HPSe07AGkPy +9GpioXUn6uFuTKErhqBggcGbA3Yo6l8ezcGW6BfvDWphYJVWpyVPHXJ X-Gm-Gg: AfdE7ckoombI7GS7KvOOWaCGlHI3N4Qr/WZ5zfRDYkLXVkFEf9yz3Rfnr2iuZR5ebIC 7f87gE6FA4/X4qH5+fdytl8c0Zl4v2qzr8Pbn3aATPQDubGZwuPe8/vHTvQCoiA/6ILk9w4s6Fe aKEjfZIIpMwabOp4W2tqOP3c37KyUSpOGT43igO3YuCOuSkpBNcvkSlrETTvVg2ogLwUy203qYS //Q5ZHK9dT8vigQ9+ItYybmeYyf8cBF9TQk6eDW/3gGiYyC8Urbjit9+AWLmFEZ8FkR0p0h7JBt nMStYyCmljBS7PBtNOduDOLYXhkRvxxhZvnXgd4k2tVvVkygJDhffhDYu4VVAlanOiRLeUIqzyA dSg20yl661fBSaHKQuC1n7M5iZ/nTjaQVouCdNLAFbr8ztVNK24NJtuz09l+j2D8cMZQuLPqKfq prCaP0oQl0XFzSSmRbHcdDKjLzFk9nS0m3nx1ZeoDlt87w7A== X-Received: by 2002:a17:902:d2c6:b0:2ca:cb8a:f26b with SMTP id d9443c01a7336-2ce9e5a5774mr161404365ad.10.1784117331030; Wed, 15 Jul 2026 05:08:51 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf105bc642sm1216325ad.63.2026.07.15.05.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:08:50 -0700 (PDT) From: Wen Jiang X-Google-Original-From: Wen Jiang To: akpm@linux-foundation.org, catalin.marinas@arm.com, linux-mm@kvack.org, urezki@gmail.com, will@kernel.org Cc: Xueyuan.chen21@gmail.com, ajd@linux.ibm.com, anshuman.khandual@arm.com, david@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, rppt@kernel.org, ryan.roberts@arm.com, dev.jain@arm.com, baohua@kernel.org, Wen Jiang , Xueyuan Chen , Leo Yan Subject: [PATCH v7 5/7] mm/vmalloc: Extract vm_shift() to consolidate mapping shift selection Date: Wed, 15 Jul 2026 20:08:11 +0800 Message-Id: <20260715120813.3609949-6-jiangwen6@xiaomi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260715120813.3609949-1-jiangwen6@xiaomi.com> References: <20260715120813.3609949-1-jiangwen6@xiaomi.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Extract the vmalloc mapping shift selection from __vmalloc_node_range_noprof() into vm_shift(), preparing for reuse by the vmap batching path. No functional change. Suggested-by: Dev Jain Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen Tested-by: Leo Yan --- mm/vmalloc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index afc695d5973e8..a1e025120e9df 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3549,6 +3549,14 @@ void vunmap(const void *addr) } EXPORT_SYMBOL(vunmap); +static inline unsigned int vm_shift(pgprot_t prot, unsigned long size) +{ + if (arch_vmap_pmd_supported(prot) && size >= PMD_SIZE) + return PMD_SHIFT; + + return arch_vmap_pte_supported_shift(size); +} + /** * vmap - map an array of pages into virtually contiguous space * @pages: array of page pointers @@ -4047,11 +4055,7 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align, * supporting them. */ - if (arch_vmap_pmd_supported(prot) && size >= PMD_SIZE) - shift = PMD_SHIFT; - else - shift = arch_vmap_pte_supported_shift(size); - + shift = vm_shift(prot, size); align = max(original_align, 1UL << shift); } -- 2.34.1