| Message ID | 20230504151100.v4.6.Ice803cb078d0e15fb2cbf49132f096ee2bd4199d@changeid (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | watchdog/hardlockup: Add the buddy hardlockup detector | expand |
On Fri May 5, 2023 at 8:13 AM AEST, Douglas Anderson wrote: > The code currently in "watchdog_hld.c" is for detecting hardlockups > using perf, as evidenced by the line in the Makefile that only > compiles this file if CONFIG_HARDLOCKUP_DETECTOR_PERF is > defined. Rename the file to prepare for the buddy hardlockup detector, > which doesn't use perf. > > It could be argued that the new name makes it less obvious that this > is a hardlockup detector. While true, it's not hard to remember that > the "perf" detector is always a hardlockup detector and it's nice not > to have names that are too convoluted. Better than the confusion that the perf version is *the* hardlockup detector IMO. Acked-by: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > > Changes in v4: > - ("Rename watchdog_hld.c to watchdog_perf.c") new for v4. > > kernel/Makefile | 2 +- > kernel/{watchdog_hld.c => watchdog_perf.c} | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > rename kernel/{watchdog_hld.c => watchdog_perf.c} (99%) > > diff --git a/kernel/Makefile b/kernel/Makefile > index 10ef068f598d..406ccccc4dd3 100644 > --- a/kernel/Makefile > +++ b/kernel/Makefile > @@ -91,7 +91,7 @@ obj-$(CONFIG_FAIL_FUNCTION) += fail_function.o > obj-$(CONFIG_KGDB) += debug/ > obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o > obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o > -obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_hld.o > +obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_perf.o > obj-$(CONFIG_SECCOMP) += seccomp.o > obj-$(CONFIG_RELAY) += relay.o > obj-$(CONFIG_SYSCTL) += utsname_sysctl.o > diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_perf.c > similarity index 99% > rename from kernel/watchdog_hld.c > rename to kernel/watchdog_perf.c > index 96b717205952..c3d8ceb149da 100644 > --- a/kernel/watchdog_hld.c > +++ b/kernel/watchdog_perf.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > /* > - * Detect hard lockups on a system > + * Detect hard lockups on a system using perf > * > * started by Don Zickus, Copyright (C) 2010 Red Hat, Inc. > * > -- > 2.40.1.521.gf1e218fcd8-goog
diff --git a/kernel/Makefile b/kernel/Makefile index 10ef068f598d..406ccccc4dd3 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -91,7 +91,7 @@ obj-$(CONFIG_FAIL_FUNCTION) += fail_function.o obj-$(CONFIG_KGDB) += debug/ obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o obj-$(CONFIG_LOCKUP_DETECTOR) += watchdog.o -obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_hld.o +obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_perf.o obj-$(CONFIG_SECCOMP) += seccomp.o obj-$(CONFIG_RELAY) += relay.o obj-$(CONFIG_SYSCTL) += utsname_sysctl.o diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_perf.c similarity index 99% rename from kernel/watchdog_hld.c rename to kernel/watchdog_perf.c index 96b717205952..c3d8ceb149da 100644 --- a/kernel/watchdog_hld.c +++ b/kernel/watchdog_perf.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Detect hard lockups on a system + * Detect hard lockups on a system using perf * * started by Don Zickus, Copyright (C) 2010 Red Hat, Inc. *
The code currently in "watchdog_hld.c" is for detecting hardlockups using perf, as evidenced by the line in the Makefile that only compiles this file if CONFIG_HARDLOCKUP_DETECTOR_PERF is defined. Rename the file to prepare for the buddy hardlockup detector, which doesn't use perf. It could be argued that the new name makes it less obvious that this is a hardlockup detector. While true, it's not hard to remember that the "perf" detector is always a hardlockup detector and it's nice not to have names that are too convoluted. Signed-off-by: Douglas Anderson <dianders@chromium.org> --- Changes in v4: - ("Rename watchdog_hld.c to watchdog_perf.c") new for v4. kernel/Makefile | 2 +- kernel/{watchdog_hld.c => watchdog_perf.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename kernel/{watchdog_hld.c => watchdog_perf.c} (99%)