* + reboot-use-a-lookup-table-for-hw_protection_action-strings.patch added to mm-nonmm-unstable branch
@ 2026-07-07 19:57 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2026-07-07 19:57 UTC (permalink / raw)
To: mm-commits, kees, akpm, include, akpm
The patch titled
Subject: reboot: use a lookup table for hw_protection_action strings
has been added to the -mm mm-nonmm-unstable branch. Its filename is
reboot-use-a-lookup-table-for-hw_protection_action-strings.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/reboot-use-a-lookup-table-for-hw_protection_action-strings.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days
------------------------------------------------------
From: Bradley Morgan <include@grrlz.net>
Subject: reboot: use a lookup table for hw_protection_action strings
Date: Tue, 7 Jul 2026 18:09:44 +0000
Replace the switch and if else chains with one table.
Link: https://lore.kernel.org/20260707180945.7781-1-include@grrlz.net
Signed-off-by: Bradley Morgan <include@grrlz.net>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <kees@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
kernel/reboot.c | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
--- a/kernel/reboot.c~reboot-use-a-lookup-table-for-hw_protection_action-strings
+++ a/kernel/reboot.c
@@ -938,16 +938,18 @@ void orderly_reboot(void)
}
EXPORT_SYMBOL_GPL(orderly_reboot);
+/* DEFAULT is NULL: a sentinel, not a real action. */
+static const char *const hw_protection_action_strs[] = {
+ [HWPROT_ACT_SHUTDOWN] = "shutdown",
+ [HWPROT_ACT_REBOOT] = "reboot",
+};
+
static const char *hw_protection_action_str(enum hw_protection_action action)
{
- switch (action) {
- case HWPROT_ACT_SHUTDOWN:
- return "shutdown";
- case HWPROT_ACT_REBOOT:
- return "reboot";
- default:
+ if (action >= ARRAY_SIZE(hw_protection_action_strs) ||
+ !hw_protection_action_strs[action])
return "undefined";
- }
+ return hw_protection_action_strs[action];
}
static enum hw_protection_action hw_failure_emergency_action;
@@ -1055,14 +1057,17 @@ EXPORT_SYMBOL_GPL(__hw_protection_trigge
static bool hw_protection_action_parse(const char *str,
enum hw_protection_action *action)
{
- if (sysfs_streq(str, "shutdown"))
- *action = HWPROT_ACT_SHUTDOWN;
- else if (sysfs_streq(str, "reboot"))
- *action = HWPROT_ACT_REBOOT;
- else
- return false;
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(hw_protection_action_strs); i++) {
+ if (hw_protection_action_strs[i] &&
+ sysfs_streq(str, hw_protection_action_strs[i])) {
+ *action = i;
+ return true;
+ }
+ }
- return true;
+ return false;
}
static int __init hw_protection_setup(char *str)
_
Patches currently in -mm which might be from include@grrlz.net are
lib-string-fix-memchr_inv-for-large-ranges.patch
signal-avoid-shared-siginfo-namespace-rewrites.patch
panic-fix-va_list-reuse-in-panic_try_force_cpu.patch
reboot-use-lookup-tables-for-sysfs-mode-and-type-strings.patch
reboot-use-a-lookup-table-for-hw_protection_action-strings.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-07 19:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-07-07 19:57 + reboot-use-a-lookup-table-for-hw_protection_action-strings.patch added to mm-nonmm-unstable branch Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.