proc/maps: make vm_is_stack() logic namespace-friendly
- Rename vm_is_stack() to task_of_stack() and change it to return "struct task_struct *" rather than the global (and thus wrong in general) pid_t. - Add the new pid_of_stack() helper which calls task_of_stack() and uses the right namespace to report the correct pid_t. Unfortunately we need to define this helper twice, in task_mmu.c and in task_nommu.c. perhaps it makes sense to add fs/proc/util.c and move at least pid_of_stack/task_of_stack there to avoid the code duplication. - Change show_map_vma() and show_numa_map() to use the new helper. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Cyrill Gorcunov <gorcunov@openvz.org> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Greg Ungerer <gerg@uclinux.org> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
2c03376d2d
commit
58cb65487e
@@ -123,6 +123,25 @@ unsigned long task_statm(struct mm_struct *mm,
|
||||
return size;
|
||||
}
|
||||
|
||||
static pid_t pid_of_stack(struct proc_maps_private *priv,
|
||||
struct vm_area_struct *vma, bool is_pid)
|
||||
{
|
||||
struct inode *inode = priv->inode;
|
||||
struct task_struct *task;
|
||||
pid_t ret = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
task = pid_task(proc_pid(inode), PIDTYPE_PID);
|
||||
if (task) {
|
||||
task = task_of_stack(task, vma, is_pid);
|
||||
if (task)
|
||||
ret = task_pid_nr_ns(task, inode->i_sb->s_fs_info);
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* display a single VMA to a sequenced file
|
||||
*/
|
||||
@@ -163,7 +182,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
|
||||
seq_pad(m, ' ');
|
||||
seq_path(m, &file->f_path, "");
|
||||
} else if (mm) {
|
||||
pid_t tid = vm_is_stack(priv->task, vma, is_pid);
|
||||
pid_t tid = pid_of_stack(priv, vma, is_pid);
|
||||
|
||||
if (tid != 0) {
|
||||
seq_pad(m, ' ');
|
||||
|
Reference in New Issue
Block a user