From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D23EBC433DB for ; Mon, 25 Jan 2021 07:09:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9343E22581 for ; Mon, 25 Jan 2021 07:09:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727090AbhAYHJG (ORCPT ); Mon, 25 Jan 2021 02:09:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726791AbhAYHHP (ORCPT ); Mon, 25 Jan 2021 02:07:15 -0500 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 037B4C061573 for ; Sun, 24 Jan 2021 23:06:33 -0800 (PST) Received: by mail-pf1-x42c.google.com with SMTP id y205so7873082pfc.5 for ; Sun, 24 Jan 2021 23:06:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=DWDAUrWBRTDtOb8FK3clfU17c1Lzn1ORQKVu1tXRuWU=; b=wjNyurSd3jPbZHQo2GP3CshjIr4SPceJV/qhZ4yeNE6rOf0u71eepojrsQi9NrPz8h ZWyuwhZkquAcruIKAov4tfBA8luJhPoD/fi/9qV10pmCD6hQSiQBtK0MJ7WCjE1xampq NX5OWKg5BkI5cqP9RKAD31YJQCpMZxRBQDyAgVG26l0FU3tY3cUZVeGwcPu1yXoxkttE XEIUtJlkSFBcuugJbsnMTFsC1EpuKnpdR4bjfkBMmZ+/2jbB5AET7mxDgbu1j4RFlqBB 1LJ4Jy5xpNrxZGeZAW6zvz8SD4YZNXM9iW3o+JZV/94RFUpxUgT2fl3cmlxHzRVtB7rK fXgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DWDAUrWBRTDtOb8FK3clfU17c1Lzn1ORQKVu1tXRuWU=; b=f8W45DjZfjYcBf8Y8x8UpdHgESZG6YLD+0CGvvkoPMkpLjuVeTP0npg+WQLGAONJyR pMEJJ5DCw7QFpBtZfeH/P9DUnRFf4m14GaoF0S37r/xplS4QjEt57hztmv2VrB5SoePe m0BZYsES6l3+2EXACPKw0WXLU3idz8zMwVSOAmLacSKT7SMFY4XmYftNuVJatYIB9M0u 86hBgCXo8qd5gGeymHzVx6abn1CFOSeLPd86cqW+3aAbQ5p0sw9R6RT8xbfhDrR5pNMw nJM8KLlarl66XcFHUhTLmCw57jlXtd/QjbyHeMYmcraTu+PDuM8VLGHM/pSLvGZb0ZdN MZQA== X-Gm-Message-State: AOAM533xRymlb7iqn7kCM/6fTERbDRR1+UsDqQ3GhSwjulf6oNSBwsuB 5vd2wgnCweXhwDW4SHnjZIH61b9Rg91HQQ== X-Google-Smtp-Source: ABdhPJw/DTLqzH1jb+2c7nZx98NYv49xavXdJw/fpxYZkNQajyq4sds5snIJQMxmQF3tZhlxD3eRhQ== X-Received: by 2002:a62:88cf:0:b029:1c0:d4fb:1e62 with SMTP id l198-20020a6288cf0000b02901c0d4fb1e62mr3109583pfd.58.1611558393374; Sun, 24 Jan 2021 23:06:33 -0800 (PST) Received: from localhost.localdomain ([110.225.229.81]) by smtp.gmail.com with ESMTPSA id b18sm16013039pfi.173.2021.01.24.23.06.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jan 2021 23:06:32 -0800 (PST) From: Sumit Garg To: kgdb-bugreport@lists.sourceforge.net Cc: jason.wessel@windriver.com, daniel.thompson@linaro.org, dianders@chromium.org, linux-kernel@vger.kernel.org, Sumit Garg Subject: [PATCH v2] kdb: Simplify kdb commands registration Date: Mon, 25 Jan 2021 12:36:11 +0530 Message-Id: <1611558371-14414-1-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify kdb commands registration via using linked list instead of static array for commands storage. Signed-off-by: Sumit Garg --- Changes in v2: - Remove redundant NULL check for "cmd_name". - Incorporate misc. comment. kernel/debug/kdb/kdb_main.c | 119 ++++++++++++----------------------------- kernel/debug/kdb/kdb_private.h | 1 + 2 files changed, 34 insertions(+), 86 deletions(-) diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 930ac1b..a0989a0 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -84,15 +85,8 @@ static unsigned int kdb_continue_catastrophic = static unsigned int kdb_continue_catastrophic; #endif -/* kdb_commands describes the available commands. */ -static kdbtab_t *kdb_commands; -#define KDB_BASE_CMD_MAX 50 -static int kdb_max_commands = KDB_BASE_CMD_MAX; -static kdbtab_t kdb_base_commands[KDB_BASE_CMD_MAX]; -#define for_each_kdbcmd(cmd, num) \ - for ((cmd) = kdb_base_commands, (num) = 0; \ - num < kdb_max_commands; \ - num++, num == KDB_BASE_CMD_MAX ? cmd = kdb_commands : cmd++) +/* kdb_cmds_head describes the available commands. */ +static LIST_HEAD(kdb_cmds_head); typedef struct _kdbmsg { int km_diag; /* kdb diagnostic */ @@ -921,7 +915,7 @@ int kdb_parse(const char *cmdstr) char *cp; char *cpp, quoted; kdbtab_t *tp; - int i, escaped, ignore_errors = 0, check_grep = 0; + int escaped, ignore_errors = 0, check_grep = 0; /* * First tokenize the command string. @@ -1011,25 +1005,18 @@ int kdb_parse(const char *cmdstr) ++argv[0]; } - for_each_kdbcmd(tp, i) { - if (tp->cmd_name) { - /* - * If this command is allowed to be abbreviated, - * check to see if this is it. - */ - - if (tp->cmd_minlen - && (strlen(argv[0]) <= tp->cmd_minlen)) { - if (strncmp(argv[0], - tp->cmd_name, - tp->cmd_minlen) == 0) { - break; - } - } - - if (strcmp(argv[0], tp->cmd_name) == 0) + list_for_each_entry(tp, &kdb_cmds_head, list_node) { + /* + * If this command is allowed to be abbreviated, + * check to see if this is it. + */ + if (tp->cmd_minlen && (strlen(argv[0]) <= tp->cmd_minlen)) { + if (strncmp(argv[0], tp->cmd_name, tp->cmd_minlen) == 0) break; } + + if (strcmp(argv[0], tp->cmd_name) == 0) + break; } /* @@ -1037,19 +1024,15 @@ int kdb_parse(const char *cmdstr) * few characters of this match any of the known commands. * e.g., md1c20 should match md. */ - if (i == kdb_max_commands) { - for_each_kdbcmd(tp, i) { - if (tp->cmd_name) { - if (strncmp(argv[0], - tp->cmd_name, - strlen(tp->cmd_name)) == 0) { - break; - } - } + if (list_entry_is_head(tp, &kdb_cmds_head, list_node)) { + list_for_each_entry(tp, &kdb_cmds_head, list_node) { + if (strncmp(argv[0], tp->cmd_name, + strlen(tp->cmd_name)) == 0) + break; } } - if (i < kdb_max_commands) { + if (!list_entry_is_head(tp, &kdb_cmds_head, list_node)) { int result; if (!kdb_check_flags(tp->cmd_flags, kdb_cmd_enabled, argc <= 1)) @@ -2428,17 +2411,14 @@ static int kdb_kgdb(int argc, const char **argv) static int kdb_help(int argc, const char **argv) { kdbtab_t *kt; - int i; kdb_printf("%-15.15s %-20.20s %s\n", "Command", "Usage", "Description"); kdb_printf("-----------------------------" "-----------------------------\n"); - for_each_kdbcmd(kt, i) { + list_for_each_entry(kt, &kdb_cmds_head, list_node) { char *space = ""; if (KDB_FLAG(CMD_INTERRUPT)) return 0; - if (!kt->cmd_name) - continue; if (!kdb_check_flags(kt->cmd_flags, kdb_cmd_enabled, true)) continue; if (strlen(kt->cmd_usage) > 20) @@ -2667,49 +2647,20 @@ int kdb_register_flags(char *cmd, short minlen, kdb_cmdflags_t flags) { - int i; kdbtab_t *kp; - /* - * Brute force method to determine duplicates - */ - for_each_kdbcmd(kp, i) { - if (kp->cmd_name && (strcmp(kp->cmd_name, cmd) == 0)) { + list_for_each_entry(kp, &kdb_cmds_head, list_node) { + if (strcmp(kp->cmd_name, cmd) == 0) { kdb_printf("Duplicate kdb command registered: " "%s, func %px help %s\n", cmd, func, help); return 1; } } - /* - * Insert command into first available location in table - */ - for_each_kdbcmd(kp, i) { - if (kp->cmd_name == NULL) - break; - } - - if (i >= kdb_max_commands) { - kdbtab_t *new = kmalloc_array(kdb_max_commands - - KDB_BASE_CMD_MAX + - kdb_command_extend, - sizeof(*new), - GFP_KDB); - if (!new) { - kdb_printf("Could not allocate new kdb_command " - "table\n"); - return 1; - } - if (kdb_commands) { - memcpy(new, kdb_commands, - (kdb_max_commands - KDB_BASE_CMD_MAX) * sizeof(*new)); - kfree(kdb_commands); - } - memset(new + kdb_max_commands - KDB_BASE_CMD_MAX, 0, - kdb_command_extend * sizeof(*new)); - kdb_commands = new; - kp = kdb_commands + kdb_max_commands - KDB_BASE_CMD_MAX; - kdb_max_commands += kdb_command_extend; + kp = kmalloc(sizeof(*kp), GFP_KDB); + if (!kp) { + kdb_printf("Could not allocate new kdb_command table\n"); + return 1; } kp->cmd_name = cmd; @@ -2719,6 +2670,8 @@ int kdb_register_flags(char *cmd, kp->cmd_minlen = minlen; kp->cmd_flags = flags; + list_add_tail(&kp->list_node, &kdb_cmds_head); + return 0; } EXPORT_SYMBOL_GPL(kdb_register_flags); @@ -2757,15 +2710,15 @@ EXPORT_SYMBOL_GPL(kdb_register); */ int kdb_unregister(char *cmd) { - int i; kdbtab_t *kp; /* * find the command. */ - for_each_kdbcmd(kp, i) { - if (kp->cmd_name && (strcmp(kp->cmd_name, cmd) == 0)) { - kp->cmd_name = NULL; + list_for_each_entry(kp, &kdb_cmds_head, list_node) { + if (strcmp(kp->cmd_name, cmd) == 0) { + list_del(&kp->list_node); + kfree(kp); return 0; } } @@ -2778,12 +2731,6 @@ EXPORT_SYMBOL_GPL(kdb_unregister); /* Initialize the kdb command table. */ static void __init kdb_inittab(void) { - int i; - kdbtab_t *kp; - - for_each_kdbcmd(kp, i) - kp->cmd_name = NULL; - kdb_register_flags("md", kdb_md, "", "Display Memory Contents, also mdWcN, e.g. md8c1", 1, KDB_ENABLE_MEM_READ | KDB_REPEAT_NO_ARGS); diff --git a/kernel/debug/kdb/kdb_private.h b/kernel/debug/kdb/kdb_private.h index a4281fb..75ceafa 100644 --- a/kernel/debug/kdb/kdb_private.h +++ b/kernel/debug/kdb/kdb_private.h @@ -174,6 +174,7 @@ typedef struct _kdbtab { short cmd_minlen; /* Minimum legal # command * chars required */ kdb_cmdflags_t cmd_flags; /* Command behaviour flags */ + struct list_head list_node; /* Command list */ } kdbtab_t; extern int kdb_bt(int, const char **); /* KDB display back trace */ -- 2.7.4