For analysis purpose it is useful to have numa node information corresponding mapped address ranges of the process. Currently /proc/<pid>/numa_maps provides list of numa nodes from where pages are allocated per VMA of the process. This is not useful if an user needs to determine which numa node the mapped pages are allocated from for a particular address range. It would have helped if the numa node information presented in /proc/<pid>/numa_maps was broken down by VA ranges showing the exact numa node from where the pages have been allocated. The format of /proc/<pid>/numa_maps file content is dependent on /proc/<pid>/maps file content as mentioned in the manpage. i.e one line entry for every VMA corresponding to entries in /proc/<pids>/maps file. Therefore changing the output of /proc/<pid>/numa_maps may not be possible. Hence, this patch proposes adding file /proc/<pid>/numa_vamaps which will provide proper break down of VA ranges by numa node id from where the mapped pages are allocated. For Address ranges not having any pages mapped, a '-' is printed instead of numa node id. In addition, this file will include most of the other information currently presented in /proc/<pid>/numa_maps. The additional information included is for convenience. If this is not preferred, the patch could be modified to just provide VA range to numa node information as the rest of the information is already available thru /proc/<pid>/numa_maps file. Since the VA range to numa node information does not include page's PFN, reading this file will not be restricted(i.e requiring CAP_SYS_ADMIN). Here is the snippet from the new file content showing the format. 00400000-00401000 N0=1 kernelpagesize_kB=4 mapped=1 file=/tmp/hmap2 00600000-00601000 N0=1 kernelpagesize_kB=4 anon=1 dirty=1 file=/tmp/hmap2 00601000-00602000 N0=1 kernelpagesize_kB=4 anon=1 dirty=1 file=/tmp/hmap2 7f0215600000-7f0215800000 N0=1 kernelpagesize_kB=2048 dirty=1 file=/mnt/f1 7f0215800000-7f0215c00000 - file=/mnt/f1 7f0215c00000-7f0215e00000 N0=1 kernelpagesize_kB=2048 dirty=1 file=/mnt/f1 7f0215e00000-7f0216200000 - file=/mnt/f1 .. 7f0217ecb000-7f0217f20000 N0=85 kernelpagesize_kB=4 mapped=85 mapmax=51 file=/usr/lib64/libc-2.17.so 7f0217f20000-7f0217f30000 - file=/usr/lib64/libc-2.17.so 7f0217f30000-7f0217f90000 N0=96 kernelpagesize_kB=4 mapped=96 mapmax=51 file=/usr/lib64/libc-2.17.so 7f0217f90000-7f0217fb0000 - file=/usr/lib64/libc-2.17.so .. The 'pmap' command can be enhanced to include an option to show numa node information which it can read from this new proc file. This will be a follow on proposal. There have been couple of previous patch proposals to provide numa node information based on pfn or physical address. They seem to have not made progress. Also it would appear reading numa node information based on PFN or physical address will require privileges(CAP_SYS_ADMIN) similar to reading PFN info from /proc/<pid>/pagemap. See https://marc.info/?t=139630938200001&r=1&w=2 https://marc.info/?t=139718724400001&r=1&w=2 Signed-off-by: Prakash Sangappa <prakash.sangappa@xxxxxxxxxx> --- fs/proc/base.c | 2 + fs/proc/internal.h | 3 + fs/proc/task_mmu.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 303 insertions(+), 1 deletion(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 1b2ede6..8fd7cc5 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2960,6 +2960,7 @@ static const struct pid_entry tgid_base_stuff[] = { REG("maps", S_IRUGO, proc_pid_maps_operations), #ifdef CONFIG_NUMA REG("numa_maps", S_IRUGO, proc_pid_numa_maps_operations), + REG("numa_vamaps", S_IRUGO, proc_pid_numa_vamaps_operations), #endif REG("mem", S_IRUSR|S_IWUSR, proc_mem_operations), LNK("cwd", proc_cwd_link), @@ -3352,6 +3353,7 @@ static const struct pid_entry tid_base_stuff[] = { #endif #ifdef CONFIG_NUMA REG("numa_maps", S_IRUGO, proc_tid_numa_maps_operations), + REG("numa_vamaps", S_IRUGO, proc_tid_numa_vamaps_operations), #endif REG("mem", S_IRUSR|S_IWUSR, proc_mem_operations), LNK("cwd", proc_cwd_link), diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 0f1692e..9a3ff80 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -273,6 +273,7 @@ struct proc_maps_private { #ifdef CONFIG_NUMA struct mempolicy *task_mempolicy; #endif + u64 vma_off; } __randomize_layout; struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode); @@ -280,7 +281,9 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode); extern const struct file_operations proc_pid_maps_operations; extern const struct file_operations proc_tid_maps_operations; extern const struct file_operations proc_pid_numa_maps_operations; +extern const struct file_operations proc_pid_numa_vamaps_operations; extern const struct file_operations proc_tid_numa_maps_operations; +extern const struct file_operations proc_tid_numa_vamaps_operations; extern const struct file_operations proc_pid_smaps_operations; extern const struct file_operations proc_pid_smaps_rollup_operations; extern const struct file_operations proc_tid_smaps_operations; diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index c486ad4..e3c7d65 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -169,6 +169,13 @@ static void *m_start(struct seq_file *m, loff_t *ppos) hold_task_mempolicy(priv); priv->tail_vma = get_gate_vma(mm); + if (priv->vma_off) { + vma = find_vma(mm, priv->vma_off); + if (vma) + return vma; + } + + if (last_addr) { vma = find_vma(mm, last_addr - 1); if (vma && vma->vm_start <= last_addr) @@ -197,7 +204,18 @@ static void *m_start(struct seq_file *m, loff_t *ppos) static void *m_next(struct seq_file *m, void *v, loff_t *pos) { struct proc_maps_private *priv = m->private; - struct vm_area_struct *next; + struct vm_area_struct *next, *vma = v; + + if (priv->vma_off) { + if (vma && vma->vm_start <= priv->vma_off && + priv->vma_off < vma->vm_end) + next = vma; + else + next = find_vma(priv->mm, priv->vma_off); + + if (next) + return next; + } (*pos)++; next = m_next_vma(priv, v); @@ -1568,9 +1586,14 @@ struct numa_maps { unsigned long mapcount_max; unsigned long dirty; unsigned long swapcache; + unsigned long nextaddr; + long nid; unsigned long node[MAX_NUMNODES]; }; +#define NUMA_VAMAPS_NID_NOPAGES (-1) +#define NUMA_VAMAPS_NID_NONE (-2) + struct numa_maps_private { struct proc_maps_private proc_maps; struct numa_maps md; @@ -1804,6 +1827,232 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) return 0; } +/* match node id of page to previous node id, return 0 on match */ +static int vamap_match_nid(struct numa_maps *md, unsigned long addr, + struct page *page) +{ + if (page) { + if (md->nid == NUMA_VAMAPS_NID_NONE || + page_to_nid(page) == md->nid) { + if (md->nid == NUMA_VAMAPS_NID_NONE) + md->nid = page_to_nid(page); + return 0; + } + } else { + if (md->nid == NUMA_VAMAPS_NID_NONE || + md->nid == NUMA_VAMAPS_NID_NOPAGES ) { + if (md->nid == NUMA_VAMAPS_NID_NONE) + md->nid = NUMA_VAMAPS_NID_NOPAGES; + return 0; + } + } + /* Did not match */ + md->nextaddr = addr; + return 1; +} + +static int gather_pte_stats_vamap(pmd_t *pmd, unsigned long addr, + unsigned long end, struct mm_walk *walk) +{ + struct numa_maps *md = walk->private; + struct vm_area_struct *vma = walk->vma; + spinlock_t *ptl; + pte_t *orig_pte; + pte_t *pte; + int ret = 0; + +#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); + ret = vamap_match_nid(md, addr, page); + if (page && !ret) + gather_stats(page, md, pmd_dirty(*pmd), + HPAGE_PMD_SIZE/PAGE_SIZE); + spin_unlock(ptl); + return ret; + } + + if (pmd_trans_unstable(pmd)) + return 0; +#endif + orig_pte = pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); + do { + struct page *page = can_gather_numa_stats(*pte, vma, addr); + ret = vamap_match_nid(md, addr, page); + if (ret) + break; + if (page) + gather_stats(page, md, pte_dirty(*pte), 1); + + } while (pte++, addr += PAGE_SIZE, addr != end); + pte_unmap_unlock(orig_pte, ptl); + cond_resched(); + return ret; +} +#ifdef CONFIG_HUGETLB_PAGE +static int gather_hugetlb_stats_vamap(pte_t *pte, unsigned long hmask, + unsigned long addr, unsigned long end, struct mm_walk *walk) +{ + pte_t huge_pte = huge_ptep_get(pte); + struct numa_maps *md; + struct page *page; + + md = walk->private; + if (!pte_present(huge_pte)) + return (vamap_match_nid(md, addr, NULL)); + + page = pte_page(huge_pte); + if (!page) + return (vamap_match_nid(md, addr, page)); + + if (vamap_match_nid(md, addr, page)) + return 1; + gather_stats(page, md, pte_dirty(huge_pte), 1); + return 0; +} + +#else +static int gather_hugetlb_stats_vamap(pte_t *pte, unsigned long hmask, + unsigned long addr, unsigned long end, struct mm_walk *walk) +{ + return 0; +} +#endif + + +static int gather_hole_info_vamap(unsigned long start, unsigned long end, + struct mm_walk *walk) +{ + struct numa_maps *md = walk->private; + struct vm_area_struct *vma = walk->vma; + + /* + * check if we are still tracking a hole or end the walk. + */ + if ((md->nid != NUMA_VAMAPS_NID_NOPAGES && + md->nid != NUMA_VAMAPS_NID_NONE) || + vma != find_vma(walk->mm, start)) { + md->nextaddr = start; + return 1; + } + + if (md->nid == NUMA_VAMAPS_NID_NONE) + md->nid = NUMA_VAMAPS_NID_NOPAGES; + + return 0; +} + +/* + * Display pages allocated per node via /proc. + */ +static int show_numa_vamap(struct seq_file *m, void *v, int is_pid) +{ + struct numa_maps_private *numa_priv = m->private; + struct proc_maps_private *proc_priv = &numa_priv->proc_maps; + struct vm_area_struct *vma = v; + struct numa_maps *md = &numa_priv->md; + struct file *file = vma->vm_file; + struct mm_struct *mm = vma->vm_mm; + struct mm_walk walk = { + .hugetlb_entry = gather_hugetlb_stats_vamap, + .pmd_entry = gather_pte_stats_vamap, + .pte_hole = gather_hole_info_vamap, + .private = md, + .mm = mm, + }; + unsigned long start_va, next_va; + + if (!mm) + return 0; + + start_va = proc_priv->vma_off; + if (!start_va) + start_va = vma->vm_start; + + if (start_va < vma->vm_end) { + + /* Ensure we start with an empty numa_maps statistics */ + memset(md, 0, sizeof(*md)); + md->nid = NUMA_VAMAPS_NID_NONE; /* invalid nodeid at start */ + md->nextaddr = 0; + + /* mmap_sem is held by m_start() */ + if (walk_page_range(start_va, vma->vm_end, &walk) < 0) + goto out; + + /* + * If we reached the end of this vma. + */ + if (md->nextaddr == 0) + md->nextaddr = vma->vm_end; + + next_va = md->nextaddr; + seq_printf(m, "%08lx-%08lx", start_va, next_va); + start_va = next_va; + + if (md->nid != NUMA_VAMAPS_NID_NONE && + md->nid != NUMA_VAMAPS_NID_NOPAGES && md->node[md->nid]) { + seq_printf(m, " N%ld=%lu", md->nid, md->node[md->nid]); + + seq_printf(m, " kernelpagesize_kB=%lu", + vma_kernel_pagesize(vma) >> 10); + } else { + seq_printf(m, " - "); + } + + if (md->anon) + seq_printf(m, " anon=%lu", md->anon); + + if (md->dirty) + seq_printf(m, " dirty=%lu", md->dirty); + + if (md->pages != md->anon && md->pages != md->dirty) + seq_printf(m, " mapped=%lu", md->pages); + + if (md->mapcount_max > 1) + seq_printf(m, " mapmax=%lu", md->mapcount_max); + + if (md->swapcache) + seq_printf(m, " swapcache=%lu", md->swapcache); + + if (md->active < md->pages && !is_vm_hugetlb_page(vma)) + seq_printf(m, " active=%lu", md->active); + + if (md->writeback) + seq_printf(m, " writeback=%lu", md->writeback); + + if (file) { + seq_puts(m, " file="); + seq_file_path(m, file, "\n\t= "); + } else if (vma->vm_start <= mm->brk && + vma->vm_end >= mm->start_brk) { + seq_puts(m, " heap"); + } else if (is_stack(vma)) { + seq_puts(m, " stack"); + + } + + seq_putc(m, '\n'); + } + + /* + * If buffer has not overflowed update vma_off, otherwise preserve + * previous offest as it will be retried. + */ + if (!seq_has_overflowed(m)) { + if (md->nextaddr < vma->vm_end) + proc_priv->vma_off = md->nextaddr; + else + proc_priv->vma_off = 0; + } +out: + m_cache_vma(m, vma); + return 0; +} + static int show_pid_numa_map(struct seq_file *m, void *v) { return show_numa_map(m, v, 1); @@ -1814,6 +2063,16 @@ static int show_tid_numa_map(struct seq_file *m, void *v) return show_numa_map(m, v, 0); } +static int show_pid_numa_vamap(struct seq_file *m, void *v) +{ + return show_numa_vamap(m, v, 1); +} + +static int show_tid_numa_vamap(struct seq_file *m, void *v) +{ + return show_numa_vamap(m, v, 0); +} + static const struct seq_operations proc_pid_numa_maps_op = { .start = m_start, .next = m_next, @@ -1828,6 +2087,20 @@ static const struct seq_operations proc_tid_numa_maps_op = { .show = show_tid_numa_map, }; +static const struct seq_operations proc_pid_numa_vamaps_op = { + .start = m_start, + .next = m_next, + .stop = m_stop, + .show = show_pid_numa_vamap, +}; + +static const struct seq_operations proc_tid_numa_vamaps_op = { + .start = m_start, + .next = m_next, + .stop = m_stop, + .show = show_tid_numa_vamap, +}; + static int numa_maps_open(struct inode *inode, struct file *file, const struct seq_operations *ops) { @@ -1845,6 +2118,16 @@ static int tid_numa_maps_open(struct inode *inode, struct file *file) return numa_maps_open(inode, file, &proc_tid_numa_maps_op); } +static int pid_numa_vamaps_open(struct inode *inode, struct file *file) +{ + return numa_maps_open(inode, file, &proc_pid_numa_vamaps_op); +} + +static int tid_numa_vamaps_open(struct inode *inode, struct file *file) +{ + return numa_maps_open(inode, file, &proc_tid_numa_vamaps_op); +} + const struct file_operations proc_pid_numa_maps_operations = { .open = pid_numa_maps_open, .read = seq_read, @@ -1858,4 +2141,18 @@ const struct file_operations proc_tid_numa_maps_operations = { .llseek = seq_lseek, .release = proc_map_release, }; + +const struct file_operations proc_pid_numa_vamaps_operations = { + .open = pid_numa_vamaps_open, + .read = seq_read, + .llseek = seq_lseek, + .release = proc_map_release, +}; + +const struct file_operations proc_tid_numa_vamaps_operations = { + .open = tid_numa_vamaps_open, + .read = seq_read, + .llseek = seq_lseek, + .release = proc_map_release, +}; #endif /* CONFIG_NUMA */ -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
