[gentoo-commits] linux-patches r1763 - genpatches-2.6/trunk/2.6.32

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2010-08-21 20:58:01 +0000 (Sat, 21 Aug 2010)
New Revision: 1763

Added:
   genpatches-2.6/trunk/2.6.32/1019_linux-2.6.32.20.patch
Removed:
   genpatches-2.6/trunk/2.6.32/1800_page-table-unmap-for-stack-guard-fix.patch
Modified:
   genpatches-2.6/trunk/2.6.32/0000_README
Log:
Remove redundant patch. Linux patch 2.6.32.20

Modified: genpatches-2.6/trunk/2.6.32/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.32/0000_README	2010-08-20 20:45:11 UTC (rev 1762)
+++ genpatches-2.6/trunk/2.6.32/0000_README	2010-08-21 20:58:01 UTC (rev 1763)
@@ -111,13 +111,13 @@
 From:   http://www.kernel.org
 Desc:   Linux 2.6.32.18
 
-Patch:  1017_linux-2.6.32.19.patch
+Patch:  1018_linux-2.6.32.19.patch
 From:   http://www.kernel.org
 Desc:   Linux 2.6.32.19
 
-Patch:  1800_page-table-unmap-for-stack-guard-fix.patch
-From:   https://bugzilla.kernel.org/show_bug.cgi?id=16588
-Desc:	Fix page table unmap for stack guard page properly
+Patch:  1019_linux-2.6.32.20.patch
+From:   http://www.kernel.org
+Desc:   Linux 2.6.32.20
 
 Patch:  2500_libata-fix-truncated-LBA48-ret-vals.patch
 From:   http://bugs.gentoo.org/show_bug.cgi?id=303313

