Commit 20d6b075 authored by Tomas Glozar's avatar Tomas Glozar Committed by Steven Rostedt (Google)
Browse files

rtla: Unify apply_config between top and hist 

The functions osnoise_top_apply_config and osnoise_hist_apply_config, as
well as timerlat_top_apply_config and timerlat_hist_apply_config, are
mostly the same.

Move common part from them into separate functions osnoise_apply_config
and timerlat_apply_config.

For rtla-timerlat, also unify params->user_hist and params->user_top
into one field called params->user_data, and move several fields used
only by timerlat-top into the top-only section of struct
timerlat_params.

Cc: Luis Goncalves <lgoncalv@redhat.com>
Link: https://lore.kernel.org/20250320092500.101385-3-tglozar@redhat.com


Signed-off-by: default avatarTomas Glozar <tglozar@redhat.com>
Reviewed-by: default avatarJohn Kacur <jkacur@redhat.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 025b2179

tools/tracing/rtla/src/osnoise.c

+79 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (C) 2021 Red Hat Inc, Daniel Bristot de Oliveira <bristot@kernel.org>

 */



#define _GNU_SOURCE

#include <sys/types.h>

#include <sys/stat.h>

#include <pthread.h>
@@ -12,6 +13,7 @@ 
#include <errno.h>

#include <fcntl.h>

#include <stdio.h>

#include <sched.h>



#include "osnoise.h"
@@ -1114,6 +1116,83 @@ osnoise_report_missed_events(struct osnoise_tool *tool) 
	}

}



/*

 * osnoise_apply_config - apply common configs to the initialized tool

 */

int

osnoise_apply_config(struct osnoise_tool *tool, struct osnoise_params *params)

{

	int retval;



	if (!params->sleep_time)

		params->sleep_time = 1;



	if (params->cpus) {

		retval = osnoise_set_cpus(tool->context, params->cpus);

		if (retval) {

			err_msg("Failed to apply CPUs config\n");

			goto out_err;

		}

	}



	if (params->runtime || params->period) {

		retval = osnoise_set_runtime_period(tool->context,

						    params->runtime,

						    params->period);

		if (retval) {

			err_msg("Failed to set runtime and/or period\n");

			goto out_err;

		}

	}



	if (params->stop_us) {

		retval = osnoise_set_stop_us(tool->context, params->stop_us);

		if (retval) {

			err_msg("Failed to set stop us\n");

			goto out_err;

		}

	}



	if (params->stop_total_us) {

		retval = osnoise_set_stop_total_us(tool->context, params->stop_total_us);

		if (retval) {

			err_msg("Failed to set stop total us\n");

			goto out_err;

		}

	}



	if (params->threshold) {

		retval = osnoise_set_tracing_thresh(tool->context, params->threshold);

		if (retval) {

			err_msg("Failed to set tracing_thresh\n");

			goto out_err;

		}

	}



	if (params->hk_cpus) {

		retval = sched_setaffinity(getpid(), sizeof(params->hk_cpu_set),

					   &params->hk_cpu_set);

		if (retval == -1) {

			err_msg("Failed to set rtla to the house keeping CPUs\n");

			goto out_err;

		}

	} else if (params->cpus) {

		/*

		 * Even if the user do not set a house-keeping CPU, try to

		 * move rtla to a CPU set different to the one where the user

		 * set the workload to run.

		 *

		 * No need to check results as this is an automatic attempt.

		 */

		auto_house_keeping(&params->monitored_cpus);

	}



	return 0;



out_err:

	return -1;

}



static void osnoise_usage(int err)

