From patchwork Wed Sep 13 15:16:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 139089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp84488vqb; Wed, 13 Sep 2023 14:03:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFmCVsUtqF6SBi8cJQug51LQqoyuM/MsrZtE0jgKOuDNqbgePkFg2/qJTQwj9NzSUSHzNMR X-Received: by 2002:a17:902:f54b:b0:1c3:2ee6:3811 with SMTP id h11-20020a170902f54b00b001c32ee63811mr4372571plf.8.1694638982126; Wed, 13 Sep 2023 14:03:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694638982; cv=none; d=google.com; s=arc-20160816; b=v8811fRvZDq1gFt/XGxjPT6ZTTmTwAOjEHt8XHSruET4jvCIJgB4fBrknh+xi+x40r PPDU1xnlAU1PpJ0QidlwTsvKGoZWIISOjSOu9H08ZMHvNHT4J/zPgZWeYlPjXRu2l88l x31FiGlPv8PRpM9JxV/M8Lbq7RumKvl5ep10UKg0xzliOCBr1WfyjD5hyG3PUQimC/He lbWby3mRWvDROUsxNIy0aBQhjtZiJbbuP4Kkl7YpNubTRR5GAvvHQ3IDJj6mhF0dXnEC DlJgh2AJA92AwFYhhReZjaTJtLEth48ecYuHNXu7J2QQwt6BoCWiPOPjPRjNc67/IkzO +QSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=wA/deTDyR3rOGKniPdSBTa4tEgxl+2pJ7p2k7fGC+MM=; fh=BiiXE8BhyFR4xzfWHGxKpxvi0Qyy3d2KeE/afcfauqc=; b=szBFqTIbdzgfNAH3un/gdFP/RGLm9ds9xsBjRyvSjBsVfv6Fk4ayqoHq4Rw2g2KN6n FcNHe4Ln/8o9p3MOwfR+hC4X8PpPtNU+sOERnZzja7Xt26Ake14HrPJeaj0KOljIbIwF tNkxyJaGZ3fAoD2+5iVv0M1OTi1/RrWrRXWuCzccjhjPgu5++1unUZE5ousVGmpnInFG 31dVcp4f+UsvDKipvIrPBnMjJHZfjzDhBRiXsUAXNm0+UDndshFhVgNLcI5sOqf7aCtl AZEOt6/VXS8qFwzWa7+bWIPl8O8TR7AoCz73UEuK77IcIyTV88DrnoxJcfZxZKe35616 qaeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UHyQObB5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id lg16-20020a170902fb9000b001c3d864d6b5si113684plb.292.2023.09.13.14.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 14:03:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UHyQObB5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E337D84A9024; Wed, 13 Sep 2023 08:18:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237841AbjIMPSa (ORCPT + 36 others); Wed, 13 Sep 2023 11:18:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241820AbjIMPS0 (ORCPT ); Wed, 13 Sep 2023 11:18:26 -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 BC31A1BE for ; Wed, 13 Sep 2023 08:17:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694618231; 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=wA/deTDyR3rOGKniPdSBTa4tEgxl+2pJ7p2k7fGC+MM=; b=UHyQObB5uN70NcUdT/JUDnxMgL69vU7HH4u8eXzLRLT9jzQw0j0p/KOigKkjG2Oar+2rwS jqr6rHfnuLAd+vG0iS1CkyS3C2ScoJIB6X3qqKOOVJ1qKhI7hZu3effHF3jlimt0QGifju 77boq91JtQFalJWg3ZL4+WzM0CbJlvE= 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-516-GaVubWuIPveFiQ1f0tTftQ-1; Wed, 13 Sep 2023 11:17:05 -0400 X-MC-Unique: GaVubWuIPveFiQ1f0tTftQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 6441E18056B4; Wed, 13 Sep 2023 15:17:04 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1204E40C2009; Wed, 13 Sep 2023 15:17:01 +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] x86/platform/uv: Use sysfs_match_string() for string parsing in param_set_action() Date: Wed, 13 Sep 2023 17:16:56 +0200 Message-ID: <20230913151656.52792-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 08:18:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776952298200667745 X-GMAIL-MSGID: 1776957764847220967 Remove the custom, hard to read code to: 1. Make a copy of "val" with any potential '\n' at the end stripped 2. Compare the copy against an array of allowed string values Linux has the sysfs_match_string() helper exactly for cases like this, switch to this. Cc: Justin Stitt Signed-off-by: Hans de Goede --- arch/x86/platform/uv/uv_nmi.c | 48 +++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c index 45d0c17ce77c..44bacb547c65 100644 --- a/arch/x86/platform/uv/uv_nmi.c +++ b/arch/x86/platform/uv/uv_nmi.c @@ -179,17 +179,27 @@ module_param_named(debug, uv_nmi_debug, int, 0644); /* Valid NMI Actions */ #define ACTION_LEN 16 -static struct nmi_action { - char *action; - char *desc; -} valid_acts[] = { - { "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= assignment)" }, - { "kgdb", "enter KGDB (needs gdb target remote)" }, - { "health", "check if CPUs respond to NMI" }, + +static const char * const valid_acts[] = { + "kdump", + "dump", + "ips", + "kdb", + "kgdb", + "health", }; + +static const char * const valid_acts_desc[] = { + "do kernel crash dump", + "dump process stack for each cpu", + "dump Inst Ptr info for each cpu", + "enter KDB (needs kgdboc= assignment)", + "enter KGDB (needs gdb target remote)", + "check if CPUs respond to NMI", +}; + +static_assert(ARRAY_SIZE(valid_acts) == ARRAY_SIZE(valid_acts_desc)); + typedef char action_t[ACTION_LEN]; static action_t uv_nmi_action = { "dump" }; @@ -202,25 +212,19 @@ static int param_set_action(const char *val, const struct kernel_param *kp) { int i; int n = ARRAY_SIZE(valid_acts); - char arg[ACTION_LEN]; - /* (remove possible '\n') */ - strscpy(arg, val, strnchrnul(val, sizeof(arg)-1, '\n') - val + 1); + i = sysfs_match_string(valid_acts, val); - for (i = 0; i < n; i++) - if (!strcmp(arg, valid_acts[i].action)) - break; - - if (i < n) { - strscpy(uv_nmi_action, arg, sizeof(uv_nmi_action)); + if (i >= 0) { + strscpy(uv_nmi_action, valid_acts[i], sizeof(uv_nmi_action)); pr_info("UV: New NMI action:%s\n", uv_nmi_action); return 0; } - pr_err("UV: Invalid NMI action:%s, valid actions are:\n", arg); + pr_err("UV: Invalid NMI action:%s, valid actions are:\n", val); for (i = 0; i < n; i++) - pr_err("UV: %-8s - %s\n", - valid_acts[i].action, valid_acts[i].desc); + pr_err("UV: %-8s - %s\n", valid_acts[i], valid_acts_desc[i]); + return -EINVAL; }