From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 44D9C3491EF for ; Tue, 4 Nov 2025 23:42:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762299725; cv=none; b=Jem1oZfcyBaydK7u63CIaJ7kWYnAlFqtEcawsyjFMLuzeGyLOYjtRvD9KQeKdpNZVJvxWCfDoBVAR8wai3ZcOnNRxPPcvc9KS4OaFrheR2VLIAzg17FOTVYof2/RHCCplp01C61wN1lm0qB/D1kghZkbM479C5NaZap1ysTorAo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762299725; c=relaxed/simple; bh=kIIlJo2ViHHyHZmJdA2SFQzK5GLkEyElPC+hRtMHrCg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=LihXUm6tSgRst0VCH3JuxWNDBb9SEFIGjxUdL9hx/HV3z3uqrX2iaDuXb+g+Cj12s1A0F60MMEsjMy42/NDfgcmzCNLKFIMtgzWOmVjl6J1ANj3ispRTf6IH5g+LZEwa4ta1msLZSThbnb0ZBWfcsblAQEQ/SMm8tJ2+YOL6kSo= 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=qE/NIFwn; arc=none smtp.client-ip=209.85.215.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="qE/NIFwn" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b630753cc38so11484078a12.1 for ; Tue, 04 Nov 2025 15:42:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1762299722; x=1762904522; 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=HLYd049AVbJIjRBiRUyfzy9PfU46/O34zx5goHeWds4=; b=qE/NIFwnTwGDaM5sTklJ+8LGCKVJR6bB8ZakhP4nV6q3A6hjarGKB5yiTgqc55c+tP RyrF9b+Zlgn2JIcxEZldQ5O/wRbAsvoV+T4vzmcqvW1WyoCvxRWOzZ8uhZsQ/xCB9/fq P9HLxmGajcD5+WkkMJnNvM0+0SFPPzEnrE9Yqwfj7mxuMPjHCQVd7JN8DtKEjndeQRce tTNjPpVSuf+iAMZcV4lPKf4ZuZ4hUaFePWpuglG9U4huiYFWDzqn7B0S1s9FMLgLwa2U 5nkAka5w/TRteOftPb/lnGOovtaQ1UbAEY2en8QBPg5KhR6Hb9Arjqkw+CIsYKgc5Sq9 Uqyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762299722; x=1762904522; 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=HLYd049AVbJIjRBiRUyfzy9PfU46/O34zx5goHeWds4=; b=C12DFcnDjXll0J5CYViriBXN/29ia3eTM6nNzFwTIJ3TfAseYezgjc21WJvd1WIuNJ tE5UTbydu+5C+tqZtoaOj+frgu3zabVwQbd/T7gQptGVsZbB/IWWkzbStPzAfH4Nudc5 279qCidc9Lle91jbY70YgDFRH56qXjMq7MB9CEJ93MFlEoN/aNgYoPG8szkl6G+oH1ta vg8CXG+RTfvA2xIsYcG0zuluNX3x3l6v1AlvFZP0kPKjwUySwtPRFqDCwnxcgzHrRRmG paxoJ5Chu5O3Rrq5xcXdveghlVb9lRAJLVCUAuJsKsV7+uN9M14EsgbtDB3fvEjwZv4x 3jyA== X-Forwarded-Encrypted: i=1; AJvYcCXKxVj7ERu74S2ytdkbwZe2rUiHnynNnlryuli1uKZIfhu9m/Tkb1Li+RAhfYJyppIV47gRfelKs5zuFt/HufS2@vger.kernel.org X-Gm-Message-State: AOJu0YymU3nOBg0Gk8o5GkuCyyQG+VzNpm6UpfGx74zeNJ4J1dTNFGuw 6beX0j8CnBKjJMp0wEv0MrkPKRXoajiAGqas9diuecmUBORbm/PXgNIowbU6hkfIA4wQmo4ZlbQ QNTR/vDEt8w== X-Google-Smtp-Source: AGHT+IEc9Jy8u31KY584hmhvAtiAz+iS9YsjA7Gk8+92qoDo2rKxi5QR3V/4N9BahDIQYcoSqiTgT8z97RL7 X-Received: from dlbvg27.prod.google.com ([2002:a05:7022:7f1b:b0:119:49ca:6b96]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:939e:b0:341:ea4:b999 with SMTP id adf61e73a8af0-34f867f410fmr1274807637.60.1762299722479; Tue, 04 Nov 2025 15:42:02 -0800 (PST) Date: Tue, 4 Nov 2025 15:41:48 -0800 In-Reply-To: <20251104234148.3103176-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: <20251104234148.3103176-1-irogers@google.com> X-Mailer: git-send-email 2.51.2.1006.ga50a493c49-goog Message-ID: <20251104234148.3103176-3-irogers@google.com> Subject: [PATCH v2 3/3] perf stat: Reduce scope of ru_stats From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Dr. David Alan Gilbert" , Yang Li , James Clark , Thomas Falcon , Thomas Richter , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" The ru_stats are used to capture user and system time stats when a process exits. These are then applied to user and system time tool events if their reads fail due to the process terminating. Reduce the scope now the metric code no longer reads these values. Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 14 +++++++++++++- tools/perf/util/config.c | 1 - tools/perf/util/stat-shadow.c | 2 -- tools/perf/util/stat.h | 16 ---------------- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index d89fa9468f89..3cd663b3b357 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -132,6 +132,7 @@ static bool interval_count; static const char *output_name; static int output_fd; static char *metrics; +static struct rusage_stats ru_stats; struct perf_stat { bool record; @@ -729,6 +730,17 @@ static int create_perf_stat_counter(struct evsel *evsel, evsel->core.threads); } +static void update_rusage_stats(const struct rusage *rusage) +{ + const u64 us_to_ns = 1000; + const u64 s_to_ns = 1000000000; + + update_stats(&ru_stats.ru_utime_usec_stat, + (rusage->ru_utime.tv_usec * us_to_ns + rusage->ru_utime.tv_sec * s_to_ns)); + update_stats(&ru_stats.ru_stime_usec_stat, + (rusage->ru_stime.tv_usec * us_to_ns + rusage->ru_stime.tv_sec * s_to_ns)); +} + static int __run_perf_stat(int argc, const char **argv, int run_idx) { int interval = stat_config.interval; @@ -978,7 +990,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) evlist__reset_aggr_stats(evsel_list); } else { update_stats(&walltime_nsecs_stats, t1 - t0); - update_rusage_stats(&ru_stats, &stat_config.ru_data); + update_rusage_stats(&stat_config.ru_data); } /* diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 6f914620c6ff..cc0746f494f4 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -45,7 +45,6 @@ struct perf_stat_config stat_config = { .run_count = 1, .metric_only_len = METRIC_ONLY_LEN, .walltime_nsecs_stats = &walltime_nsecs_stats, - .ru_stats = &ru_stats, .big_num = true, .ctl_fd = -1, .ctl_fd_ack = -1, diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 939ac3269a44..c59578886b4f 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -18,7 +18,6 @@ #include "tool_pmu.h" struct stats walltime_nsecs_stats; -struct rusage_stats ru_stats; enum { CTX_BIT_USER = 1 << 0, @@ -74,7 +73,6 @@ static int evsel_context(const struct evsel *evsel) void perf_stat__reset_shadow_stats(void) { memset(&walltime_nsecs_stats, 0, sizeof(walltime_nsecs_stats)); - memset(&ru_stats, 0, sizeof(ru_stats)); } static enum stat_type evsel__stat_type(struct evsel *evsel) diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index 34f30a295f89..5b8b4675883c 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -102,7 +102,6 @@ struct perf_stat_config { const char *csv_sep; struct stats *walltime_nsecs_stats; struct rusage ru_data; - struct rusage_stats *ru_stats; struct cpu_aggr_map *aggr_map; aggr_get_id_t aggr_get_id; struct cpu_aggr_map *cpus_aggr_map; @@ -132,25 +131,10 @@ static inline void init_stats(struct stats *stats) stats->max = 0; } -static inline void init_rusage_stats(struct rusage_stats *ru_stats) { - init_stats(&ru_stats->ru_utime_usec_stat); - init_stats(&ru_stats->ru_stime_usec_stat); -} - -static inline void update_rusage_stats(struct rusage_stats *ru_stats, struct rusage* rusage) { - const u64 us_to_ns = 1000; - const u64 s_to_ns = 1000000000; - update_stats(&ru_stats->ru_utime_usec_stat, - (rusage->ru_utime.tv_usec * us_to_ns + rusage->ru_utime.tv_sec * s_to_ns)); - update_stats(&ru_stats->ru_stime_usec_stat, - (rusage->ru_stime.tv_usec * us_to_ns + rusage->ru_stime.tv_sec * s_to_ns)); -} - struct evsel; struct evlist; extern struct stats walltime_nsecs_stats; -extern struct rusage_stats ru_stats; enum metric_threshold_classify { METRIC_THRESHOLD_UNKNOWN, -- 2.51.2.1006.ga50a493c49-goog