From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 0D0D12EF2AA for ; Thu, 24 Jul 2025 16:33:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753374840; cv=none; b=dJLWppE5fQcBNen6QXvGs8tdALVBAAYxs8b09tRw3byXYYFS6VAz0L2PZsrIUxxbVJuzhMZcgyGeJII75QEPU1HvUkLLeQwNUzf6lvfw7Np3gJUyff7LhIQE+ybPziYA8pKbyVPf4pOpJbzIeDJ/CEhCDo8me3iQ8Gwx6QFcpZ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753374840; c=relaxed/simple; bh=t81xmNlXwmr3zilOlaXEyUvx+kcnM8s9RqOFn/g1kBY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=YuqBvn71VdZOKzbSyzgPE/WQgaV++5Rhr4C+atXELovPDMJCGVwlilR9JSevCmMjz+WRf7pT94mJgUc//U2LGMTyaHXYxpCu+HhK0rx8RpJZQoFYTWOE8SmAlbgZ+jWudpN/TERyeK9sSytMU+/dqQ7QV8YkWcdwwvHPe1e5zXs= 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=GjDdZ5uN; arc=none smtp.client-ip=209.85.214.202 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="GjDdZ5uN" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-235e7550f7bso11669875ad.3 for ; Thu, 24 Jul 2025 09:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753374838; x=1753979638; 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=mPfRZHTdYSHdPtlzDRqGTvzY0SLHPDTff14m/+O2q2c=; b=GjDdZ5uN0IVP9/YJc++FmIQrO1nSOelHehl/SrLVhygg1Dt0rwIrkxXk4XcTMT5Ck7 HUV+ZNSOmvmEhxp/z+NRQVLa4YYrvJLMX4fXHtHgJn9s17pQgjVFZ3xBsw9l8ojfUzEs wb7uAi1FjMUUZwsD9aOglC3fpVZYTFMZ1gFhDL3t7Rt9Tkt1nsOBaVwlDXMcmSU+chho g5kTNKTpi2ZVxMA88BhWYn6y2WoUJIn3A6XvKw8AJEjdVo5MnFUMWEZzuMZ3lNLAI0ut hnuYUags4s3Yuw7ixB5iQ7rrnenGHNaEcVdhtn1WAmQsSRBHA6rixMYwoSHU5Yhu2tVP dmPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753374838; x=1753979638; 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=mPfRZHTdYSHdPtlzDRqGTvzY0SLHPDTff14m/+O2q2c=; b=WkuFCTI/cCGigNV2XA0bifvO2f2imMqH1RouJ+DV3KWSMKFqblFQeKVU80TGKbrsfe iUZOWCdZxtvEXb8lH78R1RTGjhaApXpWuU4FLmzSv7wldniq5Oe4ofWIfTRKpq1f+8pO c3NtRUkIaZWYsq1OLVWrskcAfpX9iyUNx715cBmKXhnHA6/1nVo9900A9eqsDTeXvelF MqonvB/vEBg1cBQ5DXYMwaReaVv3y7VOQyp0OJNE/HuYOOI99NoKNnaUFqxuLby2sEOi ucEpfxVAUtgZHtProG/tMxt3obPHk/YrgH2+1vaW3nsDTAKwjXRGwH9U3q4m514cmdPb i8kQ== X-Forwarded-Encrypted: i=1; AJvYcCUfpR5zeee/ZLckQMOvmnWy0gtSrxTjcnDxnFTxHTGGI5bQmzxiaruzwWsVnMZ+rJbVMWmUUO15QSrmj4Sli2aG@vger.kernel.org X-Gm-Message-State: AOJu0YxV2Mzr3+j5wZOuAW30/zvvJXI/b1sAqMvIaAueQtHuXtvziuoe On0bZ6u/BlhVj52niAlZxV77OJZh0W0lMaiJKSbKsS143NyCvGYePDMymdmDtgaxTt+l9ViDflD OIejikBq0UQ== X-Google-Smtp-Source: AGHT+IFvl8qTn5wPLStLonMQXuHNn5wuTPXihQ8/0C1V+YeHw5UxQDED+F0g9aj5SyAJaXew8lVy9yJvdxPI X-Received: from pjbsc10.prod.google.com ([2002:a17:90b:510a:b0:311:a4ee:7c3d]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2282:b0:236:6fbb:a5f3 with SMTP id d9443c01a7336-23f9821c52amr105502325ad.40.1753374837903; Thu, 24 Jul 2025 09:33:57 -0700 (PDT) Date: Thu, 24 Jul 2025 09:32:57 -0700 In-Reply-To: <20250724163302.596743-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250724163302.596743-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250724163302.596743-18-irogers@google.com> Subject: [PATCH v6 17/22] 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 , "=?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 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 8a829ddff6f2..7ea3a11aca70 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -775,7 +775,9 @@ static int record__auxtrace_mmap_read(struct record *rec, { int ret; - ret = auxtrace_mmap__read(map, rec->itr, &rec->tool, + ret = auxtrace_mmap__read(map, rec->itr, + perf_session__env(rec->session), + &rec->tool, record__process_auxtrace); if (ret < 0) return ret; @@ -791,7 +793,9 @@ static int record__auxtrace_mmap_read_snapshot(struct record *rec, { int ret; - ret = auxtrace_mmap__read_snapshot(map, rec->itr, &rec->tool, + ret = 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 auxtrace_mmap *mm, u64 tail) } 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 = perf_env__kernel_is_64_bit(evsel__env(NULL)); + int kernel_is_64_bit = perf_env__kernel_is_64_bit(env); head = auxtrace_mmap__read_head(mm, kernel_is_64_bit); @@ -2002,17 +2002,18 @@ static int __auxtrace_mmap__read(struct mmap *map, } 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); } 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); } /** 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_tool *tool, size_t len1, void *data2, size_t len2); 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); 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); -- 2.50.0.727.gbf7dc18ff4-goog