From nobody Sun May 24 19:33:41 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 8800A3314D0 for ; Fri, 22 May 2026 05:31:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427919; cv=none; b=RVs1QXVIfc5OA8iw6j3JdwcAV+K5iOwLCf/0yYG/4LYss/KvO3J6R5ZaIpqdiQiYDEF7PJynREUn8jwnlOGB+bAE8EWP0FrKNmuVNnyg+uTvOHY9//AOWAb4mM93ja+SsZFb8ZHOiIXgRUvhJJqvy1lwQaztO6ZC71QiSETwgj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427919; c=relaxed/simple; bh=qKZtJZwSDqxHoi5+DuqcHV26KIUkoW+Dbzi7vaSP4Iw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NwLIRjnuLo5TrVfZ21r+sFmt58tKUq6E5LyrUYrY/oI8S0bXYZNKkUbLvzu83U9/EZzHttyZ1ZnjLFD9OoDfoB4FT5jci5ogEmQafChSWUuQbakYHFMCt0NhLVsmukOqhaUDRD1aU1FNglfT18CWmZLyvLZXAjTv/W0F7PxIsd4= 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=Wfu0rAUc; arc=none smtp.client-ip=209.85.214.173 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="Wfu0rAUc" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2ba0714574fso37888405ad.2 for ; Thu, 21 May 2026 22:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779427918; x=1780032718; 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=8N+rFVtNdZ51dKl5Chv+doUD+ImVi+kXBB4grpnNGus=; b=Wfu0rAUcu5dk1kRBRY5CDWm8RyqDC1cO2sYFaSyD+C199sNQojffPRnbc7jhI6o1W+ LMb00Y956eFmgvBCfWqotbwx8n74TzlFQbSzLsjKGILa7RasQ9A5a6jIheEPoNcezhSF MKhoCWZDcuFIj8mg5CxU26+dPYmENHCHSyZ+tKaIdqfyoPUKjyaDl+Xx3ELL3sBba6pv T6KlgZGSPxMASb764mOuil13Y44T0ef5GilYAbT3CDXii6Ub23K8N74KDbQr7tnprWpe m6n/2DgjPQwhRiWrkV7c8OB9dfGAdqOrrBVyUXmHSLS/0XyVRQjblzM7F3sqfIlJKlda TBQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779427918; x=1780032718; 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=8N+rFVtNdZ51dKl5Chv+doUD+ImVi+kXBB4grpnNGus=; b=XMypiW2Q1tyV7qZKTRMVFpO+jn6uG9IdlpPd1D7vQuHRxvKH9ikaF4gKa0PFUpX5YL XQ3zDUb7R8WywjDaRMTA0MelbinO6gEsWyAzdBmCxP0W0gNcui/R9shGeh1ZVskptbjo 4LEXtjWyQfHPpuyD5pGso2u0pbnAdXj9G4CxsbTOi6TufbydQpe1+v+c1k3BbkP1bOPJ Jea714A9OeIwJQNpbGIRslzdjt9qmGo6U13bEElw4JuIXiK2PKqIU227OWdRuHfG5xN7 SC2dhPHp9R7OTucDe0+PL6C8Jhq1058b8Z3wB28ie9orjAc6Uu9CxkAI2owz/IDHO2we yzxA== X-Forwarded-Encrypted: i=1; AFNElJ9Gt5UgHgNwr9pvkx9gqtBr5joPSNfnE6tTja6Gm6UfNQQp+u6WxWG+FjQ7P5CYgh7epKx/HhVfbDv/G9k=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6I+04bBvRL+3gmM4m5Nk5Az+29ExIEXesfyfL3jXiYaUJsyoQ b1QXKajj6sGvpbUCk3wmevqtiiFQt81TbFOOD4OACiirJNf/5lOI1dVN X-Gm-Gg: Acq92OEuq99MY34zk4hP7J9eqntJPNxhCoG+Q6/VsWn0U0ARiW/3fHdZWv4YLekxABB lH/CZQi59M5IVnclQAnnVk7QdIpc093+NM4syEPrXZereUElSWqkyTiuMNyf74Uyc8LQEUixPWF MsbX/Y8bXD5NT7AIVXNBOTRfjYFrngd47hGcK7h9IxQrHTA6dOGers1/adR7wz47SwbFq0HFW4h PNepS5Zf+4oLS+1tHkptI/XN7GOURZC98pG4rSuwxQEzaXl3NSlfuRVmoUIb69zOY+y862gMX2g c7wH8aLDRwWeiCduNc6tufkJQG4QPjqsRLNkE/NJ5818pHesfqXx/DnL+I9vfGPAz4RdpL8Ac20 CecHzPY95kx9MHFigx9aXUBcPzQDgxFhAGaWvw2WgjnDby16lLIWill3W53sE3WcbQeTqYiDuaR yCbizTnlwjPkA+m2gjUVCB/wNjzq769O0e+QWKe1nRyxpYaQh/X1c= X-Received: by 2002:a17:902:db07:b0:2ba:3e50:e3f5 with SMTP id d9443c01a7336-2beb0634c8amr22954595ad.30.1779427917717; Thu, 21 May 2026 22:31:57 -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.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 22:31:57 -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 1/6] arm64/hugetlb: Extend batching of multiple CONT_PTE in a single PTE setup Date: Fri, 22 May 2026 13:31:41 +0800 Message-Id: <20260522053146.83209-2-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Barry Song (Xiaomi)" For sizes aligned to CONT_PTE_SIZE and smaller than PMD_SIZE, we can batch CONT_PTE settings instead of handling them individually. Signed-off-by: Barry Song (Xiaomi) Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen --- arch/arm64/mm/hugetlbpage.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index a42c05cf56408..c4d8b226126cb 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -110,6 +110,12 @@ static inline int num_contig_ptes(unsigned long size, = size_t *pgsize) contig_ptes =3D CONT_PTES; break; default: + if (size > 0 && size < PMD_SIZE && + IS_ALIGNED(size, CONT_PTE_SIZE)) { + contig_ptes =3D size >> PAGE_SHIFT; + *pgsize =3D PAGE_SIZE; + break; + } WARN_ON(!__hugetlb_valid_size(size)); } =20 @@ -359,6 +365,10 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shi= ft, vm_flags_t flags) case CONT_PTE_SIZE: return pte_mkcont(entry); default: + if (pagesize > 0 && pagesize < PMD_SIZE && + IS_ALIGNED(pagesize, CONT_PTE_SIZE)) + return pte_mkcont(entry); + break; } pr_warn("%s: unrecognized huge page size 0x%lx\n", --=20 2.34.1 From nobody Sun May 24 19:33:41 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 0EC7539EF34 for ; Fri, 22 May 2026 05:32:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427924; cv=none; b=sddvvSuN5CGY+TOT1o6lqF2idPZy8lx4kHXp+5Pvb/t2EtUD/wUgcg2vVAWEEuYOT2s3EfgvdrDw7zeAIkJHxmq028GZO14zbMhPuYX/c748ZChPQQg/FMGdyDNu1sfDUR/8E7fNsdwiOJhZR0W7ga5whgl1HVXAxADoqOTYRto= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427924; c=relaxed/simple; bh=ZS9odxo0vop/H0ki4rvVLOQK//QA3am1l33cExBdulw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Gl5Pkm61zTKnwz+ulkoCbUsJzutQnDfxNeNztvQtu8RGvFtLvXh0nU/sCrIssmKVFZQKNi7OrFmCs3a7UKXNX+iR/PdTFsla48iXqDNW2++HX8YM8W8lcI2nQrAp6Q720XaqqK5PpMHlmK4MTtcLN5RwHfzymPccenEstWIe+7c= 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=ofIgA4HT; arc=none smtp.client-ip=209.85.214.173 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="ofIgA4HT" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2ba0714574fso37888675ad.2 for ; Thu, 21 May 2026 22:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779427922; x=1780032722; 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=C6VthUqcKepKjJupP2u4sKeVYf/HcaCpW/hf4AjZgMk=; b=ofIgA4HTJZBaS5EmQR0dOzyvWDcEZqZ1igO9GOE1koLnQQrUfEWvH734Fd7SzuQ0pn O0VMK8Arqp4bT/xRRkKl5KTn0ykAM22/QSTafJDJL/sccl/Oi4kO/pPQXaj5Owg/ytfz 5m4MNLVZKVDNqzhXxKslPwSFyjMvpy//dq9euy6Fhk1s3JMDtyk1oU3Y9M6PwOsS45lX yjMbFWnklfMPOv71Ey/Byl8yiUqgfVwU34thkglCNLXbEVpvnX1kWSr4n6MX9AKH93Xo Eg/pPmMRe/K6i5IYaNJxaeEIGJigvGsDTOWhgHPXRFCd0rxzd+PQaDJOpSEwHAzyZ0Cm QhUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779427922; x=1780032722; 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=C6VthUqcKepKjJupP2u4sKeVYf/HcaCpW/hf4AjZgMk=; b=aXH9Po8plbDEmPDiOstWcZkRKYxr+0IM4xDmMHdEoz+tUXetTlpLp+fy3L0KtagWKz +cMF5Nlk9NGZ52fFlkxPt3jYGjKmdP/PC8jbhZcYEzGIf1BbHBZzv5Hp+KD37Kf4oRVk F6xzMlepUaBywmDHKzNdT81f3IktKwBub0iX4+wrPalIc8kow1g3iv/XnIBcu+MkzQ+y WKRrSsgHxxHPHXNY8SJJzw2SzVQmgJd3XyTKbUlSYRh1swtpVX31ffFRjq1lvpvVKV9B zBeVXkkMvpNo5qB0h1imfgyH8z28wZKnY0X5oOkBHs/YyqdN/OEM4aaQyURmOZqcMgQM GMyQ== X-Forwarded-Encrypted: i=1; AFNElJ+1gZyDo2LDAn/Fb1oEX8M8fQBgBHk3y3QCLPEy0ccBoi1wS48gg3mWT3hTJXupJ+7zG9Z3LUo6ZvLWxfU=@vger.kernel.org X-Gm-Message-State: AOJu0YxHQY07hx8m1u+BJJoCAW7Of1IxFesZVPruzuAd0QtbHACStcx1 nW7VjwSYQS+zfi72SbRTztruMIRRqwPwWk8sP8ZY/mmbRl94g2rKXcDtCGfxLAxC X-Gm-Gg: Acq92OE9q5yQHW/uTl11tE7jfKCEeMRTVI4jPwk5C2/dkMTqrkiDJumRDseWqCEPB40 5M1ONa4XuZzIcC1fK6IkEgqqEoMU+YRaYGrXBGU3vCLGRTgkjHd0tZzGshNpAYzPUVml6WJSC8V zUDmBaVeanMSmQI+1OPz+LkLp63rl/641tj/0rdd1O+s3WVGM1PoYphbYmBlAFuGRNh+/NWY6Te RsPGFDiuwUfRFvMj0tbLO0MS4Ro0GTqKH0UUd8nDFghyh2xBKdbjwqh7GJqwTcgi7a0sbBA2lD0 MKTF1RciGEpDNSTtSesyrVKvrYuSXvbILxYGEI9kEgI7CboLbhr2BjpoJZh8brGQuI4qeHvhU2w qCPkK5lYZwB8Xn14XBEQ8SqcXj4HsPW7WpwlxTS4c/hZrPx6Qug8b8ZgWf4JJqlbrLQhLz5+cnp SYfaA2wkGN8GWgAEqPvCh3b74/pZ2kHMbcdvOo18CKb6D3IdTEVu4= X-Received: by 2002:a17:902:f705:b0:2be:3dbc:eee5 with SMTP id d9443c01a7336-2beb0365bbcmr23143495ad.2.1779427922345; Thu, 21 May 2026 22:32:02 -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.31.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 22:32:02 -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 2/6] arm64/vmalloc: Allow arch_vmap_pte_range_map_size to batch multiple CONT_PTE Date: Fri, 22 May 2026 13:31:42 +0800 Message-Id: <20260522053146.83209-3-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Barry Song (Xiaomi)" Allow arch_vmap_pte_range_map_size to batch multiple CONT_PTE hugepages, reducing both PTE setup and TLB flush iterations. Signed-off-by: Barry Song (Xiaomi) Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen --- arch/arm64/include/asm/vmalloc.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/vmalloc.h b/arch/arm64/include/asm/vmal= loc.h index 4ec1acd3c1b34..787fd17b48e2c 100644 --- a/arch/arm64/include/asm/vmalloc.h +++ b/arch/arm64/include/asm/vmalloc.h @@ -23,6 +23,8 @@ static inline unsigned long arch_vmap_pte_range_map_size(= unsigned long addr, unsigned long end, u64 pfn, unsigned int max_page_shift) { + unsigned long size; + /* * If the block is at least CONT_PTE_SIZE in size, and is naturally * aligned in both virtual and physical space, then we can pte-map the @@ -40,7 +42,9 @@ static inline unsigned long arch_vmap_pte_range_map_size(= unsigned long addr, if (!IS_ALIGNED(PFN_PHYS(pfn), CONT_PTE_SIZE)) return PAGE_SIZE; =20 - return CONT_PTE_SIZE; + size =3D min3(end - addr, 1UL << max_page_shift, PMD_SIZE >> 1); + size =3D 1UL << __fls(size); + return size; } =20 #define arch_vmap_pte_range_unmap_size arch_vmap_pte_range_unmap_size --=20 2.34.1 From nobody Sun May 24 19:33:41 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.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 E9BB63314D0 for ; Fri, 22 May 2026 05:32:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427929; cv=none; b=aRZznJn8CZzUk5vMwEq1GHeI0ULYrjFYyJBeaYZSwOAMu5kODpjrPLSWN3cx/XOOkRBHzBe5ZoCKzjql/pDKcbHBzJrtTaGVO5s4FgZF7zoodSdh8+yS0yCR10p9GifFy2DPhBj3oBlMHodsKqxuOc0xmNnkXRbZSfQfTC8ZURE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427929; c=relaxed/simple; bh=zDWeF3IKVtVD/akZ9SaGHX0qvhWf5NXaeIWz/D1fBi0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NVjs41IJOeyU8DytXZLLIVRbYLqMxfZhKBE0w2gDpUkhXNoJ4nEhcDrNoCXJ/FOVmhthN7t8sag0pChFvbt6r+Pq6Exu1nFLsHPdN3SJ/Y17IZOtzmFyNIhP1mLHJB+RYlWpp5yMTgJQ8pvDsUgbJCEPpzHlhwMazrQSqapxnrk= 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=BP9Ln+Tf; arc=none smtp.client-ip=209.85.214.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="BP9Ln+Tf" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2bd80b3aa13so44939525ad.0 for ; Thu, 21 May 2026 22:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779427927; x=1780032727; 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=HydODzhJG5OH95FA088njE0U9Wx1Okn+yobhn9IOhgQ=; b=BP9Ln+TfsRbBdJEX8AJrVltUELzCoGaEFoLhdcFczhoZGrY8NK+ko5uvLOyle1B3t+ Sr00FAAzGFzsJxB//MavgDLcxpI0TOwl4aRgPAONsRiyp5PVlQ/niCO/BVjQerzhQGpU 23hrvOGKNCHCSiHJ6E1r+TyrTeLo2eL3Zxp/ZS5fePYAHPeQHR9Qva4c3h+gFymDveCO gYPEAzkdqfKG34MsnG8QGpp34qOKZjMhZGLAmnrjLFJ/wpZp978iuJoTl1UGqk+ZDNye mFmBRXDGnDGM0u9DH9AJxkEgwPc47vNGGpZ0JN0S6xMFdj3jrIH9UczspWoKEuGkQeFS /Pgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779427927; x=1780032727; 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=HydODzhJG5OH95FA088njE0U9Wx1Okn+yobhn9IOhgQ=; b=kvy1v/L4UkEuI3R4BAarL4n1vRavuqbWdZdvYrm+ncXdyoz8CU4HPNCgxewPWLSIxK Xj2JqrgzlBcigcHgq3scRvHRNqtZVx9E3ROe/iEhPpAchFTpN7P7CwISb3/fkp3sEzG1 fqMWAJR5ftlfI9Vw9ffIRSC/EIu7i2azfMuhKgsM2GH1F59mUi6aymLQT+ZVjXROgFRK ytaMpWEWeRi2XhqnYbpw3gdJ2q7GIoP8CU0Gp8yyGa+xg8NnISp9obPGqOSSLtiqzQRA 4NEKT17BqDYyEhsUf1Yd9EUtv4NZ1C0Cdj93gN+JPL9akWAZfEpBheXCY2VmVqSOq54e F8FQ== X-Forwarded-Encrypted: i=1; AFNElJ8yPdGZxCfXCm2nLwp1CdvdI6+aqksfWHEbMF2+LpYA5UoLKZc/1pEnFjok+wcPNWhftRoHX0ZEW8GF3rw=@vger.kernel.org X-Gm-Message-State: AOJu0YzWsstbEKlDZKT7VD2qqt87pMktMwMFxr2qkc+ZTHIK+xBS2PMJ vYqHxHbI66AjfRZb4M6qSg4QhlF/Z7XUBjlarvT0M9IUrsJu5S2A4TyS X-Gm-Gg: Acq92OF62n4k/H1ehih3wLXtF+z8aizCf8pGjRxu2IMSJoVEHs+TKEVfA6nriTpB5nR F29KClP0W+5oqQv/S4rmw1DlZiywkyXJmpYznNSSGkiIdL9xUFerxnxE5KmcrCj1hVsIbHKGA1c ukyzDy7OC9mXjzROQ8/onwwrin92n4tPDMXVLQ+YRnmn2IiqwDi5gX8A9jqYNHcAsMisULSulCH VIBvGXEDChdrUTiGOj2ky8cdKDuQ0o9wdnMZLG6RwN+mLuXLqbECixfS/P5O+3fnWm2s/H4gZvH 0cRrPfYeq6EotGpBzo4SrSTCYdw4wcsk5CVlBydyU//0hQSFpPlSTvHbdDkBDpH/vh+Gy73YBk2 CQyumX2IRjE53qXR1Z/5IUt7cD6NSlaOocX5E3UBbSdXbyo74tRpORF6bYHzockOjJvtncY15A+ QAvNoWNrp+JTHMnf37tQc6vsswfVxfrHUMgbhOggzr95vUv2zZqrc= X-Received: by 2002:a17:903:f8b:b0:2bd:5026:ca11 with SMTP id d9443c01a7336-2beb06ea84cmr20575295ad.2.1779427926999; Thu, 21 May 2026 22:32:06 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 22:32:06 -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 3/6] mm/vmalloc: Extract vmap_set_ptes() to consolidate PTE mapping logic Date: Fri, 22 May 2026 13:31:43 +0800 Message-Id: <20260522053146.83209-4-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: quoted-printable Content-Type: text/plain; charset="utf-8" Extract the common PTE mapping logic from vmap_pte_range() into a shared helper vmap_set_ptes(). This handles both CONT_PTE and regular PTE mappings in a single function, preparing for the next patch which will extend vmap_pages_pte_range() to also use this helper. The #ifdef CONFIG_HUGETLB_PAGE guard is moved inside vmap_set_ptes(), so callers no longer need to handle the conditional compilation. Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen --- mm/vmalloc.c | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 2c2f74a07f396..53fd4ee460ea4 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -91,6 +91,35 @@ struct vfree_deferred { static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred); =20 /*** Page table manipulation functions ***/ + +/* + * Set PTE mappings for the given PFN. Try CONT_PTE mappings first when + * supported, otherwise fall back to PAGE_SIZE mappings. + * + * Return: mapping size. + */ +static __always_inline unsigned long vmap_set_ptes(pte_t *pte, + unsigned long addr, unsigned long end, u64 pfn, + pgprot_t prot, unsigned int max_page_shift) +{ +#ifdef CONFIG_HUGETLB_PAGE + if (max_page_shift > PAGE_SHIFT) { + unsigned long size; + + size =3D arch_vmap_pte_range_map_size(addr, end, pfn, max_page_shift); + if (size !=3D PAGE_SIZE) { + pte_t entry =3D pfn_pte(pfn, prot); + + entry =3D arch_make_huge_pte(entry, ilog2(size), 0); + set_huge_pte_at(&init_mm, addr, pte, entry, size); + return size; + } + } +#endif + set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); + return PAGE_SIZE; +} + static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long en= d, phys_addr_t phys_addr, pgprot_t prot, unsigned int max_page_shift, pgtbl_mod_mask *mask) @@ -98,7 +127,8 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr= , unsigned long end, pte_t *pte; u64 pfn; struct page *page; - unsigned long size =3D PAGE_SIZE; + unsigned long size; + unsigned int steps; =20 if (WARN_ON_ONCE(!PAGE_ALIGNED(end - addr))) return -EINVAL; @@ -119,20 +149,9 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long ad= dr, unsigned long end, BUG(); } =20 -#ifdef CONFIG_HUGETLB_PAGE - size =3D arch_vmap_pte_range_map_size(addr, end, pfn, max_page_shift); - if (size !=3D PAGE_SIZE) { - pte_t entry =3D pfn_pte(pfn, prot); - - entry =3D arch_make_huge_pte(entry, ilog2(size), 0); - set_huge_pte_at(&init_mm, addr, pte, entry, size); - pfn +=3D PFN_DOWN(size); - continue; - } -#endif - set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); - pfn++; - } while (pte +=3D PFN_DOWN(size), addr +=3D size, addr !=3D end); + size =3D vmap_set_ptes(pte, addr, end, pfn, prot, max_page_shift); + steps =3D PFN_DOWN(size); + } while (pte +=3D steps, pfn +=3D steps, addr +=3D size, addr !=3D end); =20 lazy_mmu_mode_disable(); *mask |=3D PGTBL_PTE_MODIFIED; --=20 2.34.1 From nobody Sun May 24 19:33:41 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 6010F3314D0 for ; Fri, 22 May 2026 05:32:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427933; cv=none; b=LNFThuCwgtek+Bcj1i0+aU7MeXdDmij4XkX/y2dptLcclrGlhTRkvhhRnZv7s6QdJkXsdDXsPgD9F8GgOt6lhQzRyjn5EKmPH4ZGn6nKkdmQnNlqRtJFoELKjPNSV1H3S4YNGcb1lQtZTrqu18bZEQnxvhxxbwwEEVYAFbr2w0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427933; c=relaxed/simple; bh=51x4c4xxBqlT3spI7/b2K7/4EZ4bPsIc8jZZFFhblWc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ilg2lUnXIYtsEeEVsiEg7AzbvH1fT3ggiLV+z68/lSqHE8udOD6E6D1fdzHJYdQ2Av0kFDUtVrxO9RWYpPTYxehgkFjAd0Pw748rgbFIrB66h3vQrHruIll2bJaM/SMruw+q+1e+A0Weu9Nz27GKNTOKQqSl/Ju9QiuQYe0INH8= 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=jpgNiqEm; arc=none smtp.client-ip=209.85.214.181 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="jpgNiqEm" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2ba6485d219so52148235ad.3 for ; Thu, 21 May 2026 22:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779427932; x=1780032732; 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=nYmJyQ0ywc8EPBT7bjoKD+k2F/54dp54XhgQCkuTPK4=; b=jpgNiqEmo8Vbk7IDFZmOnSeCSvqcZJQSUtKQ8OaXEqSBeKD6kWILZEe+TtdgmCSRoI +7e5E1V8stT90YlvIfbW1hr+2sqV8nu1UqZ2x6Dc+o8QJ2WPjZQkh7fpdNg1xtzZIOrs RKX6mFOeoBXBI2rCZtM1+e+AWwWVzJsrV2rv+xtNq8C8oQN6ZOQo/B0+xSA2IEw323hf lDwzZ828HoCWkyDe4HjWYnAq+sV6snNcYl3Zcye/b2oenK+cu0aGRIlYnPSuYvtY2xBz XmoX0xJsHIMpVM0UUtLCSU1CQtsVpuBi4ciUEq14kqSpZoeuz+xX38Wl488mmlM1QJ12 KnEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779427932; x=1780032732; 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=nYmJyQ0ywc8EPBT7bjoKD+k2F/54dp54XhgQCkuTPK4=; b=QP+DvoLZXkE9kOGNB+g22sv8KOqoN0iMEb/4O4HG8zelkPC0JoKBPv3CAgh8+BhVji kMTEExohOv6ehEYfrN1DlkR7UYDhsK+F+2YIhzRRE3UKJ6KQzDDJeGopGLqCbB6JSFni G+q9Q8DYo+vH355hK/unKENSjiiYLWRr+jrw9rgqi0SKOSKovAMc4bgVFMhsAoEn/Ft6 9EMy6cVPHfEEeI74ZzmRB8KQjbdT3JDTDhKSXA7vMAynmGWX3UyH7jxLuda6DTzS/AV4 Iwy+wirewAI1kongK2oNpzY6mHtpm3p1KJ7MFRVxgLdvJIkHU6aNKcR/FYBDSK7Ar2L6 EBLQ== X-Forwarded-Encrypted: i=1; AFNElJ/bqbX/AYIXX/OfKCPpg5/vzSOQSmnuXcx7nwxJ/5IxsxAHF/6ggntb4sikOpVpdrKj6rU8aJGp9sGBMFk=@vger.kernel.org X-Gm-Message-State: AOJu0YztkcNNG6j1NH2gl9LT1OoDh2XWAroJ5R2PZcNxOGIQC10I3nIW dnQ/6tl0kMkGROrXlb9+9dEWt9gTiWtmH8SM+s1vFtJIwY+16OzUE2Vu X-Gm-Gg: Acq92OGw6ITnVAYdMagwmCA77qZkc1GHjn329f5Yrdvlpqpo8rkjBMHJDeGfUAjStu+ Dghgq9jaVR1Trmf2MfHIdyBNY67Mrd8nrfoizu7i9ckllhRQVici0vF91IMuy3NWGgUG+60VmPX uiDJEGycSX/0Cg52WHqZETFI6nMRzZMPPaTiBDB4LO9b0QMXtoZGJp+cTMwivaviQ5vIksWa7cs AQeIBI6ebqGi8Crvx2yj+6CP4tWm5WilgrZIag5jp5V4WmfjS4QP7b+0Jt+giCKBycR05uRsRmb NWrUbKLbIpZuXSLQUAQiZSvZn0P5ErpBqRjJP3XCri/bSy0f7R2d5E3gQ2Wos7Y5mKOPJs7asCO a1dh8k7uOohWDU8edVqX4HqQG1BUbH7BPX2aFF9wwDSbeXLlac4iis7EpY8gehHKfxGjTuXEJk3 PUmKQLiJiHa4vUCB+ltd9/LuRdSjk279WxX1DWzFl0g6JJj8KXJR8= X-Received: by 2002:a17:902:f544:b0:2ba:6ed6:aa35 with SMTP id d9443c01a7336-2beb05e4133mr22071865ad.19.1779427931640; Thu, 21 May 2026 22:32:11 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 22:32:11 -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 4/6] mm/vmalloc: Extend page table walk to support larger page_shift sizes and eliminate page table rewalk Date: Fri, 22 May 2026 13:31:44 +0800 Message-Id: <20260522053146.83209-5-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Barry Song (Xiaomi)" vmap_pages_range_noflush_walk() (formerly vmap_small_pages_range_noflush()) provides a clean interface by taking struct page **pages and mapping them via direct PTE iteration. This avoids the page table rewalk seen when using vmap_range_noflush() for page_shift values other than PAGE_SHIFT. Extend it to support larger page_shift values, and add PMD- and contiguous-PTE mappings as well. Rename it to vmap_pages_range_noflush_walk= () since it now handles more than just small pages. For vmalloc() allocations with VM_ALLOW_HUGE_VMAP, we no longer need to iterate over pages one by one via vmap_range_noflush(), which would otherwise lead to page table rewalk. The code is now unified with the PAGE_SHIFT case by simply calling vmap_pages_range_noflush_walk(). Signed-off-by: Barry Song (Xiaomi) Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen --- mm/vmalloc.c | 71 +++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 53fd4ee460ea4..deb764abc0571 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -543,8 +543,10 @@ void vunmap_range(unsigned long addr, unsigned long en= d) =20 static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, int *nr, - pgtbl_mod_mask *mask) + pgtbl_mod_mask *mask, unsigned int shift) { + unsigned long pfn, size; + unsigned int steps; int err =3D 0; pte_t *pte; =20 @@ -575,9 +577,10 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned l= ong addr, break; } =20 - set_pte_at(&init_mm, addr, pte, mk_pte(page, prot)); - (*nr)++; - } while (pte++, addr +=3D PAGE_SIZE, addr !=3D end); + pfn =3D page_to_pfn(page); + size =3D vmap_set_ptes(pte, addr, end, pfn, prot, shift); + steps =3D PFN_DOWN(size); + } while (pte +=3D steps, *nr +=3D steps, addr +=3D size, addr !=3D end); =20 lazy_mmu_mode_disable(); *mask |=3D PGTBL_PTE_MODIFIED; @@ -587,7 +590,7 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned lo= ng addr, =20 static int vmap_pages_pmd_range(pud_t *pud, unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, int *nr, - pgtbl_mod_mask *mask) + pgtbl_mod_mask *mask, unsigned int shift) { pmd_t *pmd; unsigned long next; @@ -597,7 +600,27 @@ static int vmap_pages_pmd_range(pud_t *pud, unsigned l= ong addr, return -ENOMEM; do { next =3D pmd_addr_end(addr, end); - if (vmap_pages_pte_range(pmd, addr, next, prot, pages, nr, mask)) + + if (shift =3D=3D PMD_SHIFT) { + struct page *page =3D pages[*nr]; + phys_addr_t phys_addr; + + if (WARN_ON(!page)) + return -ENOMEM; + if (WARN_ON(!pfn_valid(page_to_pfn(page)))) + return -EINVAL; + + phys_addr =3D page_to_phys(page); + + if (vmap_try_huge_pmd(pmd, addr, next, phys_addr, prot, + shift)) { + *mask |=3D PGTBL_PMD_MODIFIED; + *nr +=3D 1 << (shift - PAGE_SHIFT); + continue; + } + } + + if (vmap_pages_pte_range(pmd, addr, next, prot, pages, nr, mask, shift)) return -ENOMEM; } while (pmd++, addr =3D next, addr !=3D end); return 0; @@ -605,7 +628,7 @@ static int vmap_pages_pmd_range(pud_t *pud, unsigned lo= ng addr, =20 static int vmap_pages_pud_range(p4d_t *p4d, unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, int *nr, - pgtbl_mod_mask *mask) + pgtbl_mod_mask *mask, unsigned int shift) { pud_t *pud; unsigned long next; @@ -615,7 +638,7 @@ static int vmap_pages_pud_range(p4d_t *p4d, unsigned lo= ng addr, return -ENOMEM; do { next =3D pud_addr_end(addr, end); - if (vmap_pages_pmd_range(pud, addr, next, prot, pages, nr, mask)) + if (vmap_pages_pmd_range(pud, addr, next, prot, pages, nr, mask, shift)) return -ENOMEM; } while (pud++, addr =3D next, addr !=3D end); return 0; @@ -623,7 +646,7 @@ static int vmap_pages_pud_range(p4d_t *p4d, unsigned lo= ng addr, =20 static int vmap_pages_p4d_range(pgd_t *pgd, unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, int *nr, - pgtbl_mod_mask *mask) + pgtbl_mod_mask *mask, unsigned int shift) { p4d_t *p4d; unsigned long next; @@ -633,14 +656,14 @@ static int vmap_pages_p4d_range(pgd_t *pgd, unsigned = long addr, return -ENOMEM; do { next =3D p4d_addr_end(addr, end); - if (vmap_pages_pud_range(p4d, addr, next, prot, pages, nr, mask)) + if (vmap_pages_pud_range(p4d, addr, next, prot, pages, nr, mask, shift)) return -ENOMEM; } while (p4d++, addr =3D next, addr !=3D end); return 0; } =20 -static int vmap_small_pages_range_noflush(unsigned long addr, unsigned lon= g end, - pgprot_t prot, struct page **pages) +static int vmap_pages_range_noflush_walk(unsigned long addr, unsigned long= end, + pgprot_t prot, struct page **pages, unsigned int shift) { unsigned long start =3D addr; pgd_t *pgd; @@ -655,7 +678,7 @@ static int vmap_small_pages_range_noflush(unsigned long= addr, unsigned long end, next =3D pgd_addr_end(addr, end); if (pgd_bad(*pgd)) mask |=3D PGTBL_PGD_MODIFIED; - err =3D vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, &mask); + err =3D vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, &mask, s= hift); if (err) break; } while (pgd++, addr =3D next, addr !=3D end); @@ -678,27 +701,13 @@ static int vmap_small_pages_range_noflush(unsigned lo= ng addr, unsigned long end, int __vmap_pages_range_noflush(unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, unsigned int page_shift) { - unsigned int i, nr =3D (end - addr) >> PAGE_SHIFT; - WARN_ON(page_shift < PAGE_SHIFT); =20 - if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMALLOC) || - page_shift =3D=3D PAGE_SHIFT) - return vmap_small_pages_range_noflush(addr, end, prot, pages); + if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMALLOC)) + page_shift =3D PAGE_SHIFT; =20 - for (i =3D 0; i < nr; i +=3D 1U << (page_shift - PAGE_SHIFT)) { - int err; - - err =3D vmap_range_noflush(addr, addr + (1UL << page_shift), - page_to_phys(pages[i]), prot, - page_shift); - if (err) - return err; - - addr +=3D 1UL << page_shift; - } - - return 0; + return vmap_pages_range_noflush_walk(addr, end, prot, pages, + min(page_shift, PMD_SHIFT)); } =20 int vmap_pages_range_noflush(unsigned long addr, unsigned long end, --=20 2.34.1 From nobody Sun May 24 19:33:41 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 E60AC3A05CC for ; Fri, 22 May 2026 05:32:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427938; cv=none; b=ZrE3QgsyVVeMrI6K+7VwI7+Afj8FctO13dnPWpnLtSErQdKXfa8xfOePxFQ4Kr4MAmwvwoC+Zufsqv377DmGl00J/y7hQjPDgVnhhWJpzmDVxQChEiXzmGTLy+IM6UgjnCKEzxX//54mb90eV5ENDHQlNowEGmQyOMQWwpNa3Gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779427938; c=relaxed/simple; bh=LdsND3STYh4BypV9GZjw0LQICsDiKifD84zvHA/3J20=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=G+i60wvZ3dDbgiVWO4ya1FVxV43qnW64YpVggszfqUAjU7chPkM6V4v8Aa4qX0XCObJYg7Hxk3egdnvHPiOjqTA0ZMqcnk5X5wlV4iff8/iUWlvSd7uihUfcRcQS+WuQhpEH7AixwZOjJ8QIgb/st/9bzA2Bq6ScN+/+YXdzoSM= 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=sxDecJi8; arc=none smtp.client-ip=209.85.214.182 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="sxDecJi8" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2bd2c147abaso41751195ad.3 for ; Thu, 21 May 2026 22:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779427936; x=1780032736; 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=G4nDVPNvDGaaEdnxQatYVMpRpD4mqtQtLPJNe5AMUKI=; b=sxDecJi8HwsR/C09FxppDBBwOkKjqqHRInHNxYDaXbDwY1n+dBebOmzFusgGQ0bVox WURxIPHvvOLQLdwo8Q+gDt0V/lcFjZ4ylgryvL/t9cWY1xwJtRAi0vpefb0AmqUNw5Ww NnGC6lB8vsWQdXQK2+cVVzKK5nTjisPEqtL5dHPhYt3jb15s0/0hQnk7f/R96QwaNdRR 9DOAgWnC9qydbv84FHEv2uM1544QOrwN4XESFzBPMCHCKsoEgmVtjGCQJBb7h5l1aw5g hbPxCg3M2j8+2rFlsErM3RKqbILd49RILxmjRViu2fjIXrp2KNyNaEGoldyhCwy8BAu+ QLJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779427936; x=1780032736; 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=G4nDVPNvDGaaEdnxQatYVMpRpD4mqtQtLPJNe5AMUKI=; b=WEMmPD4YTP0WqWLoPhX7y+7qW0mjITj4KDEvuhqMozZQ1gUhWgI5kEUAgPCMTuORWm NZJmZvpme6ZTinVF3Z47fS6bXllod0dDjJcFLCKnmnkhVdm4FeKccFaF5DTHxsYnJE+B E3IQ9cANsISdKX/MwHty+kI2x4LrhfD37BnNKb6rA8BuhQRaHjTT7TLn0c8flmMPDIKk W+n7WIjCb7VOYjs0+M5CwSowUAjdF9C4dkX+hoyF6DxOAKKkYp7XCeXV8ZnvMnYsWsTO RG/1mWpQlLbt5oLz7gG/rgIvKJGXA/QD/Ygjw2CDyvE3oje7IbAj0tT8cH68YTv9O5Dw JD5A== X-Forwarded-Encrypted: i=1; AFNElJ+3xIE63T9Q85kEkoeBLd1yWc9MwSbhmt58yHwQ7mFXo/wR/+Alq9H6zPUnEcN1ZKHtbEW0NH06HGUwrxo=@vger.kernel.org X-Gm-Message-State: AOJu0YxlmJJqWBx7LdulZo93ZNllVnjGn7Q7cpW0UF4pngjlz527/yq9 Rc2uderCzKnnY2L+eNh5++OUMwswi6uGbk9+mtFW5FxjGupcA+N50B0o X-Gm-Gg: Acq92OE3k8gK6L/l21wGDpyE85JhsUSlDmRlQIylMySGZVUydt6wxkfhcyP76dq3kTG G9lIQL9GRwiYMA8iW7wuQNMf/29n3WltxoI4XsTmv5S0jnW+kW62m6GMvU7j31vQFCnfxT9Foa0 7x8c9FGT+4/fRzvoI6Fg/xiAOnPrHtpgFuL2SudzwVuARrmVQB3UOqu6FuRKlfKj0z8eG2YgvRL uDPK4g/mP8CCnuAYMmr03EMFgKFt3mHwh9Tqu9mNywU/12Go52boU0+Fi6JnkFgL6UkhqVWxgbp z4z2f+F9EaXxXlTNe8nkUgJLq7+f14gL2lJXi9fAVMfDoTRRuB4+zWfEaeVXzQjBvyA1CD8bTVo IGwCQ+2Gd6eV2nh9L5ftQSEcnmAkBqG11Wvib6NZa2NvWj/Ul8eNHeYh8kaogjD/vRC0TcxuZCi xjgnBrBHQgF5MWMP+XV17KuzopeXyvOn7ZpHJP3Dz5Bg/Ypf4wxoX5UqCiYek0EQ== X-Received: by 2002:a17:903:2c04:b0:2b4:61cc:37a8 with SMTP id d9443c01a7336-2beb037a5ebmr22161795ad.17.1779427936265; Thu, 21 May 2026 22:32:16 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 22:32:15 -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 5/6] mm/vmalloc: map contiguous pages in batches for vmap() if possible Date: Fri, 22 May 2026 13:31:45 +0800 Message-Id: <20260522053146.83209-6-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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "Barry Song (Xiaomi)" In many cases, the pages passed to vmap() may include high-order pages. For example, the systemheap often allocates pages in descending order: order 8, then 4, then 0. Currently, vmap() iterates over every page individually=E2=80=94even pages inside a high-order block are handled one by one. This patch detects physically contiguous pages (regardless of whether they are compound or non-compound) by scanning with num_pages_contiguous(), and maps them as a single contiguous block whenever possible. The first page's pfn must be aligned to the mapping order for the batched mapping to be used. Pages with the same page_shift are coalesced and mapped via vmap_pages_range_noflush_walk() to avoid page table rewalk. As users typically allocate memory in descending orders (e.g. 8 =E2=86=92 4 =E2=86=92 0), once an order-0 page is encountered, we stop sc= anning for contiguous pages since subsequent pages are likely order-0 as well. Signed-off-by: Barry Song (Xiaomi) Co-developed-by: Dev Jain Signed-off-by: Dev Jain Signed-off-by: Wen Jiang Tested-by: Xueyuan Chen --- mm/vmalloc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index deb764abc0571..50642246f4d40 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3542,6 +3542,84 @@ void vunmap(const void *addr) } EXPORT_SYMBOL(vunmap); =20 +static inline int get_vmap_batch_order(struct page **pages, + unsigned int max_steps, unsigned int idx) +{ + unsigned int nr_contig; + int order; + + if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP) || + ioremap_max_page_shift =3D=3D PAGE_SHIFT) + return 0; + + nr_contig =3D num_pages_contiguous(&pages[idx], max_steps); + if (nr_contig < 2) + return 0; + + order =3D fls(nr_contig) - 1; + + if (arch_vmap_pte_supported_shift(PAGE_SIZE << order) =3D=3D PAGE_SHIFT) + return 0; + + /* Ensure the first page's pfn is aligned to the order */ + if (!IS_ALIGNED(page_to_pfn(pages[idx]), 1 << order)) + return 0; + + return order; +} + +static int vmap_batched(unsigned long addr, unsigned long end, + pgprot_t prot, struct page **pages) +{ + unsigned int count =3D (end - addr) >> PAGE_SHIFT; + unsigned int prev_shift =3D 0, idx =3D 0; + unsigned long start =3D addr, map_addr =3D addr; + int err; + + err =3D kmsan_vmap_pages_range_noflush(addr, end, prot, pages, + PAGE_SHIFT, GFP_KERNEL); + if (err) + goto out; + + for (unsigned int i =3D 0; i < count; ) { + unsigned int shift =3D PAGE_SHIFT + + get_vmap_batch_order(pages, count - i, i); + + if (!i) + prev_shift =3D shift; + + if (shift !=3D prev_shift) { + err =3D vmap_pages_range_noflush_walk(map_addr, addr, + prot, pages + idx, + min(prev_shift, PMD_SHIFT)); + if (err) + goto out; + prev_shift =3D shift; + map_addr =3D addr; + idx =3D i; + } + + /* + * Once small pages are encountered, the remaining pages + * are likely small as well. + */ + if (shift =3D=3D PAGE_SHIFT) + break; + + addr +=3D 1UL << shift; + i +=3D 1U << (shift - PAGE_SHIFT); + } + + /* Remaining */ + if (map_addr < end) + err =3D vmap_pages_range_noflush_walk(map_addr, end, + prot, pages + idx, min(prev_shift, PMD_SHIFT)); + +out: + flush_cache_vmap(start, end); + return err; +} + /** * vmap - map an array of pages into virtually contiguous space * @pages: array of page pointers @@ -3585,8 +3663,8 @@ void *vmap(struct page **pages, unsigned int count, return NULL; =20 addr =3D (unsigned long)area->addr; - if (vmap_pages_range(addr, addr + size, pgprot_nx(prot), - pages, PAGE_SHIFT) < 0) { + if (vmap_batched(addr, addr + size, pgprot_nx(prot), + pages) < 0) { vunmap(area->addr); return NULL; } --=20 2.34.1 From nobody Sun May 24 19:33:41 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" 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; } =20 +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 >=3D PMD_SIZE) { + vm_area =3D __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 =3D arch_vmap_pte_supported_shift(size); + if (shift > PAGE_SHIFT) { + vm_area =3D __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; =20 size =3D (unsigned long)count << PAGE_SHIFT; - area =3D get_vm_area_caller(size, flags, __builtin_return_address(0)); + area =3D get_aligned_vm_area(size, flags, __builtin_return_address(0)); if (!area) return NULL; =20 --=20 2.34.1