From nobody Wed Oct 8 14:40:50 2025 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0956227B95 for ; Sat, 28 Jun 2025 04:51:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751086283; cv=none; b=bXSgasn+o6roI3qrM4+eb9896t0Brd6dYbUvSCcxncPZ5+sX1G3SmLKAFYASB6IoreOHUvU3sj8A6SC5Cg3yqYpgXQ2aub9rN8Levbnha4+1KEIPXVofi6q6QqwA3Egk5L0twtUjnG5ripGJsW7HFdN2hba3LIbcILe45hXFnjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751086283; c=relaxed/simple; bh=rzX8B0iDELZ/bYw3/jiUDZsS7oa2ckXn4WeaJ/6cDmI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=gi+LxT0sjeXMtlkMKMwaKF47mDBQ48ecYj+gOtPwDzlFFPDHq4nV3wgypcmNHss3013df9tbL3X/1MVnRMM1ZNSzkb6ktHonxhqKAw5MtOUEkLOvZvo6/3Cz8LuSlEAI3nP4nRYxYPaYPZZy9S7og4MDpg3Plzf+gs6oXwjd7ms= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1/3EcPu8; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1/3EcPu8" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-74913385dd8so1106610b3a.0 for ; Fri, 27 Jun 2025 21:51:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751086281; x=1751691081; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=zuXuLHVC8mUAXN1Rk38gtyje6VxPsjMfZ/jwecza8r0=; b=1/3EcPu8SQdH4JsabudDskflkSiQ5Zfk95PGfY7PMHu7zNnePZA1FVi0m8foTnKiXc ZY0kraeKLO2DT0UFOMBAQwzoPaKnRZjfXs6fbPnXASF0V1bsgQww5IX30GJ6onEaxt41 7WquScZRj2k0DJDrknSBMbubMXaTCPjd8+VyrDREBK4VdhSi8eHRq6Lijxo2bGgy5eAy 3EpjVoc+imwIUh7HMv0yrE2s0Dw2HY6LnX46lJNhQVI6ltyXkbQXyqMe8F7HSOiuo8GN UnLfS/M5V4YV5z0WibBccQGrXWDaBHgaD7sxQ/OFpHTLWzVbQrJKZBU1njOjqNiN6Lx/ Ly7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751086281; x=1751691081; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zuXuLHVC8mUAXN1Rk38gtyje6VxPsjMfZ/jwecza8r0=; b=kE8hcywRe4zoTf4Yojbxi0gDDcdFe8T4Ym16r7ba94wfwcvyLw1sGkPluIXiv6hbhL zX8wocnj0tHTSJRj2FSwCLs5Px0boCoXCsfPoWrlHjj2AHw+aEtjZ1M/joen0f2lN59P NQhwCVZxVZLeW96ABQFbEniyGDcEZQzfp5yop8AmUHhPgygOObgDfEiZgopYZi3QMXY8 AdVG1lqb8qfgBcVX/RBqvaQ7QCTqOTJNoNdSK4PfmC+mS7QMiYc5SNFt370wIqfJfhiY +l3BgpqrcawVdShiDKoklcrCSQ5HaxuY3IoK9vKYHnqFnnJn5x5CwSLLyIbSWL5bW1hO bzmA== X-Forwarded-Encrypted: i=1; AJvYcCVoCPOMPK52cNqGHNRgoRMD9erSK8K48YpcIpZYQZx+ZERPy9aZQ3p2vTxROX2mDsqt/Vz+gCEfYh2T8DU=@vger.kernel.org X-Gm-Message-State: AOJu0YylcLk3UtBicFtSa/fq53zBNSvg+kELB6Na/jkIKV+0y+gpQNHz n0neIS2tlXe4RKprAzm5H54bKok8QwCkDEFsw0YLblr5bwDV3mDcplxM69X85ejA156dUZyN/qK DzfYLH8Q+4Q== X-Google-Smtp-Source: AGHT+IE0qxcnnxTTWe9CHDCNPjcV2j5Ls+Y8fN+NmEKyKnoatl4vzJ3R6yfnqSJhftKCP5XZWld0LGT3E1t9 X-Received: from pgnb21.prod.google.com ([2002:a63:7155:0:b0:b31:d4af:e567]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:9186:b0:21f:5324:340 with SMTP id adf61e73a8af0-220a17e9b09mr9968310637.41.1751086281226; Fri, 27 Jun 2025 21:51:21 -0700 (PDT) Date: Fri, 27 Jun 2025 21:50:13 -0700 In-Reply-To: <20250628045017.1361563-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250628045017.1361563-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250628045017.1361563-20-irogers@google.com> Subject: [PATCH v5 19/23] perf trace: Avoid global perf_env with evsel__env From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , "Masami Hiramatsu (Google)" , Ravi Bangoria , Charlie Jenkins , Colin Ian King , Andi Kleen , Dmitry Vyukov , Graham Woodward , Ilkka Koskinen , Zhongqiu Han , Yicong Yang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , Stephen Brennan , Chun-Tse Shao , Yujie Liu , "Dr. David Alan Gilbert" , Levi Yun , Howard Chu , Weilin Wang , Thomas Falcon , Matt Fleming , Veronika Molnarova , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Zixian Cai , Steve Clevenger , Ben Gainey , Chaitanya S Prakash , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no session in perf trace unless in replay mode, so in host mode no session can be associated with the evlist. If the evsel__env call fails resort to the host_env that's part of the trace. Remove errno_to_name as it becomes a called once 1-line function once the argument is turned into a perf_env, just call perf_env__arch_strerrno directly. Signed-off-by: Ian Rogers --- tools/perf/builtin-trace.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index d52f21afdeb1..da94cd28c8dc 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2904,13 +2904,6 @@ static int trace__fprintf_callchain(struct trace *tr= ace, struct perf_sample *sam return sample__fprintf_callchain(sample, 38, print_opts, get_tls_callchai= n_cursor(), symbol_conf.bt_stop_list, trace->output); } =20 -static const char *errno_to_name(struct evsel *evsel, int err) -{ - struct perf_env *env =3D evsel__env(evsel); - - return perf_env__arch_strerrno(env, err); -} - static int trace__sys_exit(struct trace *trace, struct evsel *evsel, union perf_event *event __maybe_unused, struct perf_sample *sample) @@ -2996,8 +2989,9 @@ static int trace__sys_exit(struct trace *trace, struc= t evsel *evsel, } else if (ret < 0) { errno_print: { char bf[STRERR_BUFSIZE]; - const char *emsg =3D str_error_r(-ret, bf, sizeof(bf)), - *e =3D errno_to_name(evsel, -ret); + struct perf_env *env =3D evsel__env(evsel) ?: &trace->host_env; + const char *emsg =3D str_error_r(-ret, bf, sizeof(bf)); + const char *e =3D perf_env__arch_strerrno(env, err); =20 fprintf(trace->output, "-1 %s (%s)", e, emsg); } --=20 2.50.0.727.gbf7dc18ff4-goog