From nobody Fri Dec 19 06:31:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBE96CD37BB for ; Sat, 16 Sep 2023 13:08:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237866AbjIPNIG (ORCPT ); Sat, 16 Sep 2023 09:08:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239269AbjIPNH5 (ORCPT ); Sat, 16 Sep 2023 09:07:57 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4CCDBCC4 for ; Sat, 16 Sep 2023 06:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694869624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=jDXtiR/0/D/booQvTxY6wI8UNSyTRiqpkXd3v2pYXds=; b=jSc+9WwrfPHoHoMlt5k4R9Vv7tq0v8I84J+OFltP6RMO74HEvguplnsGqli8bl6VWfuKcV JGIiiOSulkpzCEz18XzwIxDwBIZjiHWf9b9m1kdg4g5tJohkAIQwNjqGYayaxSNftB1+GB Lsyelm1vEc0eklWcexkG/3SYzJkoGU4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-280-4Fl6nKn_OuesLwuyArMYcg-1; Sat, 16 Sep 2023 09:06:57 -0400 X-MC-Unique: 4Fl6nKn_OuesLwuyArMYcg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0ED4B101A529; Sat, 16 Sep 2023 13:06:57 +0000 (UTC) Received: from shalem.redhat.com (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86EB740C6EA8; Sat, 16 Sep 2023 13:06:54 +0000 (UTC) From: Hans de Goede To: Steve Wahl , Justin Ernst , Kyle Meyer , Dimitri Sivanich , Russ Anderson , Darren Hart , Andy Shevchenko , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" Cc: Hans de Goede , x86@kernel.org, linux-kernel@vger.kernel.org, Justin Stitt Subject: [PATCH v3] x86/platform/uv: Rework NMI "action" modparam handling Date: Sat, 16 Sep 2023 15:06:53 +0200 Message-ID: <20230916130653.243532-1-hdegoede@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rework NMI "action" modparam handling: 1. Replace the uv_nmi_action string with an enum; and 2. Use sysfs_match_string() for string parsing in param_set_action() Suggested-by: Steve Wahl Reviewed-by: Justin Stitt Reviewed-by: Steve Wahl Tested-by: Steve Wahl Signed-off-by: Hans de Goede Reviewed-by: Andy Shevchenko --- Changes in v3: - Add 'include ' - Add nmi_act_max and use it for string array sizes - Stop printing val when it is invalid to avoid issues with printing unvalidated user input which could e.g. contain a '\n' - Add Reviewed- / Tested-by tags Changes in v2: - Also change uv_nmi_action to an enum to replace a bunch of strcmp() calls --- arch/x86/platform/uv/uv_nmi.c | 104 +++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 47 deletions(-) diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index 45d0c17ce77c..e03207de2880 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include =20 #include @@ -178,49 +179,56 @@ module_param_named(debug, uv_nmi_debug, int, 0644); } while (0) =20 /* Valid NMI Actions */ -#define ACTION_LEN 16 -static struct nmi_action { - char *action; - char *desc; -} valid_acts[] =3D { - { "kdump", "do kernel crash dump" }, - { "dump", "dump process stack for each cpu" }, - { "ips", "dump Inst Ptr info for each cpu" }, - { "kdb", "enter KDB (needs kgdboc=3D assignment)" }, - { "kgdb", "enter KGDB (needs gdb target remote)" }, - { "health", "check if CPUs respond to NMI" }, +enum action_t { + nmi_act_kdump, + nmi_act_dump, + nmi_act_ips, + nmi_act_kdb, + nmi_act_kgdb, + nmi_act_health, + nmi_act_max }; -typedef char action_t[ACTION_LEN]; -static action_t uv_nmi_action =3D { "dump" }; + +static const char * const actions[nmi_act_max] =3D { + [nmi_act_kdump] =3D "kdump", + [nmi_act_dump] =3D "dump", + [nmi_act_ips] =3D "ips", + [nmi_act_kdb] =3D "kdb", + [nmi_act_kgdb] =3D "kgdb", + [nmi_act_health] =3D "health", +}; + +static const char * const actions_desc[nmi_act_max] =3D { + [nmi_act_kdump] =3D "do kernel crash dump", + [nmi_act_dump] =3D "dump process stack for each cpu", + [nmi_act_ips] =3D "dump Inst Ptr info for each cpu", + [nmi_act_kdb] =3D "enter KDB (needs kgdboc=3D assignment)", + [nmi_act_kgdb] =3D "enter KGDB (needs gdb target remote)", + [nmi_act_health] =3D "check if CPUs respond to NMI", +}; + +static enum action_t uv_nmi_action =3D nmi_act_dump; =20 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]); } =20 static int param_set_action(const char *val, const struct kernel_param *kp) { - int i; - int n =3D ARRAY_SIZE(valid_acts); - char arg[ACTION_LEN]; + int i, n =3D ARRAY_SIZE(actions); =20 - /* (remove possible '\n') */ - strscpy(arg, val, strnchrnul(val, sizeof(arg)-1, '\n') - val + 1); - - for (i =3D 0; i < n; i++) - if (!strcmp(arg, valid_acts[i].action)) - break; - - if (i < n) { - strscpy(uv_nmi_action, arg, sizeof(uv_nmi_action)); - pr_info("UV: New NMI action:%s\n", uv_nmi_action); + i =3D sysfs_match_string(actions, val); + if (i >=3D 0) { + uv_nmi_action =3D i; + pr_info("UV: New NMI action:%s\n", actions[i]); return 0; } =20 - pr_err("UV: Invalid NMI action:%s, valid actions are:\n", arg); + pr_err("UV: Invalid NMI action. Valid actions are:\n"); for (i =3D 0; i < n; i++) - pr_err("UV: %-8s - %s\n", - valid_acts[i].action, valid_acts[i].desc); + pr_err("UV: %-8s - %s\n", actions[i], actions_desc[i]); + return -EINVAL; } =20 @@ -228,15 +236,10 @@ static const struct kernel_param_ops param_ops_action= =3D { .get =3D param_get_action, .set =3D 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) =20 module_param_named(action, uv_nmi_action, action, 0644); =20 -static inline bool uv_nmi_action_is(const char *action) -{ - return (strncmp(uv_nmi_action, action, strlen(action)) =3D=3D 0); -} - /* Setup which NMI support is present in system */ static void uv_nmi_setup_mmrs(void) { @@ -727,10 +730,10 @@ static void uv_nmi_dump_state_cpu(int cpu, struct pt_= regs *regs) if (cpu =3D=3D 0) uv_nmi_dump_cpu_ip_hdr(); =20 - if (current->pid !=3D 0 || !uv_nmi_action_is("ips")) + if (current->pid !=3D 0 || uv_nmi_action !=3D nmi_act_ips) uv_nmi_dump_cpu_ip(cpu, regs); =20 - if (uv_nmi_action_is("dump")) { + if (uv_nmi_action =3D=3D nmi_act_dump) { pr_info("UV:%sNMI process trace for CPU %d\n", dots, cpu); show_regs(regs); } @@ -798,7 +801,7 @@ static void uv_nmi_dump_state(int cpu, struct pt_regs *= regs, int master) int saved_console_loglevel =3D console_loglevel; =20 pr_alert("UV: tracing %s for %d CPUs from CPU %d\n", - uv_nmi_action_is("ips") ? "IPs" : "processes", + uv_nmi_action =3D=3D nmi_act_ips ? "IPs" : "processes", atomic_read(&uv_nmi_cpus_in_nmi), cpu); =20 console_loglevel =3D uv_nmi_loglevel; @@ -874,7 +877,7 @@ static inline int uv_nmi_kdb_reason(void) static inline int uv_nmi_kdb_reason(void) { /* Ensure user is expecting to attach gdb remote */ - if (uv_nmi_action_is("kgdb")) + if (uv_nmi_action =3D=3D nmi_act_kgdb) return 0; =20 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) master =3D (atomic_read(&uv_nmi_cpu) =3D=3D cpu); =20 /* If NMI action is "kdump", then attempt to do it */ - if (uv_nmi_action_is("kdump")) { + if (uv_nmi_action =3D=3D nmi_act_kdump) { uv_nmi_kdump(cpu, master, regs); =20 /* Unexpected return, revert action to "dump" */ if (master) - strscpy(uv_nmi_action, "dump", sizeof(uv_nmi_action)); + uv_nmi_action =3D nmi_act_dump; } =20 /* Pause as all CPU's enter the NMI handler */ uv_nmi_wait(master); =20 /* 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); - } 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); - } 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); - } else { + break; + default: 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); + break; } =20 /* Clear per_cpu "in_nmi" flag */ --=20 2.41.0