Added: genpatches-2.6/trunk/2.6.32/1019_linux-2.6.32.20.patch
===================================================================
--- genpatches-2.6/trunk/2.6.32/1019_linux-2.6.32.20.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.32/1019_linux-2.6.32.20.patch	2010-08-21 20:58:01 UTC (rev 1763)
@@ -0,0 +1,81 @@
+diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
+index 366b101..899145d 100644
+--- a/fs/proc/task_mmu.c
++++ b/fs/proc/task_mmu.c
+@@ -206,6 +206,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+ 	int flags = vma->vm_flags;
+ 	unsigned long ino = 0;
+ 	unsigned long long pgoff = 0;
++	unsigned long start;
+ 	dev_t dev = 0;
+ 	int len;
+ 
+@@ -216,8 +217,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+ 		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
+ 	}
+ 
++	/* We don't show the stack guard page in /proc/maps */
++	start = vma->vm_start;
++	if (vma->vm_flags & VM_GROWSDOWN)
++		start += PAGE_SIZE;
++
+ 	seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
+-			vma->vm_start,
++			start,
+ 			vma->vm_end,
+ 			flags & VM_READ ? 'r' : '-',
+ 			flags & VM_WRITE ? 'w' : '-',
+diff --git a/mm/memory.c b/mm/memory.c
+index 76d1b21..babb991 100644
+--- a/mm/memory.c
++++ b/mm/memory.c
+@@ -2662,24 +2662,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+ 	spinlock_t *ptl;
+ 	pte_t entry;
+ 
+-	if (check_stack_guard_page(vma, address) < 0) {
+-		pte_unmap(page_table);
++	pte_unmap(page_table);
++
++	/* Check if we need to add a guard page to the stack */
++	if (check_stack_guard_page(vma, address) < 0)
+ 		return VM_FAULT_SIGBUS;
+-	}
+ 
++	/* Use the zero-page for reads */
+ 	if (!(flags & FAULT_FLAG_WRITE)) {
+ 		entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
+ 						vma->vm_page_prot));
+-		ptl = pte_lockptr(mm, pmd);
+-		spin_lock(ptl);
++		page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
+ 		if (!pte_none(*page_table))
+ 			goto unlock;
+ 		goto setpte;
+ 	}
+ 
+ 	/* Allocate our own private page. */
+-	pte_unmap(page_table);
+-
+ 	if (unlikely(anon_vma_prepare(vma)))
+ 		goto oom;
+ 	page = alloc_zeroed_user_highpage_movable(vma, address);
+diff --git a/mm/mlock.c b/mm/mlock.c
+index 2e05c97..524d2a4 100644
+--- a/mm/mlock.c
++++ b/mm/mlock.c
+@@ -170,6 +170,14 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,
+ 	if (vma->vm_flags & VM_WRITE)
+ 		gup_flags |= FOLL_WRITE;
+ 
++	/* We don't try to access the guard page of a stack vma */
++	if (vma->vm_flags & VM_GROWSDOWN) {
++		if (start == vma->vm_start) {
++			start += PAGE_SIZE;
++			nr_pages--;
++		}
++	}
++
+ 	while (nr_pages > 0) {
+ 		int i;
+ 

Deleted: genpatches-2.6/trunk/2.6.32/1800_page-table-unmap-for-stack-guard-fix.patch
===================================================================
--- genpatches-2.6/trunk/2.6.32/1800_page-table-unmap-for-stack-guard-fix.patch	2010-08-20 20:45:11 UTC (rev 1762)
+++ genpatches-2.6/trunk/2.6.32/1800_page-table-unmap-for-stack-guard-fix.patch	2010-08-21 20:58:01 UTC (rev 1763)
@@ -1,76 +0,0 @@
-From 11ac552477e32835cb6970bf0a70c210807f5673 Mon Sep 17 00:00:00 2001
-From: Linus Torvalds <torvalds@××××××××××××××××.org>
-Date: Sat, 14 Aug 2010 11:44:56 -0700
-Subject: [PATCH] mm: fix page table unmap for stack guard page properly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-We do in fact need to unmap the page table _before_ doing the whole
-stack guard page logic, because if it is needed (mainly 32-bit x86 with
-PAE and CONFIG_HIGHPTE, but other architectures may use it too) then it
-will do a kmap_atomic/kunmap_atomic.
-
-And those kmaps will create an atomic region that we cannot do
-allocations in.  However, the whole stack expand code will need to do
-anon_vma_prepare() and vma_lock_anon_vma() and they cannot do that in an
-atomic region.
-
-Now, a better model might actually be to do the anon_vma_prepare() when
-_creating_ a VM_GROWSDOWN segment, and not have to worry about any of
-this at page fault time.  But in the meantime, this is the
-straightforward fix for the issue.
-
-See https://bugzilla.kernel.org/show_bug.cgi?id=16588 for details.
-
-Reported-by: Wylda <wylda@×××××.cz>
-Reported-by: Sedat Dilek <sedat.dilek@×××××.com>
-Reported-by: Mike Pagano <mpagano@g.o>
-Reported-by: François Valenduc <francois.valenduc@××××××××××.be>
-Tested-by: Ed Tomlinson <edt@×××.ca>
-Cc: Pekka Enberg <penberg@××××××.org>
-Cc: Greg KH <gregkh@××××.de>
-Cc: stable@××××××.org
-Signed-off-by: Linus Torvalds <torvalds@××××××××××××××××.org>
----
- mm/memory.c |   13 ++++++-------
- 1 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/mm/memory.c b/mm/memory.c
-index 9b3b73f..b6e5fd2 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -2792,24 +2792,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
- 	spinlock_t *ptl;
- 	pte_t entry;
- 
--	if (check_stack_guard_page(vma, address) < 0) {
--		pte_unmap(page_table);
-+	pte_unmap(page_table);
-+
-+	/* Check if we need to add a guard page to the stack */
-+	if (check_stack_guard_page(vma, address) < 0)
- 		return VM_FAULT_SIGBUS;
--	}
- 
-+	/* Use the zero-page for reads */
- 	if (!(flags & FAULT_FLAG_WRITE)) {
- 		entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
- 						vma->vm_page_prot));
--		ptl = pte_lockptr(mm, pmd);
--		spin_lock(ptl);
-+		page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
- 		if (!pte_none(*page_table))
- 			goto unlock;
- 		goto setpte;
- 	}
- 
- 	/* Allocate our own private page. */
--	pte_unmap(page_table);
--
- 	if (unlikely(anon_vma_prepare(vma)))
- 		goto oom;
- 	page = alloc_zeroed_user_highpage_movable(vma, address);
--- 
-1.7.2.2
-