Skip to contentSkip to conversation

kdb: Make memory allocations more robust

PATCH Superseded Sumit Garg 2 participants 2 messages Jan 22, 2021 KGDB / KDB /debug_core

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Sumit Garg

author
#0 lore raw

PATCH v2 1/1 kdb: Make memory allocations more robust

Currently kdb uses in_interrupt() to determine whether it's library code has been called from the kgdb trap handler or from a saner calling context such as driver init. This approach is broken because in_interrupt() alone isn't able to determine kgdb trap handler entry via normal task context such as [1].

We can improve this by adding check for in_dbg_master() instead which explicitly determines if we are running in debugger context.

[1] $ echo g > /proc/sysrq-trigger

---

Changes in v2:
- Get rid of redundant in_atomic() check.

 kernel/debug/kdb/kdb_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/debug/kdb/kdb_private.h +1 -1
index 7a4a181..344eb0d 100644
@@ -231,7 +231,7 @@ extern struct task_struct *kdb_curr_task(int);
 
 #define kdb_task_has_cpu(p) (task_curr(p))
 
-#define GFP_KDB (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)
+#define GFP_KDB (in_dbg_master() ? GFP_ATOMIC : GFP_KERNEL)
 
 extern void *debug_kmalloc(size_t size, gfp_t flags);
 extern void debug_kfree(void *);
Signature · 1 line
2.7.4
#1 lore raw
Quoted 1 line · Sumit Garg

Currently kdb uses in_interrupt() to determine whether it's library

Looks like a good change just a few nitpicks with the description:

s/it's/its/

Quoted 4 lines

code has been called from the kgdb trap handler or from a saner calling context such as driver init. This approach is broken because in_interrupt() alone isn't able to determine kgdb trap handler entry via normal task context such as [1].

Why footnote this and aren't breakpoints a far more natural reason to enter the debugger?

The following will be clearer for backporting, etc:

... detmermine kgdb trap handler entry from normal task context. This can happen during normal use of basic features such as breakpoints and can also be trivially reproduced using: echo g > /proc/sysrq-trigger

Quoted 6 lines

We can improve this by adding check for in_dbg_master() instead which explicitly determines if we are running in debugger context.

[1] $ echo g > /proc/sysrq-trigger

Cc stable@ ?
Quoted 1 line

Daniel.

Quoted 24 lines

---

Changes in v2:
- Get rid of redundant in_atomic() check.

 kernel/debug/kdb/kdb_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/debug/kdb/kdb_private.h +1 -1
index 7a4a181..344eb0d 100644
@@ -231,7 +231,7 @@ extern struct task_struct *kdb_curr_task(int);
 
 #define kdb_task_has_cpu(p) (task_curr(p))
 
-#define GFP_KDB (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL)
+#define GFP_KDB (in_dbg_master() ? GFP_ATOMIC : GFP_KERNEL)
 
 extern void *debug_kmalloc(size_t size, gfp_t flags);
 extern void debug_kfree(void *);
Signature · 1 line
2.7.4