5 files changed, 41 insertions, 10 deletions
diff --git a/sys/tools/gdb/README.txt b/sys/tools/gdb/README.txt
index 8c31565ddc42..ad1544912c3c 100644
--- a/sys/tools/gdb/README.txt
+++ b/sys/tools/gdb/README.txt
@@ -8,6 +8,9 @@ be automatically loaded by kgdb when opening a vmcore, so if you add new GDB
 commands or functions, that script should be updated to import them, and you
 should document them here.
 
+When improving these scripts, you can use the "kgdb-reload" command to reload
+them from /usr/lib/debug/boot/kernel/gdb/*.
+
 To provide some rudimentary testing, selftest.py tries to exercise all of the
 commands and functions defined here.  To use it, run selftest.sh to panic the
 system.  Then, create a kernel dump or attach to the panicked kernel, and invoke
@@ -15,6 +18,8 @@ the script with "python import selftest" in (k)gdb.
 
 Commands:
 acttrace	Display a backtrace for all on-CPU threads
+kgdb-reload     Reload all gdb modules, useful when developing the modules
+                themselves.
 
 Functions:
 $PCPU(<field>[, <cpuid>])	Display the value of a PCPU/DPCPU field
diff --git a/sys/tools/gdb/acttrace.py b/sys/tools/gdb/acttrace.py
index 147effbbddf1..fdd18a4833cd 100644
--- a/sys/tools/gdb/acttrace.py
+++ b/sys/tools/gdb/acttrace.py
@@ -13,10 +13,8 @@ from pcpu import *
 
 class acttrace(gdb.Command):
     """
-    Register an acttrace command with gdb.
-
-    When run, acttrace prints the stack trace of all threads that were on-CPU
-    at the time of the panic.
+    Print the stack trace of all threads that were on-CPU at the time of
+    the panic.
     """
     def __init__(self):
         super(acttrace, self).__init__("acttrace", gdb.COMMAND_USER)
diff --git a/sys/tools/gdb/pcpu.py b/sys/tools/gdb/pcpu.py
index aadc4b2d42df..94c451e6eca5 100644
--- a/sys/tools/gdb/pcpu.py
+++ b/sys/tools/gdb/pcpu.py
@@ -9,7 +9,7 @@ from freebsd import *
 
 class pcpu(gdb.Function):
     """
-    Register a function to lookup PCPU and DPCPU variables by name.
+    A function to look up PCPU and DPCPU fields by name.
 
     To look up the value of the PCPU field foo on CPU n, use
     $PCPU("foo", n).  This works for DPCPU fields too.  If the CPU ID is
diff --git a/sys/tools/gdb/vnet.py b/sys/tools/gdb/vnet.py
index 36b4d512a3eb..5f416b2a515a 100644
--- a/sys/tools/gdb/vnet.py
+++ b/sys/tools/gdb/vnet.py
@@ -10,7 +10,7 @@ from freebsd import *
 
 class vnet(gdb.Function):
     """
-    Register a function to look up VNET variables by name.
+    A function to look up VNET variables by name.
 
     To look at the value of a VNET variable V_foo, print $V("foo").  The
     currently selected thread's VNET is used by default, but can be optionally
diff --git a/sys/tools/kernel-gdb.py b/sys/tools/kernel-gdb.py
index 8a41ef6efab1..990bdaf31fda 100644
--- a/sys/tools/kernel-gdb.py
+++ b/sys/tools/kernel-gdb.py
@@ -4,12 +4,40 @@
 # SPDX-License-Identifier: BSD-2-Clause
 #
 
+import importlib
 import os
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "gdb"))
 
-# Import FreeBSD kernel debugging commands and modules below.
-import acttrace
-import pcpu
-import vnet
+modules = [
+    "acttrace",
+    "freebsd",
+    "pcpu",
+    "vnet"
+]
+
+
+def reload_modules(modules):
+    for mod in modules:
+        if mod in sys.modules:
+            importlib.reload(sys.modules[mod])
+        else:
+            importlib.import_module(mod)
+
+reload_modules(modules)
+
+
+class reload(gdb.Command):
+    """
+    Reload the FreeBSD kernel GDB helper scripts.
+    """
+    def __init__(self):
+        super(reload, self).__init__("kgdb-reload", gdb.COMMAND_USER)
+
+    def invoke(self, arg, from_tty):
+        reload_modules(modules)
+
+
+# Register the reload command with gdb.
+reload()