| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <53skdgz6ck6pmnyjs26qbitomi5lchepf3uyl74tpcri26nhhf@mupp5irjqdif>
Date: Tue, 16 Dec 2025 13:16:35 -0300
From: Wander Lairson Costa <wander@...hat.com>
To: Costa Shulyupin <costa.shul@...hat.com>
Cc: Steven Rostedt <rostedt@...dmis.org>,
Tomas Glozar <tglozar@...hat.com>, Crystal Wood <crwood@...hat.com>, John Kacur <jkacur@...hat.com>,
Ivan Pravdin <ipravdin.official@...il.com>, linux-trace-kernel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 2/8] tools/rtla: Consolidate -c/--cpus option parsing
On Tue, Dec 09, 2025 at 12:00:41PM +0200, Costa Shulyupin wrote:
> Each rtla tool duplicates parsing of -c/--cpus.
>
> Migrate the option parsing from individual tools to the
> common_parse_options().
>
> Signed-off-by: Costa Shulyupin <costa.shul@...hat.com>
> ---
> tools/tracing/rtla/src/common.c | 8 +++++++-
> tools/tracing/rtla/src/osnoise_hist.c | 9 +--------
> tools/tracing/rtla/src/osnoise_top.c | 9 +--------
> tools/tracing/rtla/src/timerlat_hist.c | 9 +--------
> tools/tracing/rtla/src/timerlat_top.c | 9 +--------
> 5 files changed, 11 insertions(+), 33 deletions(-)
>
> diff --git a/tools/tracing/rtla/src/common.c b/tools/tracing/rtla/src/common.c
> index a78f9883521e..e5aa8c30cd7d 100644
> --- a/tools/tracing/rtla/src/common.c
> +++ b/tools/tracing/rtla/src/common.c
> @@ -56,14 +56,20 @@ int common_parse_options(int argc, char **argv, struct common_params *common)
> int c;
>
> static struct option long_options[] = {
> + {"cpus", required_argument, 0, 'c'},
> {0, 0, 0, 0}
> };
>
> opterr = 0;
> - c = getopt_long(argc, argv, "", long_options, NULL);
> + c = getopt_long(argc, argv, "c:", long_options, NULL);
> opterr = 1;
>
> switch (c) {
> + case 'c':
> + if (parse_cpu_set(optarg, &common->monitored_cpus))
> + fatal("Invalid -c cpu list");
> + common->cpus = optarg;
> + break;
> default:
> optind = saved_state;
> return 0;
> diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src/osnoise_hist.c
> index 35f4a068af95..9e721362989a 100644
> --- a/tools/tracing/rtla/src/osnoise_hist.c
> +++ b/tools/tracing/rtla/src/osnoise_hist.c
> @@ -491,7 +491,6 @@ static struct common_params
> {"auto", required_argument, 0, 'a'},
> {"bucket-size", required_argument, 0, 'b'},
> {"entries", required_argument, 0, 'E'},
> - {"cpus", required_argument, 0, 'c'},
> {"cgroup", optional_argument, 0, 'C'},
> {"debug", no_argument, 0, 'D'},
> {"duration", required_argument, 0, 'd'},
> @@ -521,7 +520,7 @@ static struct common_params
> if (common_parse_options(argc, argv, ¶ms->common))
> continue;
>
> - c = getopt_long(argc, argv, "a:c:C::b:d:e:E:DhH:p:P:r:s:S:t::T:01234:5:6:7:",
> + c = getopt_long(argc, argv, "a:C::b:d:e:E:DhH:p:P:r:s:S:t::T:01234:5:6:7:",
> long_options, NULL);
>
> /* detect the end of the options. */
> @@ -547,12 +546,6 @@ static struct common_params
> params->common.hist.bucket_size >= 1000000)
> fatal("Bucket size needs to be > 0 and <= 1000000");
> break;
> - case 'c':
> - retval = parse_cpu_set(optarg, ¶ms->common.monitored_cpus);
> - if (retval)
> - fatal("Invalid -c cpu list");
> - params->common.cpus = optarg;
> - break;
> case 'C':
> params->common.cgroup = 1;
> params->common.cgroup_name = parse_optional_arg(argc, argv);
> diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
> index 550731c7addd..73736cefd992 100644
> --- a/tools/tracing/rtla/src/osnoise_top.c
> +++ b/tools/tracing/rtla/src/osnoise_top.c
> @@ -346,7 +346,6 @@ struct common_params *osnoise_top_parse_args(int argc, char **argv)
> while (1) {
> static struct option long_options[] = {
> {"auto", required_argument, 0, 'a'},
> - {"cpus", required_argument, 0, 'c'},
> {"cgroup", optional_argument, 0, 'C'},
> {"debug", no_argument, 0, 'D'},
> {"duration", required_argument, 0, 'd'},
> @@ -373,7 +372,7 @@ struct common_params *osnoise_top_parse_args(int argc, char **argv)
> if (common_parse_options(argc, argv, ¶ms->common))
> continue;
>
> - c = getopt_long(argc, argv, "a:c:C::d:De:hH:p:P:qr:s:S:t::T:0:1:2:3:",
> + c = getopt_long(argc, argv, "a:C::d:De:hH:p:P:qr:s:S:t::T:0:1:2:3:",
> long_options, NULL);
>
> /* Detect the end of the options. */
> @@ -392,12 +391,6 @@ struct common_params *osnoise_top_parse_args(int argc, char **argv)
> if (!trace_output)
> trace_output = "osnoise_trace.txt";
>
> - break;
> - case 'c':
> - retval = parse_cpu_set(optarg, ¶ms->common.monitored_cpus);
> - if (retval)
> - fatal("Invalid -c cpu list");
> - params->common.cpus = optarg;
> break;
> case 'C':
> params->common.cgroup = 1;
> diff --git a/tools/tracing/rtla/src/timerlat_hist.c b/tools/tracing/rtla/src/timerlat_hist.c
> index ffcfcabb9964..4ae77145adea 100644
> --- a/tools/tracing/rtla/src/timerlat_hist.c
> +++ b/tools/tracing/rtla/src/timerlat_hist.c
> @@ -796,7 +796,6 @@ static struct common_params
> while (1) {
> static struct option long_options[] = {
> {"auto", required_argument, 0, 'a'},
> - {"cpus", required_argument, 0, 'c'},
> {"cgroup", optional_argument, 0, 'C'},
> {"bucket-size", required_argument, 0, 'b'},
> {"debug", no_argument, 0, 'D'},
> @@ -837,7 +836,7 @@ static struct common_params
> if (common_parse_options(argc, argv, ¶ms->common))
> continue;
>
> - c = getopt_long(argc, argv, "a:c:C::b:d:e:E:DhH:i:knp:P:s:t::T:uU0123456:7:8:9\1\2:\3:",
> + c = getopt_long(argc, argv, "a:C::b:d:e:E:DhH:i:knp:P:s:t::T:uU0123456:7:8:9\1\2:\3:",
> long_options, NULL);
>
> /* detect the end of the options. */
> @@ -859,12 +858,6 @@ static struct common_params
> if (!trace_output)
> trace_output = "timerlat_trace.txt";
>
> - break;
> - case 'c':
> - retval = parse_cpu_set(optarg, ¶ms->common.monitored_cpus);
> - if (retval)
> - fatal("Invalid -c cpu list");
> - params->common.cpus = optarg;
> break;
> case 'C':
> params->common.cgroup = 1;
> diff --git a/tools/tracing/rtla/src/timerlat_top.c b/tools/tracing/rtla/src/timerlat_top.c
> index d18d48671ccd..9774c26b27ff 100644
> --- a/tools/tracing/rtla/src/timerlat_top.c
> +++ b/tools/tracing/rtla/src/timerlat_top.c
> @@ -566,7 +566,6 @@ static struct common_params
> while (1) {
> static struct option long_options[] = {
> {"auto", required_argument, 0, 'a'},
> - {"cpus", required_argument, 0, 'c'},
> {"cgroup", optional_argument, 0, 'C'},
> {"debug", no_argument, 0, 'D'},
> {"duration", required_argument, 0, 'd'},
> @@ -601,7 +600,7 @@ static struct common_params
> if (common_parse_options(argc, argv, ¶ms->common))
> continue;
>
> - c = getopt_long(argc, argv, "a:c:C::d:De:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:",
> + c = getopt_long(argc, argv, "a:C::d:De:hH:i:knp:P:qs:t::T:uU0:1:2:345:6:7:",
> long_options, NULL);
>
> /* detect the end of the options. */
> @@ -638,12 +637,6 @@ static struct common_params
> /* set aa_only to avoid parsing the trace */
> params->common.aa_only = 1;
> break;
> - case 'c':
> - retval = parse_cpu_set(optarg, ¶ms->common.monitored_cpus);
> - if (retval)
> - fatal("Invalid -c cpu list");
> - params->common.cpus = optarg;
> - break;
> case 'C':
> params->common.cgroup = 1;
> params->common.cgroup_name = optarg;
> --
> 2.52.0
>
Reviewed-by: Wander Lairson Costa <wander@...hat.com>
Powered by blists - more mailing lists