Commit d54ce615 authored by Sumit Garg's avatar Sumit Garg Committed by Linus Torvalds

kgdb: fix to kill breakpoints on initmem after boot

Currently breakpoints in kernel .init.text section are not handled
correctly while allowing to remove them even after corresponding pages
have been freed.

Fix it via killing .init.text section breakpoints just prior to initmem
pages being freed.

Doug: "HW breakpoints aren't handled by this patch but it's probably
not such a big deal".

Link: https://lkml.kernel.org/r/20210224081652.587785-1-sumit.garg@linaro.orgSigned-off-by: default avatarSumit Garg <sumit.garg@linaro.org>
Suggested-by: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Tested-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent db7fbf49
...@@ -359,9 +359,11 @@ extern atomic_t kgdb_active; ...@@ -359,9 +359,11 @@ extern atomic_t kgdb_active;
extern bool dbg_is_early; extern bool dbg_is_early;
extern void __init dbg_late_init(void); extern void __init dbg_late_init(void);
extern void kgdb_panic(const char *msg); extern void kgdb_panic(const char *msg);
extern void kgdb_free_init_mem(void);
#else /* ! CONFIG_KGDB */ #else /* ! CONFIG_KGDB */
#define in_dbg_master() (0) #define in_dbg_master() (0)
#define dbg_late_init() #define dbg_late_init()
static inline void kgdb_panic(const char *msg) {} static inline void kgdb_panic(const char *msg) {}
static inline void kgdb_free_init_mem(void) { }
#endif /* ! CONFIG_KGDB */ #endif /* ! CONFIG_KGDB */
#endif /* _KGDB_H_ */ #endif /* _KGDB_H_ */
...@@ -1426,6 +1426,7 @@ static int __ref kernel_init(void *unused) ...@@ -1426,6 +1426,7 @@ static int __ref kernel_init(void *unused)
async_synchronize_full(); async_synchronize_full();
kprobe_free_init_mem(); kprobe_free_init_mem();
ftrace_free_init_mem(); ftrace_free_init_mem();
kgdb_free_init_mem();
free_initmem(); free_initmem();
mark_readonly(); mark_readonly();
......
...@@ -455,6 +455,17 @@ int dbg_remove_all_break(void) ...@@ -455,6 +455,17 @@ int dbg_remove_all_break(void)
return 0; return 0;
} }
void kgdb_free_init_mem(void)
{
int i;
/* Clear init memory breakpoints. */
for (i = 0; i < KGDB_MAX_BREAKPOINTS; i++) {
if (init_section_contains((void *)kgdb_break[i].bpt_addr, 0))
kgdb_break[i].state = BP_UNDEFINED;
}
}
#ifdef CONFIG_KGDB_KDB #ifdef CONFIG_KGDB_KDB
void kdb_dump_stack_on_cpu(int cpu) void kdb_dump_stack_on_cpu(int cpu)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment