[kernel] r17222 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/x86 patches/series

Wed Apr 13 16:02:15 UTC 2011

Author: waldi
Date: Wed Apr 13 16:02:04 2011
New Revision: 17222

Log:
* debian/changelog: Update.
* debian/patches/bugfix/x86/revert-x86-cleanup-highmap-after-brk-is-concluded.patch:
  Revert faulty patch.
* debian/patches/series/34: Add new patch.

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/x86/revert-x86-cleanup-highmap-after-brk-is-concluded.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/34

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================

--- dists/squeeze/linux-2.6/debian/changelog	Wed Apr 13 07:46:37 2011	(r17221)
+++ dists/squeeze/linux-2.6/debian/changelog	Wed Apr 13 16:02:04 2011	(r17222)
@@ -7,6 +7,10 @@
   [ Ian Campbell ]
   * [xen] backport fixes to vmalloc_sync_all (Closes: #614400)
 
+  [ Bastian Blank ]
+  * [x86] Revert "x86: Cleanup highmap after brk is concluded"
+    (closes: #621072)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 08 Apr 2011 01:13:01 +0100
 
 linux-2.6 (2.6.32-33) stable; urgency=high

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/x86/revert-x86-cleanup-highmap-after-brk-is-concluded.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/x86/revert-x86-cleanup-highmap-after-brk-is-concluded.patch	Wed Apr 13 16:02:04 2011	(r17222)
@@ -0,0 +1,117 @@
+From 5988b32500933add4877201667ce7b1725254072 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh at suse.de>
+Date: Mon, 11 Apr 2011 16:04:59 -0700
+Subject: [PATCH] Revert "x86: Cleanup highmap after brk is concluded"
+
+This reverts upstream commit e5f15b45ddf3afa2bbbb10c7ea34fb32b6de0a0e
+
+It caused problems in the stable tree and should not have been there.
+
+Cc: Yinghai Lu <yinghai at kernel.org>
+Cc: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
+Cc: H. Peter Anvin <hpa at zytor.com>
+Cc: Ingo Molnar <mingo at elte.hu>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ arch/x86/kernel/head64.c |    3 +++
+ arch/x86/kernel/setup.c  |    5 -----
+ arch/x86/mm/init.c       |   19 +++++++++++++++++++
+ arch/x86/mm/init_64.c    |   11 +++++------
+ 4 files changed, 27 insertions(+), 11 deletions(-)
+
+--- a/arch/x86/kernel/head64.c
++++ b/arch/x86/kernel/head64.c
+@@ -76,6 +76,9 @@ void __init x86_64_start_kernel(char * r
+ 	/* Make NULL pointers segfault */
+ 	zap_identity_mappings();
+ 
++	/* Cleanup the over mapped high alias */
++	cleanup_highmap();
++
+ 	for (i = 0; i < NUM_EXCEPTION_VECTORS; i++) {
+ #ifdef CONFIG_EARLY_PRINTK
+ 		set_intr_gate(i, &early_idt_handlers[i]);
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -294,9 +294,6 @@ static void __init init_gbpages(void)
+ static inline void init_gbpages(void)
+ {
+ }
+-static void __init cleanup_highmap(void)
+-{
+-}
+ #endif
+ 
+ static void __init reserve_brk(void)
+@@ -924,8 +921,6 @@ void __init setup_arch(char **cmdline_p)
+ 
+ 	reserve_brk();
+ 
+-	cleanup_highmap();
+-
+ 	init_gbpages();
+ 
+ 	/* max_pfn_mapped is updated here */
+--- a/arch/x86/mm/init.c
++++ b/arch/x86/mm/init.c
+@@ -287,6 +287,25 @@ unsigned long __init_refok init_memory_m
+ 	load_cr3(swapper_pg_dir);
+ #endif
+ 
++#ifdef CONFIG_X86_64
++	if (!after_bootmem && !start) {
++		pud_t *pud;
++		pmd_t *pmd;
++
++		mmu_cr4_features = read_cr4();
++
++		/*
++		 * _brk_end cannot change anymore, but it and _end may be
++		 * located on different 2M pages. cleanup_highmap(), however,
++		 * can only consider _end when it runs, so destroy any
++		 * mappings beyond _brk_end here.
++		 */
++		pud = pud_offset(pgd_offset_k(_brk_end), _brk_end);
++		pmd = pmd_offset(pud, _brk_end - 1);
++		while (++pmd <= pmd_offset(pud, (unsigned long)_end - 1))
++			pmd_clear(pmd);
++	}
++#endif
+ 	__flush_tlb_all();
+ 
+ 	if (!after_bootmem && e820_table_end > e820_table_start)
+--- a/arch/x86/mm/init_64.c
++++ b/arch/x86/mm/init_64.c
+@@ -49,7 +49,6 @@
+ #include <asm/numa.h>
+ #include <asm/cacheflush.h>
+ #include <asm/init.h>
+-#include <asm/setup.h>
+ #include <linux/bootmem.h>
+ 
+ static unsigned long dma_reserve __initdata;
+@@ -258,18 +257,18 @@ void __init init_extra_mapping_uc(unsign
+  * to the compile time generated pmds. This results in invalid pmds up
+  * to the point where we hit the physaddr 0 mapping.
+  *
+- * We limit the mappings to the region from _text to _brk_end.  _brk_end
+- * is rounded up to the 2MB boundary. This catches the invalid pmds as
++ * We limit the mappings to the region from _text to _end.  _end is
++ * rounded up to the 2MB boundary. This catches the invalid pmds as
+  * well, as they are located before _text:
+  */
+ void __init cleanup_highmap(void)
+ {
+ 	unsigned long vaddr = __START_KERNEL_map;
+-	unsigned long vaddr_end = __START_KERNEL_map + (max_pfn_mapped << PAGE_SHIFT);
+-	unsigned long end = roundup((unsigned long)_brk_end, PMD_SIZE) - 1;
++	unsigned long end = roundup((unsigned long)_end, PMD_SIZE) - 1;
+ 	pmd_t *pmd = level2_kernel_pgt;
++	pmd_t *last_pmd = pmd + PTRS_PER_PMD;
+ 
+-	for (; vaddr + PMD_SIZE - 1 < vaddr_end; pmd++, vaddr += PMD_SIZE) {
++	for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
+ 		if (pmd_none(*pmd))
+ 			continue;
+ 		if (vaddr < (unsigned long) _text || vaddr > end)

Modified: dists/squeeze/linux-2.6/debian/patches/series/34
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/34	Wed Apr 13 07:46:37 2011	(r17221)
+++ dists/squeeze/linux-2.6/debian/patches/series/34	Wed Apr 13 16:02:04 2011	(r17222)
@@ -1,2 +1,3 @@
 + bugfix/all/ALSA-usb-audio-reduce-MIDI-packet-size-to-work-aroun.patch
 + bugfix/all/ALSA-usb-audio-define-another-USB-ID-for-a-buggy-USB.patch
++ bugfix/x86/revert-x86-cleanup-highmap-after-brk-is-concluded.patch

