Commit 263d7eac authored by Crystal Wood's avatar Crystal Wood Committed by Steven Rostedt (Google)
Browse files

tools/rtla: Create common_apply_config() 

Merge the common bits of osnoise_apply_config() and
timerlat_apply_config().  Put the result in a new common.c, and move
enough things to common.h so that common.c does not need to include
osnoise.h.

Cc: John Kacur <jkacur@redhat.com>
Cc: Costa Shulyupin <costa.shul@redhat.com>
Link: https://lore.kernel.org/20250907022325.243930-4-crwood@redhat.com


Reviewed-by: default avatarTomas Glozar <tglozar@redhat.com>
Signed-off-by: default avatarCrystal Wood <crwood@redhat.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 5742bf62

tools/tracing/rtla/src/Build

+1 −0
Original line number Diff line number Diff line 
rtla-y += trace.o

rtla-y += utils.o

rtla-y += actions.o

rtla-y += common.o

rtla-y += osnoise.o

rtla-y += osnoise_top.o

rtla-y += osnoise_hist.o

tools/tracing/rtla/src/common.c

0 → 100644
+63 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#define _GNU_SOURCE



#include <unistd.h>

#include "common.h"



/*

 * common_apply_config - apply common configs to the initialized tool

 */

int

common_apply_config(struct osnoise_tool *tool, struct common_params *params)

{

	int retval, i;



	if (!params->sleep_time)

		params->sleep_time = 1;



	retval = osnoise_set_cpus(tool->context, params->cpus ? params->cpus : "all");

	if (retval) {

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

		goto out_err;

	}



	if (!params->cpus) {

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

			CPU_SET(i, &params->monitored_cpus);

	}



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

	}



	/*

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

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

	 * on missing 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;

}

tools/tracing/rtla/src/common.h

+67 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#pragma once



#include "trace.h"

#include "utils.h"



/*

 * osnoise_context - read, store, write, restore osnoise configs.

 */

struct osnoise_context {

	int			flags;

	int			ref;



	char			*curr_cpus;

	char			*orig_cpus;



	/* 0 as init value */

	unsigned long long	orig_runtime_us;

	unsigned long long	runtime_us;



	/* 0 as init value */

	unsigned long long	orig_period_us;

	unsigned long long	period_us;



	/* 0 as init value */

	long long		orig_timerlat_period_us;

	long long		timerlat_period_us;



	/* 0 as init value */

	long long		orig_tracing_thresh;

	long long		tracing_thresh;



	/* -1 as init value because 0 is disabled */

	long long		orig_stop_us;

	long long		stop_us;



	/* -1 as init value because 0 is disabled */

	long long		orig_stop_total_us;

	long long		stop_total_us;



	/* -1 as init value because 0 is disabled */

	long long		orig_print_stack;

	long long		print_stack;



	/* -1 as init value because 0 is off */

	int			orig_opt_irq_disable;

	int			opt_irq_disable;



	/* -1 as init value because 0 is off */

	int			orig_opt_workload;

	int			opt_workload;

};



/*

 * osnoise_tool -  osnoise based tool definition.

 */

struct osnoise_tool {

	struct trace_instance		trace;

	struct osnoise_context		*context;

	void				*data;

	void				*params;

	time_t				start_time;

};



struct hist_params {

	char			no_irq;

	char			no_thread;
@@ -44,4 +103,12 @@ struct common_params { 
	int			output_divisor;

	int			pretty_output;

	int			quiet;

	int			kernel_workload;

};



int osnoise_set_cpus(struct osnoise_context *context, char *cpus);

void osnoise_restore_cpus(struct osnoise_context *context);



int osnoise_set_workload(struct osnoise_context *context, bool onoff);



int common_apply_config(struct osnoise_tool *tool, struct common_params *params);

tools/tracing/rtla/src/osnoise.c

+3 −34
Original line number Diff line number Diff line
@@ -1120,21 +1120,14 @@ osnoise_report_missed_events(struct osnoise_tool *tool) 
}



/*

 * osnoise_apply_config - apply common configs to the initialized tool

 * osnoise_apply_config - apply osnoise configs to the initialized tool

 */

int

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

{

	int retval;



	if (!params->common.sleep_time)

		params->common.sleep_time = 1;



	retval = osnoise_set_cpus(tool->context, params->common.cpus ? params->common.cpus : "all");

	if (retval) {

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

		goto out_err;

	}

	params->common.kernel_workload = true;



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

		retval = osnoise_set_runtime_period(tool->context,
@@ -1169,31 +1162,7 @@ osnoise_apply_config(struct osnoise_tool *tool, struct osnoise_params *params) 
		goto out_err;

	}



	if (params->common.hk_cpus) {

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

					   &params->common.hk_cpu_set);

		if (retval == -1) {

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

			goto out_err;

		}

	} else if (params->common.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->common.monitored_cpus);

	}



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

	if (retval < -1) {

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

		goto out_err;

	}



	return 0;

	return common_apply_config(tool, &params->common);



out_err:

	return -1;

tools/tracing/rtla/src/osnoise.h

+0 −64
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#pragma once



#include "common.h"

#include "trace.h"



enum osnoise_mode {

	MODE_OSNOISE = 0,
@@ -18,53 +17,6 @@ struct osnoise_params { 
	enum osnoise_mode	mode;

};



/*

 * osnoise_context - read, store, write, restore osnoise configs.

 */

struct osnoise_context {

	int			flags;

	int			ref;



	char			*curr_cpus;

	char			*orig_cpus;



	/* 0 as init value */

	unsigned long long	orig_runtime_us;

	unsigned long long	runtime_us;



	/* 0 as init value */

	unsigned long long	orig_period_us;

	unsigned long long	period_us;



	/* 0 as init value */

	long long		orig_timerlat_period_us;

	long long		timerlat_period_us;



	/* 0 as init value */

	long long		orig_tracing_thresh;

	long long		tracing_thresh;



	/* -1 as init value because 0 is disabled */

	long long		orig_stop_us;

	long long		stop_us;



	/* -1 as init value because 0 is disabled */

	long long		orig_stop_total_us;

	long long		stop_total_us;



	/* -1 as init value because 0 is disabled */

	long long		orig_print_stack;

	long long		print_stack;



	/* -1 as init value because 0 is off */

	int			orig_opt_irq_disable;

	int			opt_irq_disable;



	/* -1 as init value because 0 is off */

	int			orig_opt_workload;

	int			opt_workload;

};



/*

 * *_INIT_VALs are also invalid values, they are used to

 * communicate errors.
@@ -76,9 +28,6 @@ struct osnoise_context *osnoise_context_alloc(void); 
int osnoise_get_context(struct osnoise_context *context);

void osnoise_put_context(struct osnoise_context *context);



int osnoise_set_cpus(struct osnoise_context *context, char *cpus);

void osnoise_restore_cpus(struct osnoise_context *context);



int osnoise_set_runtime_period(struct osnoise_context *context,

			       unsigned long long runtime,

			       unsigned long long period);
@@ -105,19 +54,6 @@ int osnoise_set_print_stack(struct osnoise_context *context, 
			    long long print_stack);



int osnoise_set_irq_disable(struct osnoise_context *context, bool onoff);

int osnoise_set_workload(struct osnoise_context *context, bool onoff);



/*

 * osnoise_tool -  osnoise based tool definition.

 */

struct osnoise_tool {

	struct trace_instance		trace;

	struct osnoise_context		*context;

	void				*data;

	void				*params;

	time_t				start_time;

};



void osnoise_destroy_tool(struct osnoise_tool *top);

struct osnoise_tool *osnoise_init_tool(char *tool_name);

struct osnoise_tool *osnoise_init_trace_tool(char *tracer);