[PATCH 0/2] watchdog: pretimeout: Allow building dump governor as module

[PATCH 0/2] watchdog: pretimeout: Allow building dump governor as module

[Mayank Rungta via B4 Relay]

All other watchdog pretimeout governors (noop, panic) can be built as
loadable modules. However the "dump" pretimeout governor is restricted
to built-in code because it calls trigger_all_cpu_backtrace(), which
relies on arch_trigger_cpumask_backtrace(), an arch specific helper that
is not exported to loadable modules.

This 2-patch series allows building the dump governor as a module (=m):
1) Export cpumask_backtrace() in lib/nmi_backtrace.c.
2) Convert CONFIG_WATCHDOG_PRETIMEOUT_GOV_DUMP from bool to tristate.

Signed-off-by: Mayank Rungta <mrungta@google.com>
---
Mayank Rungta (2):
      nmi: Export CPU backtrace APIs for loadable modules
      watchdog: pretimeout: Convert dump pretimeout governor to tristate

 drivers/watchdog/Kconfig |  4 ++--
 include/linux/nmi.h      | 10 ++++++----
 lib/nmi_backtrace.c      |  7 +++++++
 3 files changed, 15 insertions(+), 6 deletions(-)
---
base-commit: 3fe08b9796f36ef437ab9328e7dd1e5ff2d66603
change-id: 20260728-export-cpu-backtrace-apis-136d3b819377

Best regards,
-- 
Mayank Rungta <mrungta@google.com>

[PATCH 1/2] nmi: Export CPU backtrace APIs for loadable modules

[Mayank Rungta via B4 Relay]

From: Mayank Rungta <mrungta@google.com>

Currently, CPU backtrace functions cannot be called from loadable
modules because the underlying helper arch_trigger_cpumask_backtrace()
is not exported.

Instead of exporting arch_trigger_cpumask_backtrace() individually
across every supported architecture, introduce and export a common
helper, cpumask_backtrace(), in lib/nmi_backtrace.c. Update the four
inline CPU backtrace macros in include/linux/nmi.h to route through this
centralized helper.

Signed-off-by: Mayank Rungta <mrungta@google.com>
---
 include/linux/nmi.h | 10 ++++++----
 lib/nmi_backtrace.c |  7 +++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 89c5465e2524..af69712df5f4 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -157,27 +157,29 @@ static inline void touch_nmi_watchdog(void)
  * to allow calling code to fall back to some other mechanism:
  */
 #ifdef arch_trigger_cpumask_backtrace
+void cpumask_backtrace(const cpumask_t *mask, int exclude_cpu);
+
 static inline bool trigger_all_cpu_backtrace(void)
 {
-	arch_trigger_cpumask_backtrace(cpu_online_mask, -1);
+	cpumask_backtrace(cpu_online_mask, -1);
 	return true;
 }
 
 static inline bool trigger_allbutcpu_cpu_backtrace(int exclude_cpu)
 {
-	arch_trigger_cpumask_backtrace(cpu_online_mask, exclude_cpu);
+	cpumask_backtrace(cpu_online_mask, exclude_cpu);
 	return true;
 }
 
 static inline bool trigger_cpumask_backtrace(struct cpumask *mask)
 {
-	arch_trigger_cpumask_backtrace(mask, -1);
+	cpumask_backtrace(mask, -1);
 	return true;
 }
 
 static inline bool trigger_single_cpu_backtrace(int cpu)
 {
-	arch_trigger_cpumask_backtrace(cpumask_of(cpu), -1);
+	cpumask_backtrace(cpumask_of(cpu), -1);
 	return true;
 }
 
diff --git a/lib/nmi_backtrace.c b/lib/nmi_backtrace.c
index a3bfa9360b23..f39c9eca8888 100644
--- a/lib/nmi_backtrace.c
+++ b/lib/nmi_backtrace.c
@@ -19,6 +19,7 @@
 #include <linux/stringify.h>
 #include <linux/nmi.h>
 #include <linux/cpu.h>
+#include <linux/export.h>
 #include <linux/sched/debug.h>
 
 #ifdef arch_trigger_cpumask_backtrace
@@ -129,4 +130,10 @@ bool nmi_cpu_backtrace(struct pt_regs *regs)
 	return false;
 }
 NOKPROBE_SYMBOL(nmi_cpu_backtrace);
+
+void cpumask_backtrace(const cpumask_t *mask, int exclude_cpu)
+{
+	arch_trigger_cpumask_backtrace(mask, exclude_cpu);
+}
+EXPORT_SYMBOL_GPL(cpumask_backtrace);
 #endif

