Skip to content

Commit dd21bfa

Browse files
zhouyun1306torvalds
authored andcommitted
proc: fix documentation and description of pagemap
Since bit 57 was exported for uffd-wp write-protected (commit fb8e37f: "mm/pagemap: export uffd-wp protection information"), fixing it can reduce some unnecessary confusion. Link: https://lkml.kernel.org/r/[email protected] Fixes: fb8e37f ("mm/pagemap: export uffd-wp protection information") Signed-off-by: Yun Zhou <[email protected]> Reviewed-by: Peter Xu <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Tiberiu A Georgescu <[email protected]> Cc: Florian Schmidt <[email protected]> Cc: Ivan Teterevkov <[email protected]> Cc: SeongJae Park <[email protected]> Cc: Yang Shi <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Axel Rasmussen <[email protected]> Cc: Miaohe Lin <[email protected]> Cc: Andrea Arcangeli <[email protected]> Cc: Colin Cross <[email protected]> Cc: Alistair Popple <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent b773827 commit dd21bfa

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Documentation/admin-guide/mm/pagemap.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ There are four components to pagemap:
2323
* Bit 56 page exclusively mapped (since 4.2)
2424
* Bit 57 pte is uffd-wp write-protected (since 5.13) (see
2525
:ref:`Documentation/admin-guide/mm/userfaultfd.rst <userfaultfd>`)
26-
* Bits 57-60 zero
26+
* Bits 58-60 zero
2727
* Bit 61 page is file-page or shared-anon (since 3.5)
2828
* Bit 62 page swapped
2929
* Bit 63 page present

fs/proc/task_mmu.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,8 @@ static const struct mm_walk_ops pagemap_ops = {
15971597
* Bits 5-54 swap offset if swapped
15981598
* Bit 55 pte is soft-dirty (see Documentation/admin-guide/mm/soft-dirty.rst)
15991599
* Bit 56 page exclusively mapped
1600-
* Bits 57-60 zero
1600+
* Bit 57 pte is uffd-wp write-protected
1601+
* Bits 58-60 zero
16011602
* Bit 61 page is file-page or shared-anon
16021603
* Bit 62 page swapped
16031604
* Bit 63 page present

0 commit comments

Comments
 (0)