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 5BF2DC44503 for ; Thu, 9 Jul 2026 07:39:07 +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=Fk2AnNyTURv/eSeaFRjqsjfwR0678HcFAycOaxoU8q0=; b=jh/GqPm+seu3fLnWfPRuYTFtp9 lE6ibW0iqjoDSu0BvV8cHKyBYy25SmHFWhSjosaEmbngHyu2R0cx/6jj4x7N96q0r49DAvKsx2XwU nq9ayC21c1Ak8GKiMAaTsAuIEBlU9NePWroWyoZbtnwJxGtbcD6Pe2PCjmNYVxWnKf7jE1MHMiYCf COcgoOXrpNIZR8oKOPzcEF5MBvESQqSLpHjmMjyFnJfe2xEt2vkhAmU0MwpZz51iePpAUW0gMJUnD cOCoTHxZrWr9OnRdD35ejN0NN6sPsq6V7oFoI9KFm/Clo1JGEJOR/ck8HPzRBYb5sD1RCC9SdDVzu +jCJBERg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1whjLY-00000001KAW-4A6H; Thu, 09 Jul 2026 07:39:01 +0000 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1whjLW-00000001K8i-0E80 for linux-arm-kernel@lists.infradead.org; Thu, 09 Jul 2026 07:38:59 +0000 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-c9ef3e1337fso1101384a12.2 for ; Thu, 09 Jul 2026 00:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783582737; x=1784187537; 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=Fk2AnNyTURv/eSeaFRjqsjfwR0678HcFAycOaxoU8q0=; b=TrxNJi3fN3YSgKymb+de6+eJGEjjHte+dIG3Mb5g6lzRq3buR3ai5ViYn7+5zOf33A pP7zUViwR+IkKCC4g1dzunQB3RnDUfX0XwJRWDXnFDHsd7XadopE4cJu8FvVC7iLRehF +Sqg0ljhjSgoMLjQu1qbSD2hjA772321Ll+WyHplPrK4+jHzirZXx1v1Q7pf7mfZLokg lU2GCrLmkSekTw9Q4ixEHuHvKGGmegcOqY2k+8Lqran4kTvqzTxXdAcHDzYJyGuxIao5 /NJyLETP4IMcikPnfMczfA6/inKvyhW2jSYomhKlJQt5jE5gyhLqmQbXl/F9fnPsz6rJ PwQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783582737; x=1784187537; 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=Fk2AnNyTURv/eSeaFRjqsjfwR0678HcFAycOaxoU8q0=; b=NvgklyaIu/VzR5WvYJgvFtXML4slXcfn5lx8UuPjWbxXE8VRRcRyW0MdX27grfwbT5 +Vq9nSqNtCclKsA0NGxO1DlRA2oIq/oj/0FcA/H6KsufrFtR9UOneSzvCikZ/aFzrBj7 p/afmWMVnN59MHCcC91f1OLhiUobZVAZx9W9CbyCvGOEyB1FnGqLoffYFEzWpQy85eLk 1SEY1y5T6o7qsC9ylccKS21aocb15qvCvmwHUl9MjmWDtSmlxScQqJ/DGYwyB91PVNwV YrnW233CkudMX8T6Eh5qQON83Im7nSsonr0K3n2zMmRi6oVJspedpXtmgmExpy36NrC0 rEkA== X-Forwarded-Encrypted: i=1; AHgh+RpNbKHjFCQa5AFXT2WL9VrX/32e3SsKsXKiR+y3pxy9Ii0laPtxdlwbsMYqwXUVyKs3GeyZ4LOfd/5BPVbTKW2/@lists.infradead.org X-Gm-Message-State: AOJu0YzTrIsaQE1hJV247PTw/G4kJLXP6j4d5E6LFVj4PwTObkyjO9M4 Z397RZ3XDH53EVzLUgWk2FmhSuMfZ/Xg6aiMaGi+Cu2VLgddpe7m9/zk X-Gm-Gg: AfdE7cmajp0FJjctMWV55IhaPWYAjF24e3Z0B5RVfYDIYJTJ/6ypSqmv5OvhflAIVYL FBzexccaOxd+kAFGTyyYRKAxhyfGS7qCCk7J/hY5pBcXnWs7786KeyXJoRnmzHUJZOjyEPdG8HZ VsmuKUyxhhABZEvMfvUQp3O/6/WHlm/jv/S40pBDVFVVIsuj943BqxGcC5gg1bIkDCVhWOxwQqp SHbnPULL7jHa2G9wSGmka3a8U1Z0ratFJLMX7IbjaGNwj3GW4rLZqNMGMap2ajI/f99sA/gX2nM sV0YuRDiDaEh/LTofBirg2BG0VLHdspElFoebdlujuena6mSmZ7+Y95wke6U9lIxBU0BtXGwhuH h1TOz8lJZUxf3J+7uSPI8Wp7ogaL9edhp3CTPmQEH6rx0NmXwQakWaBxgS29u9X3obhBmV4cPLc qDu5FfUX7d04VToRfvNSPnni1XAx7Gpi5eXfg= X-Received: by 2002:a05:6a20:7486:b0:3b3:26aa:5455 with SMTP id adf61e73a8af0-3c0bc8c42e6mr7909704637.13.1783582737175; Thu, 09 Jul 2026 00:38:57 -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.38.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 00:38:56 -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 4/6] mm/vmalloc: Extend page table walk to support larger page_shift sizes and eliminate page table rewalk Date: Thu, 9 Jul 2026 15:38:21 +0800 Message-Id: <20260709073823.6643-5-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260709_003858_109071_4BDF17CB X-CRM114-Status: GOOD ( 17.15 ) 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 | 81 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 34 deletions(-) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d7fef85b241c4..d2a4d649af549 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -125,7 +125,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 = PAGE_SIZE; + unsigned long size; + unsigned int steps; if (WARN_ON_ONCE(!PAGE_ALIGNED(end - addr))) return -EINVAL; @@ -147,8 +148,8 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, } size = vmap_set_ptes(pte, addr, end, pfn, prot, max_page_shift); - pfn += PFN_DOWN(size); - } while (pte += PFN_DOWN(size), addr += size, addr != end); + steps = PFN_DOWN(size); + } while (pte += steps, pfn += steps, addr += size, addr != end); lazy_mmu_mode_disable(); *mask |= PGTBL_PTE_MODIFIED; @@ -540,8 +541,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; @@ -572,9 +575,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; @@ -584,7 +588,7 @@ 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; @@ -594,7 +598,27 @@ static int vmap_pages_pmd_range(pud_t *pud, unsigned long addr, return -ENOMEM; do { next = pmd_addr_end(addr, end); - if (vmap_pages_pte_range(pmd, addr, next, prot, pages, nr, mask)) + + 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; + } + } + + if (vmap_pages_pte_range(pmd, addr, next, prot, pages, nr, mask, shift)) return -ENOMEM; } while (pmd++, addr = next, addr != end); return 0; @@ -602,7 +626,7 @@ static int vmap_pages_pmd_range(pud_t *pud, unsigned long addr, 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; @@ -612,7 +636,7 @@ static int vmap_pages_pud_range(p4d_t *p4d, unsigned long addr, return -ENOMEM; do { next = 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 = next, addr != end); return 0; @@ -620,7 +644,7 @@ static int vmap_pages_pud_range(p4d_t *p4d, unsigned long addr, 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; @@ -630,14 +654,18 @@ static int vmap_pages_p4d_range(pgd_t *pgd, unsigned long addr, return -ENOMEM; do { next = 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 = 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; @@ -652,7 +680,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); @@ -675,27 +703,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); - - for (i = 0; i < nr; i += 1U << (page_shift - PAGE_SHIFT)) { - int err; + if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMALLOC)) + page_shift = PAGE_SHIFT; - 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