-- 
2.55.0.508.g3f0d502094-goog

[PATCH 2/2] watchdog: pretimeout: Convert dump pretimeout governor to tristate

[Mayank Rungta via B4 Relay]

From: Mayank Rungta <mrungta@google.com>

Commit 645ad41da8b2 ("watchdog: pretimeout: Add "dump" pretimeout
governor") added the "dump" watchdog pretimeout governor, but restricted
it to built-in code because trigger_all_cpu_backtrace() was not exported
to loadable modules.

Now that CPU backtrace APIs are supported for loadable kernel modules
via cpumask_backtrace(), convert WATCHDOG_PRETIMEOUT_GOV_DUMP to
tristate. This allows kernels to deliver the pretimeout governor as a
loadable kernel module.

Signed-off-by: Mayank Rungta <mrungta@google.com>
---
 drivers/watchdog/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9f013d774897..922741dd837c 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -99,8 +99,8 @@ config WATCHDOG_PRETIMEOUT_GOV_SEL
 if WATCHDOG_PRETIMEOUT_GOV
 
 config WATCHDOG_PRETIMEOUT_GOV_DUMP
-	bool "Dump watchdog pretimeout governor"
-	depends on WATCHDOG_CORE=y
+	tristate "Dump watchdog pretimeout governor"
+	depends on WATCHDOG_CORE
 	default WATCHDOG_CORE
 	help
 	  Dump watchdog pretimeout governor, all cpu backtrace is

-- 
2.55.0.508.g3f0d502094-goog

Re: [PATCH 0/2] watchdog: pretimeout: Allow building dump governor as module

[Andrew Morton]

On Thu, 30 Jul 2026 15:00:20 -0700 Mayank Rungta via B4 Relay <devnull+mrungta.google.com@kernel.org> wrote:

> All other watchdog pretimeout governors (noop, panic) can be built as
> loadable modules. However the "dump" pretimeout governor is restricted
> to built-in code because it calls trigger_all_cpu_backtrace(), which
> relies on arch_trigger_cpumask_backtrace(), an arch specific helper that
> is not exported to loadable modules.
> 
> This 2-patch series allows building the dump governor as a module (=m):
> 1) Export cpumask_backtrace() in lib/nmi_backtrace.c.
> 2) Convert CONFIG_WATCHDOG_PRETIMEOUT_GOV_DUMP from bool to tristate.

LGTM.  Can you please redo against current mainline?  The Kconfig has
changed.

Re: [PATCH 0/2] watchdog: pretimeout: Allow building dump governor as module

[Mayank Rungta]

On Thu, Jul 30, 2026 at 3:50 PM Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Thu, 30 Jul 2026 15:00:20 -0700 Mayank Rungta via B4 Relay <devnull+mrungta.google.com@kernel.org> wrote:
>
> > All other watchdog pretimeout governors (noop, panic) can be built as
> > loadable modules. However the "dump" pretimeout governor is restricted
> > to built-in code because it calls trigger_all_cpu_backtrace(), which
> > relies on arch_trigger_cpumask_backtrace(), an arch specific helper that
> > is not exported to loadable modules.
> >
> > This 2-patch series allows building the dump governor as a module (=m):
> > 1) Export cpumask_backtrace() in lib/nmi_backtrace.c.
> > 2) Convert CONFIG_WATCHDOG_PRETIMEOUT_GOV_DUMP from bool to tristate.
>
> LGTM.  Can you please redo against current mainline?  The Kconfig has
> changed.
>

Thanks for the LGTM!

