From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (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 ADE803A8735 for ; Thu, 14 May 2026 09:42:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751731; cv=none; b=fb7n05z7vkrFXNhPCH6ewGroVE9eSTU3hb0JCDtSOpLoER1YV0ytNL+8SmJGxXkwr+MjKoDvglw9lkltWYijo0dgjywgYRDVMccKZDn4zyd0x8MH5kX5szi+QvUxStViznskrhI2tyKqpnFQLj4UYBt6tLutRWVzVREzPCRWhDM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778751731; c=relaxed/simple; bh=TmAkXaAw5cJHa+mEh0TSy8Kn5ny/TDE2/zEY35TBm2k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VIkMttRu9NGWJATVmqex4NPNAElP8YeBkuBKqzvPOi54gSyIobK9MEBCiLyhZUpi+oZj/lz8s2lbGf1wJ898lL71JPpfSWwjTtNNoBNtW9Q1HnUWVJ6fgH6zVB/YX8GwAiCz2wFte/tA57rv3+BHUuGmU6UPUCKHRi6VwJ/5j9k= 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=DB8CMlHN; arc=none smtp.client-ip=209.85.215.175 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="DB8CMlHN" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-c80167f56cdso3250685a12.3 for ; Thu, 14 May 2026 02:42:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778751729; x=1779356529; 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=rrNbLANiBcQr27ZSAlrK2cxuCnVeM2v9Np9AjqW/V2E=; b=DB8CMlHNZ4YLNwZAtMEri5DjJT5d1U76uncbMR6k9rE6U0nkXV+itYYQ80TFv2T8D2 22bAsCXo8dPoXJdReYxZYm5+vnUeAQvjbBqXQCfChChe1JF6GUphOlU+36Xg71Xc4LkK +UKdqh7ODbr1Taag0rwwv22IqfJXJrCNjvz9ga1i//0t/y6/eA5ozyKV6E5rjpSqZpxA TAWujVFiWodLercgXs0oxORgC4FKjS9DWpugSKxe8z2i06uQWXbER7RNZdk0oNtMxcqq dovILiiChCzfgMDnRWMlFN4JpBqo1wRU6B120s/nsiBWssJclC4UVvz0m43/4RpfpHSQ MRIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778751729; x=1779356529; 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=rrNbLANiBcQr27ZSAlrK2cxuCnVeM2v9Np9AjqW/V2E=; b=FftgoSHY6ChVKE8rSM9ef+XGSwtFyiwyeRevvGUvbmU3ymgPa28A9ItNNg56ePt0/p lXdY8XiZ5lskmZ5PBsRFwmtNpmItg8iJeMZXImthh08lwz1WGTzwuwWR2A/Hdq2ymg5k uL7s4E2OwXc8NLZ1jqlMrPUqsDq10jiNsFiHIOrHikCEQA+aDdGYhc0qFfpsPpeTj0yd YPVjg4tn7/yjoB3m/jAmbSehCB2osTibc1KebekzuT13qGqevhey8zXBzJ5Brmi1oU1c FPfOHgTT8nQWE/norIRl8yqnGJi/1P52DUKO9YTVUAc5vVpNePxstApxky9EffC/CcH+ Gihg== X-Forwarded-Encrypted: i=1; AFNElJ9mr6hJeTGMwOKfixkLHSEAkM4uD+vNDXWi88m8JonjuvzJgDANUgvpgXfZy6Yi090b1P72mrtZzMmOKf0=@vger.kernel.org X-Gm-Message-State: AOJu0YyX8FKg9nq1FitYBe4YmwyykYaibhe3ISvs9xdoDaCdrVlNULeJ hgNC6qGAev0rFkEllitWLsKNDgUhF5NtKtIeczF6ZqsULVr2E5nUOBgc X-Gm-Gg: Acq92OFZZYSyiomVBMJ1TZ4bhffB9gxPjgYHbfBGgGtWZTlg5Y1fcQDVd19XIqdUC1M o7DAxgvzghRye+DA4tj5TmSL9Y2WdOqr0+1UBMTjxp1B2jyPWQeeuPZrOd0iluc35ppLxuxFaBC AFXYjCvAP9fIA6+rSlCvLpK/6BLDMCHjfP5CjgyUfpO5nNezDIHg+W+7WxdaTfLuTbJCpDOTC7u IsVl9HEtdY2k8zBgriOx0+2MPtQEwnIgTK09F/G4gyRvXdIhTRGGsFaxF1L++qsEqXTXWIWMNjE 5vi0PxWudI7etr2eUC0OOEE4xxiLG+bL40fDV3XbreIIM7n68DQ5Tw+oCRqi9yE4JKDk3LE34Tw R2At8zXfKDWTTzErMU84yKK/4/UlAzaL2/pedgIniI1l5fNbiL1NAIzwPbao/ZnufcS9sbprvj2 hkSj2lIsC7aW3F0MZ0+OG/u8pGqYAqJFd4dceajraK1RMv8w== X-Received: by 2002:a05:6a21:3390:b0:3aa:60e0:b2ed with SMTP id adf61e73a8af0-3afb1009aabmr7737701637.27.1778751728731; Thu, 14 May 2026 02:42:08 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c82bb114a70sm2351244a12.22.2026.05.14.02.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 02:42:08 -0700 (PDT) From: Wen Jiang X-Google-Original-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, Wen Jiang , Xueyuan Chen Subject: [PATCH v2 6/7] mm/vmalloc: align vm_area so vmap() can batch mappings Date: Thu, 14 May 2026 17:41:07 +0800 Message-Id: <20260514094108.2016201-7-jiangwen6@xiaomi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260514094108.2016201-1-jiangwen6@xiaomi.com> References: <20260514094108.2016201-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 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 | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index c30a7673e..b3389c8f1 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3591,6 +3591,35 @@ static int __vmap_huge(unsigned long addr, unsigned long end, return err; } +static struct vm_struct *get_aligned_vm_area(unsigned long size, unsigned long flags) +{ + unsigned int shift = (size >= PMD_SIZE) ? PMD_SHIFT : + arch_vmap_pte_supported_shift(size); + struct vm_struct *vm_area = NULL; + + /* + * Try to allocate an aligned vm_area so contiguous pages can be + * mapped in batches. + */ + while (1) { + unsigned long align = 1UL << shift; + + vm_area = __get_vm_area_node(size, align, PAGE_SHIFT, flags, + VMALLOC_START, VMALLOC_END, + NUMA_NO_NODE, GFP_KERNEL, + __builtin_return_address(0)); + if (vm_area || shift <= PAGE_SHIFT) + goto out; + if (shift == PMD_SHIFT) + shift = arch_vmap_pte_supported_shift(size); + else if (shift > PAGE_SHIFT) + shift = PAGE_SHIFT; + } + +out: + return vm_area; +} + /** * vmap - map an array of pages into virtually contiguous space * @pages: array of page pointers @@ -3629,7 +3658,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); if (!area) return NULL; -- 2.34.1