"VmStk:\t%8lu kB\n"
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
- "VmPTE:\t%8lu kB\n"
- "StaBrk:\t%08lx kB\n"
- "Brk:\t%08lx kB\n"
- "StaStk:\t%08lx kB\n"
- ,
+ "VmPTE:\t%8lu kB\n",
hiwater_vm << (PAGE_SHIFT-10),
(total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
mm->locked_vm << (PAGE_SHIFT-10),
total_rss << (PAGE_SHIFT-10),
data << (PAGE_SHIFT-10),
mm->stack_vm << (PAGE_SHIFT-10), text, lib,
- (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
- mm->start_brk, mm->brk, mm->start_stack);
-#ifdef __i386__
- if (!nx_enabled)
- buffer += sprintf(buffer,
- "ExecLim:\t%08lx\n", mm->context.exec_limit);
-#endif
+ (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10);
return buffer;
}
{
struct vm_area_struct * vma;
int result = -ENOENT;
- struct task_struct *task = get_proc_task(inode);
- struct mm_struct * mm = NULL;
+ struct task_struct *task = proc_task(inode);
+ struct mm_struct * mm = get_task_mm(task);
- if (task) {
- mm = get_task_mm(task);
- put_task_struct(task);
- }
if (!mm)
goto out;
down_read(&mm->mmap_sem);
unsigned long private_dirty;
};
-__attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma)
-{
- return NULL;
-}
-
static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats *mss)
{
- struct proc_maps_private *priv = m->private;
- struct task_struct *task = priv->task;
-#ifdef __i386__
- struct mm_struct *tmm = get_task_mm(task);
-#endif
+ struct task_struct *task = m->private;
struct vm_area_struct *vma = v;
struct mm_struct *mm = vma->vm_mm;
struct file *file = vma->vm_file;
vma->vm_end,
flags & VM_READ ? 'r' : '-',
flags & VM_WRITE ? 'w' : '-',
- (flags & VM_EXEC
-#ifdef __i386__
- || (!nx_enabled && tmm &&
- (vma->vm_start < tmm->context.exec_limit))
-#endif
- )
- ? 'x' : '-',
+ flags & VM_EXEC ? 'x' : '-',
flags & VM_MAYSHARE ? 's' : 'p',
vma->vm_pgoff << PAGE_SHIFT,
MAJOR(dev), MINOR(dev), ino, &len);
-#ifdef __i386__
- if (tmm)
- mmput(tmm);
-#endif
/*
* Print the dentry name for named mappings, and a
pad_len_spaces(m, len);
seq_path(m, file->f_vfsmnt, file->f_dentry, "\n");
} else {
- const char *name = arch_vma_name(vma);
- if (!name) {
- if (mm) {
- if (vma->vm_start <= mm->start_brk &&
+ if (mm) {
+ if (vma->vm_start <= mm->start_brk &&
vma->vm_end >= mm->brk) {
- name = "[heap]";
- } else if (vma->vm_start <= mm->start_stack &&
- vma->vm_end >= mm->start_stack) {
- name = "[stack]";
- }
+ pad_len_spaces(m, len);
+ seq_puts(m, "[heap]");
} else {
- name = "[vdso]";
+ if (vma->vm_start <= mm->start_stack &&
+ vma->vm_end >= mm->start_stack) {
+
+ pad_len_spaces(m, len);
+ seq_puts(m, "[stack]");
+ }
}
- }
- if (name) {
+ } else {
pad_len_spaces(m, len);
- seq_puts(m, name);
+ seq_puts(m, "[vdso]");
}
}
seq_putc(m, '\n');
static void *m_start(struct seq_file *m, loff_t *pos)
{
- struct proc_maps_private *priv = m->private;
+ struct task_struct *task = m->private;
unsigned long last_addr = m->version;
struct mm_struct *mm;
- struct vm_area_struct *vma, *tail_vma = NULL;
+ struct vm_area_struct *vma, *tail_vma;
loff_t l = *pos;
- /* Clear the per syscall fields in priv */
- priv->task = NULL;
- priv->tail_vma = NULL;
-
/*
* We remember last_addr rather than next_addr to hit with
* mmap_cache most of the time. We have zero last_addr at
if (last_addr == -1UL)
return NULL;
- priv->task = get_pid_task(priv->pid, PIDTYPE_PID);
- if (!priv->task)
- return NULL;
-
- mm = mm_for_maps(priv->task);
+ mm = get_task_mm(task);
if (!mm)
return NULL;
- priv->tail_vma = tail_vma = get_gate_vma(priv->task);
+ tail_vma = get_gate_vma(task);
+ down_read(&mm->mmap_sem);
/* Start with last addr hint */
if (last_addr && (vma = find_vma(mm, last_addr))) {
return tail_vma;
}
-static void vma_stop(struct proc_maps_private *priv, struct vm_area_struct *vma)
+static void m_stop(struct seq_file *m, void *v)
{
- if (vma && vma != priv->tail_vma) {
+ struct task_struct *task = m->private;
+ struct vm_area_struct *vma = v;
+ if (vma && vma != get_gate_vma(task)) {
struct mm_struct *mm = vma->vm_mm;
up_read(&mm->mmap_sem);
mmput(mm);
static void *m_next(struct seq_file *m, void *v, loff_t *pos)
{
- struct proc_maps_private *priv = m->private;
+ struct task_struct *task = m->private;
struct vm_area_struct *vma = v;
- struct vm_area_struct *tail_vma = priv->tail_vma;
+ struct vm_area_struct *tail_vma = get_gate_vma(task);
(*pos)++;
if (vma && (vma != tail_vma) && vma->vm_next)
return vma->vm_next;
- vma_stop(priv, vma);
+ m_stop(m, v);
return (vma != tail_vma)? tail_vma: NULL;
}
-static void m_stop(struct seq_file *m, void *v)
-{
- struct proc_maps_private *priv = m->private;
- struct vm_area_struct *vma = v;
-
- vma_stop(priv, vma);
- if (priv->task)
- put_task_struct(priv->task);
-}
-
-static struct seq_operations proc_pid_maps_op = {
+struct seq_operations proc_pid_maps_op = {
.start = m_start,
.next = m_next,
.stop = m_stop,
.show = show_map
};
-static struct seq_operations proc_pid_smaps_op = {
+struct seq_operations proc_pid_smaps_op = {
.start = m_start,
.next = m_next,
.stop = m_stop,
.show = show_smap
};
-static int do_maps_open(struct inode *inode, struct file *file,
- struct seq_operations *ops)
-{
- struct proc_maps_private *priv;
- int ret = -ENOMEM;
- priv = kzalloc(sizeof(*priv), GFP_KERNEL);
- if (priv) {
- priv->pid = proc_pid(inode);
- ret = seq_open(file, ops);
- if (!ret) {
- struct seq_file *m = file->private_data;
- m->private = priv;
- } else {
- kfree(priv);
- }
- }
- return ret;
-}
-
-static int maps_open(struct inode *inode, struct file *file)
-{
- return do_maps_open(inode, file, &proc_pid_maps_op);
-}
-
-struct file_operations proc_maps_operations = {
- .open = maps_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = seq_release_private,
-};
-
#ifdef CONFIG_NUMA
extern int show_numa_map(struct seq_file *m, void *v);
-static struct seq_operations proc_pid_numa_maps_op = {
+struct seq_operations proc_pid_numa_maps_op = {
.start = m_start,
.next = m_next,
.stop = m_stop,
.show = show_numa_map
};
-
-static int numa_maps_open(struct inode *inode, struct file *file)
-{
- return do_maps_open(inode, file, &proc_pid_numa_maps_op);
-}
-
-struct file_operations proc_numa_maps_operations = {
- .open = numa_maps_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = seq_release_private,
-};
#endif
-
-static int smaps_open(struct inode *inode, struct file *file)
-{
- return do_maps_open(inode, file, &proc_pid_smaps_op);
-}
-
-struct file_operations proc_smaps_operations = {
- .open = smaps_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = seq_release_private,
-};
git://git.onelab.eu / linux-2.6.git / blobdiff