From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4DD836402A for ; Mon, 9 Feb 2026 09:24:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770629098; cv=none; b=BVi2QILdA5j7LuOzCnWHWU71ci2VnEYAkUaWdKPK8l0wfaXUDx0H8YlySAFF+aOVKTtsNjGuqO9/bpXeG2vVY4Le7yaD3mGDlXuLANJzuCdSbD4D9/AsSjrvexNxtXy4BPHc3CeT71gDI8Q+fqbIj8B8ghzWMaqALVBHqdfxcmc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770629098; c=relaxed/simple; bh=TS3My54+1+wB3igxyJXqNn57tpPk9g2oanX93lMf9nc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S3WHumlp9PcTbdKUmHIjCRBK1x9aPqzQQfTgwyCusuGnOdeLQfJgEaCX3Y3JIZNWbuOKp/ZyjBk373vzvwrZNWc8pT3ZC35OmJsEoifx0A/2fWfdIlSpil3jm+0sP8JDiHUUMlIgU6IZEzlQfE2/eEiHjtDEMoXKI7wrfbGMAsk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=hdC7IlB9; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=HZSKOJdz; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hdC7IlB9"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="HZSKOJdz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770629097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=st11ylo4z/SO3tLN7S2b9c++GEqcWdO6dyVW8k4qC0Q=; b=hdC7IlB9Zl8SzI7RQmpb8iyhTr2u0FTYT69p1F86WJp9O9ICyagIYPo2nnCW1O7o+hoyJr k1CbFNj5a10UUePQVclKQyE3se5EAt3pmjcIjxgAxzNl9si+XExhJJ2t/mDMSw9iNhcdBT iQf5P0KnOQQPm7IUC9rict0Hrgfxlz0= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-451-V7yR4VBvOYCfM9dEhWcjww-1; Mon, 09 Feb 2026 04:24:54 -0500 X-MC-Unique: V7yR4VBvOYCfM9dEhWcjww-1 X-Mimecast-MFC-AGG-ID: V7yR4VBvOYCfM9dEhWcjww_1770629093 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4831192e66aso38099275e9.2 for ; Mon, 09 Feb 2026 01:24:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770629093; x=1771233893; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=st11ylo4z/SO3tLN7S2b9c++GEqcWdO6dyVW8k4qC0Q=; b=HZSKOJdzZ/idoYRx4/HZXz+lLCYBxtp891fHPSMJcnMNtpyRSrKb/Nv2WAREBrj8tU E6HJM2p4phHhh9UfZcxr02LlKx4clRQQbiC5OOb7GhrE4qZshFwipI1gO0B+YrYXC5Ni IN6Yuldgp6k+SSFaCR3Xl7VX5CC9ifHG6lEGjl2YQuKgIol8ZqBD7zWnteqvDFM4v74P +mUnIILbYzU9I2CL77EPX6nQ4psJGoECBE78wpH3v6alT+9K63+CQLAghyX9ppc9twGo 1d89zBoHZM391Cwqgz/kbI5scLeTKd6xDj4InpWfRoH1cwDJ7IqD6YVR8h+KJkyahD2p ThSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770629093; x=1771233893; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=st11ylo4z/SO3tLN7S2b9c++GEqcWdO6dyVW8k4qC0Q=; b=oEn9h5GwgbqSqYE7viuGmTqpHrAQ/ZXrfNAaOXIKYRwskG8SVJ95rDOxUWkkOy3nIg yq32sx9c2F0pRENc/b/aroZVElbKvTQrOnwITJ3moHiMR5YOjdrHY3l6WzW/PpkZtmc2 TVqoX590xAe07ocva3p8ldDDzAIM1tEFV0Qgz6flSTKBnp4YVqpZVfdMYpnPfHK34gMU t4+7kqFO3K7Tsvc6h70TUF4PdlNVXXymw6E6qs9/fWsdJ+sjibp6GtxWM3T/ggfClQKS GRg5GhA/lESFmu9MqPL0eQxkKTvVsUUg+YW/W7eepfBYpCF6tklhLpxVqSuj69HbNjcW 4g6A== X-Forwarded-Encrypted: i=1; AJvYcCXSTMQG6RG9oVxS/835GtYjS7NingS3WrCDZ85aggMrZJBRoIhKqVBr1EBbT5YP+39ixfQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzcE1WjRKuyeT1dFIBjaoZChP+uem0pAoJ2BBvDdz8NEHu8Oq5G MOmJI/yyVCyml8m9D/7zyClBhy1Y0sD9QslC49iqcqr7dSUTa5pEqS41ZdIYPCM1fmXm3olEJhJ 8VsRLm/BQlTNOQl18ST7mgDUcMeEI7xaxsjAVqLCCQ7UDLyU7ZDFa3A== X-Gm-Gg: AZuq6aJKvVSptN/jex0rFXbP0dHK6sayjh5ilLXMfUMU0LoJK0qwakEZhZHfqNV3g8A yKJ4BSCYk83nNz87ThSxzh3ZXAiDh4TQrYoQgCMgndR+4OrwttJQntBzcJmCVrVtcha5ocJjkqq Nj5a1RUsEY7yCziUt9CXQxG+320/53QP0ctfSuG23G3dYfD5a3EPdpysNEYaYg/NKc4q2RVxxZ4 2xF0Le0NiKuV7ihVzPhTBPnWSe+U4k3Q4aua77M5qazxBalYqQ8IdpTJf6/M7yj5jWWlDmfjSVv HJADr4myRPn8s0xVsXW5pYgrKvMz8dVOaR0XMpU5xJ30q22xUS6QWUigQDDnEf2AuJjKaZPSIhx SUZqQ+CJLI26MNYgMMD8c7aM7sA== X-Received: by 2002:a05:600c:4e86:b0:480:52fd:d2e4 with SMTP id 5b1f17b1804b1-483201710c7mr129388075e9.0.1770629093080; Mon, 09 Feb 2026 01:24:53 -0800 (PST) X-Received: by 2002:a05:600c:4e86:b0:480:52fd:d2e4 with SMTP id 5b1f17b1804b1-483201710c7mr129387715e9.0.1770629092614; Mon, 09 Feb 2026 01:24:52 -0800 (PST) Received: from costa-tp.redhat.com ([2a00:a041:e223:1b00:fe51:8bb:7986:c897]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48317d33f5fsm316310295e9.5.2026.02.09.01.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Feb 2026 01:24:52 -0800 (PST) From: Costa Shulyupin To: Steven Rostedt , Tomas Glozar , Costa Shulyupin , Crystal Wood , Wander Lairson Costa , Ivan Pravdin , John Kacur , Tiezhu Yang , linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH v2 1/4] tools/rtla: Consolidate nr_cpus usage across all tools Date: Mon, 9 Feb 2026 11:24:33 +0200 Message-ID: <20260209092436.2899888-2-costa.shul@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260209092436.2899888-1-costa.shul@redhat.com> References: <20260209092436.2899888-1-costa.shul@redhat.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit sysconf(_SC_NPROCESSORS_CONF) (via get_nprocs_conf) reflects cpu_possible_mask, which is fixed at boot time, so querying it repeatedly is unnecessary. Replace multiple calls to sysconf(_SC_NPROCESSORS_CONF) with a single global nr_cpus variable initialized once at startup. `#pragma once` in timerlat_u.h is needed for pre-C23 compilers to avoid redefinition errors. Signed-off-by: Costa Shulyupin --- tools/tracing/rtla/src/common.c | 7 +++++-- tools/tracing/rtla/src/common.h | 2 ++ tools/tracing/rtla/src/osnoise_hist.c | 3 --- tools/tracing/rtla/src/osnoise_top.c | 7 ------- tools/tracing/rtla/src/timerlat.c | 5 +---- tools/tracing/rtla/src/timerlat_aa.c | 1 - tools/tracing/rtla/src/timerlat_hist.c | 3 --- tools/tracing/rtla/src/timerlat_top.c | 7 ------- tools/tracing/rtla/src/timerlat_u.c | 3 +-- tools/tracing/rtla/src/timerlat_u.h | 1 + tools/tracing/rtla/src/utils.c | 10 +--------- 11 files changed, 11 insertions(+), 38 deletions(-) diff --git a/tools/tracing/rtla/src/common.c b/tools/tracing/rtla/src/common.c index ceff76a62a30..e4cf30a65e82 100644 --- a/tools/tracing/rtla/src/common.c +++ b/tools/tracing/rtla/src/common.c @@ -5,12 +5,14 @@ #include #include #include -#include #include +#include + #include "common.h" struct trace_instance *trace_inst; volatile int stop_tracing; +int nr_cpus; static void stop_trace(int sig) { @@ -135,7 +137,7 @@ common_apply_config(struct osnoise_tool *tool, struct common_params *params) } if (!params->cpus) { - for (i = 0; i < sysconf(_SC_NPROCESSORS_CONF); i++) + for (i = 0; i < nr_cpus; i++) CPU_SET(i, ¶ms->monitored_cpus); } @@ -183,6 +185,7 @@ int run_tool(struct tool_ops *ops, int argc, char *argv[]) bool stopped; int retval; + nr_cpus = get_nprocs_conf(); params = ops->parse_args(argc, argv); if (!params) exit(1); diff --git a/tools/tracing/rtla/src/common.h b/tools/tracing/rtla/src/common.h index 7602c5593ef5..32f9c1351209 100644 --- a/tools/tracing/rtla/src/common.h +++ b/tools/tracing/rtla/src/common.h @@ -107,6 +107,8 @@ struct common_params { struct timerlat_u_params user; }; +extern int nr_cpus; + #define for_each_monitored_cpu(cpu, nr_cpus, common) \ for (cpu = 0; cpu < nr_cpus; cpu++) \ if (!(common)->cpus || CPU_ISSET(cpu, &(common)->monitored_cpus)) diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src/osnoise_hist.c index 9d70ea34807f..03ebff34fff4 100644 --- a/tools/tracing/rtla/src/osnoise_hist.c +++ b/tools/tracing/rtla/src/osnoise_hist.c @@ -647,9 +647,6 @@ static struct osnoise_tool *osnoise_init_hist(struct common_params *params) { struct osnoise_tool *tool; - int nr_cpus; - - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); tool = osnoise_init_tool("osnoise_hist"); if (!tool) diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c index d54d47947fb4..7dcd2e318205 100644 --- a/tools/tracing/rtla/src/osnoise_top.c +++ b/tools/tracing/rtla/src/osnoise_top.c @@ -232,12 +232,8 @@ osnoise_print_stats(struct osnoise_tool *top) { struct osnoise_params *params = to_osnoise_params(top->params); struct trace_instance *trace = &top->trace; - static int nr_cpus = -1; int i; - if (nr_cpus == -1) - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); - if (!params->common.quiet) clear_terminal(trace->seq); @@ -495,9 +491,6 @@ osnoise_top_apply_config(struct osnoise_tool *tool) struct osnoise_tool *osnoise_init_top(struct common_params *params) { struct osnoise_tool *tool; - int nr_cpus; - - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); tool = osnoise_init_tool("osnoise_top"); if (!tool) diff --git a/tools/tracing/rtla/src/timerlat.c b/tools/tracing/rtla/src/timerlat.c index 8f8811f7a13b..69856f677fce 100644 --- a/tools/tracing/rtla/src/timerlat.c +++ b/tools/tracing/rtla/src/timerlat.c @@ -99,7 +99,7 @@ timerlat_apply_config(struct osnoise_tool *tool, struct timerlat_params *params) int timerlat_enable(struct osnoise_tool *tool) { struct timerlat_params *params = to_timerlat_params(tool->params); - int retval, nr_cpus, i; + int retval, i; if (params->dma_latency >= 0) { dma_latency_fd = set_cpu_dma_latency(params->dma_latency); @@ -115,8 +115,6 @@ int timerlat_enable(struct osnoise_tool *tool) return -1; } - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); - for_each_monitored_cpu(i, nr_cpus, ¶ms->common) { if (save_cpu_idle_disable_state(i) < 0) { err_msg("Could not save cpu idle state.\n"); @@ -214,7 +212,6 @@ void timerlat_analyze(struct osnoise_tool *tool, bool stopped) void timerlat_free(struct osnoise_tool *tool) { struct timerlat_params *params = to_timerlat_params(tool->params); - int nr_cpus = sysconf(_SC_NPROCESSORS_CONF); int i; timerlat_aa_destroy(); diff --git a/tools/tracing/rtla/src/timerlat_aa.c b/tools/tracing/rtla/src/timerlat_aa.c index 31e66ea2b144..5766d58709eb 100644 --- a/tools/tracing/rtla/src/timerlat_aa.c +++ b/tools/tracing/rtla/src/timerlat_aa.c @@ -1022,7 +1022,6 @@ void timerlat_aa_destroy(void) */ int timerlat_aa_init(struct osnoise_tool *tool, int dump_tasks) { - int nr_cpus = sysconf(_SC_NPROCESSORS_CONF); struct timerlat_aa_context *taa_ctx; int retval; diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c index 4e8c38a61197..841118ed84f2 100644 --- a/tools/tracing/rtla/src/timerlat_hist.c +++ b/tools/tracing/rtla/src/timerlat_hist.c @@ -1031,9 +1031,6 @@ static struct osnoise_tool *timerlat_init_hist(struct common_params *params) { struct osnoise_tool *tool; - int nr_cpus; - - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); tool = osnoise_init_tool("timerlat_hist"); if (!tool) diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c index 284b74773c2b..3e395ce4fa9f 100644 --- a/tools/tracing/rtla/src/timerlat_top.c +++ b/tools/tracing/rtla/src/timerlat_top.c @@ -442,15 +442,11 @@ timerlat_print_stats(struct osnoise_tool *top) struct timerlat_params *params = to_timerlat_params(top->params); struct trace_instance *trace = &top->trace; struct timerlat_top_cpu summary; - static int nr_cpus = -1; int i; if (params->common.aa_only) return; - if (nr_cpus == -1) - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); - if (!params->common.quiet) clear_terminal(trace->seq); @@ -781,9 +777,6 @@ static struct osnoise_tool *timerlat_init_top(struct common_params *params) { struct osnoise_tool *top; - int nr_cpus; - - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); top = osnoise_init_tool("timerlat_top"); if (!top) diff --git a/tools/tracing/rtla/src/timerlat_u.c b/tools/tracing/rtla/src/timerlat_u.c index ce68e39d25fd..a569fe7f93aa 100644 --- a/tools/tracing/rtla/src/timerlat_u.c +++ b/tools/tracing/rtla/src/timerlat_u.c @@ -16,7 +16,7 @@ #include #include -#include "utils.h" +#include "common.h" #include "timerlat_u.h" /* @@ -131,7 +131,6 @@ static int timerlat_u_send_kill(pid_t *procs, int nr_cpus) */ void *timerlat_u_dispatcher(void *data) { - int nr_cpus = sysconf(_SC_NPROCESSORS_CONF); struct timerlat_u_params *params = data; char proc_name[128]; int procs_count = 0; diff --git a/tools/tracing/rtla/src/timerlat_u.h b/tools/tracing/rtla/src/timerlat_u.h index 661511908957..a692331bd1c7 100644 --- a/tools/tracing/rtla/src/timerlat_u.h +++ b/tools/tracing/rtla/src/timerlat_u.h @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#pragma once /* * Copyright (C) 2023 Red Hat Inc, Daniel Bristot de Oliveira */ diff --git a/tools/tracing/rtla/src/utils.c b/tools/tracing/rtla/src/utils.c index 0da3b2470c31..8cd1b374b035 100644 --- a/tools/tracing/rtla/src/utils.c +++ b/tools/tracing/rtla/src/utils.c @@ -19,7 +19,7 @@ #include #include -#include "utils.h" +#include "common.h" #define MAX_MSG_LENGTH 1024 int config_debug; @@ -119,14 +119,11 @@ int parse_cpu_set(char *cpu_list, cpu_set_t *set) { const char *p; int end_cpu; - int nr_cpus; int cpu; int i; CPU_ZERO(set); - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); - for (p = cpu_list; *p; ) { cpu = atoi(p); if (cpu < 0 || (!cpu && *p != '0') || cpu >= nr_cpus) @@ -559,7 +556,6 @@ int save_cpu_idle_disable_state(unsigned int cpu) unsigned int nr_states; unsigned int state; int disabled; - int nr_cpus; nr_states = cpuidle_state_count(cpu); @@ -567,7 +563,6 @@ int save_cpu_idle_disable_state(unsigned int cpu) return 0; if (saved_cpu_idle_disable_state == NULL) { - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); saved_cpu_idle_disable_state = calloc(nr_cpus, sizeof(unsigned int *)); if (!saved_cpu_idle_disable_state) return -1; @@ -644,13 +639,10 @@ int restore_cpu_idle_disable_state(unsigned int cpu) void free_cpu_idle_disable_states(void) { int cpu; - int nr_cpus; if (!saved_cpu_idle_disable_state) return; - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); - for (cpu = 0; cpu < nr_cpus; cpu++) { free(saved_cpu_idle_disable_state[cpu]); saved_cpu_idle_disable_state[cpu] = NULL; -- 2.52.0