mm/debug_vm_pgtable: Use a swp_entry_t input value for swap tests
Subsystems (4)
PATCH 1/1 mm/debug_vm_pgtable: Use a swp_entry_t input value for swap tests
The various __pte/pmd_to_swp_entry and __swp_entry_to_pte/pmd helper functions are expected to operate on swap PTE/PMD entries, not on present and mapped entries.
Reflect this in the swap tests by using a swp_entry_t as input value, and convert it to a swap PTE/PMD for testing, similar to how it is already done in pte_swap_exclusive_tests(). Move the swap entry creation from there to init_args() and store it in args, so it can also be used in other functions.
The pte/pmd_swap_tests() are also changed to compare entries instead of pfn values, again similar to pte_swap_exclusive_tests(). pte/pmd_pfn() helpers are also not expected to operate on swap PTE/PMD entries at all.
Also update documentation, to reflect that the helpers operate on swap PTE/PMD entries and not present and mapped entries, and use correct names, i.e. __swp_to_pte/pmd_entry -> __swp_entry_to_pte/pmd.
For consistency, also change pte/pmd_swap_soft_dirty_tests() to use args->swp_entry instead of a present and mapped PTE/PMD.
--- Documentation/mm/arch_pgtable_helpers.rst | 8 ++-- mm/debug_vm_pgtable.c | 53 ++++++++++++++--------- 2 files changed, 36 insertions(+), 25 deletions(-)
Documentation/mm/arch_pgtable_helpers.rst +4 -4
@@ -236,13 +236,13 @@ SWAP Page Table Helpers ======================== +---------------------------+--------------------------------------------------+ -| __pte_to_swp_entry | Creates a swapped entry (arch) from a mapped PTE | +| __pte_to_swp_entry | Creates a swp_entry_t (arch) from a swap PTE | +---------------------------+--------------------------------------------------+ -| __swp_to_pte_entry | Creates a mapped PTE from a swapped entry (arch) | +| __swp_entry_to_pte | Creates a swap PTE from a swp_entry_t (arch) | +---------------------------+--------------------------------------------------+ -| __pmd_to_swp_entry | Creates a swapped entry (arch) from a mapped PMD | +| __pmd_to_swp_entry | Creates a swp_entry_t (arch) from a swap PMD | +---------------------------+--------------------------------------------------+ -| __swp_to_pmd_entry | Creates a mapped PMD from a swapped entry (arch) | +| __swp_entry_to_pmd | Creates a swap PMD from a swp_entry_t (arch) | +---------------------------+--------------------------------------------------+ | is_migration_entry | Tests a migration (read or write) swapped entry | +-------------------------------+----------------------------------------------+
mm/debug_vm_pgtable.c +32 -21
116 lines not on this page · raw message
Signature · 1 line
2.48.1
Quoted 18 lines · Gerald Schaefer
The various __pte/pmd_to_swp_entry and __swp_entry_to_pte/pmd helper functions are expected to operate on swap PTE/PMD entries, not on present and mapped entries.
Reflect this in the swap tests by using a
swp_entry_tas input value, and convert it to a swap PTE/PMD for testing, similar to how it is already done inpte_swap_exclusive_tests(). Move the swap entry creation from there toinit_args()and store it in args, so it can also be used in other functions.The pte/pmd_swap_tests() are also changed to compare entries instead of pfn values, again similar to
pte_swap_exclusive_tests(). pte/pmd_pfn() helpers are also not expected to operate on swap PTE/PMD entries at all.Also update documentation, to reflect that the helpers operate on swap PTE/PMD entries and not present and mapped entries, and use correct names, i.e. __swp_to_pte/pmd_entry -> __swp_entry_to_pte/pmd.
Quoted 6 lines
For consistency, also change pte/pmd_swap_soft_dirty_tests() to use
args->swp_entryinstead of a present and mapped PTE/PMD.Signed-off-by Gerald Schaefer <[email protected]>---
Signature · 3 lines
Cheers, David / dhildenb
Quoted 18 lines · Gerald Schaefer
The various __pte/pmd_to_swp_entry and __swp_entry_to_pte/pmd helper functions are expected to operate on swap PTE/PMD entries, not on present and mapped entries.
Reflect this in the swap tests by using a
swp_entry_tas input value, and convert it to a swap PTE/PMD for testing, similar to how it is already done inpte_swap_exclusive_tests(). Move the swap entry creation from there toinit_args()and store it in args, so it can also be used in other functions.The pte/pmd_swap_tests() are also changed to compare entries instead of pfn values, again similar to
pte_swap_exclusive_tests(). pte/pmd_pfn() helpers are also not expected to operate on swap PTE/PMD entries at all.Also update documentation, to reflect that the helpers operate on swap PTE/PMD entries and not present and mapped entries, and use correct names, i.e. __swp_to_pte/pmd_entry -> __swp_entry_to_pte/pmd.
Quoted 5 lines
For consistency, also change pte/pmd_swap_soft_dirty_tests() to use
args->swp_entryinstead of a present and mapped PTE/PMD.
LGTM