Add /proc/PID/{smaps, numa_maps} support for DAX
Subsystems (2)
PATCH 1/1 Add /proc/PID/{smaps, numa_maps} support for DAX
So user could check those interface for more detailed information about how much DAX mappings are currently created.
Here we use vma_is_dax method to find specific page struture with DAX {huge, normal}page mappings, vm_normal_page routine works as before without any impact on the existing logical where _vm_normal_page are called.
--- fs/proc/task_mmu.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
fs/proc/task_mmu.c +19 -6
@@ -528,7 +528,11 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr,struct page *page =NULL ;if (pte_present (*pte)) { - page =vm_normal_page (vma, addr, *pte); +if (!vma_is_dax (vma)) + page =vm_normal_page (vma, addr, *pte); +else + page =pte_page (*pte); + }else if (is_swap_pte (*pte)) {swp_entry_t swpent =pte_to_swp_entry (*pte);
@@ -579,7 +583,11 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr,struct page *page;/* FOLL_DUMP will return -EFAULT on huge zero page */ - page =follow_trans_huge_pmd (vma, addr, pmd,FOLL_DUMP ); +if (!vma_is_dax (vma)) + page =follow_trans_huge_pmd (vma, addr, pmd,FOLL_DUMP ); +else + page =pmd_page (*pmd); +if (IS_ERR_OR_NULL (page))return ;if (PageAnon (page))
@@ -1668,13 +1676,15 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr,spinlock_t *ptl;pte_t *orig_pte;pte_t *pte; +struct page *page;#ifdef CONFIG_TRANSPARENT_HUGEPAGE ptl =pmd_trans_huge_lock (pmd, vma);if (ptl) { -struct page *page; - - page =can_gather_numa_stats_pmd (*pmd, vma, addr); +if (!vma_is_dax (vma)) + page =can_gather_numa_stats_pmd (*pmd, vma, addr); +else + page =pmd_page (*pmd);if (page)gather_stats (page, md,pmd_dirty (*pmd),HPAGE_PMD_SIZE /PAGE_SIZE );
@@ -1687,7 +1697,10 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr,#endif orig_pte = pte =pte_offset_map_lock (walk->mm, pmd, addr, &ptl); do { - struct page *page = can_gather_numa_stats(*pte, vma, addr); + if (!vma_is_dax(vma)) + page = can_gather_numa_stats(*pte, vma, addr); + else + page = pte_page(*pte); if (!page) continue; gather_stats(page, md, pte_dirty(*pte), 1);
Signature · 1 line
1.8.3.1
Quoted 21 lines · Fan Du
So user could check those interface for more detailed information about how much DAX mappings are currently created.
Here we use
vma_is_daxmethod to find specific page struture with DAX {huge, normal}page mappings,vm_normal_pageroutine works as before without any impact on the existing logical where_vm_normal_pageare called.Signed-off-by Fan Du <[email protected]>--- fs/proc/task_mmu.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)fs/proc/task_mmu.c +0
-0
fs/proc/task_mmu.c static void smaps_pte_entry(pte_t *pte, unsigned long addr, · line 534
Quoted 8 lines
fs/proc/task_mmu.c +4
-1@@ -528,7 +528,11 @@ static void smaps_pte_entry(pte_t *pte, unsigned long addr,struct page *page =NULL ;if (pte_present (*pte)) { - page =vm_normal_page (vma, addr, *pte); +if (!vma_is_dax (vma)) + page =vm_normal_page (vma, addr, *pte); +else + page =pte_page (*pte);
See usage of pte_devmap, pmd_devmap, and pud_devmap in mm/gup.c. You need to check for that bit to know that there is a 'struct page' entry associated with a DAX mapping. I believe we just need to fix up and resend his approach from last year:
https://marc.info/?l=linux-kernel&m=148045064103357&w=2
Quoted 43 lines
-----Original Message-----
From: Dan Williams [mailto:[email protected]]
Sent: Tuesday, October 24, 2017 4:47 PM
To: Du, Fan <[email protected]>
Cc: Andrew Morton <[email protected]>; Christoph Hellwig <[email protected]>; [email protected]; Dave Hansen <[email protected]>
Subject: Re: [PATCH] Add/proc/PID/{smaps,numa_maps} support for DAXfs/proc/task_mmu.c static void smaps_pte_entry(pte_t *pte, unsigned
Quoted 21 lines · Fan Du
So user could check those interface for more detailed information about how much DAX mappings are currently created.
Here we use
vma_is_daxmethod to find specific page struture with DAX {huge, normal}page mappings,vm_normal_pageroutine works as before without any impact on the existing logical where_vm_normal_pageare called.Signed-off-by Fan Du <[email protected]>--- fs/proc/task_mmu.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)fs/proc/task_mmu.c +0
-0@@ -528,7 +528,11 @@ static void smaps_pte_entry(pte_t *pte, unsignedlong addr,
fs/proc/task_mmu.c static void smaps_pte_entry(pte_t *pte, unsigned long addr, · line 534
Quoted 8 lines
fs/proc/task_mmu.c +4
-1struct page *page =NULL ;if (pte_present (*pte)) { - page =vm_normal_page (vma, addr, *pte); +if (!vma_is_dax (vma)) + page =vm_normal_page (vma, addr, *pte); +else + page =pte_page (*pte);
Quoted 3 lines
See usage of
pte_devmap,pmd_devmap, andpud_devmapinmm/gup.c. You need to check for that bit to know that there is a 'struct page' entry associated with a DAX mapping.
Thanks Dan for your review, got it!
Quoted 4 lines
I believe we just need to fix up and
resend his approach from last year:https://marc.info/?l=linux-kernel&m=148045064103357&w=2
Sure, I will rebase Dave's patch and send v2 soon.
Quoted 9 lines · Fan Du
So user could check those interface for more detailed information about how much DAX mappings are currently created.
Here we use
vma_is_daxmethod to find specific page struture with DAX {huge, normal}page mappings,vm_normal_pageroutine works as before without any impact on the existing logical where_vm_normal_pageare called.
And like for any other user visible changes it should be CC to the linux-api mailing list and a usecase which requires this information provided as well.
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 21 lines
-----Original Message-----
From: Michal Hocko [mailto:[email protected]]
Sent: Tuesday, October 24, 2017 8:02 PM
To: Du, Fan <[email protected]>
Cc: [email protected]; [email protected]; Williams, Dan J <[email protected]>; [email protected]
Subject: Re: [PATCH] Add/proc/PID/{smaps,numa_maps} support for DAXQuoted 9 lines · Fan Du
So user could check those interface for more detailed information about how much DAX mappings are currently created.
Here we use
vma_is_daxmethod to find specific page struture with DAX {huge, normal}page mappings,vm_normal_pageroutine works as before without any impact on the existing logical where_vm_normal_pageare called.
Quoted 3 lines
And like for any other user visible changes it should be CC to the linux-api mailing list and a usecase which requires this information provided as well.
Done!
Please kindly review v3.
Quoted 3 lines
--
Michal Hocko
SUSE Labs