linux-next: manual merge of the kmemcheck tree with the x86 tree

linux-next: manual merge of the kmemcheck tree with the x86 tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/fault.c between commit
a2bcd4731f77cb77ae4b5e4a3d7f5471cf346c33 ("x86/mm: further cleanups of
fault.c's include file section") from the x86 tree and commit
787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for kmemcheck")
from the kmemcheck tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/mm/fault.c
index 5ec7ae3,3fcd79a..0000000
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -3,16 -3,41 +3,17 @@@
   *  Copyright (C) 2001, 2002 Andi Kleen, SuSE Labs.
   *  Copyright (C) 2008-2009, Red Hat Inc., Ingo Molnar
   */
 -#include <linux/interrupt.h>
 -#include <linux/mmiotrace.h>
 -#include <linux/bootmem.h>
 -#include <linux/compiler.h>
 -#include <linux/highmem.h>
 -#include <linux/kprobes.h>
 -#include <linux/uaccess.h>
 -#include <linux/vmalloc.h>
 -#include <linux/vt_kern.h>
 -#include <linux/signal.h>
 -#include <linux/kernel.h>
 -#include <linux/ptrace.h>
 -#include <linux/string.h>
 -#include <linux/module.h>
 -#include <linux/kdebug.h>
 -#include <linux/errno.h>
 -#include <linux/magic.h>
 -#include <linux/sched.h>
 -#include <linux/types.h>
 -#include <linux/init.h>
 -#include <linux/mman.h>
 -#include <linux/tty.h>
 -#include <linux/smp.h>
 -#include <linux/mm.h>
 -
 -#include <asm-generic/sections.h>
 -
 +#include <linux/magic.h>		/* STACK_END_MAGIC		*/
 +#include <linux/sched.h>		/* test_thread_flag(), ...	*/
 +#include <linux/kdebug.h>		/* oops_begin/end, ...		*/
 +#include <linux/module.h>		/* search_exception_table	*/
 +#include <linux/bootmem.h>		/* max_low_pfn			*/
 +#include <linux/kprobes.h>		/* __kprobes, ...		*/
 +#include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/
 +
 +#include <asm/traps.h>			/* dotraplinkage, ...		*/
 +#include <asm/pgalloc.h>		/* pgd_*(), ...			*/
+ #include <asm/kmemcheck.h>
 -#include <asm/tlbflush.h>
 -#include <asm/pgalloc.h>
 -#include <asm/segment.h>
 -#include <asm/system.h>
 -#include <asm/proto.h>
 -#include <asm/traps.h>
 -#include <asm/desc.h>
  
  /*
   * Page fault error code bits:

linux-next: manual merge of the kmemcheck tree with the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 726 bytes --]

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/kernel/head_32.S between commits
2bd2753ff46346543ab92e80df9d96366e21baa5 ("x86: put initial_pg_tables
into .bss") and c090f532db3ab5b7be503f8ac84b0d33a18646c6 ("x86-32: make
sure we map enough to fit linear map pagetables") from the x86 tree and
commit a7fff94fffaa0cecb923d6c1bb9b7691f608b49a ("Revert "kmemcheck: use
set_memory_4k() instead of disabling PSE"") from the kmemcheck tree.

I fixed it up (by using the version from the x86 tree - which is also
what is done in tip/master) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the kmemcheck tree with the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/init_64.c between commit
f765090a2617b8d9cb73b71e0aa850c29460d8be ("x86: move init_memory_mapping
() to common mm/init.c") from the x86 tree and
commit760932c8607b736504a134ed6feec25e90e089ac  ("kmemcheck: (finally)
use 4k pages for identity mapping") from the kmemcheck tree.

I fixed it up as in the tip/master branch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the kmemcheck tree with the x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/init_32.c between various commits from the x86 tree and
commits a7fff94fffaa0cecb923d6c1bb9b7691f608b49a ("Revert "kmemcheck: use
set_memory_4k() instead of disabling PSE"") and
760932c8607b736504a134ed6feec25e90e089ac ("kmemcheck: (finally) use 4k
pages for identity mapping") from the kmemcheck tree.

I fixed it up as in the tip/master branch (patching arch/x86/mm/init.c as
well).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the kmemcheck tree with the x86 tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/Kconfig between commit 2e9f3bddcbc711bb14d86c6f068a779bf3710247
("bzip2/lzma: make config machinery an arch configurable") from the x86
tree and commit 7df4b20d10108f0c1aa08ed3a7c0bfd9b9014562 ("kmemcheck:
make kconfig accessible for other architectures") from the kmemcheck tree.

Just simple overlapping additions.  I fixed it up (see below) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/Kconfig
index 5f50c50,467bacc..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -41,9 -40,7 +41,10 @@@ config X8
  	select HAVE_GENERIC_DMA_COHERENT if X86_32
  	select HAVE_EFFICIENT_UNALIGNED_ACCESS
  	select USER_STACKTRACE_SUPPORT
 +	select HAVE_KERNEL_GZIP
 +	select HAVE_KERNEL_BZIP2
 +	select HAVE_KERNEL_LZMA
+ 	select HAVE_ARCH_KMEMCHECK
  
  config ARCH_DEFCONFIG
  	string

Re: linux-next: manual merge of the kmemcheck tree with the x86 tree

[Ingo Molnar]

* Pekka Enberg <penberg@cs.helsinki.fi> wrote:

> Hi Stephen,
> 
> On Fri, 2009-01-23 at 15:44 +1100, Stephen Rothwell wrote:
> > Today's linux-next merge of the kmemcheck tree got a conflict in
> > arch/x86/mm/fault.c between commit do_page_fault ("x86: optimise x86's
> > do_page_fault (C entry point for the page fault path)") from the x86 tree
> > and commit 787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for
> > kmemcheck") from the kmemcheck tree.
> > 
> > I fixed it up (see below) but it is worth a check.  I can carry the fix
> > as necessary.
> 
> Looks good to me. Vegard?

it's resolved in tip/master already.

Stephen, could you please only report conflict resolutions that you do if 
they differ from the one done in tip/master? Or use tip/auto-latest that 
has all these conflict resolutions integrated into a single package.

A lot of internal conflicts between -tip originated trees get reported 
again and again as genuine conflicts - needlessly in 99% of the cases as 
i've already done the conflict resolution myself days (sometimes weeks) 
ahead of the linux-next resolution, and tested the end result in 
tip/master.

	Ingo

Re: linux-next: manual merge of the kmemcheck tree with the x86 tree

[Pekka Enberg]

Hi Stephen,

On Fri, 2009-01-23 at 15:44 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kmemcheck tree got a conflict in
> arch/x86/mm/fault.c between commit do_page_fault ("x86: optimise x86's
> do_page_fault (C entry point for the page fault path)") from the x86 tree
> and commit 787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for
> kmemcheck") from the kmemcheck tree.
> 
> I fixed it up (see below) but it is worth a check.  I can carry the fix
> as necessary.

Looks good to me. Vegard?

		Pekka

linux-next: manual merge of the kmemcheck tree with the x86 tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/fault.c between commit do_page_fault ("x86: optimise x86's
do_page_fault (C entry point for the page fault path)") from the x86 tree
and commit 787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for
kmemcheck") from the kmemcheck tree.

I fixed it up (see below) but it is worth a check.  I can carry the fix
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/x86/mm/fault.c
index d3eee74,c73afbb..0000000
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -806,7 -602,16 +807,14 @@@ void __kprobes do_page_fault(struct pt_
  	/* get the address */
  	address = read_cr2();
  
 -	si_code = SEGV_MAPERR;
 -
+ 	/*
+ 	 * Detect and handle instructions that would cause a page fault for
+ 	 * both a tracked kernel page and a userspace page.
+ 	 */
+ 	if(kmemcheck_active(regs))
+ 		kmemcheck_hide(regs);
+ 
 -	if (notify_page_fault(regs))
 +	if (unlikely(notify_page_fault(regs)))
  		return;
  	if (unlikely(kmmio_fault(regs, address)))
  		return;
@@@ -829,12 -634,16 +837,16 @@@
  #else
  	if (unlikely(address >= TASK_SIZE64)) {
  #endif
- 		if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) &&
- 		    vmalloc_fault(address) >= 0)
- 			return;
+ 		if (!(error_code & (PF_RSVD | PF_USER | PF_PROT))) {
+ 			if (vmalloc_fault(address) >= 0)
+ 				return;
+ 
+ 			if (kmemcheck_fault(regs, address, error_code))
+ 				return;
+ 		}
  
  		/* Can handle a stale RO->RW TLB */
 -		if (spurious_fault(address, error_code))
 +		if (spurious_fault(error_code, address))
  			return;
  
  		/*