From nobody Fri Oct 3 02:15:00 2025 Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (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 B424B1E130F; Mon, 8 Sep 2025 02:06:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757297175; cv=none; b=pxDHgp+2JqEYLo8UH70lmXqdxNIWtTkMfRTyAriNowLivqHKCxoi/4apR9UJr3CKaviaRefdglQUHwjsKQ+CkgMdlEFAV9rWleKlK/HX08jr7tKLlnz+uqLrW0r0DFNPpg7AWlwoD6zUbB3qSL7c56l8M828qkVqNnsjBi8jags= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757297175; c=relaxed/simple; bh=3oGnWRstd/UVHJx79u10eGgbspDyUadPtUVoAviHh8s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IlAxNql/aPgls5Gb0FobHfLxlPvZOEoSCn+Ah93dKi4FZ4uD12nsQuPvMp66Zsc6jXMlG3IklnM8hisdirCfWYWmKbQKnBgPCPSJHHx+ii3rZ4U26/dcvnxZhuuUyejWLMGSC61B+J8+nEWxCYbHxOQFNwoSwMKIltE5bdQRcQA= 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=LfVafo1I; arc=none smtp.client-ip=209.85.219.42 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="LfVafo1I" Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-7240eb21ccaso37789046d6.0; Sun, 07 Sep 2025 19:06:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757297172; x=1757901972; 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=2x1h6orz8+wGExapeOmhQBGgWXVchLxViuyUEuu+o04=; b=LfVafo1IXUyNaV4UzhoVSfOaprDPbNW4bGEMHKTU3ZSZz2fUNn+FJSBYSKroMBJFMc oTyFAjUTmBOF7DX0hEd47wAMU+ucjhsBmdhe23yw/Wv8r5VREQ2etVFPMz+UI5s2+hkU dDPm+81BuXhVEYdJDUcqOIM1Pp8wtwNIkyh2sEvN/hWW37B5zSkwd0+CBlzTN2EhDpcw lwKlvT3LurZQ9JzqzhQdpSLsD7P2UzQ3mEWUOM+Q7sK/zpzFjAXMG5+6EP7r+Olj8kh8 IW0ZdwD3sVYtYH478ZiJUvdliiTRQczLz0BPUlyyzbA2Cpi7ajoLrrBAh0x9BIenWxMg 1pSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757297172; x=1757901972; 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=2x1h6orz8+wGExapeOmhQBGgWXVchLxViuyUEuu+o04=; b=P/6gMwqnvfA4NELX/0gq/IaRMY29VNCyzpg3BRkkM9DeRSA8faYdwQZNR++sHJ+NQ8 Qy5JPATV4kemN6oHMyiCvUyVTuG3TAJH2IwAR9p6IUjQZyQNm3XtubQrkqOCdY2WAM8j RetDUWQrpi5bYS1hpBw77o5Wd0zE9RW4+7EXFrWVN1TO8ST+H75lWjB7/I987RbfxhTf 7o+fDALE+4+bTqRAvqdc5R/v+xthlSXVF4XJ5TJ38xu33DMe7hqVIl5vrziXMV/4MQLo yciNyzMWROyZ7NjEYVasjLLB5mMJxSsBUS6rHiIenXqe8uaO/rurWYenBb32PS5blNiA FtIA== X-Forwarded-Encrypted: i=1; AJvYcCW1q9r/t2WWWz4owlIp2FFxeLRfBhZKLTnOQPMQCJjXk/If2yrnYyHJPtrFHzBPWSKzj5li0SbM2N4S85E=@vger.kernel.org, AJvYcCWYeH0qliHCp4y9hwLxAHD0eYCatkRePJwwFfEtld47sSygqX2uMUe9RXK85NjvHoZWTtEYwbBU3dm7dDi97iP6B88k@vger.kernel.org X-Gm-Message-State: AOJu0YzvIuR5rZowlS0Bc8yQHoLauW/OXKIn+gGsdYZKfYbTNxMxtZ+Z nUC2eP5NojA5phNObtegyql4GOVRbdjqO2p53n4Q+Brv5kepYvtUuxEEPYq1zg== X-Gm-Gg: ASbGncsIBfQFwJxt5FwF/QBFyNE/f2PxJz5BJ8NOdIAaxyrf/94ewqu5PJWaYzM/Ja4 DSOiK7OtkI0rF3BVtoGuNssX7yskktdoAbYB4VWavoBFlV6RDs+9tJRT/0f07Y3TMQnVXgu1zHX A8siR9M8v8FWo2wYgRr+U62EdPauNrKJRtqrRjSCahe0WFvHV3oihFa+DdrTYoHycbok/3eAlmw GPlEwClBgCd5OuAqxaxyCBgUwp4P+5fZfIM1sdeccpvzgq7hiihb36WJ0PeqF3ZkZrcbMAaGFO/ WqwPgMVnDvP5kvRwnbKCX9uidHl9K6PQvvRql0v+SLUTi1kawlntnlE2LDp0pImTquIDw7n7qMz x6xdXrMft+dTadgdunuA5H/pxgrVqpfAWHi72O2WIdu0VmkfsNLk+lIcFSEFlbDLwanUEYP0uGJ WMH+xQD8EJdi252KuTPw== X-Google-Smtp-Source: AGHT+IErm/VTBUJedFUg5eywLLVow7XHdGUcgt/7Vw0xyWJ3PDtRd1czg7DEAmfWvOuT7qHnMMHiBQ== X-Received: by 2002:ad4:4eea:0:b0:70d:f64e:d49e with SMTP id 6a1803df08f44-72bc44eb4bbmr119584496d6.23.1757297172574; Sun, 07 Sep 2025 19:06:12 -0700 (PDT) Received: from ideapad.solutionip.com (wsip-184-179-113-83.ri.ri.cox.net. [184.179.113.83]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-72925b87571sm79638846d6.6.2025.09.07.19.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Sep 2025 19:06:12 -0700 (PDT) From: Ivan Pravdin To: rostedt@goodmis.org, tglozar@redhat.com, linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ivan Pravdin Subject: [PATCH v3 1/3] rtla: fix buffer overflow in actions_parse Date: Sun, 7 Sep 2025 22:05:57 -0400 Message-ID: <164ffc2ec8edacaf1295789dad82a07817b6263d.1757034919.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, tests 3 and 13-22 in tests/timerlat.t fail with error: *** buffer overflow detected ***: terminated timeout: the monitored command dumped core The result of running `sudo make check` is tests/timerlat.t (Wstat: 0 Tests: 22 Failed: 11) Failed tests: 3, 13-22 Files=3D3, Tests=3D34, 140 wallclock secs ( 0.07 usr 0.01 sys + 27.63 = cusr 27.96 csys =3D 55.67 CPU) Result: FAIL Fix buffer overflow in actions_parse to avoid this error. After this change, the tests results are tests/hwnoise.t ... ok tests/osnoise.t ... ok tests/timerlat.t .. ok All tests successful. Files=3D3, Tests=3D34, 186 wallclock secs ( 0.06 usr 0.01 sys + 41.10 = cusr 44.38 csys =3D 85.55 CPU) Result: PASS Fixes: 6ea082b171e0 ("rtla/timerlat: Add action on threshold feature") Signed-off-by: Ivan Pravdin Reviewed-by: Tomas Glozar --- tools/tracing/rtla/src/actions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tracing/rtla/src/actions.c b/tools/tracing/rtla/src/acti= ons.c index aaf0808125d7..eab51c0c0ce2 100644 --- a/tools/tracing/rtla/src/actions.c +++ b/tools/tracing/rtla/src/actions.c @@ -131,7 +131,7 @@ actions_parse(struct actions *self, const char *trigger) { enum action_type type =3D ACTION_NONE; char *token; - char trigger_c[strlen(trigger)]; + char trigger_c[strlen(trigger) + 1]; =20 /* For ACTION_SIGNAL */ int signal =3D 0, pid =3D 0; --=20 2.48.1 From nobody Fri Oct 3 02:15:00 2025 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 B4C181EBFE0; Mon, 8 Sep 2025 02:06:16 +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=1757297178; cv=none; b=RY4JzB1gn11UkM1BEoySMYTbaCCwWW1JkFsKsOEbl+nbGPoz8krCDdW2CPAWyy0uSPxI8PjN2UccCjboqlWSzVcn9d+8VU5o7b36lwKY35urYso0Tbre1c79JTZSLObP9U4RTZzYGKmTRtwJUzj+JR5J46x8XM94/Qx/SJB8mz0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757297178; c=relaxed/simple; bh=Q6rPj5XExPw5kXt3UBLLesxku9bvm3nVPnH/RDqDIWo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iEJYnCwajd1mjig8hzeWgzjMXrsdBQVchuXWhhZXX82QyurEAijcArydhprFq0bcmrqGGZgYj5Y8aGbTyzYDmUU5zQhT9QtI9kUJ5L9UjJhLfL6NCVvtEN+t/+HwEkyt5WuuYWZIXwNGIod87pDCkvqNQCFsLCnvAjLj+hhom00= 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=avmphYNH; 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="avmphYNH" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-70ba7aa131fso45197496d6.2; Sun, 07 Sep 2025 19:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757297175; x=1757901975; 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=8rH1Q4HIwxLwZ1f0LKqOXACw6UR10UU8sHDYvnNq8p4=; b=avmphYNHS0nioZ2ANAHBt9ftptw/aXNnnqmUfIwZws8J0LLFT90p4ilRmDFXH4USP6 4ahR8EIfIRWjbY0F86T8t5Z2tQ0bhF5aRD8XTxzjHQSs1CzWRLYFegVDC69FoJD/h9Od QILKci2ReTS+IhLDbfx2UPwZgd0AfJ4toi83EsBZC86zMZkxZzD5cAwz0+k0a6MrAJ3V RpP6uZ/eo0qgdwkiXGnVbccXrsqKUbCnEpjS+v3LP9z5igZeuNRKbBkq8e+e3O7ARvlJ s/RDtFlFjjfOiOIOCsjGcN+QKcrtzzs3fDHueoz2k/J5TvUc4jF0yjSy/Fo+G3+7Z7pL vbLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757297175; x=1757901975; 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=8rH1Q4HIwxLwZ1f0LKqOXACw6UR10UU8sHDYvnNq8p4=; b=Lln9FLkoiLD3U0pZw3XdKyS1Ihf9nzaCHlxJRR6zaT0RTxDTWvtj5YtdgnRmyarpCE uADC02sWZz8DbUrc7m8lJFsd9PhEAqte9MwK8zwdH2llOBHgBvvGyoesceaZavF884pE ltJA/8xixi59HB7OsQXDs8lU3spNQ5EK3kmQxYM+T6ea3f8PSXKKodDA6PsuLepjYuKn eGS8ZJQuEj3O/Ozmw40hAuQVvB9R2heb7wDXeFAyUBmk7aALwnznHLh37E93EnhMPSUt Xo4nabap9ZQsCEUS9W7nx+dDCacbeNZQdcMjW9xC2WkAJO9MVndOQA4VuxXOXIlnZMto HJzg== X-Forwarded-Encrypted: i=1; AJvYcCXDHi6i1BE5r4XJrBB+pCOo2mtl5u8SO3aTJQJHrUZtac9AbLVaobcPjnY84iI6vGUlFVh6paPtUvkOo8ePP5Wk3a6d@vger.kernel.org, AJvYcCXiGq9e5Gy0ztQCvNCydZGTbcK0QZUv16kgZqRyevd2sp0ThHD4eBf6XCXDn/bEIeBq66pBlEqZV4w22ec=@vger.kernel.org X-Gm-Message-State: AOJu0YyeUsEtXR64LfjpAD2eoH1DN+90XX4cmYWEOKPbn1TjSfRu7M/I yZsy8RWeACX4Ep/Siewcnzy/DU3gpk4E32ATXfisijONGVYXiPbmBOT7LVbkjw== X-Gm-Gg: ASbGncu9TvGLoNXpacMYD0qLRiNt21wEzrbCx3yQUGH6eblthtKHejDm16BNtiktc/e gajPFiUu3kRqTduFbLH5kJ2qbRWgg4+aeJsOG4a5leVxAxa/E7a9ewrl5FKAQR50VV2wcp/HvcW 0WW8XgrcQjAAA9XoCTr+mowZfhFxeKmY88uBls/cF064YpzeVi8P78HdpzZ7U7LFxyXBK2KEgi/ c2PaH/gWVKA4FI4VkuMS6d86iFIoz9IDcV81/1LEu3/rhQmoP8GnMLakZSdhZ7FMNRwQnK4XXSx zFeOgLNuopzjGgk7mxLyAsFb4n6FUBOnU/D8GITdJCnErLFW1Db1OsCtpZBBIZJW7wJoLfA2ycj 19jitEGOAH/bAS1nsU54KgOyAT7bYJceI3g4h6FFc2SXHN/d6furQ0boO0xB6bEY9/Gmgj/o5Uv lW3CA6xdy0Za7ELO8TiA== X-Google-Smtp-Source: AGHT+IGeUCO95fGBwGUmOSpGDkKozomxcyG5csobsYZCX/t73uJphgb5U1soQgy7YZdwgSNrpRBkyg== X-Received: by 2002:ad4:5ecb:0:b0:728:7d77:63ba with SMTP id 6a1803df08f44-739371a7998mr69427196d6.33.1757297175254; Sun, 07 Sep 2025 19:06:15 -0700 (PDT) Received: from ideapad.solutionip.com (wsip-184-179-113-83.ri.ri.cox.net. [184.179.113.83]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-72925b87571sm79638846d6.6.2025.09.07.19.06.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Sep 2025 19:06:14 -0700 (PDT) From: Ivan Pravdin To: rostedt@goodmis.org, tglozar@redhat.com, linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ivan Pravdin Subject: [PATCH v3 2/3] rtla: fix -C/--cgroup interface Date: Sun, 7 Sep 2025 22:05:58 -0400 Message-ID: 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 2dc1575210aa..3f292a12b7af 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 8d579bcee709..1dc39de79d78 100644 --- a/tools/tracing/rtla/src/osnoise_hist.c +++ b/tools/tracing/rtla/src/osnoise_hist.c @@ -422,9 +422,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", @@ -435,10 +435,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", @@ -559,13 +559,7 @@ static struct osnoise_params break; case 'C': params->cgroup =3D 1; - if (!optarg) { - /* will inherit this cgroup */ - params->cgroup_name =3D NULL; - } else if (*optarg =3D=3D '=3D') { - /* skip the =3D */ - params->cgroup_name =3D ++optarg; - } + params->cgroup_name =3D parse_optional_arg(argc, argv); break; case 'D': config_debug =3D 1; @@ -630,14 +624,8 @@ static struct osnoise_params params->threshold =3D get_llong_from_str(optarg); break; case 't': - if (optarg) { - if (optarg[0] =3D=3D '=3D') - params->trace_output =3D &optarg[1]; - else - params->trace_output =3D &optarg[0]; - } else if (optind < argc && argv[optind][0] !=3D '0') - params->trace_output =3D argv[optind]; - else + params->trace_output =3D parse_optional_arg(argc, argv); + if (!params->trace_output) params->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 2c12780c8aa9..b3e161536ed8 100644 --- a/tools/tracing/rtla/src/osnoise_top.c +++ b/tools/tracing/rtla/src/osnoise_top.c @@ -257,8 +257,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", @@ -269,10 +269,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", @@ -394,13 +394,7 @@ struct osnoise_params *osnoise_top_parse_args(int argc= , char **argv) break; case 'C': params->cgroup =3D 1; - if (!optarg) { - /* will inherit this cgroup */ - params->cgroup_name =3D NULL; - } else if (*optarg =3D=3D '=3D') { - /* skip the =3D */ - params->cgroup_name =3D ++optarg; - } + params->cgroup_name =3D parse_optional_arg(argc, argv); break; case 'D': config_debug =3D 1; @@ -460,14 +454,8 @@ struct osnoise_params *osnoise_top_parse_args(int argc= , char **argv) params->stop_total_us =3D get_llong_from_str(optarg); break; case 't': - if (optarg) { - if (optarg[0] =3D=3D '=3D') - params->trace_output =3D &optarg[1]; - else - params->trace_output =3D &optarg[0]; - } else if (optind < argc && argv[optind][0] !=3D '-') - params->trace_output =3D argv[optind]; - else + params->trace_output =3D parse_optional_arg(argc, argv); + if (!params->trace_output) params->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 9baea1b251ed..ad713dafa3c3 100644 --- a/tools/tracing/rtla/src/timerlat_hist.c +++ b/tools/tracing/rtla/src/timerlat_hist.c @@ -713,9 +713,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", @@ -726,11 +726,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", @@ -885,13 +885,7 @@ static struct timerlat_params break; case 'C': params->cgroup =3D 1; - if (!optarg) { - /* will inherit this cgroup */ - params->cgroup_name =3D NULL; - } else if (*optarg =3D=3D '=3D') { - /* skip the =3D */ - params->cgroup_name =3D ++optarg; - } + params->cgroup_name =3D parse_optional_arg(argc, argv); break; case 'b': params->bucket_size =3D get_llong_from_str(optarg); @@ -962,14 +956,8 @@ static struct timerlat_params params->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 c80b81c0b4da..7f1885018624 100644 --- a/tools/tracing/rtla/src/timerlat_top.c +++ b/tools/tracing/rtla/src/timerlat_top.c @@ -480,8 +480,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", @@ -492,11 +492,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", @@ -650,13 +650,7 @@ static struct timerlat_params break; case 'C': params->cgroup =3D 1; - if (!optarg) { - /* will inherit this cgroup */ - params->cgroup_name =3D NULL; - } else if (*optarg =3D=3D '=3D') { - /* skip the =3D */ - params->cgroup_name =3D ++optarg; - } + params->cgroup_name =3D optarg; break; case 'D': config_debug =3D 1; @@ -719,14 +713,8 @@ static struct timerlat_params params->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 Fri Oct 3 02:15:00 2025 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) (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 D6C3E1F30A4; Mon, 8 Sep 2025 02:06:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757297181; cv=none; b=peAXsDiW8J05rps9gFjAupeqt70cjlVhJfDQsMjHv/lmDxaFtD2ujvET68yef5CJgBpE6BMtBSGXnT3B1bNOh/ais2g3eo4YkeESotWuwrdAeBkKivoO3EPjyyy0zGiz0um4vcQj4NGNdHGjNHHw6DBQn6LwTXpUxi/7RpN9Fsk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757297181; c=relaxed/simple; bh=us1QFzHM3F3Tx5gbB5Xm3+iG8ZcTVYz+MmsqUabv0Ek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R8ANH/Cg0mYGZolRLv4RC4B0usu0sPrTIpfTdJAiJlOtt5L+TXZZZ8dsJvwkkb7H9dNlJmDP8eD3gkDL7KxO1YO3T/Ls7jNkje0SM49BupWmVgGLQF0w/kRZM5+IENoMWjjgMtX2WbDneMPDdrfmGNu05cYMOMoeI9RPdUHVvS0= 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=cRnZS0lD; arc=none smtp.client-ip=209.85.219.48 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="cRnZS0lD" Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-70ba7aa131fso45198106d6.2; Sun, 07 Sep 2025 19:06:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757297179; x=1757901979; 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=oaBAcVJZNA9ab0l53ugbMEso8fa/CwAwMsudSNPp4o4=; b=cRnZS0lD9FtO77RKFu/PT8A5VmIw7ZZbuL+etD0QxF0dg9Q81SCl4gd9TYHr/8+Ntf sqPlng/SkarW2Lib3T2rnuoPT9J0reAIQGic+Kp2PojRhC8lS5RkTc4SOpv4w9g1yx1W Ps8qB4t7SdpEZmEL9XJ22YVkVQIT1hClkmXsrPSAggjRtTucjc3Kqwth7JGb7NymKYwH CPwKTocWv3l0gZudEGycsXejWzeqqujBUbkFEg6e8lwP2s49GLvxTM9b6EASKmlWwFJu zzlkWwhBN+sGEARgW969lkMJJtWunvk48PA/6bjkBmbaZoKotoajiWgDjGMVRfpySTuI QPVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757297179; x=1757901979; 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=oaBAcVJZNA9ab0l53ugbMEso8fa/CwAwMsudSNPp4o4=; b=hOGGJBrf7x065D1AuAawFYKOejDbanO2Zla0In4RXFSHm9DD/sSTAu9HrGTvjClkL9 I2GUVY3/Qzj6pgWdEdEAkbkUJVfcD7L/b77fZVRxuWZcQ62k9qR0mooE9G6qsC5mE93l 1DJveN3nLV8Ds4FcbZfgmIUoZb89jyKOoWg92Zab/Tf/eDENskvxL/tvhAsSrpsm/25T Z6Smzz1BVCXNalYfAH97B7eBPo0sEc+swUFw2RsFXUgAa0NUm+cr9n0Y2iGzI5Npnj1P LTn5Z750Lvd2xXy49mHviVsuvuEOYgOXpJUtPqUu2xtdYZ4hTEFB4ls0RLih1Q+dZ4xH WIng== X-Forwarded-Encrypted: i=1; AJvYcCU0x6BEJS5qloxirIl+QELOQlTqC3/KrJ02sqQSd9cNDfYPTfgHq8OZdc92yHvC+EMNzolaIs4cm8WxQRM=@vger.kernel.org, AJvYcCV2PEeQxQPnrdIqLJtiKXQ0jeFheMLs6UD5YdOJKYFd2PZCdv7UgQlQBZbYBPIAVSUzSz3R94bNEHHYf5MQnx7yDD69@vger.kernel.org X-Gm-Message-State: AOJu0YwTPUvoUPjaCIxJzBjGhRO6GSEmVdyosQO+q8G6O7fQCzp94O/h 0VcUfEM6m55Qwj638iYDe+s4atS0xPzRc19BL0/E0xJgDavmmTyAaTHL X-Gm-Gg: ASbGncvcm76rovw8GiAjZgXL2wfwfl2nix30v79JBPvFcR9VligAd73VEM3soKOnpCr wNs+3x+FKjIriDhYER+z7sWKFqrvIfb4UyRxW56GZLl7H2WcaFB+7K/OXMc/hg9PLQYiQxnfzss VVoQNXYNPAPErIYFcJF84M2v+FaUgILT0Ys2rJwFgGIiXQhIEMFXeMlE7IWhCF6/ST8xm6O6z9x rYPO1INtsEvVDK25w8csOXd/Fi3NEG+pup5aqb8/K87wtI3lr51qOlhH0EsGcUNc5BaREHwx+vp QEgcqhMtboSMDa1kt+BcogyFjt78tX7rGtHzVgQqkytEhBZDKfuf31CQL5YHf4qMZtzz5TWV504 S4xXYtucZQpp3Nb9QLH3S+wc0oBeaQUM2sRJXlnqu31SoJtTjzJTNMk5e2FviyrULMR0DTNV5aS eDSh9Ihs7s+vFjOBFIlw== X-Google-Smtp-Source: AGHT+IHZ/hD01zVbSdcsMLdVqx/W+/+CcThF2p0btDBB01OxOdC6PVomOpWDgdx2a2KJFxUAqssFWQ== X-Received: by 2002:a0c:f119:0:b0:739:f004:a176 with SMTP id 6a1803df08f44-739f004a468mr57212566d6.39.1757297178592; Sun, 07 Sep 2025 19:06:18 -0700 (PDT) Received: from ideapad.solutionip.com (wsip-184-179-113-83.ri.ri.cox.net. [184.179.113.83]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-72925b87571sm79638846d6.6.2025.09.07.19.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Sep 2025 19:06:18 -0700 (PDT) From: Ivan Pravdin To: rostedt@goodmis.org, tglozar@redhat.com, linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ivan Pravdin Subject: [PATCH v3 3/3] rtla: fix -a overriding -t argument Date: Sun, 7 Sep 2025 22:05:59 -0400 Message-ID: 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 | 3 ++- tools/tracing/rtla/src/timerlat_hist.c | 3 ++- tools/tracing/rtla/src/timerlat_top.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/tracing/rtla/src/osnoise_hist.c b/tools/tracing/rtla/src= /osnoise_hist.c index 1dc39de79d78..3aa74affac26 100644 --- a/tools/tracing/rtla/src/osnoise_hist.c +++ b/tools/tracing/rtla/src/osnoise_hist.c @@ -543,7 +543,8 @@ static struct osnoise_params params->threshold =3D 1; =20 /* set trace */ - params->trace_output =3D "osnoise_trace.txt"; + if (!params->trace_output) + params->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 b3e161536ed8..6bcb8d10c342 100644 --- a/tools/tracing/rtla/src/osnoise_top.c +++ b/tools/tracing/rtla/src/osnoise_top.c @@ -383,7 +383,8 @@ struct osnoise_params *osnoise_top_parse_args(int argc,= char **argv) params->threshold =3D 1; =20 /* set trace */ - params->trace_output =3D "osnoise_trace.txt"; + if (!params->trace_output) + params->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 ad713dafa3c3..f845d5fa8141 100644 --- a/tools/tracing/rtla/src/timerlat_hist.c +++ b/tools/tracing/rtla/src/timerlat_hist.c @@ -874,7 +874,8 @@ static struct timerlat_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 7f1885018624..42d85ea2e996 100644 --- a/tools/tracing/rtla/src/timerlat_top.c +++ b/tools/tracing/rtla/src/timerlat_top.c @@ -625,7 +625,8 @@ static struct timerlat_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