From nobody Sat Feb 7 10:44:16 2026 Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) (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 78D162D7388 for ; Sat, 18 Oct 2025 13:04:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760792692; cv=none; b=iWJw85vEIGqipYQ2jJNvGXo/ZvmjbIhQWCU3Rvr7zMkZB+NtMy5WL9dYDZhd2Zght9lMZKiH1mOFmEzMrSnIdu0vwQK2GzhpyfedPQZ+e8Mf4SmKUwAfAGjee6IJT2pOtzaMhzK89p/dYrEzb5F3lhhk5GIEryC3QS6EYZh4onY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760792692; c=relaxed/simple; bh=tNCtfZXrwra07r6TPtCLq3FKK/mpUzFwvZ2s9FeejDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pg8i/A0iZ+zsqBI3uI9x4XGDQ8s8VtdBJmqteZ1hO/YOTXQWQXTVWPpwXumAOZd4lSfHHVYdcZUAxAcOlEuqQzCYPkLSbNKuGxmm8GU1nksEKpbq8Mo8YgjALZPhW21ufAmbGGi/nsXAAaFaFEhzinUKz+FSdkTNcmkDbHZLyAc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Dqh1TJS0; arc=none smtp.client-ip=209.85.219.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dqh1TJS0" Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-795be3a3644so24143576d6.0 for ; Sat, 18 Oct 2025 06:04:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760792689; x=1761397489; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CkQnkfhKVZ2WiQWF8dIRcSRecJlwiFQZcKoAtHOZptI=; b=Dqh1TJS0okdYv0K9KNpVgAoS3zPHD5outYG7KQUoxgPnrFefZ0DsxOcy6zOu1Bafna GoZTDC9nbk55g3A8a5j01DfIEvnPFSoJhQ6MSW07HJhXMsVsEKK5dLFHSWjkCFwJ3Ig/ kgDa3s6TjSHdKjLeTJBuJcTk4VCZ+asBe5Zxkle17H0ENEPun4Xd7lEEsrd7B95Jyb4e 1etuWYI5rbrROsmjxjHhrPBaAYWnPRjd62GotUKVkZi3PkSyWJ3aXwUhutZDIneJZCbn nS3FtceJuMy2S520lEq8QqP8Pmi6UPaHFNxNv9kQ94CT49XO8VVAu9qtx/bIWsF5DApW vRqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760792689; x=1761397489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CkQnkfhKVZ2WiQWF8dIRcSRecJlwiFQZcKoAtHOZptI=; b=edmoOcJejpGKhe8aQwicEQdQlXpNnLCcgzFUbKKT5ptrgHBPrCQoECOpds40kp+7Bl 9y8yD6etMDkotiD2QkdYyphOc97K7Bt/xl+Ub2dZin4IgYfyoBgg7OILxOPzy7RAgmBI o89T0Pr++UN+NrScP7WZOD8D6R13kPmjoUgSU3Lhz6CmCwWvWxzmk0qC/i7e8C/2m1c+ BQm4p2gA4Il2COtuaO0WLMv5QopuRQ1TY05C1bW9S9rSJU26W6YiD8X38V/7Dz2fuBS4 CdpCHIjVNo+NK8PPh7hmg8rUSjL3Jm0wiSLZbwxjSDFHt1TYisI9O4s6aa9rKOw8ksJt 3Jtw== X-Forwarded-Encrypted: i=1; AJvYcCXHBDgtrlfekhQNp5rus7tLGbWSeqRQ00ZXr6yTMH3F+4Mu66jSZSxQI8EeTLMspxptq43nWt8tUypv7Rs=@vger.kernel.org X-Gm-Message-State: AOJu0YxO3fM8cbrNcus2RmdLaTnuZm1+H674zin2ddias67iLMUF3W9X VHhVB8Pk3z+q1zFCmE5DfDhuD4LmR4kjifU72fgOBDPESHZW+KIWQU1q X-Gm-Gg: ASbGncvCBlyhra8HqkbgvXSmKiBGC4vbL+CXezvxeaXkgJdAzah16zaP6xnNDLgKVTD 0qv8xCX0Ce3tWo+mZ139+ZJ9zjtbGe/6UPAvE14U+eXnfpwhcQjeKBfYxicijiYA1kVW1QyB4TF 5MY8O347ul4KE5CGnYscHi24QZySixAL4/TMrC5LV5yVldLbxdIaTrHW4SRFH6N23ybWN2e5yAe t3T1qc2pIDiBthTpKsMNrdU9AyM+Pehzr/fhSYj0+xbxmrXoTMIgAIFTMj8BL1J/CxU9n3SH0kU 6to/7opSBbX1jmsua3tITQ5dtycyI/CHco/jpGN1/oBiAkJdfR0Df9VYqjWb8a4wkJM+xNatCCm 1NKtAEOREmzo8gr8I2RekmlTtcwogInBsX99vDD6TrnS+zLhUCCTcXcHFPa1uRY//C8sCcJEx1r 1z5G+r0QDY9/UQSUrwfzjhpWmNZ4pKCyhYhC95 X-Google-Smtp-Source: AGHT+IGTBjXIhOWC86hx4SGk6B0RopfrHRh+YLNI/bAmg9Pt0yLabyd37BfTIk3sWm7f/2E/S5GOJw== X-Received: by 2002:ad4:5cea:0:b0:87c:1ec5:841e with SMTP id 6a1803df08f44-87c2054ac90mr92083136d6.8.1760792689172; Sat, 18 Oct 2025 06:04:49 -0700 (PDT) Received: from ideapad.mynetworksettings.com ([2600:4040:5304:d300:275f:6229:da5:6a60]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-87d028966fasm15840596d6.33.2025.10.18.06.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Oct 2025 06:04:48 -0700 (PDT) From: Ivan Pravdin To: rostedt@goodmis.org, tglozar@redhat.com, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ivan Pravdin Subject: [PATCH v4 1/2] rtla: fix -C/--cgroup interface Date: Sat, 18 Oct 2025 09:04:30 -0400 Message-ID: <005ddb8734decbbbf5629f01015c441683ff803b.1760791697.git.ipravdin.official@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, user can only specify cgroup to the tracer's thread the following ways: `-C[cgroup]` `-C[=3Dcgroup]` `--cgroup[=3Dcgroup]` If user tries to specify cgroup as `-C [cgroup]` or `--cgroup [cgroup]`, the parser silently fails and rtla's cgroup is used for the tracer threads. To make interface more user-friendly, allow user to specify cgroup in the aforementioned way, i.e. `-C [cgroup]` and `--cgroup [cgroup]`. Refactor identical logic between -t/--trace and -C/--cgroup into a common function. Change documentation to reflect this user interface change. Fixes: a957cbc02531 ("rtla: Add -C cgroup support") Signed-off-by: Ivan Pravdin Reviewed-by: Tomas Glozar --- Documentation/tools/rtla/common_options.rst | 2 +- tools/tracing/rtla/src/osnoise_hist.c | 26 ++++++--------------- tools/tracing/rtla/src/osnoise_top.c | 26 ++++++--------------- tools/tracing/rtla/src/timerlat_hist.c | 26 ++++++--------------- tools/tracing/rtla/src/timerlat_top.c | 26 ++++++--------------- tools/tracing/rtla/src/utils.c | 26 +++++++++++++++++++++ tools/tracing/rtla/src/utils.h | 1 + 7 files changed, 56 insertions(+), 77 deletions(-) diff --git a/Documentation/tools/rtla/common_options.rst b/Documentation/to= ols/rtla/common_options.rst index 77ef35d3f831..edc8e850f5d0 100644 --- a/Documentation/tools/rtla/common_options.rst +++ b/Documentation/tools/rtla/common_options.rst @@ -42,7 +42,7 @@ - *f:prio* - use SCHED_FIFO with *prio*; - *d:runtime[us|ms|s]:period[us|ms|s]* - use SCHED_DEADLINE with *= runtime* and *period* in nanoseconds. =20 -**-C**, **--cgroup**\[*=3Dcgroup*] +**-C**, **--cgroup** \[*cgroup*] =20 Set a *cgroup* to the tracer's threads. If the **-C** option is pa= ssed without arguments, the tracer's thread will inherit **rtla**'s *cgroup= *. Otherwise, the threads will be placed on the *cgroup* passed to the opti= on. =20 diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src= /osnoise_hist.c index dffb6d0a98d7..8b12d8803998 100644 --- a/tools/tracing/rtla/src/osnoise_hist.c +++ b/tools/tracing/rtla/src/osnoise_hist.c @@ -428,9 +428,9 @@ static void osnoise_hist_usage(char *usage) static const char * const msg[] =3D { "", " usage: rtla osnoise hist [-h] [-D] [-d s] [-a us] [-p us] [-r us] [-s= us] [-S us] \\", - " [-T us] [-t[file]] [-e sys[:event]] [--filter ] [--trigger <= trigger>] \\", + " [-T us] [-t [file]] [-e sys[:event]] [--filter ] [--trigger = ] \\", " [-c cpu-list] [-H cpu-list] [-P priority] [-b N] [-E N] [--no-header= ] [--no-summary] \\", - " [--no-index] [--with-zeros] [-C[=3Dcgroup_name]] [--warm-up]", + " [--no-index] [--with-zeros] [-C [cgroup_name]] [--warm-up]", "", " -h/--help: print this menu", " -a/--auto: set automatic trace mode, stopping the session if argumen= t in us sample is hit", @@ -441,10 +441,10 @@ static void osnoise_hist_usage(char *usage) " -T/--threshold us: the minimum delta to be considered a noise", " -c/--cpus cpu-list: list of cpus to run osnoise threads", " -H/--house-keeping cpus: run rtla control threads only on the given = cpus", - " -C/--cgroup[=3Dcgroup_name]: set cgroup, if no cgroup_name is passed= , the rtla's cgroup will be inherited", + " -C/--cgroup [cgroup_name]: set cgroup, if no cgroup_name is passed, = the rtla's cgroup will be inherited", " -d/--duration time[s|m|h|d]: duration of the session", " -D/--debug: print debug info", - " -t/--trace[file]: save the stopped trace to [file|osnoise_trace.txt]= ", + " -t/--trace [file]: save the stopped trace to [file|osnoise_trace.txt= ]", " -e/--event : enable the in the trace instance= , multiple -e are allowed", " --filter : enable a trace event filter to the previous -e= event", " --trigger : enable a trace event trigger to the previous= -e event", @@ -574,13 +574,7 @@ static struct common_params break; case 'C': params->common.cgroup =3D 1; - if (!optarg) { - /* will inherit this cgroup */ - params->common.cgroup_name =3D NULL; - } else if (*optarg =3D=3D '=3D') { - /* skip the =3D */ - params->common.cgroup_name =3D ++optarg; - } + params->common.cgroup_name =3D parse_optional_arg(argc, argv); break; case 'D': config_debug =3D 1; @@ -646,14 +640,8 @@ static struct common_params params->threshold =3D get_llong_from_str(optarg); break; case 't': - if (optarg) { - if (optarg[0] =3D=3D '=3D') - trace_output =3D &optarg[1]; - else - trace_output =3D &optarg[0]; - } else if (optind < argc && argv[optind][0] !=3D '0') - trace_output =3D argv[optind]; - else + trace_output =3D parse_optional_arg(argc, argv); + if (!trace_output) trace_output =3D "osnoise_trace.txt"; break; case '0': /* no header */ diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/= osnoise_top.c index 95418f7ecc96..0be400666c05 100644 --- a/tools/tracing/rtla/src/osnoise_top.c +++ b/tools/tracing/rtla/src/osnoise_top.c @@ -263,8 +263,8 @@ static void osnoise_top_usage(struct osnoise_params *pa= rams, char *usage) =20 static const char * const msg[] =3D { " [-h] [-q] [-D] [-d s] [-a us] [-p us] [-r us] [-s us] [-S us] \\", - " [-T us] [-t[file]] [-e sys[:event]] [--filter ] [--trigger <= trigger>] \\", - " [-c cpu-list] [-H cpu-list] [-P priority] [-C[=3Dcgroup_name]] [--wa= rm-up s]", + " [-T us] [-t [file]] [-e sys[:event]] [--filter ] [--trigger = ] \\", + " [-c cpu-list] [-H cpu-list] [-P priority] [-C [cgroup_name]] [--warm= -up s]", "", " -h/--help: print this menu", " -a/--auto: set automatic trace mode, stopping the session if argumen= t in us sample is hit", @@ -275,10 +275,10 @@ static void osnoise_top_usage(struct osnoise_params *= params, char *usage) " -T/--threshold us: the minimum delta to be considered a noise", " -c/--cpus cpu-list: list of cpus to run osnoise threads", " -H/--house-keeping cpus: run rtla control threads only on the given = cpus", - " -C/--cgroup[=3Dcgroup_name]: set cgroup, if no cgroup_name is passed= , the rtla's cgroup will be inherited", + " -C/--cgroup [cgroup_name]: set cgroup, if no cgroup_name is passed, = the rtla's cgroup will be inherited", " -d/--duration time[s|m|h|d]: duration of the session", " -D/--debug: print debug info", - " -t/--trace[file]: save the stopped trace to [file|osnoise_trace.txt]= ", + " -t/--trace [file]: save the stopped trace to [file|osnoise_trace.txt= ]", " -e/--event : enable the in the trace instance= , multiple -e are allowed", " --filter : enable a trace event filter to the previous -e= event", " --trigger : enable a trace event trigger to the previous= -e event", @@ -408,13 +408,7 @@ struct common_params *osnoise_top_parse_args(int argc,= char **argv) break; case 'C': params->common.cgroup =3D 1; - if (!optarg) { - /* will inherit this cgroup */ - params->common.cgroup_name =3D NULL; - } else if (*optarg =3D=3D '=3D') { - /* skip the =3D */ - params->common.cgroup_name =3D ++optarg; - } + params->common.cgroup_name =3D parse_optional_arg(argc, argv); break; case 'D': config_debug =3D 1; @@ -474,14 +468,8 @@ struct common_params *osnoise_top_parse_args(int argc,= char **argv) params->common.stop_total_us =3D get_llong_from_str(optarg); break; case 't': - if (optarg) { - if (optarg[0] =3D=3D '=3D') - trace_output =3D &optarg[1]; - else - trace_output =3D &optarg[0]; - } else if (optind < argc && argv[optind][0] !=3D '-') - trace_output =3D argv[optind]; - else + trace_output =3D parse_optional_arg(argc, argv); + if (!trace_output) trace_output =3D "osnoise_trace.txt"; break; case 'T': diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/sr= c/timerlat_hist.c index 606c1688057b..16416192e432 100644 --- a/tools/tracing/rtla/src/timerlat_hist.c +++ b/tools/tracing/rtla/src/timerlat_hist.c @@ -717,9 +717,9 @@ static void timerlat_hist_usage(char *usage) char *msg[] =3D { "", " usage: [rtla] timerlat hist [-h] [-q] [-d s] [-D] [-n] [-a us] [-p us= ] [-i us] [-T us] [-s us] \\", - " [-t[file]] [-e sys[:event]] [--filter ] [--trigger ] [-c cpu-list] [-H cpu-list]\\", + " [-t [file]] [-e sys[:event]] [--filter ] [--trigger ] [-c cpu-list] [-H cpu-list]\\", " [-P priority] [-E N] [-b N] [--no-irq] [--no-thread] [--no-header] [= --no-summary] \\", - " [--no-index] [--with-zeros] [--dma-latency us] [-C[=3Dcgroup_name]] = [--no-aa] [--dump-task] [-u|-k]", + " [--no-index] [--with-zeros] [--dma-latency us] [-C [cgroup_name]] [-= -no-aa] [--dump-task] [-u|-k]", " [--warm-up s] [--deepest-idle-state n]", "", " -h/--help: print this menu", @@ -730,11 +730,11 @@ static void timerlat_hist_usage(char *usage) " -s/--stack us: save the stack trace at the IRQ if a thread latency i= s higher than the argument in us", " -c/--cpus cpus: run the tracer only on the given cpus", " -H/--house-keeping cpus: run rtla control threads only on the given = cpus", - " -C/--cgroup[=3Dcgroup_name]: set cgroup, if no cgroup_name is passed= , the rtla's cgroup will be inherited", + " -C/--cgroup [cgroup_name]: set cgroup, if no cgroup_name is passed, = the rtla's cgroup will be inherited", " -d/--duration time[m|h|d]: duration of the session in seconds", " --dump-tasks: prints the task running on all CPUs if stop conditi= ons are met (depends on !--no-aa)", " -D/--debug: print debug info", - " -t/--trace[file]: save the stopped trace to [file|timerlat_trace.txt= ]", + " -t/--trace [file]: save the stopped trace to [file|timerlat_trace.tx= t]", " -e/--event : enable the in the trace instance= , multiple -e are allowed", " --filter : enable a trace event filter to the previous -e= event", " --trigger : enable a trace event trigger to the previous= -e event", @@ -889,13 +889,7 @@ static struct common_params break; case 'C': params->common.cgroup =3D 1; - if (!optarg) { - /* will inherit this cgroup */ - params->common.cgroup_name =3D NULL; - } else if (*optarg =3D=3D '=3D') { - /* skip the =3D */ - params->common.cgroup_name =3D ++optarg; - } + params->common.cgroup_name =3D parse_optional_arg(argc, argv); break; case 'b': params->common.hist.bucket_size =3D get_llong_from_str(optarg); @@ -968,14 +962,8 @@ static struct common_params params->common.stop_total_us =3D get_llong_from_str(optarg); break; case 't': - if (optarg) { - if (optarg[0] =3D=3D '=3D') - trace_output =3D &optarg[1]; - else - trace_output =3D &optarg[0]; - } else if (optind < argc && argv[optind][0] !=3D '-') - trace_output =3D argv[optind]; - else + trace_output =3D parse_optional_arg(argc, argv); + if (!trace_output) trace_output =3D "timerlat_trace.txt"; break; case 'u': diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src= /timerlat_top.c index fc479a0dcb59..fe4f4e69e00f 100644 --- a/tools/tracing/rtla/src/timerlat_top.c +++ b/tools/tracing/rtla/src/timerlat_top.c @@ -483,8 +483,8 @@ static void timerlat_top_usage(char *usage) static const char *const msg[] =3D { "", " usage: rtla timerlat [top] [-h] [-q] [-a us] [-d s] [-D] [-n] [-p us]= [-i us] [-T us] [-s us] \\", - " [[-t[file]] [-e sys[:event]] [--filter ] [--trigger ] [-c cpu-list] [-H cpu-list]\\", - " [-P priority] [--dma-latency us] [--aa-only us] [-C[=3Dcgroup_name]]= [-u|-k] [--warm-up s] [--deepest-idle-state n]", + " [[-t [file]] [-e sys[:event]] [--filter ] [--trigger ] [-c cpu-list] [-H cpu-list]\\", + " [-P priority] [--dma-latency us] [--aa-only us] [-C [cgroup_name]] [= -u|-k] [--warm-up s] [--deepest-idle-state n]", "", " -h/--help: print this menu", " -a/--auto: set automatic trace mode, stopping the session if argumen= t in us latency is hit", @@ -495,11 +495,11 @@ static void timerlat_top_usage(char *usage) " -s/--stack us: save the stack trace at the IRQ if a thread latency i= s higher than the argument in us", " -c/--cpus cpus: run the tracer only on the given cpus", " -H/--house-keeping cpus: run rtla control threads only on the given = cpus", - " -C/--cgroup[=3Dcgroup_name]: set cgroup, if no cgroup_name is passed= , the rtla's cgroup will be inherited", + " -C/--cgroup [cgroup_name]: set cgroup, if no cgroup_name is passed, = the rtla's cgroup will be inherited", " -d/--duration time[s|m|h|d]: duration of the session", " -D/--debug: print debug info", " --dump-tasks: prints the task running on all CPUs if stop conditi= ons are met (depends on !--no-aa)", - " -t/--trace[file]: save the stopped trace to [file|timerlat_trace.txt= ]", + " -t/--trace [file]: save the stopped trace to [file|timerlat_trace.tx= t]", " -e/--event : enable the in the trace instance= , multiple -e are allowed", " --filter : enable a trace event filter to the previous -= e event", " --trigger : enable a trace event trigger to the previous= -e event", @@ -653,13 +653,7 @@ static struct common_params break; case 'C': params->common.cgroup =3D 1; - if (!optarg) { - /* will inherit this cgroup */ - params->common.cgroup_name =3D NULL; - } else if (*optarg =3D=3D '=3D') { - /* skip the =3D */ - params->common.cgroup_name =3D ++optarg; - } + params->common.cgroup_name =3D optarg; break; case 'D': config_debug =3D 1; @@ -722,14 +716,8 @@ static struct common_params params->common.stop_total_us =3D get_llong_from_str(optarg); break; case 't': - if (optarg) { - if (optarg[0] =3D=3D '=3D') - trace_output =3D &optarg[1]; - else - trace_output =3D &optarg[0]; - } else if (optind < argc && argv[optind][0] !=3D '-') - trace_output =3D argv[optind]; - else + trace_output =3D parse_optional_arg(argc, argv); + if (!trace_output) trace_output =3D "timerlat_trace.txt"; break; case 'u': diff --git a/tools/tracing/rtla/src/utils.c b/tools/tracing/rtla/src/utils.c index d6ab15dcb490..bd5f34b44648 100644 --- a/tools/tracing/rtla/src/utils.c +++ b/tools/tracing/rtla/src/utils.c @@ -959,3 +959,29 @@ int auto_house_keeping(cpu_set_t *monitored_cpus) =20 return 1; } + +/** + * parse_optional_arg - Parse optional argument value + * + * Parse optional argument value, which can be in the form of: + * -sarg, -s/--long=3Darg, -s/--long arg + * + * Returns arg value if found, NULL otherwise. + */ +char *parse_optional_arg(int argc, char **argv) +{ + if (optarg) { + if (optarg[0] =3D=3D '=3D') { + /* skip the =3D */ + return &optarg[1]; + } else { + return optarg; + } + /* parse argument of form -s [arg] and --long [arg]*/ + } else if (optind < argc && argv[optind][0] !=3D '-') { + /* consume optind */ + return argv[optind++]; + } else { + return NULL; + } +} diff --git a/tools/tracing/rtla/src/utils.h b/tools/tracing/rtla/src/utils.h index a2a6f89f342d..d8d83abf0f0d 100644 --- a/tools/tracing/rtla/src/utils.h +++ b/tools/tracing/rtla/src/utils.h @@ -24,6 +24,7 @@ long parse_seconds_duration(char *val); void get_duration(time_t start_time, char *output, int output_size); =20 int parse_cpu_list(char *cpu_list, char **monitored_cpus); +char *parse_optional_arg(int argc, char **argv); long long get_llong_from_str(char *start); =20 static inline void --=20 2.48.1 From nobody Sat Feb 7 10:44:16 2026 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 1D7352D7D2E for ; Sat, 18 Oct 2025 13:04:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760792694; cv=none; b=geFUf2AVGtMNIcq5YUBFQ6uyC8tniyBECBW9YLb7P1OJ2HZZsxBRemcF6uGKiG2XeClUyxUFGDEWsq4JpLNLZSyYzy9O6cEMMHV1ZiDrdvb4uwry49h4grLxn30n0pGo1cj0bP2irLUBdhZ5ZTSU7tvPQ87sgRly9sEjGMnWufw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760792694; c=relaxed/simple; bh=/QKA0xRQrUJstKtOglqkTvta05yDY6MtV3GQJq3894Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UxlalK0KLRjun2kIstcjgc8L/jI2U9ztfjvovAutR1hlOuZLkdYxNQVEtZmXCTOUzxNDSsV9J+efOFTdMXNUL62kOlUJNe6BaoQVQyt+ddFSXeK/PqMJUewfl/4hDL3ss4UZ7/5FUOdLExlNLD1PGmMQk/iMTZxIFtDNoYoQj9w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PKBe9OAt; arc=none smtp.client-ip=209.85.219.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PKBe9OAt" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-87c1a760df5so55537996d6.1 for ; Sat, 18 Oct 2025 06:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760792691; x=1761397491; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qWnt+sjZ8ZgsaI+sAzX/D1lkWlG+AQb06P47+lpZEQg=; b=PKBe9OAtNm2mYV7LBc/I1P+3WdYFxg32SnRmqXzmR0AC6IhklsxEs7827chNf1tcmu 7buyvT30Mb4C8cHXMTwRPT16ZhLUZNXwtZeABLYMWojXrECnFVtdLiP52bzk9a8s5RV4 Gxer1r4m/OGFS1yLYmoL2Tq6q9hP90PyMCweaJQXPSkFGqrxRexa/SPlv07IhaY9Ym1j u0ZHl73Jw5vJfsdwDmyycLtyN3Lhg8HQaecqgEokKffpWKdjgSAc8xh2mWyYp38hsnk7 QJlok8rWmf93BTqSlYQ0A6j7S7bl21MoWrWSkW5rOMQtRNHhGK08pRtA4A7qdiS+uiJj p+qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760792691; x=1761397491; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qWnt+sjZ8ZgsaI+sAzX/D1lkWlG+AQb06P47+lpZEQg=; b=AQTC7tx2UBHZ/fAlnsEIjvTMu+TiJNx99oY4StnHUs1AZy6QUi79vW4JInmg78cUj5 +EGWJv40yIQc1d2IEdVwv8cq9dU9H5UKh8K1Ywhx3eEap4jJucobr2Rb35OfZkNlZssB JEDWkO+DJi9oUWLX/AGS3wUwfJHqo66watFpbmSR8IRuv0FoPfMAK9cNWza8UOrYWjif 5Px6mh1YCL+r4N9Odzuv3R/bLIiPFMoSRFvte7usQDLZR09vRWshHvJO+zh7NG2qKgE+ 3NJ49xOKn4d2OdCzgCd3Z6I3508zuRXz+Yabxeue91gvDhhheLEdrhufy+NdYF90PhjP PQYA== X-Forwarded-Encrypted: i=1; AJvYcCX9FnRgtsfR4H2T7+ey6sGfTKcQQ1d0tkF0g0Kfj7zZBX4PtEglHKVsXcnaQth6YRnjTnfNfy5E/QM7VDM=@vger.kernel.org X-Gm-Message-State: AOJu0Yyun4SqF2m5DkX55LWDZ+JAAiWQridn/w0fINJ+e96ULFeO3os/ Q9VIr/tZ8pBj+VrPuEz+4qtuu86vO0i+h6vOzscKXhY1i97nSRXYyrjc X-Gm-Gg: ASbGncvJeF2lcFx2ziFVLyql23OPXHOErlKJrrdXb0ctDY+R0nZTsNs45pPEywSHuKj 5SoOWXBGxqO+T0Er1RiSMrkxerwUDXmebswx5VeR7wxYAmTDBha2KLmQ3N54qY8y2uk6PtQABgq bTXzgtWMBv2e1DydyVcV8s0qs88MlQyjGf1o38XTcTHzDmJs8csmlXwtByU2gKHMaLBREKLu8go gPCs0k51ZXc8igGHqHmKgy3SqMJ4Anty7zHCxk1c6z3L7KkkstIW+YshwJSrxoXfUO7VG5JiDga hy9IjnuRExRfLZcTttFv7B+UYLaonD2TL7O94V3BpkaGNqE8kipSv4Hw1wesTjImINc/0KQ3Xy8 lXe03DeWqDUs/LDXaoOJkb4oqHLDZmWrsb3P0E6pWP+oy4YgfCWdFGMYajQp4LkeLnUtcWDNfxu hoTlkPhTrqLvZUd0A6vDsdGthtJ1O8Pupd13tD X-Google-Smtp-Source: AGHT+IHmRouhpzmNuhXsb90wciLNRo+Xh2dXpLMyR7s2zHZrsvFLahcyOci9MsF3wzHDrdrwup9N5g== X-Received: by 2002:a05:6214:1948:b0:87c:dff0:7c0a with SMTP id 6a1803df08f44-87cdff07d94mr54571536d6.55.1760792691024; Sat, 18 Oct 2025 06:04:51 -0700 (PDT) Received: from ideapad.mynetworksettings.com ([2600:4040:5304:d300:275f:6229:da5:6a60]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-87d028966fasm15840596d6.33.2025.10.18.06.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Oct 2025 06:04:50 -0700 (PDT) From: Ivan Pravdin To: rostedt@goodmis.org, tglozar@redhat.com, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ivan Pravdin Subject: [PATCH v4 2/2] rtla: fix -a overriding -t argument Date: Sat, 18 Oct 2025 09:04:31 -0400 Message-ID: <93cf8411e8c23ebdcf2e168f0f7d3e8c9081900b.1760791697.git.ipravdin.official@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When running rtla as `rtla -t custom_file.txt -a 100` -a options override trace output filename specified by -t option. Running the command above will create _trace.txt file instead of custom_file.txt. Fix this by making sure that -a option does not override trace output filename even if it's passed after trace output filename is specified. Fixes: 173a3b014827 ("rtla/timerlat: Add the automatic trace option") Signed-off-by: Ivan Pravdin Reviewed-by: Tomas Glozar --- tools/tracing/rtla/src/osnoise_hist.c | 3 ++- tools/tracing/rtla/src/osnoise_top.c | 2 ++ tools/tracing/rtla/src/timerlat_hist.c | 3 ++- tools/tracing/rtla/src/timerlat_top.c | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src= /osnoise_hist.c index 8b12d8803998..ae8426f40f8f 100644 --- a/tools/tracing/rtla/src/osnoise_hist.c +++ b/tools/tracing/rtla/src/osnoise_hist.c @@ -557,7 +557,8 @@ static struct common_params params->threshold =3D 1; =20 /* set trace */ - trace_output =3D "osnoise_trace.txt"; + if (!trace_output) + trace_output =3D "osnoise_trace.txt"; =20 break; case 'b': diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/= osnoise_top.c index 0be400666c05..9487c6a592c2 100644 --- a/tools/tracing/rtla/src/osnoise_top.c +++ b/tools/tracing/rtla/src/osnoise_top.c @@ -398,6 +398,8 @@ struct common_params *osnoise_top_parse_args(int argc, = char **argv) =20 /* set trace */ trace_output =3D "osnoise_trace.txt"; + if (!trace_output) + trace_output =3D "osnoise_trace.txt"; =20 break; case 'c': diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/sr= c/timerlat_hist.c index 16416192e432..311c4f18ce4c 100644 --- a/tools/tracing/rtla/src/timerlat_hist.c +++ b/tools/tracing/rtla/src/timerlat_hist.c @@ -878,7 +878,8 @@ static struct common_params params->print_stack =3D auto_thresh; =20 /* set trace */ - trace_output =3D "timerlat_trace.txt"; + if (!trace_output) + trace_output =3D "timerlat_trace.txt"; =20 break; case 'c': diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src= /timerlat_top.c index fe4f4e69e00f..3a3b11b5beaa 100644 --- a/tools/tracing/rtla/src/timerlat_top.c +++ b/tools/tracing/rtla/src/timerlat_top.c @@ -628,7 +628,8 @@ static struct common_params params->print_stack =3D auto_thresh; =20 /* set trace */ - trace_output =3D "timerlat_trace.txt"; + if (!trace_output) + trace_output =3D "timerlat_trace.txt"; =20 break; case '5': --=20 2.48.1