From nobody Tue Dec 16 22:12:46 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 A011E25D8FD for ; Thu, 29 May 2025 04:40:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748493647; cv=none; b=bvF8SqNNXJ5kxyhNStW539iI3jVS1+VOjWwpopJ4VRsC8VWQt5XiOx175AkhehuJ4xsfY160pPVe5+ynEI22y3A5YmGOyN/gDZGxnvs4f91kk35ju+6QepDFX/g5uT6iJE1cerHFF32jeI5nGcyUkdcuqWB3rBMpJqz28xDxti4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748493647; c=relaxed/simple; bh=YHbWm2yxj1fAwq/L5g4cTe2YSWi0PRNEpHuUS9EzDy0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Ov9K9Ttta91YYXMSP0630BTmg5zbpDQuQhOB/ciYw8SKPtSy0vAFiNdWrS1CYmTIVM3XHtRPAssoJxS5VvAdGqkXJGqOm9lZrX2UHPky0q9z4aiTqWlJm3ienNpJFudTv6jXvXIFUCjRueP0mJfG9k+l3UJVO8FB+QiXxjkylSc= 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=F1E0KUuy; arc=none smtp.client-ip=209.85.216.73 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="F1E0KUuy" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3110ee88316so505908a91.1 for ; Wed, 28 May 2025 21:40:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1748493645; x=1749098445; 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=2BpKlJL8pzkzbqgm7fgbbElRoUwnyGMPhhJWvEjPnCw=; b=F1E0KUuyLnV4PPyfVYa9hk3mSMRh1oVqIS+rTL87QJwynzaXbrQnCzYgpzU3EwnrNe MUYP3IxA8Mi8TNXnWz/1YlKQN7cjsaUev/JXEMRyj45ywqy/PA7EJLQGjWIuqGxnhyQ7 vrzgdoxBjLXEvuFFBzHKXK9/nTEBlD+YVrzNZI//PTbFBVn+x3gGPMGnatkXw2wSBqOt HKKC2jYk4bXCs7e530CZxIWbbnY5/eRVy9ik7UioUF2d3A6DHP7EUsX+SXphmDt0eIAQ uNImFHJbOLTHwWA2yIkEExXIidKSHtU77ivAFnYPqhdxWeRUZxiM5pOQByUMDSrGjhwJ lLgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748493645; x=1749098445; 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=2BpKlJL8pzkzbqgm7fgbbElRoUwnyGMPhhJWvEjPnCw=; b=HVBhv7MsQNuUCp6iI3543JQ23L3raZEBlBITzXTk+fBCyNjQtmI/szDocflIj1Vr7E 5NPvvFNy4AiCwGF1zndgFyOgDAFSvAMQUsI81GJBbmHAWRi/6Ap3yeMl9S8ww3m+iYpC hxiVPR7oLGn8FYSwrM8Sb1JAKIzQAk6Cd8W2Xu6nmPoVybKZxe9Bu5LBh4hRFIfTQwVq qpo2+AtnUjTvmPPSAKBuXhZwkMK3UiSNkjDe0x0oYQGMfxrb+cjyTHu3Gj1WJafYrDHH OSPvS7SDBEBGjpo/q+OKuNGBf0n622B8J7vhdse6xwITXxi4O2cdAXcxWRTcPPv9Bgwr hmLg== X-Forwarded-Encrypted: i=1; AJvYcCUWi5HvTKgir4jXPdobkUaX395j+ULzyrG4UPGyCFdcgA/7ET0YxnHBOT30m96VqVLzPC43ZjbJ2cON8YA=@vger.kernel.org X-Gm-Message-State: AOJu0YwSWdb18cnhnFQQ5GF7Tg1i9hB1/SiZwhV9ECA8o9wuy1VBwxBd di+d9HhUo36xRQAOa2pvbnQmyKCqtTc9xtQ7RofCb7BpKdph2GLvYsffDwA2kBeXskW/dXSH1mx ZNJUS81nU5Q== X-Google-Smtp-Source: AGHT+IFVqtbndzuo7nxvSEKRMaPAublvvL5GrZMwdXD5ql+gcaO8MsxgTKp2KUN3L5eDoC3TUaRbG7RA6HnG X-Received: from pjbsf15.prod.google.com ([2002:a17:90b:51cf:b0:311:ea2a:3919]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3b41:b0:30a:4874:5397 with SMTP id 98e67ed59e1d1-311e7403565mr9110666a91.9.1748493644795; Wed, 28 May 2025 21:40:44 -0700 (PDT) Date: Wed, 28 May 2025 21:39:55 -0700 In-Reply-To: <20250529044000.759937-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: <20250529044000.759937-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.1204.g71687c7c1d-goog Message-ID: <20250529044000.759937-20-irogers@google.com> Subject: [PATCH v4 19/24] perf auxtrace: Pass perf_env from session through to mmap read 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" auxtrace_mmap__read and auxtrace_mmap__read_snapshot end up calling `evsel__env(NULL)` which returns the global perf_env variable for the host. Their only call is in perf record. Rather than use the global variable pass through the perf_env for `perf record`. Signed-off-by: Ian Rogers --- tools/perf/builtin-record.c | 8 ++++++-- tools/perf/util/auxtrace.c | 13 +++++++------ tools/perf/util/auxtrace.h | 6 ++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 66569ec4410e..ca76423d81da 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -774,7 +774,9 @@ static int record__auxtrace_mmap_read(struct record *re= c, { int ret; =20 - ret =3D auxtrace_mmap__read(map, rec->itr, &rec->tool, + ret =3D auxtrace_mmap__read(map, rec->itr, + perf_session__env(rec->session), + &rec->tool, record__process_auxtrace); if (ret < 0) return ret; @@ -790,7 +792,9 @@ static int record__auxtrace_mmap_read_snapshot(struct r= ecord *rec, { int ret; =20 - ret =3D auxtrace_mmap__read_snapshot(map, rec->itr, &rec->tool, + ret =3D auxtrace_mmap__read_snapshot(map, rec->itr, + perf_session__env(rec->session), + &rec->tool, record__process_auxtrace, rec->opts.auxtrace_snapshot_size); if (ret < 0) diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 03211c2623de..ebd32f1b8f12 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -1890,7 +1890,7 @@ int __weak compat_auxtrace_mmap__write_tail(struct au= xtrace_mmap *mm, u64 tail) } =20 static int __auxtrace_mmap__read(struct mmap *map, - struct auxtrace_record *itr, + struct auxtrace_record *itr, struct perf_env *env, const struct perf_tool *tool, process_auxtrace_t fn, bool snapshot, size_t snapshot_size) { @@ -1900,7 +1900,7 @@ static int __auxtrace_mmap__read(struct mmap *map, size_t size, head_off, old_off, len1, len2, padding; union perf_event ev; void *data1, *data2; - int kernel_is_64_bit =3D perf_env__kernel_is_64_bit(evsel__env(NULL)); + int kernel_is_64_bit =3D perf_env__kernel_is_64_bit(env); =20 head =3D auxtrace_mmap__read_head(mm, kernel_is_64_bit); =20 @@ -2002,17 +2002,18 @@ static int __auxtrace_mmap__read(struct mmap *map, } =20 int auxtrace_mmap__read(struct mmap *map, struct auxtrace_record *itr, - const struct perf_tool *tool, process_auxtrace_t fn) + struct perf_env *env, const struct perf_tool *tool, + process_auxtrace_t fn) { - return __auxtrace_mmap__read(map, itr, tool, fn, false, 0); + return __auxtrace_mmap__read(map, itr, env, tool, fn, false, 0); } =20 int auxtrace_mmap__read_snapshot(struct mmap *map, - struct auxtrace_record *itr, + struct auxtrace_record *itr, struct perf_env *env, const struct perf_tool *tool, process_auxtrace_t fn, size_t snapshot_size) { - return __auxtrace_mmap__read(map, itr, tool, fn, true, snapshot_size); + return __auxtrace_mmap__read(map, itr, env, tool, fn, true, snapshot_size= ); } =20 /** diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h index b0db84d27b25..f001cbb68f8e 100644 --- a/tools/perf/util/auxtrace.h +++ b/tools/perf/util/auxtrace.h @@ -23,6 +23,7 @@ union perf_event; struct perf_session; struct evlist; struct evsel; +struct perf_env; struct perf_tool; struct mmap; struct perf_sample; @@ -512,10 +513,11 @@ typedef int (*process_auxtrace_t)(const struct perf_t= ool *tool, size_t len1, void *data2, size_t len2); =20 int auxtrace_mmap__read(struct mmap *map, struct auxtrace_record *itr, - const struct perf_tool *tool, process_auxtrace_t fn); + struct perf_env *env, const struct perf_tool *tool, + process_auxtrace_t fn); =20 int auxtrace_mmap__read_snapshot(struct mmap *map, - struct auxtrace_record *itr, + struct auxtrace_record *itr, struct perf_env *env, const struct perf_tool *tool, process_auxtrace_t fn, size_t snapshot_size); =20 --=20 2.49.0.1204.g71687c7c1d-goog