Skip to contentSkip to conversation

sched: move scheduler sysctl bits into dedicated header file

PATCH Superseded Clark Williams 5 participants 7 messages Jan 28, 2013 – Jan 31, 2013 Scheduler

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 sched: move scheduler sysctl bits into dedicated header file

Move all the scheduler sysctl-related bits out of include/linux/sched.h into a new file include/linux/sched_sysctl.h.

---
 include/linux/sched.h        | 102 +-----------------------------------
 include/linux/sched_sysctl.h | 121 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 101 deletions(-)
include/linux/sched.h +1 -101
index 924e42a..12e689e 100644
@@ -51,6 +51,7 @@ struct sched_param {
 #include <linux/cred.h>
 #include <linux/llist.h>
 #include <linux/uidgid.h>
+#include <linux/sched_sysctl.h>
 
 #include <asm/processor.h>
 
@@ -304,19 +305,6 @@ static inline void lockup_detector_init(void)
 }
 #endif
 
-#ifdef CONFIG_DETECT_HUNG_TASK
-extern unsigned int  sysctl_hung_task_panic;
-extern unsigned long sysctl_hung_task_check_count;
-extern unsigned long sysctl_hung_task_timeout_secs;
-extern unsigned long sysctl_hung_task_warnings;
-extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
-					 void __user *buffer,
-					 size_t *lenp, loff_t *ppos);
-#else
-/* Avoid need for ifdefs elsewhere in the code */
-enum { sysctl_hung_task_timeout_secs = 0 };
-#endif
-
 /* Attach to any functions which should be ignored in wchan output. */
 #define __sched		__attribute__((__section__(".sched.text")))
 
@@ -338,23 +326,6 @@ extern int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner);
 struct nsproxy;
 struct user_namespace;
 
-/*
- * Default maximum number of active map areas, this limits the number of vmas
- * per mm struct. Users can overwrite this number by sysctl but there is a
- * problem.
- *
- * When a program's coredump is generated as ELF format, a section is created
- * per a vma. In ELF, the number of sections is represented in unsigned short.
- * This means the number of sections should be smaller than 65535 at coredump.
- * Because the kernel adds some informative sections to a image of program at
- * generating coredump, we need some margin. The number of extra sections is
- * 1-3 now and depends on arch. We use "5" as safe margin, here.
- */
-#define MAPCOUNT_ELF_CORE_MARGIN	(5)
-#define DEFAULT_MAX_MAP_COUNT	(USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
-
-extern int sysctl_max_map_count;
-
 #include <linux/aio.h>
 
 #ifdef CONFIG_MMU
@@ -2034,77 +2005,6 @@ extern void wake_up_idle_cpu(int cpu);
 static inline void wake_up_idle_cpu(int cpu) { }
 #endif
 
-extern unsigned int sysctl_sched_latency;
-extern unsigned int sysctl_sched_min_granularity;
-extern unsigned int sysctl_sched_wakeup_granularity;
-extern unsigned int sysctl_sched_child_runs_first;
-
-enum sched_tunable_scaling {
-	SCHED_TUNABLESCALING_NONE,
-	SCHED_TUNABLESCALING_LOG,
-	SCHED_TUNABLESCALING_LINEAR,
-	SCHED_TUNABLESCALING_END,
-};
-extern enum sched_tunable_scaling sysctl_sched_tunable_scaling;
-
-extern unsigned int sysctl_numa_balancing_scan_delay;
-extern unsigned int sysctl_numa_balancing_scan_period_min;
-extern unsigned int sysctl_numa_balancing_scan_period_max;
-extern unsigned int sysctl_numa_balancing_scan_period_reset;
-extern unsigned int sysctl_numa_balancing_scan_size;
-extern unsigned int sysctl_numa_balancing_settle_count;
-
-#ifdef CONFIG_SCHED_DEBUG
-extern unsigned int sysctl_sched_migration_cost;
-extern unsigned int sysctl_sched_nr_migrate;
-extern unsigned int sysctl_sched_time_avg;
-extern unsigned int sysctl_timer_migration;
-extern unsigned int sysctl_sched_shares_window;
-
-int sched_proc_update_handler(struct ctl_table *table, int write,
-		void __user *buffer, size_t *length,
-		loff_t *ppos);
-#endif
-#ifdef CONFIG_SCHED_DEBUG
-static inline unsigned int get_sysctl_timer_migration(void)
-{
-	return sysctl_timer_migration;
-}
-#else
-static inline unsigned int get_sysctl_timer_migration(void)
-{
-	return 1;
-}
-#endif
-extern unsigned int sysctl_sched_rt_period;
-extern int sysctl_sched_rt_runtime;
-
-int sched_rt_handler(struct ctl_table *table, int write,
-		void __user *buffer, size_t *lenp,
-		loff_t *ppos);
-
-#ifdef CONFIG_SCHED_AUTOGROUP
-extern unsigned int sysctl_sched_autogroup_enabled;
-
-extern void sched_autogroup_create_attach(struct task_struct *p);
-extern void sched_autogroup_detach(struct task_struct *p);
-extern void sched_autogroup_fork(struct signal_struct *sig);
-extern void sched_autogroup_exit(struct signal_struct *sig);
-#ifdef CONFIG_PROC_FS
-extern void proc_sched_autogroup_show_task(struct task_struct *p, struct seq_file *m);
-extern int proc_sched_autogroup_set_nice(struct task_struct *p, int nice);
-#endif
-#else
-static inline void sched_autogroup_create_attach(struct task_struct *p) { }
-static inline void sched_autogroup_detach(struct task_struct *p) { }
-static inline void sched_autogroup_fork(struct signal_struct *sig) { }
-static inline void sched_autogroup_exit(struct signal_struct *sig) { }
-#endif
-
-#ifdef CONFIG_CFS_BANDWIDTH
-extern unsigned int sysctl_sched_cfs_bandwidth_slice;
-#endif
-
 #ifdef CONFIG_RT_MUTEXES
 extern int rt_mutex_getprio(struct task_struct *p);
 extern void rt_mutex_setprio(struct task_struct *p, int prio);
