From patchwork Sat Sep 24 12:20:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen (ThunderTown)" X-Patchwork-Id: 12987606 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 5BCE3C6FA93 for ; Sat, 24 Sep 2022 12:22:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233831AbiIXMWy (ORCPT ); Sat, 24 Sep 2022 08:22:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233786AbiIXMWx (ORCPT ); Sat, 24 Sep 2022 08:22:53 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0752EE1090; Sat, 24 Sep 2022 05:22:51 -0700 (PDT) Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MZSl21YlWzpTpf; Sat, 24 Sep 2022 20:19:58 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggpemm500021.china.huawei.com (7.185.36.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 20:22:50 +0800 Received: from thunder-town.china.huawei.com (10.174.178.55) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 24 Sep 2022 20:22:49 +0800 From: Zhen Lei To: Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek , Joe Lawrence , , , Masahiro Yamada , Alexei Starovoitov , Jiri Olsa , Kees Cook , Andrew Morton , "Luis Chamberlain" , , "Steven Rostedt" , Ingo Molnar CC: Zhen Lei Subject: [PATCH v6 03/11] scripts/kallsyms: remove helper sym_name() and cleanup Date: Sat, 24 Sep 2022 20:20:43 +0800 Message-ID: <20220924122051.362-4-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20220924122051.362-1-thunder.leizhen@huawei.com> References: <20220924122051.362-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.55] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: Now, the type and name of a symbol are no longer stored together. So the helper sym_name() is no longer needed. Correspondingly, replacing the field name 'sym[]' with 'name[]' is more accurate. Suggested-by: Petr Mladek Signed-off-by: Zhen Lei --- scripts/kallsyms.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 296277128d450ff..ca378a7e9425c00 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c @@ -35,7 +35,7 @@ struct sym_entry { unsigned int start_pos; unsigned int percpu_absolute; unsigned char type; - unsigned char sym[]; + unsigned char name[]; }; struct addr_range { @@ -76,11 +76,6 @@ static void usage(void) exit(1); } -static char *sym_name(const struct sym_entry *s) -{ - return (char *)s->sym; -} - static bool is_ignored_symbol(const char *name, char type) { /* Symbol names that exactly match to the following are ignored.*/ @@ -238,7 +233,7 @@ static struct sym_entry *read_symbol(FILE *in) sym->addr = addr; sym->len = len; sym->type = type; - strcpy(sym_name(sym), name); + strcpy((char *)sym->name, name); sym->percpu_absolute = 0; return sym; @@ -262,7 +257,7 @@ static int symbol_in_range(const struct sym_entry *s, static int symbol_valid(const struct sym_entry *s) { - const char *name = sym_name(s); + const char *name = (char *)s->name; /* if --all-symbols is not specified, then symbols outside the text * and inittext sections are discarded */ @@ -475,7 +470,7 @@ static void write_src(void) printf("\t.byte 0x%02x", table[i]->len + 1); printf(", 0x%02x", table[i]->type); for (k = 0; k < table[i]->len; k++) - printf(", 0x%02x", table[i]->sym[k]); + printf(", 0x%02x", table[i]->name[k]); printf("\n"); /* fields 'len' and 'type' occupy one byte each */ @@ -533,7 +528,7 @@ static void build_initial_token_table(void) unsigned int i; for (i = 0; i < table_cnt; i++) - learn_symbol(table[i]->sym, table[i]->len); + learn_symbol(table[i]->name, table[i]->len); } static unsigned char *find_token(unsigned char *str, int len, @@ -558,14 +553,14 @@ static void compress_symbols(const unsigned char *str, int idx) for (i = 0; i < table_cnt; i++) { len = table[i]->len; - p1 = table[i]->sym; + p1 = table[i]->name; /* find the token on the symbol */ p2 = find_token(p1, len, str); if (!p2) continue; /* decrease the counts for this symbol's tokens */ - forget_symbol(table[i]->sym, len); + forget_symbol(table[i]->name, len); size = len; @@ -587,7 +582,7 @@ static void compress_symbols(const unsigned char *str, int idx) table[i]->len = len; /* increase the counts for this symbol's new tokens */ - learn_symbol(table[i]->sym, len); + learn_symbol(table[i]->name, len); } } @@ -645,7 +640,7 @@ static void insert_real_symbols_in_table(void) for (i = 0; i < table_cnt; i++) { for (j = 0; j < table[i]->len; j++) { - c = table[i]->sym[j]; + c = table[i]->name[j]; best_table[c][0] = c; best_table_len[c] = 1; } @@ -667,7 +662,7 @@ static void optimize_token_table(void) /* guess for "linker script provide" symbol */ static int may_be_linker_script_provide_symbol(const struct sym_entry *se) { - const char *symbol = sym_name(se); + const char *symbol = (char *)se->name; int len = se->len; if (len < 8) @@ -724,8 +719,8 @@ static int compare_symbols(const void *a, const void *b) return wa - wb; /* sort by the number of prefix underscores */ - wa = strspn(sym_name(sa), "_"); - wb = strspn(sym_name(sb), "_"); + wa = strspn((char *)sa->name, "_"); + wb = strspn((char *)sb->name, "_"); if (wa != wb) return wa - wb;