Skip to contentSkip to conversation

mm-change-pudp_huge_get_and_clear_full-take-vm_area_struct-as-arg.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Aug 11, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: change pudp_huge_get_and_clear_full take vm_area_struct as arg
has been removed from the -mm tree. Its filename was
mm-change-pudp_huge_get_and_clear_full-take-vm_area_struct-as-arg.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Aneesh Kumar K.V" <[email protected]>
Subject: mm: change pudp_huge_get_and_clear_full take vm_area_struct as arg
Date: Tue, 25 Jul 2023 00:37:48 +0530

We will use this in a later patch to do tlb flush when clearing pud entries on powerpc. This is similar to commit 93a98695f2f9 ("mm: change pmdp_huge_get_and_clear_full take vm_area_struct as arg")

Cc Catalin Marinas <[email protected]>
Cc Dan Williams <[email protected]>
Cc Joao Martins <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Mike Kravetz <[email protected]>
Cc Muchun Song <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Will Deacon <[email protected]>

---

 include/linux/pgtable.h |    4 ++--
 mm/debug_vm_pgtable.c   |    2 +-
 mm/huge_memory.c        |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
include/linux/pgtable.h renamed from include/linux/pgtable.h~mm-change-pudp_huge_get_and_clear_full-take-vm_area_struct-as-arg +2 -2
@@ -456,11 +456,11 @@ static inline pmd_t pmdp_huge_get_and_cl
 #endif
 
 #ifndef __HAVE_ARCH_PUDP_HUGE_GET_AND_CLEAR_FULL
-static inline pud_t pudp_huge_get_and_clear_full(struct mm_struct *mm,
+static inline pud_t pudp_huge_get_and_clear_full(struct vm_area_struct *vma,
 					    unsigned long address, pud_t *pudp,
 					    int full)
 {
-	return pudp_huge_get_and_clear(mm, address, pudp);
+	return pudp_huge_get_and_clear(vma->vm_mm, address, pudp);
 }
 #endif
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
mm/debug_vm_pgtable.c renamed from mm/debug_vm_pgtable.c~mm-change-pudp_huge_get_and_clear_full-take-vm_area_struct-as-arg +1 -1
@@ -385,7 +385,7 @@ static void __init pud_advanced_tests(st
 	WARN_ON(!(pud_write(pud) && pud_dirty(pud)));
 
 #ifndef __PAGETABLE_PMD_FOLDED
-	pudp_huge_get_and_clear_full(args->mm, vaddr, args->pudp, 1);
+	pudp_huge_get_and_clear_full(args->vma, vaddr, args->pudp, 1);
 	pud = READ_ONCE(*args->pudp);
 	WARN_ON(!pud_none(pud));
 #endif /* __PAGETABLE_PMD_FOLDED */
mm/huge_memory.c renamed from mm/huge_memory.c~mm-change-pudp_huge_get_and_clear_full-take-vm_area_struct-as-arg +1 -1
@@ -1981,7 +1981,7 @@ int zap_huge_pud(struct mmu_gather *tlb,
 	if (!ptl)
 		return 0;
 
-	pudp_huge_get_and_clear_full(tlb->mm, addr, pud, tlb->fullmm);
+	pudp_huge_get_and_clear_full(vma, addr, pud, tlb->fullmm);
 	tlb_remove_pud_tlb_entry(tlb, pud, addr);
 	if (vma_is_special_huge(vma)) {
 		spin_unlock(ptl);

_

Patches currently in -mm which might be from [email protected] are

mm-memory_hotplug-simplify-arch_mhp_memmap_on_memory_enable-kconfig.patch mm-memory_hotplug-allow-memmap-on-memory-hotplug-request-to-fallback.patch mm-memory_hotplug-allow-architecture-to-override-memmap-on-memory-support-check.patch mm-memory_hotplug-support-memmap_on_memory-when-memmap-is-not-aligned-to-pageblocks.patch powerpc-book3s64-memhotplug-enable-memmap-on-memory-for-radix.patch mm-memory_hotplug-embed-vmem_altmap-details-in-memory-block.patch