From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.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 14E523E5A09 for ; Thu, 9 Jul 2026 07:39:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783582752; cv=none; b=RMyiq9Xmwi8mw9wQPhphJLQyjxneuxAKvdWMunGs5vEVc2QKKp12UNqT/mRfTYFq+qobH/ox6T7mzcltKbfB0t+hfByDnSpVJL7cUYK6X8BP1CQT1Pjo/F+Kels+YER7L3H/7uvR9dVUXMawb5mss3WDbNZdsr93xRveUjUI4XM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783582752; c=relaxed/simple; bh=uATxEQOjcm1YGUWFt0vGMgx0M4I1Xiecjv3MwK1b0ME=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KqZPgl4W8qLFf/1QE1nY08DikoTmudm1TLUVI3m0JFwtSpFB65vYjQ8lRwMLAiuA5pfMOMV6utOEd8xKmtbzXrrxgWENCzepm0Q1mnNtclr5RyS2ZEbgkJYcUU3Dp3Y4z/I1U4GzZrGy/6/3M2IN1SOfbawuCXlT4c99xaW1tQk= 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=eq3vYTWy; arc=none smtp.client-ip=209.85.210.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="eq3vYTWy" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-8484a0b998fso1508546b3a.2 for ; Thu, 09 Jul 2026 00:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783582748; x=1784187548; 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=ClBPAUdo6N5oJZIf4ypP10hp87KU/iyoMuoMwuvEL3A=; b=eq3vYTWyKzM8fOJCnXaJ9G+sOsY/PgvsaZPnOGO8bbAOuTcB7tvMuZwFAYnjOlpV8t UNLqC1oftEhCcCUZ6RLTYMdMqLAeoQkGU2OnDLg6CbQYhs0CviNCf12BuwbRWJSzJ0bc rFfN+RwjWvTtCJkotcMGR7kZE2wxH2Fhu0seGTZMVnc2VuUwDZ/fcN7gFOhIwKCPFTPK iGcwT8YWlFt8BC1xhm0OaF/SM+Wtq35ZiYyDigHGwx5qdm7kWuL2VpVMDCnocaan6F8S WACh/nj0G8K0yxA10R0CWhUe63mRF/+j2CZ+Mcw2hIr52SGDtwJk0T+0WyYrO9URaXyR WkDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783582748; x=1784187548; 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=ClBPAUdo6N5oJZIf4ypP10hp87KU/iyoMuoMwuvEL3A=; b=m/uijF6B8pMj/HVF9vDogBEMt9AZYhkNfj6mo/NSTd0npOk6X2UvP0rsTrxqKWPo9X 0IiJbQdXWcl06y3m2w7Tgz5XaJxG581vx9nM02CCENzE2xhAE+EndZ/M3SBykcLju+Nr J+GLLQ5k2+jwwmqMT4jiIXXIKwW8FezuOu8y1ilbWSUk8kjEhT8x0WyrSPSqb3kwlMPi kCe0PpplCWdl8jbSR/BuOGqYsMVQgFYvTHT8TgbOp5Jj/wjOLRXDOxWDxhUhQM2hIZzf qUfWLNPvNgxdfP07X2Zt9IYhq3vzH0sB+B5Q44kt/ozbeaQ5GFsIsp30DSi9/MHmQCWU 9d/Q== X-Forwarded-Encrypted: i=1; AHgh+RpIkIHdKWUBKobN4IG1LUSyllXGEhsqybhfGB2iUgmxCFTyjSQJCK/HGgBksiI7sqSmd/NVE1PWZs+ECZE=@vger.kernel.org X-Gm-Message-State: AOJu0YyhMK3HNDz0BoDInU7iMTWlZ5qnyYmicuZPkvHfhMNRMzQ6ZPps T/VsNpH5cECf3G7NGut2A32NDSbysXGBsQLaJ5zKjCTULSS9733Rg9+j X-Gm-Gg: AfdE7cnyJW8Xw1tSygs+HOFTuiA0D6uS1YZ/Iy9Szt+8kDHtR74hAMFJedaZbS3Camt pJ1u3pVIGN9YCP5YS2nR70tMlXg5eq578dC7VnGrI5FNdkkNhb0Hz/r58zr2ftd+LcKRNeAaXiN SU6rYE78tQ2QiCsIDtlK5q4+BlyW+xETNOY74HeGwp72dQB0TKdC9D/sP1BJ2Bb0yfi0MwQNnQj 4lHsXN4TIT2uskLJ7Ff5n1lEhJoV0Uiz2MT/wtOaY27oXwIN/19ZAtv5ja+0wTwgHacdcZ2EZhi 23eoU5DIhS1gW9iyXueH53eL0pINJcFVQOpqOc6X1AGi8QrbI6CFA4CL4kMAhGLm4wdOEz7KvSs 8qAV9LA72MPP8o5zTUQLOZ9ElpZUmBBJ/E16rdqkVL78J/m3yraksFcvQlOBMgWed1cSojPTZsj SNOVAwpLqdrVzia4BvZzSbwtecqMmf4PghvOw= X-Received: by 2002:a05:6a00:2e07:b0:847:7f38:27ad with SMTP id d2e1a72fcca58-848438a7e6amr5640848b3a.53.1783582748319; Thu, 09 Jul 2026 00:39:08 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ca5b3162a49sm3334902a12.15.2026.07.09.00.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 00:39:07 -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, "Barry Song (Xiaomi)" , Wen Jiang , Xueyuan Chen , Leo Yan Subject: [PATCH v6 6/6] mm/vmalloc: align vm_area so vmap() can batch mappings Date: Thu, 9 Jul 2026 15:38:23 +0800 Message-Id: <20260709073823.6643-7-jiangwen6@xiaomi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260709073823.6643-1-jiangwen6@xiaomi.com> References: <20260709073823.6643-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. We do not expect any significant overhead for this. Add __get_vm_area_node_aligned_caller() as a wrapper over __get_vm_area_node() to simplify repeated calls with fixed arguments. Signed-off-by: Barry Song (Xiaomi) Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen Tested-by: Leo Yan Reviewed-by: Uladzislau Rezki (Sony) --- mm/vmalloc.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index db0492151ad08..2ac805cdf18ad 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3314,6 +3314,14 @@ struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, NUMA_NO_NODE, GFP_KERNEL, caller); } +static struct vm_struct *__get_vm_area_node_aligned_caller(unsigned long size, + unsigned long align, unsigned long flags, const void *caller) +{ + return __get_vm_area_node(size, align, PAGE_SHIFT, flags, + VMALLOC_START, VMALLOC_END, + NUMA_NO_NODE, GFP_KERNEL, caller); +} + /** * find_vm_area - find a continuous kernel virtual area * @addr: base address @@ -3626,6 +3634,30 @@ static int vmap_pages_range_batched(unsigned long addr, unsigned long end, return err; } +static struct vm_struct *vmap_get_aligned_vm_area(unsigned long size, + unsigned long flags, pgprot_t prot, const void *caller) +{ + struct vm_struct *vm_area; + unsigned int shift; + + if (arch_vmap_pmd_supported(prot) && size >= PMD_SIZE) { + vm_area = __get_vm_area_node_aligned_caller(size, PMD_SIZE, + flags, caller); + if (vm_area) + return vm_area; + } + + shift = arch_vmap_pte_supported_shift(size); + if (shift > PAGE_SHIFT) { + vm_area = __get_vm_area_node_aligned_caller(size, 1UL << shift, + flags, caller); + if (vm_area) + return vm_area; + } + + return __get_vm_area_node_aligned_caller(size, PAGE_SIZE, flags, caller); +} + /** * vmap - map an array of pages into virtually contiguous space * @pages: array of page pointers @@ -3664,7 +3696,8 @@ 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 = vmap_get_aligned_vm_area(size, flags, prot, + __builtin_return_address(0)); if (!area) return NULL; -- 2.34.1