[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: 217f0b1e990e30a1f06f6d531fdb4530f4788d48
Note: The patch differs from the upstream commit:
---
1: 217f0b1e990e3 ! 1: c364e187bdf5b rtla/timerlat_top: Set OSNOISE_WORKLOAD for kernel threads
@@ Metadata
## Commit message ##
rtla/timerlat_top: Set OSNOISE_WORKLOAD for kernel threads
+ commit 217f0b1e990e30a1f06f6d531fdb4530f4788d48 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
@@ Commit message
Fixes: cdca4f4e5e8e ("rtla/timerlat_top: Add timerlat user-space support")
Signed-off-by: Tomas Glozar <tglozar@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
+ [ params->kernel_workload does not exist in 6.6, use
+ !params->user_top ]
+ Signed-off-by: Tomas Glozar <tglozar@xxxxxxxxxx>
## tools/tracing/rtla/src/timerlat_top.c ##
@@ tools/tracing/rtla/src/timerlat_top.c: timerlat_top_apply_config(struct osnoise_tool *top, struct timerlat_top_params *
- }
+ auto_house_keeping(¶ms->monitored_cpus);
}
- if (params->user_top) {
@@ tools/tracing/rtla/src/timerlat_top.c: timerlat_top_apply_config(struct osnoise_
+ * 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(top->context, params->kernel_workload);
++ retval = osnoise_set_workload(top->context, !params->user_top);
+ if (retval < -1) {
+ err_msg("Failed to set OSNOISE_WORKLOAD option\n");
+ goto out_err;
}
- if (isatty(STDOUT_FILENO) && !params->quiet)
+ return 0;
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
