.27 patch

diff --git a/queue-2.6.27/proc-fix-vma-display-mismatch-between-proc-pid-maps-smaps.patch b/queue-2.6.27/proc-fix-vma-display-mismatch-between-proc-pid-maps-smaps.patch
new file mode 100644 (file)
index 0000000..6944e4c
--- /dev/null
+++ b/queue-2.6.27/proc-fix-vma-display-mismatch-between-proc-pid-maps-smaps.patch
@@ -0,0 +1,134 @@
+From joe.korty@ccur.com  Thu Oct 23 15:20:06 2008
+From: Joe Korty <joe.korty@ccur.com>
+Date: Thu, 23 Oct 2008 18:14:25 -0400
+Subject: proc: fix vma display mismatch between /proc/pid/{maps,smaps}
+To: Greg KH <greg@kroah.com>
+Cc: "akpm@linux-foundation.org" <akpm@linux-foundation.org>, stable <stable@kernel.org>, Matt Mackall <mpm@selenic.com>
+Message-ID: <20081023221425.GA11202@tsunami.ccur.com>
+Content-Disposition: inline
+
+From: Joe Korty <joe.korty@ccur.com>
+
+[ backport of 7c88db0cb589df980acfb2f73c3595a0653004ec to 2.7.27.3 by Joe
+Korty <joe.korty@ccur.com ]
+
+proc: fix vma display mismatch between /proc/pid/{maps,smaps}
+
+Commit 4752c369789250eafcd7813e11c8fb689235b0d2 aka
+"maps4: simplify interdependence of maps and smaps" broke /proc/pid/smaps,
+causing it to display some vmas twice and other vmas not at all.  For example:
+
+    grep .- /proc/1/smaps >/tmp/smaps; diff /proc/1/maps /tmp/smaps
+
+    1  25d24
+    2  < 7fd7e23aa000-7fd7e23ac000 rw-p 7fd7e23aa000 00:00 0
+    3  28a28
+    4  > ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0  [vsyscall]
+
+The bug has something to do with setting m->version before all the
+seq_printf's have been performed.  show_map was doing this correctly,
+but show_smap was doing this in the middle of its seq_printf sequence.
+This patch arranges things so that the setting of m->version in show_smap
+is also done at the end of its seq_printf sequence.
+
+Testing: in addition to the above grep test, for each process I summed
+up the 'Rss' fields of /proc/pid/smaps and compared that to the 'VmRSS'
+field of /proc/pid/status.  All matched except for Xorg (which has a
+/dev/mem mapping which Rss accounts for but VmRSS does not).  This result
+gives us some confidence that neither /proc/pid/maps nor /proc/pid/smaps
+are any longer skipping or double-counting vmas.
+
+Signed-off-by: Joe Korty <joe.korty@ccur.com>
+Cc: Matt Mackall <mpm@selenic.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
+
+---
+ fs/proc/task_mmu.c |   34 ++++++++++++++++++++++------------
+ 1 file changed, 22 insertions(+), 12 deletions(-)
+
+--- a/fs/proc/task_mmu.c
++++ b/fs/proc/task_mmu.c
+@@ -198,11 +198,8 @@ static int do_maps_open(struct inode *in
+       return ret;
+ }
+ 
+-static int show_map(struct seq_file *m, void *v)
++static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+ {
+-      struct proc_maps_private *priv = m->private;
+-      struct task_struct *task = priv->task;
+-      struct vm_area_struct *vma = v;
+       struct mm_struct *mm = vma->vm_mm;
+       struct file *file = vma->vm_file;
+       int flags = vma->vm_flags;
+@@ -210,9 +207,6 @@ static int show_map(struct seq_file *m, 
+       dev_t dev = 0;
+       int len;
+ 
+-      if (maps_protect && !ptrace_may_access(task, PTRACE_MODE_READ))
+-              return -EACCES;
+-
+       if (file) {
+               struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+               dev = inode->i_sb->s_dev;
+@@ -257,6 +251,18 @@ static int show_map(struct seq_file *m, 
+               }
+       }
+       seq_putc(m, '\n');
++}
++
++static int show_map(struct seq_file *m, void *v)
++{
++      struct vm_area_struct *vma = v;
++      struct proc_maps_private *priv = m->private;
++      struct task_struct *task = priv->task;
++
++      if (maps_protect && !ptrace_may_access(task, PTRACE_MODE_READ))
++              return -EACCES;
++
++      show_map_vma(m, vma);
+ 
+       if (m->count < m->size)  /* vma is copied successfully */
+               m->version = (vma != get_gate_vma(task))? vma->vm_start: 0;
+@@ -367,23 +373,25 @@ static int smaps_pte_range(pmd_t *pmd, u
+ 
+ static int show_smap(struct seq_file *m, void *v)
+ {
++      struct proc_maps_private *priv = m->private;
++      struct task_struct *task = priv->task;
+       struct vm_area_struct *vma = v;
+       struct mem_size_stats mss;
+-      int ret;
+       struct mm_walk smaps_walk = {
+               .pmd_entry = smaps_pte_range,
+               .mm = vma->vm_mm,
+               .private = &mss,
+       };
+ 
++      if (maps_protect && !ptrace_may_access(task, PTRACE_MODE_READ))
++              return -EACCES;
++
+       memset(&mss, 0, sizeof mss);
+       mss.vma = vma;
+       if (vma->vm_mm && !is_vm_hugetlb_page(vma))
+               walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
+ 
+-      ret = show_map(m, v);
+-      if (ret)
+-              return ret;
++      show_map_vma(m, vma);
+ 
+       seq_printf(m,
+                  "Size:           %8lu kB\n"
+@@ -405,7 +413,9 @@ static int show_smap(struct seq_file *m,
+                  mss.referenced >> 10,
+                  mss.swap >> 10);
+ 
+-      return ret;
++      if (m->count < m->size)  /* vma is copied successfully */
++              m->version = (vma != get_gate_vma(task)) ? vma->vm_start : 0;
++      return 0;
+ }
+ 
+ static const struct seq_operations proc_pid_smaps_op = {

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index f9ea724b6995969636c6a2ef2f7853343f7a7f6e..c8e3c4aae1a911b15d60ff9ad758ee618e67dcc9 100644 (file)
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -21,3 +21,4 @@ hvc_console-fix-free_irq-in-spinlocked-section.patch
 acpi-suspend-enable-acpi-during-resume-if-sci_en-is-not-set.patch
 acpi-suspend-blacklist-hp-xw4600-workstation-for-old-code-ordering.patch
 acpi-suspend-always-use-the-32-bit-waking-vector.patch
+proc-fix-vma-display-mismatch-between-proc-pid-maps-smaps.patch