sync vapier-m

[patches.git] / nommu-map-list.patch

--- linux-2.6.x/mm/nommu.c
+++ linux-2.6.x/mm/nommu.c
@@ -421,6 +421,10 @@ static int validate_mmap_request(struct 
 	if ((pgoff + (len >> PAGE_SHIFT)) < pgoff)
 		return -EOVERFLOW;
 
+	/* Too many mappings? */
+	if (current->mm->map_count > sysctl_max_map_count)
+		return -ENOMEM;
+
 	if (file) {
 		/* validate file mapping requests */
 		struct address_space *mapping;
@@ -853,6 +857,7 @@ unsigned long do_mmap_pgoff(struct file 
 
 	vml->next = current->mm->context.vmlist;
 	current->mm->context.vmlist = vml;
+	current->mm->map_count++;
 
 	up_write(&nommu_vma_sem);
 
@@ -961,6 +966,7 @@ int do_munmap(struct mm_struct *mm, unsi
 
 	update_hiwater_vm(mm);
 	mm->total_vm -= len >> PAGE_SHIFT;
+	mm->map_count--;
 
 #ifdef DEBUG
 	show_process_blocks();
--- linux-2.6.x/fs/proc/task_nommu.c
+++ linux-2.6.x/fs/proc/task_nommu.c
@@ -137,23 +137,129 @@ out:
 	return result;
 }
 
-/*
- * Albert D. Cahalan suggested to fake entries for the traditional
- * sections here.  This might be worth investigating.
- */
+static void pad_len_spaces(struct seq_file *m, int len)
+{
+	len = 25 + sizeof(void*) * 6 - len;
+	if (len < 1)
+		len = 1;
+	seq_printf(m, "%*c", len, ' ');
+}
+
 static int show_map(struct seq_file *m, void *v)
 {
+	struct vm_list_struct *vml = v;
+	struct vm_area_struct *vma = vml->vma;
+	struct task_struct *task = m->private;
+	struct mm_struct *mm = get_task_mm(task);
+	struct file *file = vma->vm_file;
+	int flags = vma->vm_flags;
+	unsigned long ino = 0;
+	dev_t dev = 0;
+	int len;
+
+	if (file) {
+		struct inode *inode = vma->vm_file->f_dentry->d_inode;
+		dev = inode->i_sb->s_dev;
+		ino = inode->i_ino;
+	}
+
+	seq_printf(m, "%08lx-%08lx %c%c%c%c %08lx %02x:%02x %lu %n",
+			vma->vm_start,
+			vma->vm_end,
+			flags & VM_READ ? 'r' : '-',
+			flags & VM_WRITE ? 'w' : '-',
+			flags & VM_EXEC ? 'x' : '-',
+			flags & VM_MAYSHARE ? 's' : 'p',
+			vma->vm_pgoff << PAGE_SHIFT,
+			MAJOR(dev), MINOR(dev), ino, &len);
+
+	/*
+	 * Print the dentry name for named mappings, and a
+	 * special [heap] marker for the heap:
+	 */
+	if (file) {
+		pad_len_spaces(m, len);
+		seq_path(m, file->f_vfsmnt, file->f_dentry, "\n");
+	} else {
+		if (mm) {
+			if (vma->vm_start <= mm->start_brk &&
+						vma->vm_end >= mm->brk) {
+				pad_len_spaces(m, len);
+				seq_puts(m, "[heap]");
+			} else {
+				if (vma->vm_start <= mm->start_stack &&
+					vma->vm_end >= mm->start_stack) {
+
+					pad_len_spaces(m, len);
+					seq_puts(m, "[stack]");
+				}
+			}
+		} else {
+			pad_len_spaces(m, len);
+			seq_puts(m, "[vdso]");
+		}
+	}
+	seq_putc(m, '\n');
+
 	return 0;
 }
 static void *m_start(struct seq_file *m, loff_t *pos)
 {
+	struct task_struct *task = m->private;
+	struct mm_struct *mm;
+	struct vm_list_struct *vml;
+	loff_t l = *pos;
+
+	mm = get_task_mm(task);
+	if (!mm)
+		return NULL;
+
+	down_read(&mm->mmap_sem);
+
+	/*
+	 * Check the vml index is within the range and do
+	 * sequential scan until m_index.
+	 */
+	vml = NULL;
+	if ((unsigned long)l < mm->map_count) {
+		vml = mm->context.vmlist;
+		while (l-- && vml)
+			vml = vml->next;
+	}
+
+	if (vml)
+		return vml;
+
+	/* End of vmls has been reached */
+	up_read(&mm->mmap_sem);
+	mmput(mm);
+
 	return NULL;
 }
 static void m_stop(struct seq_file *m, void *v)
 {
+	struct task_struct *task = m->private;
+	struct mm_struct *mm;
+
+	if (!v)
+		return;
+
+	mm = get_task_mm(task);
+	if (!mm)
+		return;
+
+	up_read(&mm->mmap_sem);
+	mmput(mm);
 }
 static void *m_next(struct seq_file *m, void *v, loff_t *pos)
 {
+	struct vm_list_struct *vml = v;
+
+	(*pos)++;
+	if (vml && vml->next)
+		return vml->next;
+
+	m_stop(m, vml);
 	return NULL;
 }
 struct seq_operations proc_pid_maps_op = {