Page MenuHomeFreeBSD
Files F131932221

D33817.diff
No OneTemporary
Actions

D33817.diff
View Options

diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -161,6 +161,8 @@
..
hyperv
..
+ kgdb
+ ..
lpr
ru
..
diff --git a/libexec/Makefile b/libexec/Makefile
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
.include <bsd.compat.pre.mk>
@@ -11,6 +10,7 @@
flua \
getty \
${_hyperv} \
+ kgdb \
${_mail.local} \
${_makewhatis.local} \
${_mknetid} \
diff --git a/libexec/kgdb/Makefile b/libexec/kgdb/Makefile
new file mode 100644
--- /dev/null
+++ b/libexec/kgdb/Makefile
@@ -0,0 +1,5 @@
+FILESDIR?= /usr/libexec/kgdb
+
+FILES= acttrace.py
+
+.include <bsd.prog.mk>
diff --git a/libexec/kgdb/acttrace.py b/libexec/kgdb/acttrace.py
new file mode 100644
--- /dev/null
+++ b/libexec/kgdb/acttrace.py
@@ -0,0 +1,63 @@
+#-
+# Copyright (c) 2022 The FreeBSD Foundation
+#
+# This software was developed by Mark Johnston under sponsorship from the
+# FreeBSD Foundation.
+#
+
+import gdb
+
+
+def symval(name):
+ return gdb.lookup_global_symbol(name).value()
+
+
+def tid_to_gdb_thread(tid):
+ for thread in gdb.inferiors()[0].threads():
+ if thread.ptid[2] == tid:
+ return thread
+ else:
+ return None
+
+
+def all_pcpus():
+ mp_maxid = symval("mp_maxid")
+ cpuid_to_pcpu = symval("cpuid_to_pcpu")
+
+ cpu = 0
+ while cpu <= mp_maxid:
+ pcpu = cpuid_to_pcpu[cpu]
+ if pcpu:
+ yield pcpu
+ cpu = cpu + 1
+
+
+class acttrace(gdb.Command):
+ def __init__(self):
+ super(acttrace, self).__init__("acttrace", gdb.COMMAND_USER)
+
+ def invoke(self, arg, from_tty):
+ # Save the current thread so that we can switch back after.
+ curthread = gdb.selected_thread()
+
+ for pcpu in all_pcpus():
+ td = pcpu['pc_curthread']
+ tid = td['td_tid']
+
+ gdb_thread = tid_to_gdb_thread(tid)
+ if gdb_thread is None:
+ print("failed to find GDB thread with TID {}".format(tid))
+ else:
+ gdb_thread.switch()
+
+ p = td['td_proc']
+ print("Tracing command {} pid {} tid {} (CPU {})".format(
+ p['p_comm'], p['p_pid'], td['td_tid'], pcpu['pc_cpuid']))
+ gdb.execute("bt")
+ print()
+
+ curthread.switch()
+
+
+# Registers the command with gdb, doesn't do anything.
+acttrace()
diff --git a/usr.sbin/crashinfo/crashinfo.sh b/usr.sbin/crashinfo/crashinfo.sh
--- a/usr.sbin/crashinfo/crashinfo.sh
+++ b/usr.sbin/crashinfo/crashinfo.sh
@@ -215,13 +215,15 @@
sed -ne '/^ Panic String: /{s//panic: /;p;}' $INFO
echo
-# XXX: /bin/sh on 7.0+ is broken so we can't simply pipe the commands to
-# kgdb via stdin and have to use a temporary file instead.
file=`mktemp /tmp/crashinfo.XXXXXX`
if [ $? -eq 0 ]; then
+ scriptdir=/usr/libexec/kgdb
+
echo "bt -full" >> $file
+ echo "source ${scriptdir}/acttrace.py" >> $file
+ echo "acttrace" >> $file
echo "quit" >> $file
- ${GDB%gdb}kgdb $KERNEL $VMCORE < $file
+ ${GDB%gdb}kgdb -q $KERNEL $VMCORE < $file
rm -f $file
echo
fi

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 13, 7:38 AM (13 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23664697
Default Alt Text
D33817.diff (3 KB)

Event Timeline