Commit efaa0227 authored by tangmeng's avatar tangmeng Committed by Thomas Gleixner
Browse files

timers: Move timer sysctl into the timer code 



This is part of the effort to reduce kernel/sysctl.c to only contain the
core logic.

Signed-off-by: default avatartangmeng <tangmeng@uniontech.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20220215065019.7520-1-tangmeng@uniontech.com
parent 2966a991

include/linux/timer.h

+0 −8
Original line number Diff line number Diff line
@@ -196,14 +196,6 @@ extern void init_timers(void); 
struct hrtimer;

extern enum hrtimer_restart it_real_fn(struct hrtimer *);



#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)

struct ctl_table;



extern unsigned int sysctl_timer_migration;

int timer_migration_handler(struct ctl_table *table, int write,

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

#endif



unsigned long __round_jiffies(unsigned long j, int cpu);

unsigned long __round_jiffies_relative(unsigned long j, int cpu);

unsigned long round_jiffies(unsigned long j);

kernel/sysctl.c

+0 −11
Original line number Diff line number Diff line
@@ -2288,17 +2288,6 @@ static struct ctl_table kern_table[] = { 
		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)

	{

		.procname	= "timer_migration",

		.data		= &sysctl_timer_migration,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= timer_migration_handler,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

#endif

#ifdef CONFIG_BPF_SYSCALL

	{

		.procname	= "unprivileged_bpf_disabled",

kernel/time/timer.c

+38 −15
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <linux/slab.h>

#include <linux/compat.h>

#include <linux/random.h>

#include <linux/sysctl.h>



#include <linux/uaccess.h>

#include <asm/unistd.h>
@@ -223,7 +224,7 @@ static void timer_update_keys(struct work_struct *work); 
static DECLARE_WORK(timer_update_work, timer_update_keys);



#ifdef CONFIG_SMP

unsigned int sysctl_timer_migration = 1;

static unsigned int sysctl_timer_migration = 1;



DEFINE_STATIC_KEY_FALSE(timers_migration_enabled);
@@ -234,34 +235,56 @@ static void timers_update_migration(void) 
	else

		static_branch_disable(&timers_migration_enabled);

}

#else

static inline void timers_update_migration(void) { }

#endif /* !CONFIG_SMP */



static void timer_update_keys(struct work_struct *work)

#ifdef CONFIG_SYSCTL

static int timer_migration_handler(struct ctl_table *table, int write,

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

{

	int ret;



	mutex_lock(&timer_keys_mutex);

	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	if (!ret && write)

		timers_update_migration();

	static_branch_enable(&timers_nohz_active);

	mutex_unlock(&timer_keys_mutex);

	return ret;

}



void timers_update_nohz(void)

static struct ctl_table timer_sysctl[] = {

	{

	schedule_work(&timer_update_work);

}

		.procname	= "timer_migration",

		.data		= &sysctl_timer_migration,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= timer_migration_handler,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

	{}

};



int timer_migration_handler(struct ctl_table *table, int write,

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

static int __init timer_sysctl_init(void)

{

	int ret;

	register_sysctl("kernel", timer_sysctl);

	return 0;

}

device_initcall(timer_sysctl_init);

#endif /* CONFIG_SYSCTL */

#else /* CONFIG_SMP */

static inline void timers_update_migration(void) { }

#endif /* !CONFIG_SMP */



static void timer_update_keys(struct work_struct *work)

{

	mutex_lock(&timer_keys_mutex);

	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	if (!ret && write)

	timers_update_migration();

	static_branch_enable(&timers_nohz_active);

	mutex_unlock(&timer_keys_mutex);

	return ret;

}



void timers_update_nohz(void)

{

	schedule_work(&timer_update_work);

}



static inline bool is_timers_nohz_active(void)