include/linux/sched_sysctl.h new file +121 -0

121 lines not on this page · raw message

Signature · 1 line
1.7.11.7
#1 lore raw
Quoted 4 lines
include/linux/sched.h +0 -4
-extern void sched_autogroup_create_attach(struct task_struct *p);
-extern void sched_autogroup_detach(struct task_struct *p);
-extern void sched_autogroup_fork(struct signal_struct *sig);
-extern void sched_autogroup_exit(struct signal_struct *sig);

include/linux/sched.h extern void wake_up_idle_cpu(int cpu); · line 2102

Quoted 10 lines
include/linux/sched.h +0 -10
-#ifdef CONFIG_PROC_FS
-extern void proc_sched_autogroup_show_task(struct task_struct *p, struct seq_file *m);
-extern int proc_sched_autogroup_set_nice(struct task_struct *p, int nice);
-#endif
-#else
-static inline void sched_autogroup_create_attach(struct task_struct *p) { }
-static inline void sched_autogroup_detach(struct task_struct *p) { }
-static inline void sched_autogroup_fork(struct signal_struct *sig) { }
-static inline void sched_autogroup_exit(struct signal_struct *sig) { }
-#endif

but those function declarations have nothing to do with sysctl..

Quoted 5 lines
include/linux/sched.h +0 -5
-
-#ifdef CONFIG_CFS_BANDWIDTH
-extern unsigned int sysctl_sched_cfs_bandwidth_slice;
-#endif
-
#3 lore raw
In reply to Clark Williams

Hi Clark,

Quoted 5 lines · Clark Williams

Move all the scheduler sysctl-related bits out of include/linux/sched.h into a new file include/linux/sched_sysctl.h.

---

[snip]

Quoted 7 lines
include/linux/sched_sysctl.h new file +1 -0
new file mode 100644
index 0000000..912adab
@@ -0,0 +1,121 @@
+#ifndef _SCHED_SYSCTL_H

include/linux/sched_sysctl.h line 11

Quoted 10 lines
include/linux/sched_sysctl.h new file +10 -0
+#define _SCHED_SYSCTL_H
+
+
+/* provide a home for sysctl scheduler tuning knobs */
+
+/*
+ * default timeslice is 100 msecs (used only for SCHED_RR tasks).
+ * Timeslices get refilled after they expire.
+ */
+#define RR_TIMESLICE		(100 * HZ / 1000)

It seems this line came from sched.h but I can't find that part deleted.

Thanks
Namhyung

#2 lore raw
In reply to Li Zefan
Quoted 17 lines · On Tue, 29 Jan 2013 09:12:45 +0800 Li Zefan <[email protected]> wrote:
Quoted 4 lines
include/linux/sched.h +0 -4
-extern void sched_autogroup_create_attach(struct task_struct *p);
-extern void sched_autogroup_detach(struct task_struct *p);
-extern void sched_autogroup_fork(struct signal_struct *sig);
-extern void sched_autogroup_exit(struct signal_struct *sig);

include/linux/sched.h extern void wake_up_idle_cpu(int cpu); · line 2102

Quoted 10 lines
include/linux/sched.h +0 -10
-#ifdef CONFIG_PROC_FS
-extern void proc_sched_autogroup_show_task(struct task_struct *p, struct seq_file *m);
-extern int proc_sched_autogroup_set_nice(struct task_struct *p, int nice);
-#endif
-#else
-static inline void sched_autogroup_create_attach(struct task_struct *p) { }
-static inline void sched_autogroup_detach(struct task_struct *p) { }
-static inline void sched_autogroup_fork(struct signal_struct *sig) { }
-static inline void sched_autogroup_exit(struct signal_struct *sig) { }
-#endif

but those function declarations have nothing to do with sysctl..

Quoted 6 lines

include/linux/sched.h extern void wake_up_idle_cpu(int cpu); · line 2107

Quoted 5 lines
include/linux/sched.h +0 -5
-
-#ifdef CONFIG_CFS_BANDWIDTH
-extern unsigned int sysctl_sched_cfs_bandwidth_slice;
-#endif
-

True, but they're all under the SCHED_AUTOGROUP config variable along with:

	extern unsigned int sysctl_sched_autogroup_enabled;

So I thought I'd keep them all grouped together.

I can move the prototypes back into sched.h but the whole reason for doing this is to reduce the size of sched.

Guess I'll let Ingo make the call here.

Clark

#4 lore raw
In reply to Namhyung Kim
Quoted 21 lines · On Tue, 29 Jan 2013 15:05:43 +0900 Namhyung Kim <[email protected]> wrote:

Hi Clark,

Quoted 5 lines · Clark Williams

Move all the scheduler sysctl-related bits out of include/linux/sched.h into a new file include/linux/sched_sysctl.h.

---

[snip]

Quoted 12 lines
include/linux/sched_sysctl.h new file +6 -0
new file mode 100644
index 0000000..912adab
@@ -0,0 +1,121 @@
+#ifndef _SCHED_SYSCTL_H
+#define _SCHED_SYSCTL_H
+
+
+/* provide a home for sysctl scheduler tuning knobs */
+
Quoted 9 lines

include/linux/sched_sysctl.h line 11

Quoted 5 lines
include/linux/sched_sysctl.h new file +5 -0
+/*
+ * default timeslice is 100 msecs (used only for SCHED_RR tasks).
+ * Timeslices get refilled after they expire.
+ */
+#define RR_TIMESLICE		(100 * HZ / 1000)

It seems this line came from sched.h but I can't find that part deleted.

Arggghh! I reorganized the commits and didn't remove RR_TIMESLICE when I moved it. I'm surprised it compiled.

I can generate a new patchset or let Ingo just remove it from sched.h.

Clark

#5 lore raw
Quoted 12 lines · Clark Williams
Quoted 11 lines

include/linux/sched_sysctl.h line 11

Quoted 7 lines
include/linux/sched_sysctl.h new file +7 -0
+/* provide a home for sysctl scheduler tuning knobs */
+
+/*
+ * default timeslice is 100 msecs (used only for SCHED_RR tasks).
+ * Timeslices get refilled after they expire.
+ */
+#define RR_TIMESLICE		(100 * HZ / 1000)

It seems this line came from sched.h but I can't find that part deleted.

Quoted 4 lines

Arggghh! I reorganized the commits and didn't remove RR_TIMESLICE when I moved it. I'm surprised it compiled.

I can generate a new patchset or let Ingo just remove it from sched.h.

gcc won't warn if you define a macro to what it is already defined to.

#define foo bar
#define foo bar

won't warn

#define foo bar
#define foo cat

will.

-- Steve

#6 lore raw
In reply to Clark Williams
Quoted 34 lines · Clark Williams
Quoted 21 lines · On Tue, 29 Jan 2013 15:05:43 +0900 Namhyung Kim <[email protected]> wrote:

Hi Clark,

Quoted 5 lines · Clark Williams

Move all the scheduler sysctl-related bits out of include/linux/sched.h into a new file include/linux/sched_sysctl.h.

---

[snip]

Quoted 12 lines
include/linux/sched_sysctl.h new file +6 -0
new file mode 100644
index 0000000..912adab
@@ -0,0 +1,121 @@
+#ifndef _SCHED_SYSCTL_H
+#define _SCHED_SYSCTL_H
+
+
+/* provide a home for sysctl scheduler tuning knobs */
+
Quoted 9 lines

include/linux/sched_sysctl.h line 11

Quoted 5 lines
include/linux/sched_sysctl.h new file +5 -0
+/*
+ * default timeslice is 100 msecs (used only for SCHED_RR tasks).
+ * Timeslices get refilled after they expire.
+ */
+#define RR_TIMESLICE		(100 * HZ / 1000)

It seems this line came from sched.h but I can't find that part deleted.

Quoted 5 lines

Arggghh! I reorganized the commits and didn't remove RR_TIMESLICE when I moved it. I'm surprised it compiled.

I can generate a new patchset or let Ingo just remove it from sched.h.

Please generate a new patch-set.

Mind also changing the placement of the new file a bit? Could you create a new include/linux/sched/ directory, and put a new sysctl.h into it?

That way further sched.h splitups will populate
include/linux/sched/ nicely.

Agreed?

Thanks,

Ingo