From nobody Wed Oct 8 14:40:51 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 BA9F7226D1A for ; Sat, 28 Jun 2025 04:51:12 +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=1751086274; cv=none; b=g9b3iOPyZEgI1Wa6paZjyUJ+cP7tqEOatfBctM5z1z6LSHFD5j3z4HOjr2m0sZpOynG/yqg82nkFXiizAVXtp1mSUlv/YjxlMJt46LZJu34ayJbsRS1iOzIDtrXIIP7XCVe3WPU0Nw89vBDM3wfEhekZy/GiP30VdxTCTNf3C38= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751086274; c=relaxed/simple; bh=8RWUW+TcnFEXdNv/Uk32ZicFePVvRTy5c3CKcsXSp68=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=SbOORVdDiVW4arq8AoD1Sf76P0VP3Pujn07+UrHEi4cXpzple+xx3SfeqT9TZlJyBwYEZ2D4X4E21nrNm0KW4WTQRXU25didsoX4fBmdlY3LBAgB63+ogGNIZD5h1koGI44hZ32le9KGuJQ+AnFmW2qFCH+VFXe3Hlr1uZAMTRg= 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=g+ATd3wT; 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="g+ATd3wT" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-749177ad09fso261610b3a.2 for ; Fri, 27 Jun 2025 21:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751086272; x=1751691072; 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=C96JAGkPAc0LFzD2iy/4OszeuhNF3cJzB9GEOz3PGEU=; b=g+ATd3wTm+AhW98ipVEBvO0saYfjNdSpxM1BQJdOv/qatLJ7vb3r2U6DG0UiQf8ZWd SRKYnQ/WsJMTW4kHHpGhdWBKKHbO+4iAkdUIbprtskOSn0mW92FQ1xERcFH7PEwXRK5P ph1M32a8veR++oxO1KuRbtRK7PsiPmIx6q2g71HD+oFqPD0IRihqP+Elb5ZUsRJUICoR qIk91e4uVsCYnzNxojCt2HqGEfWTpl6Bna1Z0HUayscyVLCJXLo+bH+XEFQ5SnF9I5iP 8HQ9WqXSSPPAzuxePQOz/KH3QL5teL0iqnS0td6M+jmIL9Mxwq6ybeTzmMDpxd1k8Mv6 tPZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751086272; x=1751691072; 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=C96JAGkPAc0LFzD2iy/4OszeuhNF3cJzB9GEOz3PGEU=; b=sFZCZsL6Rfx5jEHfLwSZHMWSeWSa4U59hlV0ApDvFKdXmUGJj5bmQkuarv8+8rg6zh e4qTAxq3dkuPyjCsgoVL47ueo22fgcsCTPgPdYOLH1Bf5dmvBzfywUqpEnReQ93Wbgl3 mdpi3ejuEzc3on1Iq6t6wwLORg25mrJNa4cU6h01T48AYJG/KfvaS+cSUcV2CIAkN3Kr D57uA8KFJS+wdtkNml+cMG+3sz6YKycx42xMePN7fr+RW9+//tLy2Z/K+47kpYzMX2mG Zw7kpIHQtVqN0h5zImnQZ3dkM9+9EZHyTqC7QHv4gVjl8/D0i5xCdDbTKQ/UbCpfhqMB b7Ng== X-Forwarded-Encrypted: i=1; AJvYcCWpWSriO+XKYyKHPDaWPEdBw62y4c+guAWP4PKTDU12iaUDR8efVF8mQLjLHqcpj2BhuTtXPgWWPMEKZfo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyqc9gbnMOWyhY0HBF1r3cCYb18Sse9UkkfLkbtoAThPwLVCxl7 OFEp3e3WaPGUjD09ApoNded0L9R74ECp6oSEOpbGwyKT7C+W2yj6qtFj2trBUeYQqBu761DFjZn n2frQ/Xa97A== X-Google-Smtp-Source: AGHT+IGfUVNUkCqHuooZSLSEIRDc4HHAGWz/NrI5PdI1bYekJaTo1T5722lSTuTm5psui7KE8iVyedV6kxV8 X-Received: from pfjd20.prod.google.com ([2002:a05:6a00:2454:b0:748:34d:6d4f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4f93:b0:748:e0ee:dcff with SMTP id d2e1a72fcca58-74af6f22819mr8017717b3a.11.1751086269923; Fri, 27 Jun 2025 21:51:09 -0700 (PDT) Date: Fri, 27 Jun 2025 21:50:09 -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-16-irogers@google.com> Subject: [PATCH v5 15/23] perf top: Make perf_env locally scoped 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" The use of the global host perf_env variable is potentially inconsistent within the code. Switch perf top to using a locally scoped variable that is generally accessed through the session. Signed-off-by: Ian Rogers --- tools/perf/builtin-top.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 72f9be5a3b30..d84daeae291b 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1301,7 +1301,7 @@ static int __cmd_top(struct perf_top *top) perf_set_multithreaded(); =20 if (perf_hpp_list.socket) { - ret =3D perf_env__read_cpu_topology_map(&perf_env); + ret =3D perf_env__read_cpu_topology_map(perf_session__env(top->session)); if (ret < 0) { char errbuf[BUFSIZ]; const char *err =3D str_error_r(-ret, errbuf, sizeof(errbuf)); @@ -1624,6 +1624,7 @@ int cmd_top(int argc, const char **argv) NULL }; int status =3D hists__init(); + struct perf_env host_env; =20 if (status < 0) return status; @@ -1639,12 +1640,17 @@ int cmd_top(int argc, const char **argv) =20 status =3D perf_config(perf_top_config, &top); if (status) - return status; + goto out_delete_evlist; /* * Since the per arch annotation init routine may need the cpuid, read * it here, since we are not getting this from the perf.data header. */ - status =3D perf_env__read_cpuid(&perf_env); + perf_env__init(&host_env); + status =3D perf_env__set_cmdline(&host_env, argc, argv); + if (status) + goto out_delete_evlist; + + status =3D perf_env__read_cpuid(&host_env); if (status) { /* * Some arches do not provide a get_cpuid(), so just use pr_debug, other= wise @@ -1661,18 +1667,24 @@ int cmd_top(int argc, const char **argv) =20 if (disassembler_style) { annotate_opts.disassembler_style =3D strdup(disassembler_style); - if (!annotate_opts.disassembler_style) - return -ENOMEM; + if (!annotate_opts.disassembler_style) { + status =3D -ENOMEM; + goto out_delete_evlist; + } } if (objdump_path) { annotate_opts.objdump_path =3D strdup(objdump_path); - if (!annotate_opts.objdump_path) - return -ENOMEM; + if (!annotate_opts.objdump_path) { + status =3D -ENOMEM; + goto out_delete_evlist; + } } if (addr2line_path) { symbol_conf.addr2line_path =3D strdup(addr2line_path); - if (!symbol_conf.addr2line_path) - return -ENOMEM; + if (!symbol_conf.addr2line_path) { + status =3D -ENOMEM; + goto out_delete_evlist; + } } =20 status =3D symbol__validate_sym_arguments(); @@ -1821,14 +1833,16 @@ int cmd_top(int argc, const char **argv) perf_top__update_print_entries(&top); signal(SIGWINCH, winch_sig); } - top.session->env =3D &perf_env; =20 - top.session =3D perf_session__new(NULL, NULL); + top.session =3D __perf_session__new(/*data=3D*/NULL, /*tool=3D*/NULL, + /*trace_event_repipe=3D*/false, + &host_env); if (IS_ERR(top.session)) { status =3D PTR_ERR(top.session); top.session =3D NULL; goto out_delete_evlist; } + top.evlist->session =3D top.session; =20 if (!evlist__needs_bpf_sb_event(top.evlist)) top.record_opts.no_bpf_event =3D true; @@ -1843,7 +1857,7 @@ int cmd_top(int argc, const char **argv) goto out_delete_evlist; } =20 - if (evlist__add_bpf_sb_event(top.sb_evlist, &perf_env)) { + if (evlist__add_bpf_sb_event(top.sb_evlist, &host_env)) { pr_err("Couldn't ask for PERF_RECORD_BPF_EVENT side band events.\n."); status =3D -EINVAL; goto out_delete_evlist; @@ -1865,6 +1879,7 @@ int cmd_top(int argc, const char **argv) evlist__delete(top.evlist); perf_session__delete(top.session); annotation_options__exit(); + perf_env__exit(&host_env); =20 return status; } --=20 2.50.0.727.gbf7dc18ff4-goog