maps4: regroup task_mmu by interface
Reorder source so that all the code and data for each interface is together. Signed-off-by: Matt Mackall <mpm@selenic.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Cc: David Rientjes <rientjes@google.com> Cc: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matt Mackall
Linus Torvalds
parent
f248dcb34d
commit
a6198797cc
|
|
@ -114,36 +114,122 @@ static void pad_len_spaces(struct seq_file *m, int len)
|
|||
seq_printf(m, "%*c", len, ' ');
|
||||
}
|
||||
|
||||
/*
|
||||
* Proportional Set Size(PSS): my share of RSS.
|
||||
*
|
||||
* PSS of a process is the count of pages it has in memory, where each
|
||||
* page is divided by the number of processes sharing it. So if a
|
||||
* process has 1000 pages all to itself, and 1000 shared with one other
|
||||
* process, its PSS will be 1500.
|
||||
*
|
||||
* To keep (accumulated) division errors low, we adopt a 64bit
|
||||
* fixed-point pss counter to minimize division errors. So (pss >>
|
||||
* PSS_SHIFT) would be the real byte count.
|
||||
*
|
||||
* A shift of 12 before division means (assuming 4K page size):
|
||||
* - 1M 3-user-pages add up to 8KB errors;
|
||||
* - supports mapcount up to 2^24, or 16M;
|
||||
* - supports PSS up to 2^52 bytes, or 4PB.
|
||||
*/
|
||||
#define PSS_SHIFT 12
|
||||
|
||||
struct mem_size_stats
|
||||
static void vma_stop(struct proc_maps_private *priv, struct vm_area_struct *vma)
|
||||
{
|
||||
struct vm_area_struct *vma;
|
||||
unsigned long resident;
|
||||
unsigned long shared_clean;
|
||||
unsigned long shared_dirty;
|
||||
unsigned long private_clean;
|
||||
unsigned long private_dirty;
|
||||
unsigned long referenced;
|
||||
u64 pss;
|
||||
};
|
||||
if (vma && vma != priv->tail_vma) {
|
||||
struct mm_struct *mm = vma->vm_mm;
|
||||
up_read(&mm->mmap_sem);
|
||||
mmput(mm);
|
||||
}
|
||||
}
|
||||
|
||||
static void *m_start(struct seq_file *m, loff_t *pos)
|
||||
{
|
||||
struct proc_maps_private *priv = m->private;
|
||||
unsigned long last_addr = m->version;
|
||||
struct mm_struct *mm;
|
||||
struct vm_area_struct *vma, *tail_vma = NULL;
|
||||
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
|
||||
* the beginning and also after lseek. We will have -1 last_addr
|
||||
* after the end of the vmas.
|
||||
*/
|
||||
|
||||
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);
|
||||
if (!mm)
|
||||
return NULL;
|
||||
|
||||
tail_vma = get_gate_vma(priv->task);
|
||||
priv->tail_vma = tail_vma;
|
||||
|
||||
/* Start with last addr hint */
|
||||
vma = find_vma(mm, last_addr);
|
||||
if (last_addr && vma) {
|
||||
vma = vma->vm_next;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check the vma index is within the range and do
|
||||
* sequential scan until m_index.
|
||||
*/
|
||||
vma = NULL;
|
||||
if ((unsigned long)l < mm->map_count) {
|
||||
vma = mm->mmap;
|
||||
while (l-- && vma)
|
||||
vma = vma->vm_next;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (l != mm->map_count)
|
||||
tail_vma = NULL; /* After gate vma */
|
||||
|
||||
out:
|
||||
if (vma)
|
||||
return vma;
|
||||
|
||||
/* End of vmas has been reached */
|
||||
m->version = (tail_vma != NULL)? 0: -1UL;
|
||||
up_read(&mm->mmap_sem);
|
||||
mmput(mm);
|
||||
return tail_vma;
|
||||
}
|
||||
|
||||
static void *m_next(struct seq_file *m, void *v, loff_t *pos)
|
||||
{
|
||||
struct proc_maps_private *priv = m->private;
|
||||
struct vm_area_struct *vma = v;
|
||||
struct vm_area_struct *tail_vma = priv->tail_vma;
|
||||
|
||||
(*pos)++;
|
||||
if (vma && (vma != tail_vma) && vma->vm_next)
|
||||
return vma->vm_next;
|
||||
vma_stop(priv, vma);
|
||||
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 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 show_map(struct seq_file *m, void *v)
|
||||
{
|
||||
|
|
@ -210,6 +296,56 @@ static int show_map(struct seq_file *m, void *v)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct seq_operations proc_pid_maps_op = {
|
||||
.start = m_start,
|
||||
.next = m_next,
|
||||
.stop = m_stop,
|
||||
.show = show_map
|
||||
};
|
||||
|
||||
static int maps_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return do_maps_open(inode, file, &proc_pid_maps_op);
|
||||
}
|
||||
|
||||
const struct file_operations proc_maps_operations = {
|
||||
.open = maps_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release_private,
|
||||
};
|
||||
|
||||
/*
|
||||
* Proportional Set Size(PSS): my share of RSS.
|
||||
*
|
||||
* PSS of a process is the count of pages it has in memory, where each
|
||||
* page is divided by the number of processes sharing it. So if a
|
||||
* process has 1000 pages all to itself, and 1000 shared with one other
|
||||
* process, its PSS will be 1500.
|
||||
*
|
||||
* To keep (accumulated) division errors low, we adopt a 64bit
|
||||
* fixed-point pss counter to minimize division errors. So (pss >>
|
||||
* PSS_SHIFT) would be the real byte count.
|
||||
*
|
||||
* A shift of 12 before division means (assuming 4K page size):
|
||||
* - 1M 3-user-pages add up to 8KB errors;
|
||||
* - supports mapcount up to 2^24, or 16M;
|
||||
* - supports PSS up to 2^52 bytes, or 4PB.
|
||||
*/
|
||||
#define PSS_SHIFT 12
|
||||
|
||||
struct mem_size_stats
|
||||
{
|
||||
struct vm_area_struct *vma;
|
||||
unsigned long resident;
|
||||
unsigned long shared_clean;
|
||||
unsigned long shared_dirty;
|
||||
unsigned long private_clean;
|
||||
unsigned long private_dirty;
|
||||
unsigned long referenced;
|
||||
u64 pss;
|
||||
};
|
||||
|
||||
static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
|
||||
void *private)
|
||||
{
|
||||
|
|
@ -255,33 +391,6 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
|
||||
unsigned long end, void *private)
|
||||
{
|
||||
struct vm_area_struct *vma = private;
|
||||
pte_t *pte, ptent;
|
||||
spinlock_t *ptl;
|
||||
struct page *page;
|
||||
|
||||
pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
|
||||
for (; addr != end; pte++, addr += PAGE_SIZE) {
|
||||
ptent = *pte;
|
||||
if (!pte_present(ptent))
|
||||
continue;
|
||||
|
||||
page = vm_normal_page(vma, addr, ptent);
|
||||
if (!page)
|
||||
continue;
|
||||
|
||||
/* Clear accessed and referenced bits. */
|
||||
ptep_test_and_clear_young(vma, addr, pte);
|
||||
ClearPageReferenced(page);
|
||||
}
|
||||
pte_unmap_unlock(pte - 1, ptl);
|
||||
cond_resched();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct mm_walk smaps_walk = { .pmd_entry = smaps_pte_range };
|
||||
|
||||
static int show_smap(struct seq_file *m, void *v)
|
||||
|
|
@ -321,6 +430,52 @@ static int show_smap(struct seq_file *m, void *v)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static struct seq_operations proc_pid_smaps_op = {
|
||||
.start = m_start,
|
||||
.next = m_next,
|
||||
.stop = m_stop,
|
||||
.show = show_smap
|
||||
};
|
||||
|
||||
static int smaps_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return do_maps_open(inode, file, &proc_pid_smaps_op);
|
||||
}
|
||||
|
||||
const struct file_operations proc_smaps_operations = {
|
||||
.open = smaps_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release_private,
|
||||
};
|
||||
|
||||
static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
|
||||
unsigned long end, void *private)
|
||||
{
|
||||
struct vm_area_struct *vma = private;
|
||||
pte_t *pte, ptent;
|
||||
spinlock_t *ptl;
|
||||
struct page *page;
|
||||
|
||||
pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
|
||||
for (; addr != end; pte++, addr += PAGE_SIZE) {
|
||||
ptent = *pte;
|
||||
if (!pte_present(ptent))
|
||||
continue;
|
||||
|
||||
page = vm_normal_page(vma, addr, ptent);
|
||||
if (!page)
|
||||
continue;
|
||||
|
||||
/* Clear accessed and referenced bits. */
|
||||
ptep_test_and_clear_young(vma, addr, pte);
|
||||
ClearPageReferenced(page);
|
||||
}
|
||||
pte_unmap_unlock(pte - 1, ptl);
|
||||
cond_resched();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct mm_walk clear_refs_walk = { .pmd_entry = clear_refs_pte_range };
|
||||
|
||||
static ssize_t clear_refs_write(struct file *file, const char __user *buf,
|
||||
|
|
@ -364,147 +519,6 @@ const struct file_operations proc_clear_refs_operations = {
|
|||
.write = clear_refs_write,
|
||||
};
|
||||
|
||||
static void *m_start(struct seq_file *m, loff_t *pos)
|
||||
{
|
||||
struct proc_maps_private *priv = m->private;
|
||||
unsigned long last_addr = m->version;
|
||||
struct mm_struct *mm;
|
||||
struct vm_area_struct *vma, *tail_vma = NULL;
|
||||
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
|
||||
* the beginning and also after lseek. We will have -1 last_addr
|
||||
* after the end of the vmas.
|
||||
*/
|
||||
|
||||
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);
|
||||
if (!mm)
|
||||
return NULL;
|
||||
|
||||
priv->tail_vma = tail_vma = get_gate_vma(priv->task);
|
||||
|
||||
/* Start with last addr hint */
|
||||
if (last_addr && (vma = find_vma(mm, last_addr))) {
|
||||
vma = vma->vm_next;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check the vma index is within the range and do
|
||||
* sequential scan until m_index.
|
||||
*/
|
||||
vma = NULL;
|
||||
if ((unsigned long)l < mm->map_count) {
|
||||
vma = mm->mmap;
|
||||
while (l-- && vma)
|
||||
vma = vma->vm_next;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (l != mm->map_count)
|
||||
tail_vma = NULL; /* After gate vma */
|
||||
|
||||
out:
|
||||
if (vma)
|
||||
return vma;
|
||||
|
||||
/* End of vmas has been reached */
|
||||
m->version = (tail_vma != NULL)? 0: -1UL;
|
||||
up_read(&mm->mmap_sem);
|
||||
mmput(mm);
|
||||
return tail_vma;
|
||||
}
|
||||
|
||||
static void vma_stop(struct proc_maps_private *priv, struct vm_area_struct *vma)
|
||||
{
|
||||
if (vma && vma != priv->tail_vma) {
|
||||
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 vm_area_struct *vma = v;
|
||||
struct vm_area_struct *tail_vma = priv->tail_vma;
|
||||
|
||||
(*pos)++;
|
||||
if (vma && (vma != tail_vma) && vma->vm_next)
|
||||
return vma->vm_next;
|
||||
vma_stop(priv, vma);
|
||||
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 = {
|
||||
.start = m_start,
|
||||
.next = m_next,
|
||||
.stop = m_stop,
|
||||
.show = show_map
|
||||
};
|
||||
|
||||
static 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);
|
||||
}
|
||||
|
||||
const 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);
|
||||
|
||||
|
|
@ -539,14 +553,3 @@ const struct file_operations proc_numa_maps_operations = {
|
|||
};
|
||||
#endif
|
||||
|
||||
static int smaps_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return do_maps_open(inode, file, &proc_pid_smaps_op);
|
||||
}
|
||||
|
||||
const struct file_operations proc_smaps_operations = {
|
||||
.open = smaps_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release_private,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue