Commit dafd7a9d authored by Zhen Ni's avatar Zhen Ni Committed by Luis Chamberlain
Browse files

sched: Move rr_timeslice sysctls to rt.c 



move rr_timeslice sysctls to rt.c and use the new
register_sysctl_init() to register the sysctl interface.

Signed-off-by: default avatarZhen Ni <nizhen@uniontech.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 84227c12

include/linux/sched/sysctl.h

+0 −5
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ extern unsigned int sysctl_sched_uclamp_util_min_rt_default; 
extern unsigned int sysctl_sched_cfs_bandwidth_slice;

#endif



extern int sysctl_sched_rr_timeslice;

extern int sched_rr_timeslice;



int sched_rr_handler(struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos);

int sysctl_sched_uclamp_handler(struct ctl_table *table, int write,

		void *buffer, size_t *lenp, loff_t *ppos);

int sysctl_numa_balancing(struct ctl_table *table, int write, void *buffer,

kernel/sched/rt.c

+11 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 */



int sched_rr_timeslice = RR_TIMESLICE;

int sysctl_sched_rr_timeslice = (MSEC_PER_SEC / HZ) * RR_TIMESLICE;

static int sysctl_sched_rr_timeslice = (MSEC_PER_SEC / HZ) * RR_TIMESLICE;

/* More than 4 hours if BW_SHIFT equals 20. */

static const u64 max_rt_runtime = MAX_BW;
@@ -27,6 +27,8 @@ int sysctl_sched_rt_runtime = 950000; 


static int sched_rt_handler(struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos);

static int sched_rr_handler(struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos);

#ifdef CONFIG_SYSCTL

static struct ctl_table sched_rt_sysctls[] = {

	{
@@ -43,6 +45,13 @@ static struct ctl_table sched_rt_sysctls[] = { 
		.mode           = 0644,

		.proc_handler   = sched_rt_handler,

	},

	{

		.procname       = "sched_rr_timeslice_ms",

		.data           = &sysctl_sched_rr_timeslice,

		.maxlen         = sizeof(int),

		.mode           = 0644,

		.proc_handler   = sched_rr_handler,

	},

	{}

};
@@ -3005,7 +3014,7 @@ static int sched_rt_handler(struct ctl_table *table, int write, void *buffer, 
	return ret;

}



int sched_rr_handler(struct ctl_table *table, int write, void *buffer,

static int sched_rr_handler(struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos)

{

	int ret;

kernel/sched/sched.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ extern void call_trace_sched_update_nr_running(struct rq *rq, int count); 


extern unsigned int sysctl_sched_rt_period;

extern int sysctl_sched_rt_runtime;

extern int sched_rr_timeslice;



/*

 * Helpers for converting nanosecond timing to jiffy resolution

kernel/sysctl.c

+0 −7
Original line number Diff line number Diff line
@@ -1681,13 +1681,6 @@ static struct ctl_table kern_table[] = { 
		.extra2		= SYSCTL_FOUR,

	},

#endif /* CONFIG_NUMA_BALANCING */

	{

		.procname	= "sched_rr_timeslice_ms",

		.data		= &sysctl_sched_rr_timeslice,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= sched_rr_handler,

	},

#ifdef CONFIG_UCLAMP_TASK

	{

		.procname	= "sched_util_clamp_min",