Commit ec2f16f1 authored by Hans de Goede's avatar Hans de Goede Committed by Ingo Molnar

x86/platform/uv: Rework NMI "action" modparam handling

Rework NMI "action" modparam handling:

 - Replace the uv_nmi_action string with an enum; and
 - Use sysfs_match_string() for string parsing in param_set_action()

No change in functionality intended.
Suggested-by: default avatarSteve Wahl <steve.wahl@hpe.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarSteve Wahl <steve.wahl@hpe.com>
Reviewed-by: default avatarJustin Stitt <justinstitt@google.com>
Reviewed-by: default avatarSteve Wahl <steve.wahl@hpe.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230916130653.243532-1-hdegoede@redhat.com
parent f0b0d403
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/sched/debug.h> #include <linux/sched/debug.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <asm/apic.h> #include <asm/apic.h>
...@@ -178,49 +179,56 @@ module_param_named(debug, uv_nmi_debug, int, 0644); ...@@ -178,49 +179,56 @@ module_param_named(debug, uv_nmi_debug, int, 0644);
} while (0) } while (0)
/* Valid NMI Actions */ /* Valid NMI Actions */
#define ACTION_LEN 16 enum action_t {
static struct nmi_action { nmi_act_kdump,
char *action; nmi_act_dump,
char *desc; nmi_act_ips,
} valid_acts[] = { nmi_act_kdb,
{ "kdump", "do kernel crash dump" }, nmi_act_kgdb,
{ "dump", "dump process stack for each cpu" }, nmi_act_health,
{ "ips", "dump Inst Ptr info for each cpu" }, nmi_act_max
{ "kdb", "enter KDB (needs kgdboc= assignment)" },
{ "kgdb", "enter KGDB (needs gdb target remote)" },
{ "health", "check if CPUs respond to NMI" },
}; };
typedef char action_t[ACTION_LEN];
static action_t uv_nmi_action = { "dump" }; static const char * const actions[nmi_act_max] = {
[nmi_act_kdump] = "kdump",
[nmi_act_dump] = "dump",
[nmi_act_ips] = "ips",
[nmi_act_kdb] = "kdb",
[nmi_act_kgdb] = "kgdb",
[nmi_act_health] = "health",
};
static const char * const actions_desc[nmi_act_max] = {
[nmi_act_kdump] = "do kernel crash dump",
[nmi_act_dump] = "dump process stack for each cpu",
[nmi_act_ips] = "dump Inst Ptr info for each cpu",
[nmi_act_kdb] = "enter KDB (needs kgdboc= assignment)",
[nmi_act_kgdb] = "enter KGDB (needs gdb target remote)",
[nmi_act_health] = "check if CPUs respond to NMI",
};
static enum action_t uv_nmi_action = nmi_act_dump;
static int param_get_action(char *buffer, const struct kernel_param *kp) static int param_get_action(char *buffer, const struct kernel_param *kp)
{ {
return sprintf(buffer, "%s\n", uv_nmi_action); return sprintf(buffer, "%s\n", actions[uv_nmi_action]);
} }
static int param_set_action(const char *val, const struct kernel_param *kp) static int param_set_action(const char *val, const struct kernel_param *kp)
{ {
int i; int i, n = ARRAY_SIZE(actions);
int n = ARRAY_SIZE(valid_acts);
char arg[ACTION_LEN];
/* (remove possible '\n') */
strscpy(arg, val, strnchrnul(val, sizeof(arg)-1, '\n') - val + 1);
for (i = 0; i < n; i++)
if (!strcmp(arg, valid_acts[i].action))
break;
if (i < n) { i = sysfs_match_string(actions, val);
strscpy(uv_nmi_action, arg, sizeof(uv_nmi_action)); if (i >= 0) {
pr_info("UV: New NMI action:%s\n", uv_nmi_action); uv_nmi_action = i;
pr_info("UV: New NMI action:%s\n", actions[i]);
return 0; return 0;
} }
pr_err("UV: Invalid NMI action:%s, valid actions are:\n", arg); pr_err("UV: Invalid NMI action. Valid actions are:\n");
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
pr_err("UV: %-8s - %s\n", pr_err("UV: %-8s - %s\n", actions[i], actions_desc[i]);
valid_acts[i].action, valid_acts[i].desc);
return -EINVAL; return -EINVAL;
} }
...@@ -228,15 +236,10 @@ static const struct kernel_param_ops param_ops_action = { ...@@ -228,15 +236,10 @@ static const struct kernel_param_ops param_ops_action = {
.get = param_get_action, .get = param_get_action,
.set = param_set_action, .set = param_set_action,
}; };
#define param_check_action(name, p) __param_check(name, p, action_t) #define param_check_action(name, p) __param_check(name, p, enum action_t)
module_param_named(action, uv_nmi_action, action, 0644); module_param_named(action, uv_nmi_action, action, 0644);
static inline bool uv_nmi_action_is(const char *action)
{
return (strncmp(uv_nmi_action, action, strlen(action)) == 0);
}
/* Setup which NMI support is present in system */ /* Setup which NMI support is present in system */
static void uv_nmi_setup_mmrs(void) static void uv_nmi_setup_mmrs(void)
{ {
...@@ -727,10 +730,10 @@ static void uv_nmi_dump_state_cpu(int cpu, struct pt_regs *regs) ...@@ -727,10 +730,10 @@ static void uv_nmi_dump_state_cpu(int cpu, struct pt_regs *regs)
if (cpu == 0) if (cpu == 0)
uv_nmi_dump_cpu_ip_hdr(); uv_nmi_dump_cpu_ip_hdr();
if (current->pid != 0 || !uv_nmi_action_is("ips")) if (current->pid != 0 || uv_nmi_action != nmi_act_ips)
uv_nmi_dump_cpu_ip(cpu, regs); uv_nmi_dump_cpu_ip(cpu, regs);
if (uv_nmi_action_is("dump")) { if (uv_nmi_action == nmi_act_dump) {
pr_info("UV:%sNMI process trace for CPU %d\n", dots, cpu); pr_info("UV:%sNMI process trace for CPU %d\n", dots, cpu);
show_regs(regs); show_regs(regs);
} }
...@@ -798,7 +801,7 @@ static void uv_nmi_dump_state(int cpu, struct pt_regs *regs, int master) ...@@ -798,7 +801,7 @@ static void uv_nmi_dump_state(int cpu, struct pt_regs *regs, int master)
int saved_console_loglevel = console_loglevel; int saved_console_loglevel = console_loglevel;
pr_alert("UV: tracing %s for %d CPUs from CPU %d\n", pr_alert("UV: tracing %s for %d CPUs from CPU %d\n",
uv_nmi_action_is("ips") ? "IPs" : "processes", uv_nmi_action == nmi_act_ips ? "IPs" : "processes",
atomic_read(&uv_nmi_cpus_in_nmi), cpu); atomic_read(&uv_nmi_cpus_in_nmi), cpu);
console_loglevel = uv_nmi_loglevel; console_loglevel = uv_nmi_loglevel;
...@@ -874,7 +877,7 @@ static inline int uv_nmi_kdb_reason(void) ...@@ -874,7 +877,7 @@ static inline int uv_nmi_kdb_reason(void)
static inline int uv_nmi_kdb_reason(void) static inline int uv_nmi_kdb_reason(void)
{ {
/* Ensure user is expecting to attach gdb remote */ /* Ensure user is expecting to attach gdb remote */
if (uv_nmi_action_is("kgdb")) if (uv_nmi_action == nmi_act_kgdb)
return 0; return 0;
pr_err("UV: NMI error: KDB is not enabled in this kernel\n"); pr_err("UV: NMI error: KDB is not enabled in this kernel\n");
...@@ -950,28 +953,35 @@ static int uv_handle_nmi(unsigned int reason, struct pt_regs *regs) ...@@ -950,28 +953,35 @@ static int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)
master = (atomic_read(&uv_nmi_cpu) == cpu); master = (atomic_read(&uv_nmi_cpu) == cpu);
/* If NMI action is "kdump", then attempt to do it */ /* If NMI action is "kdump", then attempt to do it */
if (uv_nmi_action_is("kdump")) { if (uv_nmi_action == nmi_act_kdump) {
uv_nmi_kdump(cpu, master, regs); uv_nmi_kdump(cpu, master, regs);
/* Unexpected return, revert action to "dump" */ /* Unexpected return, revert action to "dump" */
if (master) if (master)
strscpy(uv_nmi_action, "dump", sizeof(uv_nmi_action)); uv_nmi_action = nmi_act_dump;
} }
/* Pause as all CPU's enter the NMI handler */ /* Pause as all CPU's enter the NMI handler */
uv_nmi_wait(master); uv_nmi_wait(master);
/* Process actions other than "kdump": */ /* Process actions other than "kdump": */
if (uv_nmi_action_is("health")) { switch (uv_nmi_action) {
case nmi_act_health:
uv_nmi_action_health(cpu, regs, master); uv_nmi_action_health(cpu, regs, master);
} else if (uv_nmi_action_is("ips") || uv_nmi_action_is("dump")) { break;
case nmi_act_ips:
case nmi_act_dump:
uv_nmi_dump_state(cpu, regs, master); uv_nmi_dump_state(cpu, regs, master);
} else if (uv_nmi_action_is("kdb") || uv_nmi_action_is("kgdb")) { break;
case nmi_act_kdb:
case nmi_act_kgdb:
uv_call_kgdb_kdb(cpu, regs, master); uv_call_kgdb_kdb(cpu, regs, master);
} else { break;
default:
if (master) if (master)
pr_alert("UV: unknown NMI action: %s\n", uv_nmi_action); pr_alert("UV: unknown NMI action: %d\n", uv_nmi_action);
uv_nmi_sync_exit(master); uv_nmi_sync_exit(master);
break;
} }
/* Clear per_cpu "in_nmi" flag */ /* Clear per_cpu "in_nmi" flag */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment