Commit f1b11f1f authored by Tomas Glozar's avatar Tomas Glozar Committed by Wentao Guan
Browse files

rtla/timerlat_hist: Set OSNOISE_WORKLOAD for kernel threads 

stable inclusion
from stable-v6.6.81
commit 129b81f6912f25f5c193d94be09b2510d38047f6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBX1M5

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=129b81f6912f25f5c193d94be09b2510d38047f6

--------------------------------

commit d8d866171a414ed88bd0d720864095fd75461134 upstream.

When using rtla timerlat with userspace threads (-u or -U), rtla
disables the OSNOISE_WORKLOAD option in
/sys/kernel/tracing/osnoise/options. This option is not re-enabled in a
subsequent run with kernel-space threads, leading to rtla collecting no
results if the previous run exited abnormally:

$ rtla timerlat hist -u
^\Quit (core dumped)
$ rtla timerlat hist -k -d 1s
Index
over:
count:
min:
avg:
max:
ALL:        IRQ       Thr       Usr
count:        0         0         0
min:          -         -         -
avg:          -         -         -
max:          -         -         -

The issue persists until OSNOISE_WORKLOAD is set manually by running:
$ echo OSNOISE_WORKLOAD > /sys/kernel/tracing/osnoise/options

Set OSNOISE_WORKLOAD when running rtla with kernel-space threads if
available to fix the issue.

Cc: stable@vger.kernel.org
Cc: John Kacur <jkacur@redhat.com>
Cc: Luis Goncalves <lgoncalv@redhat.com>
Link: https://lore.kernel.org/20250107144823.239782-3-tglozar@redhat.com


Fixes: ed774f74 ("rtla/timerlat_hist: Add timerlat user-space support")
Signed-off-by: default avatarTomas Glozar <tglozar@redhat.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
[ params->kernel_workload does not exist in 6.6, use
!params->user_hist ]
Signed-off-by: default avatarTomas Glozar <tglozar@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 129b81f6912f25f5c193d94be09b2510d38047f6)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 3da5a9b7

tools/tracing/rtla/src/timerlat_hist.c

+9 −6
Original line number Diff line number Diff line
@@ -900,13 +900,16 @@ timerlat_hist_apply_config(struct osnoise_tool *tool, struct timerlat_hist_param 
		auto_house_keeping(&params->monitored_cpus);

	}



	if (params->user_hist) {

		retval = osnoise_set_workload(tool->context, 0);

		if (retval) {

	/*

	* Set workload according to type of thread if the kernel supports it.

	* On kernels without support, user threads will have already failed

	* on missing timerlat_fd, and kernel threads do not need it.

	*/

	retval = osnoise_set_workload(tool->context, !params->user_hist);

	if (retval < -1) {

		err_msg("Failed to set OSNOISE_WORKLOAD option\n");

		goto out_err;

	}

	}



	return 0;