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 X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7587FC2BA19 for ; Mon, 13 Apr 2020 12:54:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1E8DE20732 for ; Mon, 13 Apr 2020 12:54:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GVv3ucsL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E8DE20732 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C23808E010E; Mon, 13 Apr 2020 08:54:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD4D98E0104; Mon, 13 Apr 2020 08:54:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A74208E010E; Mon, 13 Apr 2020 08:54:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0131.hostedemail.com [216.40.44.131]) by kanga.kvack.org (Postfix) with ESMTP id 884168E0104 for ; Mon, 13 Apr 2020 08:54:32 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 44AE6824556B for ; Mon, 13 Apr 2020 12:54:32 +0000 (UTC) X-FDA: 76702825584.11.low67_44a8862374551 X-HE-Tag: low67_44a8862374551 X-Filterd-Recvd-Size: 20387 Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Mon, 13 Apr 2020 12:54:31 +0000 (UTC) Received: by mail-pj1-f66.google.com with SMTP id np9so3790617pjb.4 for ; Mon, 13 Apr 2020 05:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X7MVUjdxoTYLktr/8CAz1umz/rNBVR6DTMKwArT/SjI=; b=GVv3ucsLdjLUrSZaDItIqGtF0WWKcVpzdbpq18nnkIs2OAT34acUNvX86wGgS5qUPt n6eXXfGcFLXIPOrj5zWoabSdRtTKYBMOewFnwpkFojN4v/klGSSHHlHARq0Rs04rdwqF 6et6QgG8LMT11/1pt6TtwEcXb87MNDRoOswAzhtHJFzxutN8GEbIra19aeo6HYzC4FUg MVZDNpVwlRwzs8UdEL8banprE+O7Fbox0giyXbjLs2KUjtsq7nEO9psIbdXed/PTdfg+ 088Ra4JqNWxxV7Uvgr5IJdRTFaJcz43ERTPzE2NIV0C09uILsPK1RCZYZuejPI9i/fjv 3fYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X7MVUjdxoTYLktr/8CAz1umz/rNBVR6DTMKwArT/SjI=; b=VidnElH5ITWhDoHWokZUSM7ua/VKi6Sa32KuVD9qSWFtkrgH0AcR9UqqUchklW6L/M t74eaLHybt/CxNZBsd25EW+Rx68OQ8rFCT9x4eC4NqRibW608Ys8o3i6fRnYjOQDF5pB QFU8807hTGckvK4CU6scKGab60x+cHB2n6aBXUpiS+8S+LcTRos9mstyJRN6KcPwJUCX eu7MVKyATP+EV91tkzDkJbX7135OYcEOzfq8Mz25TB/EvX6TiLsUcNpWXUEdvP67Jg9Q z+zwg1xXmgJZdr9wAu5If6//8ufXW73Y4Fe0SAiftSbcV9bjT5DcZyclBdanAWNK6pfA DOsw== X-Gm-Message-State: AGi0PuaFkDyN70zHGqIwL5hkR+T3vSpU4emrPb4AM0eJt+hlxXhrXaid 9i5GMyTXoPeQ8qLWJLYnagTeI2kZ X-Google-Smtp-Source: APiQypJEopX9J7e6sNl1kmYurlQKu4voKqn4JL7aajl4MYhYcb+7jAwZXAvFZLoBz74E1dpgMe756w== X-Received: by 2002:a17:902:5a0b:: with SMTP id q11mr17051128pli.23.1586782470530; Mon, 13 Apr 2020 05:54:30 -0700 (PDT) Received: from bobo.ibm.com (60-241-117-97.tpgi.com.au. [60.241.117.97]) by smtp.gmail.com with ESMTPSA id j24sm9235610pji.20.2020.04.13.05.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 05:54:30 -0700 (PDT) From: Nicholas Piggin To: linux-mm@kvack.org Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH v2 2/4] mm: Move ioremap page table mapping function to mm/ Date: Mon, 13 Apr 2020 22:53:01 +1000 Message-Id: <20200413125303.423864-3-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200413125303.423864-1-npiggin@gmail.com> References: <20200413125303.423864-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: ioremap_page_range is a generic function to create a kernel virtual mapping, move it to mm/vmalloc.c and rename it vmap_range. For clarity with this move, also: - Rename vunmap_page_range (vmap_range's inverse) to vunmap_range. - Rename vmap_pages_range (which takes a page array) to vmap_pages. Signed-off-by: Nicholas Piggin --- include/linux/vmalloc.h | 3 + lib/ioremap.c | 182 +++--------------------------- mm/vmalloc.c | 239 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 239 insertions(+), 185 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 0507a162ccd0..eb8a5080e472 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -173,6 +173,9 @@ extern struct vm_struct *find_vm_area(const void *add= r); extern int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page **pages); #ifdef CONFIG_MMU +int vmap_range(unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift); extern int map_kernel_range_noflush(unsigned long start, unsigned long s= ize, pgprot_t prot, struct page **pages); extern void unmap_kernel_range_noflush(unsigned long addr, unsigned long= size); diff --git a/lib/ioremap.c b/lib/ioremap.c index 3f0e18543de8..7e383bdc51ad 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -60,176 +60,26 @@ static inline int ioremap_pud_enabled(void) { return= 0; } static inline int ioremap_pmd_enabled(void) { return 0; } #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ =20 -static int ioremap_pte_range(pmd_t *pmd, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) -{ - pte_t *pte; - u64 pfn; - - pfn =3D phys_addr >> PAGE_SHIFT; - pte =3D pte_alloc_kernel(pmd, addr); - if (!pte) - return -ENOMEM; - do { - BUG_ON(!pte_none(*pte)); - set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); - pfn++; - } while (pte++, addr +=3D PAGE_SIZE, addr !=3D end); - return 0; -} - -static int ioremap_try_huge_pmd(pmd_t *pmd, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, - pgprot_t prot) -{ - if (!ioremap_pmd_enabled()) - return 0; - - if ((end - addr) !=3D PMD_SIZE) - return 0; - - if (!IS_ALIGNED(addr, PMD_SIZE)) - return 0; - - if (!IS_ALIGNED(phys_addr, PMD_SIZE)) - return 0; - - if (pmd_present(*pmd) && !pmd_free_pte_page(pmd, addr)) - return 0; - - return pmd_set_huge(pmd, phys_addr, prot); -} - -static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) -{ - pmd_t *pmd; - unsigned long next; - - pmd =3D pmd_alloc(&init_mm, pud, addr); - if (!pmd) - return -ENOMEM; - do { - next =3D pmd_addr_end(addr, end); - - if (ioremap_try_huge_pmd(pmd, addr, next, phys_addr, prot)) - continue; - - if (ioremap_pte_range(pmd, addr, next, phys_addr, prot)) - return -ENOMEM; - } while (pmd++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); - return 0; -} - -static int ioremap_try_huge_pud(pud_t *pud, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, - pgprot_t prot) -{ - if (!ioremap_pud_enabled()) - return 0; - - if ((end - addr) !=3D PUD_SIZE) - return 0; - - if (!IS_ALIGNED(addr, PUD_SIZE)) - return 0; - - if (!IS_ALIGNED(phys_addr, PUD_SIZE)) - return 0; - - if (pud_present(*pud) && !pud_free_pmd_page(pud, addr)) - return 0; - - return pud_set_huge(pud, phys_addr, prot); -} - -static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) -{ - pud_t *pud; - unsigned long next; - - pud =3D pud_alloc(&init_mm, p4d, addr); - if (!pud) - return -ENOMEM; - do { - next =3D pud_addr_end(addr, end); - - if (ioremap_try_huge_pud(pud, addr, next, phys_addr, prot)) - continue; - - if (ioremap_pmd_range(pud, addr, next, phys_addr, prot)) - return -ENOMEM; - } while (pud++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); - return 0; -} - -static int ioremap_try_huge_p4d(p4d_t *p4d, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, - pgprot_t prot) -{ - if (!ioremap_p4d_enabled()) - return 0; - - if ((end - addr) !=3D P4D_SIZE) - return 0; - - if (!IS_ALIGNED(addr, P4D_SIZE)) - return 0; - - if (!IS_ALIGNED(phys_addr, P4D_SIZE)) - return 0; - - if (p4d_present(*p4d) && !p4d_free_pud_page(p4d, addr)) - return 0; - - return p4d_set_huge(p4d, phys_addr, prot); -} - -static inline int ioremap_p4d_range(pgd_t *pgd, unsigned long addr, - unsigned long end, phys_addr_t phys_addr, pgprot_t prot) -{ - p4d_t *p4d; - unsigned long next; - - p4d =3D p4d_alloc(&init_mm, pgd, addr); - if (!p4d) - return -ENOMEM; - do { - next =3D p4d_addr_end(addr, end); - - if (ioremap_try_huge_p4d(p4d, addr, next, phys_addr, prot)) - continue; - - if (ioremap_pud_range(p4d, addr, next, phys_addr, prot)) - return -ENOMEM; - } while (p4d++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); - return 0; -} - int ioremap_page_range(unsigned long addr, unsigned long end, phys_addr_t phys_addr, pgprot_t prot) { - pgd_t *pgd; - unsigned long start; - unsigned long next; - int err; - - might_sleep(); - BUG_ON(addr >=3D end); - - start =3D addr; - pgd =3D pgd_offset_k(addr); - do { - next =3D pgd_addr_end(addr, end); - err =3D ioremap_p4d_range(pgd, addr, next, phys_addr, prot); - if (err) - break; - } while (pgd++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); - - flush_cache_vmap(start, end); + unsigned int max_page_shift =3D PAGE_SHIFT; + + /* + * Due to the max_page_shift parameter to vmap_range, platforms must + * enable all smaller sizes to take advantage of a given size, + * otherwise fall back to small pages. + */ + if (ioremap_pmd_enabled()) { + max_page_shift =3D PMD_SHIFT; + if (ioremap_pud_enabled()) { + max_page_shift =3D PUD_SHIFT; + if (ioremap_p4d_enabled()) + max_page_shift =3D P4D_SHIFT; + } + } =20 - return err; + return vmap_range(addr, end, phys_addr, prot, max_page_shift); } =20 #ifdef CONFIG_GENERIC_IOREMAP diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 1afec7def23f..b1bc2fcae4e0 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -128,7 +128,7 @@ static void vunmap_p4d_range(pgd_t *pgd, unsigned lon= g addr, unsigned long end) } while (p4d++, addr =3D next, addr !=3D end); } =20 -static void vunmap_page_range(unsigned long addr, unsigned long end) +static void vunmap_range(unsigned long addr, unsigned long end) { pgd_t *pgd; unsigned long next; @@ -143,7 +143,208 @@ static void vunmap_page_range(unsigned long addr, u= nsigned long end) } while (pgd++, addr =3D next, addr !=3D end); } =20 -static int vmap_pte_range(pmd_t *pmd, unsigned long addr, +static int vmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long = end, + phys_addr_t phys_addr, pgprot_t prot) +{ + pte_t *pte; + u64 pfn; + + pfn =3D phys_addr >> PAGE_SHIFT; + pte =3D pte_alloc_kernel(pmd, addr); + if (!pte) + return -ENOMEM; + do { + BUG_ON(!pte_none(*pte)); + set_pte_at(&init_mm, addr, pte, pfn_pte(pfn, prot)); + pfn++; + } while (pte++, addr +=3D PAGE_SIZE, addr !=3D end); + return 0; +} + +static int vmap_try_huge_pmd(pmd_t *pmd, unsigned long addr, unsigned lo= ng end, + phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP)) + return 0; + + if (max_page_shift < PMD_SHIFT) + return 0; + + if ((end - addr) !=3D PMD_SIZE) + return 0; + + if (!IS_ALIGNED(addr, PMD_SIZE)) + return 0; + + if (!IS_ALIGNED(phys_addr, PMD_SIZE)) + return 0; + + if (pmd_present(*pmd) && !pmd_free_pte_page(pmd, addr)) + return 0; + + return pmd_set_huge(pmd, phys_addr, prot); +} + +static inline int vmap_pmd_range(pud_t *pud, unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + pmd_t *pmd; + unsigned long next; + + pmd =3D pmd_alloc(&init_mm, pud, addr); + if (!pmd) + return -ENOMEM; + do { + next =3D pmd_addr_end(addr, end); + + if (vmap_try_huge_pmd(pmd, addr, next, phys_addr, prot, + max_page_shift)) + continue; + + if (vmap_pte_range(pmd, addr, next, phys_addr, prot)) + return -ENOMEM; + } while (pmd++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); + return 0; +} + +static int vmap_try_huge_pud(pud_t *pud, unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP)) + return 0; + + if (max_page_shift < PUD_SHIFT) + return 0; + + if ((end - addr) !=3D PUD_SIZE) + return 0; + + if (!IS_ALIGNED(addr, PUD_SIZE)) + return 0; + + if (!IS_ALIGNED(phys_addr, PUD_SIZE)) + return 0; + + if (pud_present(*pud) && !pud_free_pmd_page(pud, addr)) + return 0; + + return pud_set_huge(pud, phys_addr, prot); +} + +static inline int vmap_pud_range(p4d_t *p4d, unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + pud_t *pud; + unsigned long next; + + pud =3D pud_alloc(&init_mm, p4d, addr); + if (!pud) + return -ENOMEM; + do { + next =3D pud_addr_end(addr, end); + + if (vmap_try_huge_pud(pud, addr, next, phys_addr, prot, + max_page_shift)) + continue; + + if (vmap_pmd_range(pud, addr, next, phys_addr, prot, + max_page_shift)) + return -ENOMEM; + } while (pud++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); + return 0; +} + +static int vmap_try_huge_p4d(p4d_t *p4d, unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP)) + return 0; + + if (max_page_shift < P4D_SHIFT) + return 0; + + if ((end - addr) !=3D P4D_SIZE) + return 0; + + if (!IS_ALIGNED(addr, P4D_SIZE)) + return 0; + + if (!IS_ALIGNED(phys_addr, P4D_SIZE)) + return 0; + + if (p4d_present(*p4d) && !p4d_free_pud_page(p4d, addr)) + return 0; + + return p4d_set_huge(p4d, phys_addr, prot); +} + +static inline int vmap_p4d_range(pgd_t *pgd, unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + p4d_t *p4d; + unsigned long next; + + p4d =3D p4d_alloc(&init_mm, pgd, addr); + if (!p4d) + return -ENOMEM; + do { + next =3D p4d_addr_end(addr, end); + + if (vmap_try_huge_p4d(p4d, addr, next, phys_addr, prot, + max_page_shift)) + continue; + + if (vmap_pud_range(p4d, addr, next, phys_addr, prot, + max_page_shift)) + return -ENOMEM; + } while (p4d++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); + return 0; +} + +static int vmap_range_noflush(unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + pgd_t *pgd; + unsigned long start; + unsigned long next; + int err; + + might_sleep(); + BUG_ON(addr >=3D end); + + start =3D addr; + pgd =3D pgd_offset_k(addr); + do { + next =3D pgd_addr_end(addr, end); + err =3D vmap_p4d_range(pgd, addr, next, phys_addr, prot, + max_page_shift); + if (err) + break; + } while (pgd++, phys_addr +=3D (next - addr), addr =3D next, addr !=3D = end); + + return err; +} + +int vmap_range(unsigned long addr, + unsigned long end, phys_addr_t phys_addr, pgprot_t prot, + unsigned int max_page_shift) +{ + int ret; + + ret =3D vmap_range_noflush(addr, end, phys_addr, prot, max_page_shift); + flush_cache_vmap(addr, end); + + return ret; +} + +static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, int *nr) { pte_t *pte; @@ -169,7 +370,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long a= ddr, return 0; } =20 -static int vmap_pmd_range(pud_t *pud, 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) { pmd_t *pmd; @@ -180,13 +381,13 @@ static int vmap_pmd_range(pud_t *pud, unsigned long= addr, return -ENOMEM; do { next =3D pmd_addr_end(addr, end); - if (vmap_pte_range(pmd, addr, next, prot, pages, nr)) + if (vmap_pages_pte_range(pmd, addr, next, prot, pages, nr)) return -ENOMEM; } while (pmd++, addr =3D next, addr !=3D end); return 0; } =20 -static int vmap_pud_range(p4d_t *p4d, 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) { pud_t *pud; @@ -197,13 +398,13 @@ static int vmap_pud_range(p4d_t *p4d, unsigned long= addr, return -ENOMEM; do { next =3D pud_addr_end(addr, end); - if (vmap_pmd_range(pud, addr, next, prot, pages, nr)) + if (vmap_pages_pmd_range(pud, addr, next, prot, pages, nr)) return -ENOMEM; } while (pud++, addr =3D next, addr !=3D end); return 0; } =20 -static int vmap_p4d_range(pgd_t *pgd, 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) { p4d_t *p4d; @@ -214,7 +415,7 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long a= ddr, return -ENOMEM; do { next =3D p4d_addr_end(addr, end); - if (vmap_pud_range(p4d, addr, next, prot, pages, nr)) + if (vmap_pages_pud_range(p4d, addr, next, prot, pages, nr)) return -ENOMEM; } while (p4d++, addr =3D next, addr !=3D end); return 0; @@ -226,7 +427,7 @@ static int vmap_p4d_range(pgd_t *pgd, unsigned long a= ddr, * * Ie. pte at addr+N*PAGE_SIZE shall point to pfn corresponding to pages= [N] */ -static int vmap_page_range_noflush(unsigned long start, unsigned long en= d, +static int vmap_pages_range_noflush(unsigned long start, unsigned long e= nd, pgprot_t prot, struct page **pages) { pgd_t *pgd; @@ -239,7 +440,7 @@ static int vmap_page_range_noflush(unsigned long star= t, unsigned long end, pgd =3D pgd_offset_k(addr); do { next =3D pgd_addr_end(addr, end); - err =3D vmap_p4d_range(pgd, addr, next, prot, pages, &nr); + err =3D vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr); if (err) return err; } while (pgd++, addr =3D next, addr !=3D end); @@ -247,12 +448,12 @@ static int vmap_page_range_noflush(unsigned long st= art, unsigned long end, return nr; } =20 -static int vmap_page_range(unsigned long start, unsigned long end, +static int vmap_pages_range(unsigned long start, unsigned long end, pgprot_t prot, struct page **pages) { int ret; =20 - ret =3D vmap_page_range_noflush(start, end, prot, pages); + ret =3D vmap_pages_range_noflush(start, end, prot, pages); flush_cache_vmap(start, end); return ret; } @@ -1238,7 +1439,7 @@ EXPORT_SYMBOL_GPL(unregister_vmap_purge_notifier); */ static void unmap_vmap_area(struct vmap_area *va) { - vunmap_page_range(va->va_start, va->va_end); + vunmap_range(va->va_start, va->va_end); } =20 /* @@ -1699,7 +1900,7 @@ static void vb_free(const void *addr, unsigned long= size) rcu_read_unlock(); BUG_ON(!vb); =20 - vunmap_page_range((unsigned long)addr, (unsigned long)addr + size); + vunmap_range((unsigned long)addr, (unsigned long)addr + size); =20 if (debug_pagealloc_enabled_static()) flush_tlb_kernel_range((unsigned long)addr, @@ -1854,7 +2055,7 @@ void *vm_map_ram(struct page **pages, unsigned int = count, int node, pgprot_t pro =20 kasan_unpoison_vmalloc(mem, size); =20 - if (vmap_page_range(addr, addr + size, prot, pages) < 0) { + if (vmap_pages_range(addr, addr + size, prot, pages) < 0) { vm_unmap_ram(mem, count); return NULL; } @@ -2020,7 +2221,7 @@ void __init vmalloc_init(void) int map_kernel_range_noflush(unsigned long addr, unsigned long size, pgprot_t prot, struct page **pages) { - return vmap_page_range_noflush(addr, addr + size, prot, pages); + return vmap_pages_range_noflush(addr, addr + size, prot, pages); } =20 /** @@ -2039,7 +2240,7 @@ int map_kernel_range_noflush(unsigned long addr, un= signed long size, */ void unmap_kernel_range_noflush(unsigned long addr, unsigned long size) { - vunmap_page_range(addr, addr + size); + vunmap_range(addr, addr + size); } EXPORT_SYMBOL_GPL(unmap_kernel_range_noflush); =20 @@ -2056,7 +2257,7 @@ void unmap_kernel_range(unsigned long addr, unsigne= d long size) unsigned long end =3D addr + size; =20 flush_cache_vunmap(addr, end); - vunmap_page_range(addr, end); + vunmap_range(addr, end); flush_tlb_kernel_range(addr, end); } EXPORT_SYMBOL_GPL(unmap_kernel_range); @@ -2067,7 +2268,7 @@ int map_vm_area(struct vm_struct *area, pgprot_t pr= ot, struct page **pages) unsigned long end =3D addr + get_vm_area_size(area); int err; =20 - err =3D vmap_page_range(addr, end, prot, pages); + err =3D vmap_pages_range(addr, end, prot, pages); =20 return err > 0 ? 0 : err; } --=20 2.23.0