From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 0770C39EF1E for ; Fri, 22 May 2026 05:32:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427943; cv=none; b=co6CDnyLXNwHfTAnGfIgCojihyKQx1uombUtzyxHgpHAtv/pbV1BXNsxYvuasEIrQdXmZDH3xTt4vxSY9Y+hNoumxrAzol4a7PyrqeZGRVxPA4HG+srrO7vCbmNwG+5diyAvUxF7xTuEi5GUIorxRSQDIb5QnJ3IaBVJevlybVY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427943; c=relaxed/simple; bh=stK/ybrTNxqIwFAOV0JTz8RjwcH5r4k3/nF3fLlhnY8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BphDVxkHqHvNzbrjar7OSNpnLtUd/ldfiS6XHezW2h0ynaWOl6xsFh9SxxfucSx+MxfQBz7xoJoSWJ6He6ntHuS21yH7u7JlbQjw8ihw+gYOhQSAlw+GYU793STzr6oBxippIfpdXHmfw39JVm2CPf0QQRHyF50GN1wucCzNHuw= 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=EgZmukJ3; arc=none smtp.client-ip=209.85.216.43 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="EgZmukJ3" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-369002b26f4so3856267a91.3 for ; Thu, 21 May 2026 22:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779427941; x=1780032741; 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; bh=ZQMTpgiyndvYCOhmYu3e/1AOf7TgYGQa7r62/XlPc6Q=; b=EgZmukJ3PYbgcpnsKEVihcHIXCRcwWx4Kn0IFrHr6aD0oSE7b/mD44FNNJ1pldvNrJ UpARFoSt7bcpidQyRsn1OYnAxEA1a+DkGA1qjRxgMYoxrSBT5hHR18ihXENHCNJnfK/J o3GplVjZMc2GXLTSdS4z3XQuKNGKUtnzbV3Ub5B5I4m7Nlci7OutfnyQt6DjbiRLT3s5 3EAgYxxMqB+kmx/PuWp/PxkzyDGBtV+/3jSLFDssReadQrl66d6ml0LrO2ymh9rj0NvE JQ3/hpDuXlQZ0bt/CiQdIghhEScyJP2BBZkF/+9udgkRhE1AKpxO26OGJ8eiwL44sd/n GCjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779427941; x=1780032741; 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; bh=ZQMTpgiyndvYCOhmYu3e/1AOf7TgYGQa7r62/XlPc6Q=; b=hHeF7O/Iz3w/SumYjF89WWdvN0rfW6RbII6rLZPg4NNb3HvMVbcABhA2kc3iLR8N1q RGfFuAZFjZkv5wGK4Bu0gpMCgCsLd+TSqSfFFg2mIF/Yya/hlpPW7qYu/P4BX6qipEAW yRnpmyRtKhbj4AS1smZEnMmFplUyBrm7tYcA+PrrW+kBINh0kYML4yHs97Lm3zAuig3+ 77Eu+AhVtihw/5P6IvNKbWtirDcuuChhMYuHdqeBAQzwD3TmSizAR/Yk1ss/vn8O/pyX 5LIgD8iqeBSj14wEbsKBb500z1CLRLyJZEM9FhNe70CvjiJkJaRnAOd8wV1fyDXzWEXM kR6g== X-Forwarded-Encrypted: i=1; AFNElJ9Js7mwTrpCg0RAhRr7XKRnQoksOGTq8E/fRMsz11vaKjhnWk7zUdrYTIsPsVN4/lBunbWjYOSW8jP9NhE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3n1ZBAINcBItbYmiXvxwCne40a/NXcqwb1N2AiS+2V1LYQDys 8DCL37WA85dr/auVT6n+llB4U6+86q5NbOuBQiKvKR67hS9y8o/Xk5Ie X-Gm-Gg: Acq92OFsFHFCca3jVZ5GXWk8MazqNjHyxqftJK3FPMUd+HgUalJYqk2vzbtYMNa1l7g NPNF4LBzVDodmmlh93YxlI+c1exUEVu62kI/rdocNoa++3vV6XEz4AGqgXwSmVmWZQ/Lh0rVr/X EoeJKrHHwBu+4ZiR7+ecd5ZA5z+JWJ4833U7IymWLvSJ9hrL1aFusrDIut3wc5dMDS0Lkl9Rg6o AQ7EeBUMhahEXWe5cNPlSBRaOPThrgTx5odiIYDYHXuQhhGr/7W489HbebCVApu844yCL7UP6L8 XXZaGD/Sh9P4lxUx3zuWdY070/YHEUCx+9H7xes8+x87Jt90GNZsC8l+ln9yK/t75jG6iLbHyws VAQyTdjmU9DF9wxpaZou5D7tuXq7cgnbFdY0gYUNBfvxIpL124Yvy4qy7U/bcNHjDPrOZdxX8Ak wtIirLelQFumd/eAw7W8PC7uBpmVVErHKh4FcFN71gBSP9/N/TygtGQFdRxeX9WQ== X-Received: by 2002:a17:902:cec7:b0:2b2:ccfb:8387 with SMTP id d9443c01a7336-2beb0613c3bmr23217405ad.28.1779427941298; Thu, 21 May 2026 22:32:21 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb56d68adsm4782665ad.32.2026.05.21.22.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 22:32:20 -0700 (PDT) From: Wen Jiang To: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, urezki@gmail.com Cc: baohua@kernel.org, Xueyuan.chen21@gmail.com, dev.jain@arm.com, rppt@kernel.org, david@kernel.org, ryan.roberts@arm.com, anshuman.khandual@arm.com, ajd@linux.ibm.com, linux-kernel@vger.kernel.org, jiangwen6@xiaomi.com Subject: [PATCH v3 6/6] mm/vmalloc: align vm_area so vmap() can batch mappings Date: Fri, 22 May 2026 13:31:46 +0800 Message-Id: <20260522053146.83209-7-jiangwenxiaomi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260522053146.83209-1-jiangwenxiaomi@gmail.com> References: <20260522053146.83209-1-jiangwenxiaomi@gmail.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 From: "Barry Song (Xiaomi)" Try to align the vmap virtual address to PMD_SHIFT or a larger PTE mapping size hinted by the architecture, so contiguous pages can be batch-mapped when setting PMD or PTE entries. Signed-off-by: Barry Song (Xiaomi) Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen --- mm/vmalloc.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 50642246f4d40..040d400928aab 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3620,6 +3620,37 @@ static int vmap_batched(unsigned long addr, unsigned long end, return err; } +static struct vm_struct *get_aligned_vm_area(unsigned long size, + unsigned long flags, const void *caller) +{ + struct vm_struct *vm_area; + unsigned int shift; + + /* Try PMD alignment for large sizes */ + if (size >= PMD_SIZE) { + vm_area = __get_vm_area_node(size, PMD_SIZE, PAGE_SHIFT, flags, + VMALLOC_START, VMALLOC_END, + NUMA_NO_NODE, GFP_KERNEL, caller); + if (vm_area) + return vm_area; + } + + /* Try CONT_PTE alignment */ + shift = arch_vmap_pte_supported_shift(size); + if (shift > PAGE_SHIFT) { + vm_area = __get_vm_area_node(size, 1UL << shift, PAGE_SHIFT, flags, + VMALLOC_START, VMALLOC_END, + NUMA_NO_NODE, GFP_KERNEL, caller); + if (vm_area) + return vm_area; + } + + /* Fall back to page alignment */ + return __get_vm_area_node(size, PAGE_SIZE, PAGE_SHIFT, flags, + VMALLOC_START, VMALLOC_END, + NUMA_NO_NODE, GFP_KERNEL, caller); +} + /** * vmap - map an array of pages into virtually contiguous space * @pages: array of page pointers @@ -3658,7 +3689,7 @@ void *vmap(struct page **pages, unsigned int count, return NULL; size = (unsigned long)count << PAGE_SHIFT; - area = get_vm_area_caller(size, flags, __builtin_return_address(0)); + area = get_aligned_vm_area(size, flags, __builtin_return_address(0)); if (!area) return NULL; -- 2.34.1