From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9DDAC982C1 for ; Thu, 17 Sep 2026 05:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XToDi6fIsVYoV27kQlhNobBUYsIv/tm0eptMLl1rq74=; b=pVkVIXDVWPHX7tu/lAMNHm07io EbeprTQmEE+73kPt1ON7oFIKH8QKgv51Qv20D3stXiY3XcK4eZIMx/5agExzIxbgam8ECW3btMMRH t0BJ0w4Vg7CxUD3iVsMDro5gskRpgEJ2MOE12Gl3/Dq3l6nd9cu4wNU355kZlp1K48fsbUU8Jqc3S 5nSpu4k/psrkGCSaWhqJ7Os/UXGZaFOjiMnjWtjibOOIUu0MdMgvVnJOCobYpeqZIwTw6yLLy6Rxn C2oNNPNpqWHprNarg+6nHBmFcblMa1IVSBn+Z3wONvVVcFSHZwLKbo6y47IJg748xsH6uALc/+Cbp 0MQ3P7DA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x74hh-0000000AbNl-49ww; Thu, 17 Sep 2026 05:30:37 +0000 Received: from mail-pj2-x11.google.com ([2607:f8b0:4864:39::11]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x74hc-0000000AbKi-33OJ for linux-arm-kernel@lists.infradead.org; Thu, 17 Sep 2026 05:30:35 +0000 Received: by mail-pj2-x11.google.com with SMTP id d9443c01a7336-2d747eb79f6so3148035ad.0 for ; Wed, 16 Sep 2026 22:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789623032; x=1790227832; darn=lists.infradead.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=XToDi6fIsVYoV27kQlhNobBUYsIv/tm0eptMLl1rq74=; b=QWg9AeSu3Etcot/MlsPSEDZzvG188QNOV69vHiy+N7ApXYX+1X2bAl9cxVk9fBc8AP t1Z1VwYU/M/edOOh7mN/vtWNA1f9YFgkWboYyxlqkE0mILy5o+UM0Adow5/3OF7fM7+c IOUlynZCWeieuOKVng7aMMbzG2DXl5x6AkIIMWLuePpZ7fpDXk8HVIXeZf529se1atew CJp+7qqBxYx2I6iblQ6xDo4o1p6YQF0MjYS83YQKUfPh/7GwCocEag9vvxsmqIYsAMqv n2Mt8dN4ITNoTMVxeH0sXwvSIaNR+4tecnOARj6+aoe2ewXCpkgJI1eYvV2Ay2hv3QKM JCSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789623032; x=1790227832; 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=XToDi6fIsVYoV27kQlhNobBUYsIv/tm0eptMLl1rq74=; b=KOLStX/S+u/r9l42x29HHmIOslGFB9mWecx73j0eMTSIU4cJo8IeoUnbVlHmw4ZwBm vGRCSXH1X9qYid61anNGaVTuAnbisIKOmBVMF0LIcxVNjlf4jgqHfzA8ALDsTAKGF1Rk TbvA5Zmgaa0tkE5aVkayhRkcQ2iGIgNBm+OxG1cw8LcgsXECBLPaoFEw0c5i2khQh8vE Y0IhmDxzktkd8zo554MZk+hvXh8wgawFRWHtl7O1Kg/GCYeiY3nUWrv21u/FvgJn4Xcc ipP2PXSG1peO3l/UdiwWZKozpmV+mFlINO39AGfseZi2mz7tcw/92QScw0tYBKbgDyre YGCQ== X-Forwarded-Encrypted: i=1; AKwUvBwaGViMQkDN1ZMUsegi7rcvmaGGre/Ytyh66EG3Q0Fd4sR4BkZ41AsSDydui5dkfxlMtgzFXsxtEU0HIs/MWcYW@lists.infradead.org X-Gm-Message-State: AFuF++l0SNC9yzEijusvVv/d62LU9Nes2YzNAlZz1X907u9bUDj1sjBq cC++60Cl1/wopQNy6eu+xHF62IMl6tT2TKRcrsxEKVdLzfvWra8bxLTD X-Gm-Gg: AYBFou09H4mj8epZ3IrDXDhNFDAcMsxmcF2IvMujl2fBDt0LgmJFdd3Nmth4wl/otVL rBDqKFm0jfIDfoe2ewqAzwNEgFScZQtdrZttFRUoX7hZXBC6uq2tUugh/NlXFOyGd8mBvUozvr3 lkBMkxNLknotQ4Dw1yEKDH8kyDuj8Y4nV0IzgoHQO5DBKHbKVNp8pAIhdasrppwQZnieU43+7wO LC7dKfQv1n/rApmANjLaU7/6K4DbPDCYHdkUtq9Trul9Dyez1Ryj+R4MIw5Lr2j0gMqpVhLbaeP P6upfJUp2WF/rI/svvn/JN/tqqkiOhcgNWdrgxtqIYjvmdmP+/EXHZ2XaVeqQ/LMAfos7EWN5cA CkNP3Npx1BQBrlsXoFkz5bUDTTkgvQg19qp4QwRuE3M2j6a7e3lBs+NdfKcEYf+wlNcoKfNlOT0 Vj+mRpJln4cDcPP4ml96R5DiM5QtWC0/M9F71i7OlvmZV9X5BTbDnKYkLQrBp2woMzPCTJjMbmX VGkd5curG2AF6HaPjzE055gGD8= X-Received: by 2002:a17:90b:4a51:b0:39d:ee20:1e28 with SMTP id 98e67ed59e1d1-39e1e510f73mr15610978a91.21.1789623031887; Wed, 16 Sep 2026 22:30:31 -0700 (PDT) Received: from mi-OptiPlex-7060.mioffice.cn ([43.224.245.234]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39e3abada87sm1955836a91.14.2026.09.16.22.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2026 22:30:31 -0700 (PDT) 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, baohua@kernel.org, chleroy@kernel.org, david@kernel.org, dev.jain@arm.com, jiangwen6@xiaomi.com, leo.yan@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, maddy@linux.ibm.com, mpe@ellerman.id.au, npiggin@gmail.com, rppt@kernel.org, ryan.roberts@arm.com, Xueyuan Chen Subject: [PATCH v8 07/10] mm/vmalloc: extend page table walk to support larger page_shift sizes and eliminate page table rewalk Date: Thu, 17 Sep 2026 13:29:30 +0800 Message-Id: <20260917052933.188679-8-jiangwenxiaomi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260917052933.188679-1-jiangwenxiaomi@gmail.com> References: <20260917052933.188679-1-jiangwenxiaomi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260916_223032_791545_5288382C X-CRM114-Status: GOOD ( 16.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Tested-by: Leo Yan Reviewed-by: Dev Jain --- mm/vmalloc.c | 84 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index a0508bdb7d36f..cf1daf931a6f6 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -535,8 +535,10 @@ void vunmap_range(unsigned long addr, unsigned long end) 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 = 0; pte_t *pte; @@ -567,9 +569,10 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr, break; } - set_pte_at(&init_mm, addr, pte, mk_pte(page, prot)); - (*nr)++; - } while (pte++, addr += PAGE_SIZE, addr != end); + pfn = page_to_pfn(page); + size = vmap_set_ptes(pte, addr, end, pfn, prot, shift); + steps = PFN_DOWN(size); + } while (pte += steps, *nr += steps, addr += size, addr != end); lazy_mmu_mode_disable(); *mask |= PGTBL_PTE_MODIFIED; @@ -579,60 +582,88 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr, 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; + int err; pmd = pmd_alloc_track(&init_mm, pud, addr, mask); if (!pmd) return -ENOMEM; do { next = pmd_addr_end(addr, end); - if (vmap_pages_pte_range(pmd, addr, next, prot, pages, nr, mask)) - return -ENOMEM; + + if (shift >= PMD_SHIFT) { + struct page *page = 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 = page_to_phys(page); + + if (vmap_try_huge_pmd(pmd, addr, next, phys_addr, prot, shift)) { + *mask |= PGTBL_PMD_MODIFIED; + *nr += 1 << (PMD_SHIFT - PAGE_SHIFT); + continue; + } + } + err = vmap_pages_pte_range(pmd, addr, next, prot, pages, nr, mask, shift); + if (err) + return err; } while (pmd++, addr = next, addr != end); return 0; } 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; + int err; pud = pud_alloc_track(&init_mm, p4d, addr, mask); if (!pud) return -ENOMEM; do { next = pud_addr_end(addr, end); - if (vmap_pages_pmd_range(pud, addr, next, prot, pages, nr, mask)) - return -ENOMEM; + err = vmap_pages_pmd_range(pud, addr, next, prot, pages, nr, mask, shift); + if (err) + return err; } while (pud++, addr = next, addr != end); return 0; } 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; + int err; p4d = p4d_alloc_track(&init_mm, pgd, addr, mask); if (!p4d) return -ENOMEM; do { next = p4d_addr_end(addr, end); - if (vmap_pages_pud_range(p4d, addr, next, prot, pages, nr, mask)) - return -ENOMEM; + err = vmap_pages_pud_range(p4d, addr, next, prot, pages, nr, mask, shift); + if (err) + return err; } while (p4d++, addr = next, addr != end); return 0; } -static int vmap_small_pages_range_noflush(unsigned long addr, unsigned long end, - pgprot_t prot, struct page **pages) +/* + * It can take an array of pages which are not all contiguous, but it + * may have contiguous chunks, as hinted by @shift. + */ +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 = addr; pgd_t *pgd; @@ -647,7 +678,7 @@ static int vmap_small_pages_range_noflush(unsigned long addr, unsigned long end, next = pgd_addr_end(addr, end); if (pgd_bad(*pgd)) mask |= PGTBL_PGD_MODIFIED; - err = vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, &mask); + err = vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, &mask, shift); if (err) break; } while (pgd++, addr = next, addr != end); @@ -670,27 +701,12 @@ static int vmap_small_pages_range_noflush(unsigned long 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 = (end - addr) >> PAGE_SHIFT; - WARN_ON(page_shift < PAGE_SHIFT); - if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMALLOC) || - page_shift == PAGE_SHIFT) - return vmap_small_pages_range_noflush(addr, end, prot, pages); + if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMALLOC)) + page_shift = PAGE_SHIFT; - for (i = 0; i < nr; i += 1U << (page_shift - PAGE_SHIFT)) { - int err; - - err = vmap_range_noflush(addr, addr + (1UL << page_shift), - page_to_phys(pages[i]), prot, - page_shift); - if (err) - return err; - - addr += 1UL << page_shift; - } - - return 0; + return vmap_pages_range_noflush_walk(addr, end, prot, pages, page_shift); } int vmap_pages_range_noflush(unsigned long addr, unsigned long end, -- 2.34.1