Regarding rebasing onto mainline (origin/master): The "dump"
pretimeout governor was added recently by Tzung-Bi Shih ("watchdog:
pretimeout: Add "dump" pretimeout governor") and is currently in
linux-next, so it hasn't landed in mainline tree yet.

Because of this dependency, I based this series on linux-next so that
patch 2/2 ("Convert dump pretimeout governor to tristate") could apply
cleanly on top of the new governor.

Please let me know what is preferred, or if you'd like me to post
against a different tree!

Thanks,
Mayank

Re: [PATCH 1/2] nmi: Export CPU backtrace APIs for loadable modules

[Doug Anderson]

Hi,

On Thu, Jul 30, 2026 at 3:00 PM Mayank Rungta via B4 Relay
<devnull+mrungta.google.com@kernel.org> wrote:
>
> From: Mayank Rungta <mrungta@google.com>
>
> Currently, CPU backtrace functions cannot be called from loadable
> modules because the underlying helper arch_trigger_cpumask_backtrace()
> is not exported.
>
> Instead of exporting arch_trigger_cpumask_backtrace() individually
> across every supported architecture, introduce and export a common
> helper, cpumask_backtrace(), in lib/nmi_backtrace.c. Update the four
> inline CPU backtrace macros in include/linux/nmi.h to route through this
> centralized helper.
>
> Signed-off-by: Mayank Rungta <mrungta@google.com>
> ---
>  include/linux/nmi.h | 10 ++++++----
>  lib/nmi_backtrace.c |  7 +++++++
>  2 files changed, 13 insertions(+), 4 deletions(-)

Reviewed-by: Douglas Anderson <dianders@chromium.org>

Re: [PATCH 2/2] watchdog: pretimeout: Convert dump pretimeout governor to tristate

[Doug Anderson]

Hi,

On Thu, Jul 30, 2026 at 3:00 PM Mayank Rungta via B4 Relay
<devnull+mrungta.google.com@kernel.org> wrote:
>
> From: Mayank Rungta <mrungta@google.com>
>
> Commit 645ad41da8b2 ("watchdog: pretimeout: Add "dump" pretimeout
> governor") added the "dump" watchdog pretimeout governor, but restricted
> it to built-in code because trigger_all_cpu_backtrace() was not exported
> to loadable modules.
>
> Now that CPU backtrace APIs are supported for loadable kernel modules
> via cpumask_backtrace(), convert WATCHDOG_PRETIMEOUT_GOV_DUMP to
> tristate. This allows kernels to deliver the pretimeout governor as a
> loadable kernel module.
>
> Signed-off-by: Mayank Rungta <mrungta@google.com>
> ---
>  drivers/watchdog/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Douglas Anderson <dianders@chromium.org>

Re: [PATCH 0/2] watchdog: pretimeout: Allow building dump governor as module

[Andrew Morton]

On Thu, 30 Jul 2026 16:39:14 -0700 Mayank Rungta <mrungta@google.com> wrote:

> On Thu, Jul 30, 2026 at 3:50 PM Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Thu, 30 Jul 2026 15:00:20 -0700 Mayank Rungta via B4 Relay <devnull+mrungta.google.com@kernel.org> wrote:
> >
> > > All other watchdog pretimeout governors (noop, panic) can be built as
> > > loadable modules. However the "dump" pretimeout governor is restricted
> > > to built-in code because it calls trigger_all_cpu_backtrace(), which
> > > relies on arch_trigger_cpumask_backtrace(), an arch specific helper that
> > > is not exported to loadable modules.
> > >
> > > This 2-patch series allows building the dump governor as a module (=m):
> > > 1) Export cpumask_backtrace() in lib/nmi_backtrace.c.
> > > 2) Convert CONFIG_WATCHDOG_PRETIMEOUT_GOV_DUMP from bool to tristate.
> >
> > LGTM.  Can you please redo against current mainline?  The Kconfig has
> > changed.
> >
> 
> Thanks for the LGTM!
> 
> Regarding rebasing onto mainline (origin/master): The "dump"
> pretimeout governor was added recently by Tzung-Bi Shih ("watchdog:
> pretimeout: Add "dump" pretimeout governor") and is currently in
> linux-next, so it hasn't landed in mainline tree yet.
> 
> Because of this dependency, I based this series on linux-next so that
> patch 2/2 ("Convert dump pretimeout governor to tristate") could apply
> cleanly on top of the new governor.
> 
> Please let me know what is preferred, or if you'd like me to post
> against a different tree!
> 

Oh, OK.

Guenter, can you please process this patchset?

Re: [PATCH 0/2] watchdog: pretimeout: Allow building dump governor as module

[Guenter Roeck]

On 7/31/26 14:01, Andrew Morton wrote:
> On Thu, 30 Jul 2026 16:39:14 -0700 Mayank Rungta <mrungta@google.com> wrote:
> 
>> On Thu, Jul 30, 2026 at 3:50 PM Andrew Morton <akpm@linux-foundation.org> wrote:
>>>
>>> On Thu, 30 Jul 2026 15:00:20 -0700 Mayank Rungta via B4 Relay <devnull+mrungta.google.com@kernel.org> wrote:
>>>
>>>> All other watchdog pretimeout governors (noop, panic) can be built as
>>>> loadable modules. However the "dump" pretimeout governor is restricted
>>>> to built-in code because it calls trigger_all_cpu_backtrace(), which
>>>> relies on arch_trigger_cpumask_backtrace(), an arch specific helper that
>>>> is not exported to loadable modules.
>>>>
>>>> This 2-patch series allows building the dump governor as a module (=m):
>>>> 1) Export cpumask_backtrace() in lib/nmi_backtrace.c.
>>>> 2) Convert CONFIG_WATCHDOG_PRETIMEOUT_GOV_DUMP from bool to tristate.
>>>
>>> LGTM.  Can you please redo against current mainline?  The Kconfig has
>>> changed.
>>>
>>
>> Thanks for the LGTM!
>>
>> Regarding rebasing onto mainline (origin/master): The "dump"
>> pretimeout governor was added recently by Tzung-Bi Shih ("watchdog:
>> pretimeout: Add "dump" pretimeout governor") and is currently in
>> linux-next, so it hasn't landed in mainline tree yet.
>>
>> Because of this dependency, I based this series on linux-next so that
>> patch 2/2 ("Convert dump pretimeout governor to tristate") could apply
>> cleanly on top of the new governor.
>>
>> Please let me know what is preferred, or if you'd like me to post
>> against a different tree!
>>
> 
> Oh, OK.
> 
> Guenter, can you please process this patchset?
> 

Sure. Assuming you'd like me to handle it through the watchdog branch,
it would be great if you can send a formal Acked-by: to the first patch
of the series.

Thanks,
Guenter

Re: [PATCH 2/2] watchdog: pretimeout: Convert dump pretimeout governor to tristate

[Tzung-Bi Shih]

On Thu, Jul 30, 2026 at 03:00:22PM -0700, Mayank Rungta via B4 Relay wrote:
> From: Mayank Rungta <mrungta@google.com>
> 
> Commit 645ad41da8b2 ("watchdog: pretimeout: Add "dump" pretimeout

FWIW: The hash might have changed due to a rebase.

> governor") added the "dump" watchdog pretimeout governor, but restricted
> it to built-in code because trigger_all_cpu_backtrace() was not exported
> to loadable modules.
> 
> Now that CPU backtrace APIs are supported for loadable kernel modules
> via cpumask_backtrace(), convert WATCHDOG_PRETIMEOUT_GOV_DUMP to
> tristate. This allows kernels to deliver the pretimeout governor as a
> loadable kernel module.
> 
> Signed-off-by: Mayank Rungta <mrungta@google.com>

Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>

Re: [PATCH 1/2] nmi: Export CPU backtrace APIs for loadable modules

[Guenter Roeck]

On Thu, Jul 30, 2026 at 03:00:21PM -0700, Mayank Rungta wrote:
> From: Mayank Rungta <mrungta@google.com>
> 
> Currently, CPU backtrace functions cannot be called from loadable
> modules because the underlying helper arch_trigger_cpumask_backtrace()
> is not exported.
> 
> Instead of exporting arch_trigger_cpumask_backtrace() individually
> across every supported architecture, introduce and export a common
> helper, cpumask_backtrace(), in lib/nmi_backtrace.c. Update the four
> inline CPU backtrace macros in include/linux/nmi.h to route through this
> centralized helper.
> 
> Signed-off-by: Mayank Rungta <mrungta@google.com>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>

Just to give an update: I'd love to apply this and the next patch of the
series, but I can not do wo without formal Ack from a maintainer (I did
that once and got burned for it, so it won't happen again).

I'll send an Ack to the next patch of the series, in case someone else
wants to pick it up.

Guenter

Re: [PATCH 2/2] watchdog: pretimeout: Convert dump pretimeout governor to tristate

[Guenter Roeck]

On Thu, Jul 30, 2026 at 03:00:22PM -0700, Mayank Rungta wrote:
> From: Mayank Rungta <mrungta@google.com>
> 
> Commit 645ad41da8b2 ("watchdog: pretimeout: Add "dump" pretimeout
> governor") added the "dump" watchdog pretimeout governor, but restricted
> it to built-in code because trigger_all_cpu_backtrace() was not exported
> to loadable modules.
> 
> Now that CPU backtrace APIs are supported for loadable kernel modules
> via cpumask_backtrace(), convert WATCHDOG_PRETIMEOUT_GOV_DUMP to
> tristate. This allows kernels to deliver the pretimeout governor as a
> loadable kernel module.
> 
> Signed-off-by: Mayank Rungta <mrungta@google.com>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
> Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>

As mentioned in the other patch, I can not apply the series without Ack
from a maintainer. In case someone else wants to pick it up instead:

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 9f013d774897..922741dd837c 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -99,8 +99,8 @@ config WATCHDOG_PRETIMEOUT_GOV_SEL
>  if WATCHDOG_PRETIMEOUT_GOV
>  
>  config WATCHDOG_PRETIMEOUT_GOV_DUMP
> -	bool "Dump watchdog pretimeout governor"
> -	depends on WATCHDOG_CORE=y
> +	tristate "Dump watchdog pretimeout governor"
> +	depends on WATCHDOG_CORE
>  	default WATCHDOG_CORE
>  	help
>  	  Dump watchdog pretimeout governor, all cpu backtrace is

Re: [PATCH 1/2] nmi: Export CPU backtrace APIs for loadable modules

[Andrew Morton]

On Thu, 30 Jul 2026 15:00:21 -0700 Mayank Rungta via B4 Relay <devnull+mrungta.google.com@kernel.org> wrote:

> From: Mayank Rungta <mrungta@google.com>
> 
> Currently, CPU backtrace functions cannot be called from loadable
> modules because the underlying helper arch_trigger_cpumask_backtrace()
> is not exported.
> 
> Instead of exporting arch_trigger_cpumask_backtrace() individually
> across every supported architecture, introduce and export a common
> helper, cpumask_backtrace(), in lib/nmi_backtrace.c. Update the four
> inline CPU backtrace macros in include/linux/nmi.h to route through this
> centralized helper.

Reviewed-by: Andrew Morton <akpm@linux-foundation.org>

Re: [PATCH 2/2] watchdog: pretimeout: Convert dump pretimeout governor to tristate

[Andrew Morton]

On Thu, 30 Jul 2026 15:00:22 -0700 Mayank Rungta via B4 Relay <devnull+mrungta.google.com@kernel.org> wrote:

> Commit 645ad41da8b2 ("watchdog: pretimeout: Add "dump" pretimeout
> governor") added the "dump" watchdog pretimeout governor, but restricted
> it to built-in code because trigger_all_cpu_backtrace() was not exported
> to loadable modules.
> 
> Now that CPU backtrace APIs are supported for loadable kernel modules
> via cpumask_backtrace(), convert WATCHDOG_PRETIMEOUT_GOV_DUMP to
> tristate. This allows kernels to deliver the pretimeout governor as a
> loadable kernel module.

Reviewed-by: Andrew Morton <akpm@linux-foundation.org>

Re: [PATCH 1/2] nmi: Export CPU backtrace APIs for loadable modules

[Guenter Roeck]

On Thu, Jul 30, 2026 at 03:00:21PM -0700, Mayank Rungta wrote:
> From: Mayank Rungta <mrungta@google.com>
> 
> Currently, CPU backtrace functions cannot be called from loadable
> modules because the underlying helper arch_trigger_cpumask_backtrace()
> is not exported.
> 
> Instead of exporting arch_trigger_cpumask_backtrace() individually
> across every supported architecture, introduce and export a common
> helper, cpumask_backtrace(), in lib/nmi_backtrace.c. Update the four
> inline CPU backtrace macros in include/linux/nmi.h to route through this
> centralized helper.
> 
> Signed-off-by: Mayank Rungta <mrungta@google.com>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
> Reviewed-by: Andrew Morton <akpm@linux-foundation.org>

Applied.

Thanks,
Guenter

Re: [PATCH 2/2] watchdog: pretimeout: Convert dump pretimeout governor to tristate

[Guenter Roeck]

On Thu, Jul 30, 2026 at 03:00:22PM -0700, Mayank Rungta wrote:
> From: Mayank Rungta <mrungta@google.com>
> 
> Commit 645ad41da8b2 ("watchdog: pretimeout: Add "dump" pretimeout
> governor") added the "dump" watchdog pretimeout governor, but restricted
> it to built-in code because trigger_all_cpu_backtrace() was not exported
> to loadable modules.
> 
> Now that CPU backtrace APIs are supported for loadable kernel modules
> via cpumask_backtrace(), convert WATCHDOG_PRETIMEOUT_GOV_DUMP to
> tristate. This allows kernels to deliver the pretimeout governor as a
> loadable kernel module.
> 
> Signed-off-by: Mayank Rungta <mrungta@google.com>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
> Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
> Acked-by: Guenter Roeck <linux@roeck-us.net>
> Reviewed-by: Andrew Morton <akpm@linux-foundation.org>

Applied.

Thanks,
Guenter