From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: core/mm] mm/highmem: Provide and use CONFIG_DEBUG_KMAP_LOCAL
Date: Tue, 24 Nov 2020 14:20:55 -0000 [thread overview]
Message-ID: <160622765587.11115.373556851099869437.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201118204006.869487226@linutronix.de>
The following commit has been merged into the core/mm branch of tip:
Commit-ID: 6e799cb69a70eedbb41561b750f7180c12cff280
Gitweb: https://git.kernel.org/tip/6e799cb69a70eedbb41561b750f7180c12cff280
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 18 Nov 2020 20:48:39 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 24 Nov 2020 14:42:08 +01:00
mm/highmem: Provide and use CONFIG_DEBUG_KMAP_LOCAL
CONFIG_KMAP_LOCAL can be enabled by x86/32bit even if CONFIG_HIGHMEM is not
enabled for temporary MMIO space mappings.
Provide it as a seperate config option which depends on CONFIG_KMAP_LOCAL
and let CONFIG_DEBUG_HIGHMEM select it.
This won't increase the debug coverage of this significantly but it paves
the way to do so.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20201118204006.869487226@linutronix.de
---
include/asm-generic/kmap_size.h | 2 +-
lib/Kconfig.debug | 8 ++++++++
mm/highmem.c | 4 ++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/asm-generic/kmap_size.h b/include/asm-generic/kmap_size.h
index 9d6c778..6e36b24 100644
--- a/include/asm-generic/kmap_size.h
+++ b/include/asm-generic/kmap_size.h
@@ -3,7 +3,7 @@
#define _ASM_GENERIC_KMAP_SIZE_H
/* For debug this provides guard pages between the maps */
-#ifdef CONFIG_DEBUG_HIGHMEM
+#ifdef CONFIG_DEBUG_KMAP_LOCAL
# define KM_MAX_IDX 33
#else
# define KM_MAX_IDX 16
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c789b39..f24fa15 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -849,9 +849,17 @@ config DEBUG_PER_CPU_MAPS
Say N if unsure.
+config DEBUG_KMAP_LOCAL
+ bool "Debug kmap_local temporary mappings"
+ depends on DEBUG_KERNEL && KMAP_LOCAL
+ help
+ This option enables additional error checking for the kmap_local
+ infrastructure. Disable for production use.
+
config DEBUG_HIGHMEM
bool "Highmem debugging"
depends on DEBUG_KERNEL && HIGHMEM
+ select DEBUG_KMAP_LOCAL
help
This option enables additional error checking for high memory
systems. Disable for production systems.
diff --git a/mm/highmem.c b/mm/highmem.c
index 78c481a..fab128d 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -368,10 +368,10 @@ EXPORT_SYMBOL(kunmap_high);
static DEFINE_PER_CPU(int, __kmap_local_idx);
/*
- * With DEBUG_HIGHMEM the stack depth is doubled and every second
+ * With DEBUG_KMAP_LOCAL the stack depth is doubled and every second
* slot is unused which acts as a guard page
*/
-#ifdef CONFIG_DEBUG_HIGHMEM
+#ifdef CONFIG_DEBUG_KMAP_LOCAL
# define KM_INCR 2
#else
# define KM_INCR 1
next prev parent reply other threads:[~2020-11-24 14:21 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 19:48 [patch V4 0/8] mm/highmem: Preemptible variant of kmap_atomic & friends Thomas Gleixner
2020-11-18 19:48 ` [patch V4 1/8] mm/highmem: Provide and use CONFIG_DEBUG_KMAP_LOCAL Thomas Gleixner
2020-11-24 14:20 ` tip-bot2 for Thomas Gleixner [this message]
2020-11-18 19:48 ` [patch V4 2/8] mm/highmem: Provide CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP Thomas Gleixner
2020-11-18 21:13 ` Linus Torvalds
2020-11-19 8:46 ` Mel Gorman
2020-11-19 17:19 ` Linus Torvalds
2020-11-24 14:20 ` [tip: core/mm] " tip-bot2 for Thomas Gleixner
2020-11-18 19:48 ` [patch V4 3/8] x86: Support kmap_local() forced debugging Thomas Gleixner
2020-11-24 14:20 ` [tip: core/mm] " tip-bot2 for Thomas Gleixner
2021-01-06 23:01 ` [BUG] from " Steven Rostedt
2021-01-07 1:03 ` Linus Torvalds
2021-01-07 1:16 ` Steven Rostedt
2021-01-07 1:49 ` Steven Rostedt
2021-01-07 1:49 ` Jakub Kicinski
2021-01-07 2:11 ` Willem de Bruijn
2021-01-07 4:44 ` Willem de Bruijn
2021-01-07 19:47 ` Linus Torvalds
2021-01-07 20:52 ` Steven Rostedt
2021-01-07 21:07 ` Willem de Bruijn
2020-11-18 19:48 ` [patch V4 4/8] sched: Make migrate_disable/enable() independent of RT Thomas Gleixner
2020-11-19 9:38 ` Mel Gorman
2020-11-19 11:14 ` Peter Zijlstra
2020-11-19 12:14 ` Mel Gorman
2020-11-19 14:17 ` Steven Rostedt
2020-11-19 17:23 ` Linus Torvalds
2020-11-19 18:28 ` Peter Zijlstra
2020-11-20 1:33 ` Thomas Gleixner
2020-11-20 9:29 ` Peter Zijlstra
2020-11-22 23:16 ` Andy Lutomirski
2020-11-23 21:15 ` Thomas Gleixner
2020-11-23 21:25 ` Thomas Gleixner
2020-11-23 22:07 ` Andy Lutomirski
2020-11-23 23:10 ` Thomas Gleixner
2020-11-24 10:29 ` [tip: sched/core] " tip-bot2 for Thomas Gleixner
2020-11-18 19:48 ` [patch V4 5/8] sched: highmem: Store local kmaps in task struct Thomas Gleixner
2020-11-19 11:33 ` Peter Zijlstra
2020-11-19 11:51 ` Peter Zijlstra
2020-11-19 12:12 ` Peter Zijlstra
2020-11-19 14:11 ` Thomas Gleixner
2020-11-24 14:20 ` [tip: core/mm] " tip-bot2 for Thomas Gleixner
2020-11-18 19:48 ` [patch V4 6/8] mm/highmem: Provide kmap_local* Thomas Gleixner
2020-11-24 14:20 ` [tip: core/mm] " tip-bot2 for Thomas Gleixner
2020-11-18 19:48 ` [patch V4 7/8] io-mapping: Provide iomap_local variant Thomas Gleixner
2020-11-24 14:20 ` [tip: core/mm] " tip-bot2 for Thomas Gleixner
2020-11-18 19:48 ` [patch V4 8/8] x86/crashdump/32: Simplify copy_oldmem_page() Thomas Gleixner
2020-11-24 14:20 ` [tip: core/mm] " tip-bot2 for Thomas Gleixner
2020-11-24 8:03 ` [patch V4 0/8] mm/highmem: Preemptible variant of kmap_atomic & friends Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160622765587.11115.373556851099869437.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).