From nobody Thu Dec 18 14:33:08 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 3ED08C4167B for ; Fri, 1 Dec 2023 20:31:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379599AbjLAUax (ORCPT ); Fri, 1 Dec 2023 15:30:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379547AbjLAUav (ORCPT ); Fri, 1 Dec 2023 15:30:51 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EEAD10DF for ; Fri, 1 Dec 2023 12:30:57 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CBE7C433CB; Fri, 1 Dec 2023 20:30:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701462657; bh=QVbACnLUnYQMYgOMYoEehYGakqfQw3HgLVP3m0AP9nI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f70uuGixlDaJcgsf2n6YchS57/ri8BALDiEeWnOumwvDZDqwy67PHfV8h9LsE8s3N /VGa3UkO5I1x9vdByVOcmKTE75IcwsAx/Od2IhZe/kEunB0yu2/Vwd7bTz7mdYl0nT QJ1GvffFGrB0Sz1CoqFoSSeYjRmzYDgxQpKBG9/AxedGGYO8/VSBDuVLh+PFma13tV p5Zl+97ISlp1A5ISIy+amkTI89UhCQA6lvAN4YfImzZo1oVdIaK8/RpFP2IBzYCViH Ripio0j/StTd1uSV91lBO/4ICDL1cVVpvOs/n0DWngSw2fuiJX+tH3ltB3hL463Hwj Kfj+P5ng5F9SQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , Kate Carcia , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , David Laight Subject: [PATCH 1/2] perf env: Introduce perf_env__arch_strerrno() Date: Fri, 1 Dec 2023 17:30:45 -0300 Message-ID: <20231201203046.486596-2-acme@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231201203046.486596-1-acme@kernel.org> References: <20231201203046.486596-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo That will cache the arch specific function translating error numbers to strings. Cc: Adrian Hunter Cc: David Laight Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lore.kernel.org/lkml/ Signed-off-by: Arnaldo Carvalho de Melo Reviewed-by: Ian Rogers --- tools/perf/builtin-trace.c | 6 ++---- tools/perf/util/env.c | 7 +++++++ tools/perf/util/env.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index e541d0e2777ab935..109b8e64fe69ae32 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2470,9 +2470,8 @@ static int trace__fprintf_callchain(struct trace *tra= ce, struct perf_sample *sam static const char *errno_to_name(struct evsel *evsel, int err) { struct perf_env *env =3D evsel__env(evsel); - const char *arch_name =3D perf_env__arch(env); =20 - return arch_syscalls__strerrno(arch_name, err); + return perf_env__arch_strerrno(env, err); } =20 static int trace__sys_exit(struct trace *trace, struct evsel *evsel, @@ -4264,12 +4263,11 @@ static size_t thread__dump_stats(struct thread_trac= e *ttrace, printed +=3D fprintf(fp, " %9.3f %9.2f%%\n", max, pct); =20 if (trace->errno_summary && stats->nr_failures) { - const char *arch_name =3D perf_env__arch(trace->host->env); int e; =20 for (e =3D 0; e < stats->max_errno; ++e) { if (stats->errnos[e] !=3D 0) - fprintf(fp, "\t\t\t\t%s: %d\n", arch_syscalls__strerrno(arch_name, e= + 1), stats->errnos[e]); + fprintf(fp, "\t\t\t\t%s: %d\n", perf_env__arch_strerrno(trace->host-= >env, e + 1), stats->errnos[e]); } } } diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index cbc18b22ace5231e..fdd62ea00173ccf5 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -12,6 +12,7 @@ #include #include "pmus.h" #include "strbuf.h" +#include "trace/beauty/beauty.h" =20 struct perf_env perf_env; =20 @@ -453,6 +454,12 @@ const char *perf_env__arch(struct perf_env *env) return normalize_arch(arch_name); } =20 +const char *perf_env__arch_strerrno(struct perf_env *env, int err) +{ + const char *arch_name =3D perf_env__arch(env); + return arch_syscalls__strerrno(arch_name, err); +} + const char *perf_env__cpuid(struct perf_env *env) { int status; diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 94596ff124d54188..79f371879f45bafc 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -164,6 +164,7 @@ int perf_env__read_cpu_topology_map(struct perf_env *en= v); void cpu_cache_level__free(struct cpu_cache_level *cache); =20 const char *perf_env__arch(struct perf_env *env); +const char *perf_env__arch_strerrno(struct perf_env *env, int err); const char *perf_env__cpuid(struct perf_env *env); const char *perf_env__raw_arch(struct perf_env *env); int perf_env__nr_cpus_avail(struct perf_env *env); --=20 2.41.0 From nobody Thu Dec 18 14:33:08 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 83F20C4167B for ; Fri, 1 Dec 2023 20:31:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379630AbjLAUa6 (ORCPT ); Fri, 1 Dec 2023 15:30:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379603AbjLAUay (ORCPT ); Fri, 1 Dec 2023 15:30:54 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0594E10F4 for ; Fri, 1 Dec 2023 12:31:01 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC08EC433CC; Fri, 1 Dec 2023 20:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701462660; bh=+mj0dcN7GlPP3mSnBDcO9llFhhVlvh7EarboXmVwsd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ly7tgk2aHQCuPkEy3d0psO0fSlUxGiuY/19+2l3JKYAzw2+dgsX70kVlPH6a30e/1 vy04Wvgg19peOLQMUhsmQYSVibsgt7pntzMX+FnYiRJRBzpIITky3qe44wzcyvQTJN CZwTwfluwXcs/fi1E/YTcXO2EfxTrQfGrOFwwsIBFXt8HAr+2a1rpRZR8Y7SSUwtcv IwyzFJFKlxQ3s2mtbDD1oOP6YcLW+dyscEqSIDOVpw/I7cLBQXm5r6VYtWOp+/uy6H 9XmU2EtZZBpphq9sIVY4TxkWrUmLYirCv8UTSj4gJfkpLmjFFvifqBNqseggX/ZI9X tELCENgp9/mrQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , Kate Carcia , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , David Laight Subject: [PATCH 2/2] perf env: Cache the arch specific strerrno function in perf_env__arch_strerrno() Date: Fri, 1 Dec 2023 17:30:46 -0300 Message-ID: <20231201203046.486596-3-acme@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231201203046.486596-1-acme@kernel.org> References: <20231201203046.486596-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo So that we don't have to go thru the series of strcmp(arch) calls for each id -> string translation. Cc: Adrian Hunter Cc: David Laight Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lore.kernel.org/lkml/ Signed-off-by: Arnaldo Carvalho de Melo Reviewed-by: Ian Rogers --- tools/perf/trace/beauty/arch_errno_names.sh | 6 +++--- tools/perf/trace/beauty/beauty.h | 2 -- tools/perf/util/env.c | 6 ++++-- tools/perf/util/env.h | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace= /beauty/arch_errno_names.sh index b6e0767b4b34e46a..7df4bf5b55a3cc2a 100755 --- a/tools/perf/trace/beauty/arch_errno_names.sh +++ b/tools/perf/trace/beauty/arch_errno_names.sh @@ -57,13 +57,13 @@ create_arch_errno_table_func() archlist=3D"$1" default=3D"$2" =20 - printf 'const char *arch_syscalls__strerrno(const char *arch, int err)\n' + printf 'arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const= char *arch)\n' printf '{\n' for arch in $archlist; do printf '\tif (!strcmp(arch, "%s"))\n' $(arch_string "$arch") - printf '\t\treturn errno_to_name__%s(err);\n' $(arch_string "$arch") + printf '\t\treturn errno_to_name__%s;\n' $(arch_string "$arch") done - printf '\treturn errno_to_name__%s(err);\n' $(arch_string "$default") + printf '\treturn errno_to_name__%s;\n' $(arch_string "$default") printf '}\n' } =20 diff --git a/tools/perf/trace/beauty/beauty.h b/tools/perf/trace/beauty/bea= uty.h index 788e8f6bd90eb753..9feb794f5c6e15f4 100644 --- a/tools/perf/trace/beauty/beauty.h +++ b/tools/perf/trace/beauty/beauty.h @@ -251,6 +251,4 @@ size_t open__scnprintf_flags(unsigned long flags, char = *bf, size_t size, bool sh void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg, size_t (*ret_scnprintf)(char *bf, size_t size, struct syscall_arg = *arg)); =20 -const char *arch_syscalls__strerrno(const char *arch, int err); - #endif /* _PERF_TRACE_BEAUTY_H */ diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index fdd62ea00173ccf5..2845b9f4694591be 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -456,8 +456,10 @@ const char *perf_env__arch(struct perf_env *env) =20 const char *perf_env__arch_strerrno(struct perf_env *env, int err) { - const char *arch_name =3D perf_env__arch(env); - return arch_syscalls__strerrno(arch_name, err); + if (env->arch_strerrno =3D=3D NULL) + env->arch_strerrno =3D arch_syscalls__strerrno_function(perf_env__arch(e= nv)); + + return env->arch_strerrno ? env->arch_strerrno(err) : "no arch specific s= trerrno function"; } =20 const char *perf_env__cpuid(struct perf_env *env) diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 79f371879f45bafc..bf7e3c4c211f971e 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -53,6 +53,10 @@ struct pmu_caps { char *pmu_name; }; =20 +typedef const char *(arch_syscalls__strerrno_t)(int err); + +arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *ar= ch); + struct perf_env { char *hostname; char *os_release; @@ -135,6 +139,7 @@ struct perf_env { */ bool enabled; } clock; + arch_syscalls__strerrno_t *arch_strerrno; }; =20 enum perf_compress_type { --=20 2.41.0