{

	int i;

tools/tracing/rtla/src/osnoise.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ struct osnoise_tool *osnoise_init_tool(char *tool_name); 
struct osnoise_tool *osnoise_init_trace_tool(char *tracer);

void osnoise_report_missed_events(struct osnoise_tool *tool);

bool osnoise_trace_is_off(struct osnoise_tool *tool, struct osnoise_tool *record);

int osnoise_apply_config(struct osnoise_tool *tool, struct osnoise_params *params);



int osnoise_hist_main(int argc, char *argv[]);

int osnoise_top_main(int argc, char **argv);

tools/tracing/rtla/src/osnoise_hist.c

+3 −63
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <errno.h>

#include <stdio.h>

#include <time.h>

#include <sched.h>



#include "osnoise.h"
@@ -705,68 +704,9 @@ osnoise_hist_apply_config(struct osnoise_tool *tool, struct osnoise_params *para 
{

	int retval;



	if (!params->sleep_time)

		params->sleep_time = 1;



	if (params->cpus) {

		retval = osnoise_set_cpus(tool->context, params->cpus);

		if (retval) {

			err_msg("Failed to apply CPUs config\n");

			goto out_err;

		}

	}



	if (params->runtime || params->period) {

		retval = osnoise_set_runtime_period(tool->context,

						    params->runtime,

						    params->period);

		if (retval) {

			err_msg("Failed to set runtime and/or period\n");

			goto out_err;

		}

	}



	if (params->stop_us) {

		retval = osnoise_set_stop_us(tool->context, params->stop_us);

		if (retval) {

			err_msg("Failed to set stop us\n");

			goto out_err;

		}

	}



	if (params->stop_total_us) {

		retval = osnoise_set_stop_total_us(tool->context, params->stop_total_us);

		if (retval) {

			err_msg("Failed to set stop total us\n");

			goto out_err;

		}

	}



	if (params->threshold) {

		retval = osnoise_set_tracing_thresh(tool->context, params->threshold);

		if (retval) {

			err_msg("Failed to set tracing_thresh\n");

			goto out_err;

		}

	}



	if (params->hk_cpus) {

		retval = sched_setaffinity(getpid(), sizeof(params->hk_cpu_set),

					   &params->hk_cpu_set);

		if (retval == -1) {

			err_msg("Failed to set rtla to the house keeping CPUs\n");

	retval = osnoise_apply_config(tool, params);

	if (retval)

		goto out_err;

		}

	} else if (params->cpus) {

		/*

		 * Even if the user do not set a house-keeping CPU, try to

		 * move rtla to a CPU set different to the one where the user

		 * set the workload to run.

		 *

		 * No need to check results as this is an automatic attempt.

		 */

		auto_house_keeping(&params->monitored_cpus);

	}



	return 0;

tools/tracing/rtla/src/osnoise_top.c

+3 −63
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <unistd.h>

#include <stdio.h>

#include <time.h>

#include <sched.h>



#include "osnoise.h"
@@ -523,50 +522,9 @@ osnoise_top_apply_config(struct osnoise_tool *tool, struct osnoise_params *param 
{

	int retval;



	if (!params->sleep_time)

		params->sleep_time = 1;



	if (params->cpus) {

		retval = osnoise_set_cpus(tool->context, params->cpus);

		if (retval) {

			err_msg("Failed to apply CPUs config\n");

			goto out_err;

		}

	}



	if (params->runtime || params->period) {

		retval = osnoise_set_runtime_period(tool->context,

						    params->runtime,

						    params->period);

		if (retval) {

			err_msg("Failed to set runtime and/or period\n");

			goto out_err;

		}

	}



	if (params->stop_us) {

		retval = osnoise_set_stop_us(tool->context, params->stop_us);

		if (retval) {

			err_msg("Failed to set stop us\n");

			goto out_err;

		}

	}



	if (params->stop_total_us) {

		retval = osnoise_set_stop_total_us(tool->context, params->stop_total_us);

		if (retval) {

			err_msg("Failed to set stop total us\n");

			goto out_err;

		}

	}



	if (params->threshold) {

		retval = osnoise_set_tracing_thresh(tool->context, params->threshold);

		if (retval) {

			err_msg("Failed to set tracing_thresh\n");

	retval = osnoise_apply_config(tool, params);

	if (retval)

		goto out_err;

		}

	}



	if (params->mode == MODE_HWNOISE) {

		retval = osnoise_set_irq_disable(tool->context, 1);
@@ -576,24 +534,6 @@ osnoise_top_apply_config(struct osnoise_tool *tool, struct osnoise_params *param 
		}

	}



	if (params->hk_cpus) {

		retval = sched_setaffinity(getpid(), sizeof(params->hk_cpu_set),

					   &params->hk_cpu_set);

		if (retval == -1) {

			err_msg("Failed to set rtla to the house keeping CPUs\n");

			goto out_err;

		}

	} else if (params->cpus) {

		/*

		 * Even if the user do not set a house-keeping CPU, try to

		 * move rtla to a CPU set different to the one where the user

		 * set the workload to run.

		 *

		 * No need to check results as this is an automatic attempt.

		 */

		auto_house_keeping(&params->monitored_cpus);

	}



	if (isatty(STDOUT_FILENO) && !params->quiet)

		params->pretty_output = 1;

tools/tracing/rtla/src/timerlat.c

+109 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Copyright (C) 2021 Red Hat Inc, Daniel Bristot de Oliveira <bristot@kernel.org>

 */

#define _GNU_SOURCE

#include <sys/types.h>

#include <sys/stat.h>

#include <pthread.h>
@@ -11,9 +12,117 @@ 
#include <errno.h>

#include <fcntl.h>

#include <stdio.h>

#include <sched.h>



#include "timerlat.h"



/*

 * timerlat_apply_config - apply common configs to the initialized tool

 */

int

timerlat_apply_config(struct osnoise_tool *tool, struct timerlat_params *params)

{

	int retval, i;



	if (!params->sleep_time)

		params->sleep_time = 1;



	if (params->cpus) {

		retval = osnoise_set_cpus(tool->context, params->cpus);

		if (retval) {

			err_msg("Failed to apply CPUs config\n");

			goto out_err;

		}

	} else {

		for (i = 0; i < sysconf(_SC_NPROCESSORS_CONF); i++)

			CPU_SET(i, &params->monitored_cpus);

	}



	if (params->stop_us) {

		retval = osnoise_set_stop_us(tool->context, params->stop_us);

		if (retval) {

			err_msg("Failed to set stop us\n");

			goto out_err;

		}

	}



	if (params->stop_total_us) {

		retval = osnoise_set_stop_total_us(tool->context, params->stop_total_us);

		if (retval) {

			err_msg("Failed to set stop total us\n");

			goto out_err;

		}

	}





	if (params->timerlat_period_us) {

		retval = osnoise_set_timerlat_period_us(tool->context, params->timerlat_period_us);

		if (retval) {

			err_msg("Failed to set timerlat period\n");

			goto out_err;

		}

	}





	if (params->print_stack) {

		retval = osnoise_set_print_stack(tool->context, params->print_stack);

		if (retval) {

			err_msg("Failed to set print stack\n");

			goto out_err;

		}

	}



	if (params->hk_cpus) {

		retval = sched_setaffinity(getpid(), sizeof(params->hk_cpu_set),

					   &params->hk_cpu_set);

		if (retval == -1) {

			err_msg("Failed to set rtla to the house keeping CPUs\n");

			goto out_err;

		}

	} else if (params->cpus) {

		/*

		 * Even if the user do not set a house-keeping CPU, try to

		 * move rtla to a CPU set different to the one where the user

		 * set the workload to run.

		 *

		 * No need to check results as this is an automatic attempt.

		 */

		auto_house_keeping(&params->monitored_cpus);

	}



	/*

	 * If the user did not specify a type of thread, try user-threads first.

	 * Fall back to kernel threads otherwise.

	 */

	if (!params->kernel_workload && !params->user_data) {

		retval = tracefs_file_exists(NULL, "osnoise/per_cpu/cpu0/timerlat_fd");

		if (retval) {

			debug_msg("User-space interface detected, setting user-threads\n");

			params->user_workload = 1;

			params->user_data = 1;

		} else {

			debug_msg("User-space interface not detected, setting kernel-threads\n");

			params->kernel_workload = 1;

		}

	}



	/*

	 * 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->kernel_workload);

	if (retval < -1) {

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

		goto out_err;

	}



	return 0;



out_err:

	return -1;

}



static void timerlat_usage(int err)

{

	int i;