mm-pagewalk-add-p4d_entry-and-pgd_entry.patch removed from -mm tree
The patch titled
Subject: mm: pagewalk: add p4d_entry() and pgd_entry()
has been removed from the -mm tree. Its filename was
mm-pagewalk-add-p4d_entry-and-pgd_entry.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Steven Price <[email protected]>
Subject: mm: pagewalk: add p4d_entry() and pgd_entry()
pgd_entry() and pud_entry() were removed by commit 0b1fbfe50006c410 ("mm/pagewalk: remove pgd_entry() and pud_entry()") because there were no users. We're about to add users so reintroduce them, along with p4d_entry() as we now have 5 levels of tables.
Note that commit a00cc7d9dd93d66a ("mm, x86: add support for PUD-sized transparent hugepages") already re-added pud_entry() but with different semantics to the other callbacks. This commit reverts the semantics back to match the other callbacks.
To support hmm.c which now uses the new semantics of pud_entry() a new member ('action') of struct mm_walk is added which allows the callbacks to either descend (ACTION_SUBTREE, the default), skip (ACTION_CONTINUE) or repeat the callback (ACTION_AGAIN). hmm.c is then updated to call pud_trans_huge_lock() itself and make use of the splitting/retry logic of the core code.
After this change pud_entry() is called for all entries, not just transparent huge pages.
---
include/linux/pagewalk.h | 34 +++++++++++++++++---- mm/hmm.c | 58 ++++++++++++++++++++----------------- mm/pagewalk.c | 50 ++++++++++++++++++++++--------- 3 files changed, 95 insertions(+), 47 deletions(-)
include/linux/pagewalk.h renamed from include/linux/pagewalk.h~mm-pagewalk-add-p4d_entry-and-pgd_entry +28 -6
@@ -8,15 +8,15 @@ struct mm_walk;/** * mm_walk_ops - callbacks for walk_page_range -* @pud_entry: if set, called for each non-empty PUD (2nd-level) entry -* this handler should only handle pud_trans_huge() puds. -* the pmd_entry or pte_entry callbacks will be used for -* regular PUDs. -* @pmd_entry: if set, called for each non-empty PMD (3rd-level) entry +* @pgd_entry: if set, called for each non-empty PGD (top-level) entry +* @p4d_entry: if set, called for each non-empty P4D entry +* @pud_entry: if set, called for each non-empty PUD entry +* @pmd_entry: if set, called for each non-empty PMD entry * this handler is required to be able to handle * pmd_trans_huge() pmds. They may simply choose to * split_huge_page() instead of handling it explicitly. -* @pte_entry: if set, called for each non-empty PTE (4th-level) entry +* @pte_entry: if set, called for each non-empty PTE (lowest-level) +* entry * @pte_hole: if set, called for each hole at all levels * @hugetlb_entry: if set, called for each hugetlb entry * @test_walk: caller specific callback function to determine whether
@@ -27,8 +27,15 @@ struct mm_walk;* @pre_vma: if set, called before starting walk on a non-null vma. * @post_vma: if set, called after a walk on a non-null vma, provided * that @pre_vma and the vma walk succeeded. +* +* p?d_entry callbacks are called even if those levels are folded on a +* particular architecture/configuration. */ struct mm_walk_ops { +int (*pgd_entry)(pgd_t *pgd,unsigned long addr, +unsigned long next,struct mm_walk *walk); +int (*p4d_entry)(p4d_t *p4d,unsigned long addr, +unsigned long next,struct mm_walk *walk);int (*pud_entry)(pud_t *pud,unsigned long addr,unsigned long next,struct mm_walk *walk); int (*pmd_entry)(pmd_t *pmd, unsigned long addr,
@@ -47,11 +54,25 @@ struct mm_walk_ops {void (*post_vma)(struct mm_walk *walk); }; +/* +* Action for pud_entry / pmd_entry callbacks. +* ACTION_SUBTREE is the default +*/ +enum page_walk_action { +/* Descend to next level, splitting huge pages if needed and possible */ +ACTION_SUBTREE =0 , +/* Continue to next entry at this level (ignoring any subtree) */ +ACTION_CONTINUE =1 , +/* Call again for this entry */ +ACTION_AGAIN =2 +}; +/** * mm_walk - walk_page_range data * @ops: operation to call during the walk * @mm: mm_struct representing the target process of page table walk * @vma: vma currently walked (NULL if walking outside vmas) +* @action: next action to perform (see enum page_walk_action) * @private: private data for callbacks' usage * * (see the comment on walk_page_range() for more details)
@@ -60,6 +81,7 @@ struct mm_walk {const struct mm_walk_ops *ops;struct mm_struct *mm;struct vm_area_struct *vma; +enum page_walk_action action;void *private; };
mm/hmm.c renamed from mm/hmm.c~mm-pagewalk-add-p4d_entry-and-pgd_entry +32 -26
93 lines not on this page · raw message
mm/pagewalk.c renamed from mm/pagewalk.c~mm-pagewalk-add-p4d_entry-and-pgd_entry +35 -15
95 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are