kmemcheck updates for tip/kmemcheck
Ingo,
Here follows a small update to the REP instruction handling and removal of some obsolete code (if you worry that this is useful code, git will save it for us and it can be revived if needed. I believe that the code is simply a burden as it is today).
I couldn't figure out how to merge v2.6.27-rc5 without littering the pull request with all the commits that were made in Linus's repository since v2.6.27-rc3, but feel free to do it yourself. There should be no conflicts.
You may also delete the tip/kmemcheck-dma branch as this has now been integrated since the last pull you did.
The following changes since commit db4b0f1e8ae7c9ffde8bef2eb3dcd4fad5988ac1:
Vegard Nossum (1):
kmemcheck: implement REP MOVS/STOS emulation
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck.git for-tip
Vegard Nossum (3):
kmemcheck: hide/show pages in each iteration of a REP instruction
kmemcheck: rip out the optimized memset()
kmemcheck: rip out SMP code
arch/x86/Kconfig.debug | 22 -------- arch/x86/mm/kmemcheck/Makefile | 4 +- arch/x86/mm/kmemcheck/kmemcheck.c | 27 ++-------- arch/x86/mm/kmemcheck/shadow.c | 2 +- arch/x86/mm/kmemcheck/smp.c | 80 ------------------------------ arch/x86/mm/kmemcheck/smp.h | 23 --------- arch/x86/mm/kmemcheck/string.c | 99 ------------------------------------- include/asm-x86/string_32.h | 8 --- include/asm-x86/string_64.h | 1 - 9 files changed, 7 insertions(+), 259 deletions(-) delete mode 100644 arch/x86/mm/kmemcheck/smp.c delete mode 100644 arch/x86/mm/kmemcheck/smp.h delete mode 100644 arch/x86/mm/kmemcheck/string.c
Thanks,
Vegard
Quoted 6 lines · Vegard Nossum
Ingo,
Here follows a small update to the REP instruction handling and removal of some obsolete code (if you worry that this is useful code, git will save it for us and it can be revived if needed. I believe that the code is simply a burden as it is today).
pulled into tip/kmemcheck, thanks Vegard!
Quoted 4 lines
I couldn't figure out how to merge v2.6.27-rc5 without littering the pull request with all the commits that were made in Linus's repository since v2.6.27-rc3, but feel free to do it yourself. There should be no conflicts.
yeah, merges should generally be done in the upstream repo. Obviously git-request-pull must list all the commits that happened - it doesnt know which commits are 'interesting' or not. I've done an upstream merge.
btw., a small build fix (see below) was needed.
Ingo
---------------->
Quoted 1 line
From
92a9abb2c571ab8fedaee3537c5667b4e61188ceMon Sep 17 00:00:00 2001
From: Ingo Molnar <[email protected]>
Date: Mon, 8 Sep 2008 16:50:43 +0200
Subject: [PATCH] kmemcheck: build fix
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
fix:
arch/x86/mm/kmemcheck/kmemcheck.c: In function ‘kmemcheck_init’:
arch/x86/mm/kmemcheck/kmemcheck.c:42: error: ‘setup_max_cpus’ undeclared (first use in this function) arch/x86/mm/kmemcheck/kmemcheck.c:42: error: (Each undeclared identifier is reported only once arch/x86/mm/kmemcheck/kmemcheck.c:42: error: for each function it appears in.)
--- arch/x86/mm/kmemcheck/kmemcheck.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/mm/kmemcheck/kmemcheck.c +2 -0
@@ -35,6 +35,7 @@ void __init kmemcheck_init(void) {printk (KERN_INFO "kmemcheck: \"Bugs, beware!\"\n" ); +#if defined(CONFIG_SMP ) && !defined(CONFIG_KMEMCHECK_USE_SMP )/* * Limit SMP to use a single CPU. We rely on the fact that this code * runs before SMP is set up.
@@ -44,6 +45,7 @@ void __init kmemcheck_init(void) "kmemcheck: Limiting number of CPUs to 1.\n"); setup_max_cpus = 1; } +#endif }#ifdef CONFIG_KMEMCHECK_DISABLED_BY_DEFAULT
Quoted 6 lines · Ingo Molnar
yeah, merges should generally be done in the upstream repo. Obviously git-request-pull must list all the commits that happened - it doesnt know which commits are 'interesting' or not. I've done an upstream merge.
btw., a small build fix (see below) was needed.
Oops. I was being enthusiastic and removed too much.
Quoted 27 lines
---------------->
From92a9abb2c571ab8fedaee3537c5667b4e61188ceMon Sep 17 00:00:00 2001
From: Ingo Molnar <[email protected]>
Date: Mon, 8 Sep 2008 16:50:43 +0200
Subject: [PATCH] kmemcheck: build fix
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bitfix:
arch/x86/mm/kmemcheck/kmemcheck.c: In function 'kmemcheck_init':
arch/x86/mm/kmemcheck/kmemcheck.c:42: error: 'setup_max_cpus' undeclared (first use in this function)arch/x86/mm/kmemcheck/kmemcheck.c:42: error: (Each undeclared identifier is reported only oncearch/x86/mm/kmemcheck/kmemcheck.c:42: error: for each function it appears in.)Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/mm/kmemcheck/kmemcheck.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)arch/x86/mm/kmemcheck/kmemcheck.c +0
-0
arch/x86/mm/kmemcheck/kmemcheck.c void __init kmemcheck_init(void) · line 38
Quoted 4 lines
arch/x86/mm/kmemcheck/kmemcheck.c +1
-0@@ -35,6 +35,7 @@ void __init kmemcheck_init(void) {printk (KERN_INFO "kmemcheck: \"Bugs, beware!\"\n" ); +#if defined(CONFIG_SMP ) && !defined(CONFIG_KMEMCHECK_USE_SMP )
Should really be just:
+#if defined(CONFIG_SMP)
Can you amend?
Thanks a lot,
Vegard
Signature · 4 lines
"The animistic metaphor of the bug that maliciously sneaked in while the programmer was not looking is intellectually dishonest as it disguises that the error is the programmer's own creation." -- E. W. Dijkstra, EWD1036
Quoted 8 lines · Vegard Nossum
Quoted 1 line · Ingo Molnar
+#if
defined(CONFIG_SMP)&& !defined(CONFIG_KMEMCHECK_USE_SMP)Should really be just:
+#if
defined(CONFIG_SMP)Can you amend?
Er, also written like:
+#ifdef CONFIG_SMP
Bonk.
Vegard
Signature · 4 lines
"The animistic metaphor of the bug that maliciously sneaked in while the programmer was not looking is intellectually dishonest as it disguises that the error is the programmer's own creation." -- E. W. Dijkstra, EWD1036
Quoted 8 lines · Vegard Nossum
Quoted 7 lines · Vegard Nossum
Quoted 1 line · Ingo Molnar
+#if
defined(CONFIG_SMP)&& !defined(CONFIG_KMEMCHECK_USE_SMP)Should really be just:
+#if
defined(CONFIG_SMP)
Quoted 7 lines
Quoted 1 line
Can you amend?
Er, also written like:
+#ifdef
CONFIG_SMPBonk.
thx, fixed it.
Ingo