torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

mm/vmalloc: leave lazy MMU mode on PTE mapping error

Browse Source 
vmap_pages_pte_range() enters the lazy MMU mode, but fails to leave it in
case an error is encountered.

Link: https://lkml.kernel.org/r/20250623075721.2817094-1-agordeev@linux.ibm.com
Fixes: 2ba3e6947a ("mm/vmalloc: track which page-table levels were modified")
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202506132017.T1l1l6ME-lkp@intel.com/
Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Alexander Gordeev 2025-06-23 09:57:21 +02:00 committed by Andrew Morton
parent 7627b459aa
commit fea18c6863
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mm/vmalloc.c
View File

@ -514,6 +514,7 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr,
unsigned long end, pgprot_t prot, struct page **pages, int *nr, unsigned long end, pgprot_t prot, struct page **pages, int *nr,
pgtbl_mod_mask *mask) pgtbl_mod_mask *mask)
{ {
int err = 0;
pte_t *pte; pte_t *pte;
/* /*
@ -530,12 +531,18 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr,
do { do {
struct page *page = pages[*nr]; struct page *page = pages[*nr];
if (WARN_ON(!pte_none(ptep_get(pte)))) if (WARN_ON(!pte_none(ptep_get(pte)))) {
return -EBUSY; err = -EBUSY;
if (WARN_ON(!page)) break;
return -ENOMEM; }
if (WARN_ON(!pfn_valid(page_to_pfn(page)))) if (WARN_ON(!page)) {
return -EINVAL; err = -ENOMEM;
break;
}
if (WARN_ON(!pfn_valid(page_to_pfn(page)))) {
err = -EINVAL;
break;
}
set_pte_at(&init_mm, addr, pte, mk_pte(page, prot)); set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
(*nr)++; (*nr)++;
@ -543,7 +550,8 @@ static int vmap_pages_pte_range(pmd_t *pmd, unsigned long addr,
arch_leave_lazy_mmu_mode(); arch_leave_lazy_mmu_mode();
*mask |= PGTBL_PTE_MODIFIED; *mask |= PGTBL_PTE_MODIFIED;
return 0;
return err;
} }
static int vmap_pages_pmd_range(pud_t *pud, unsigned long addr, static int vmap_pages_pmd_range(pud_t *pud, unsigned long addr,