Skip to contentSkip to conversation

scheduler fixes/updates

GIT PULL Ingo Molnar 1 participant 1 message Oct 21, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest scheduler fixes/updates git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus

Thanks,

Ingo

------------------>
David Miller (1):
sched: kill unused scheduler decl.

Ingo Molnar (1):
sched: disable the hrtick for now

Miao Xie (1):
sched: fix the wrong mask_len

Mike Galbraith (1):
sched: minor fast-path overhead reduction

Peter Zijlstra (5):
sched: only update rq->clock while holding rq->lock
sched: fix the wrong mask_len, cleanup
sched: optimize group load balancer
sched: fair scheduler should not resched rt tasks
sched: revert back to per-rq vruntime

 include/linux/sched.h   |    2 +-
 kernel/sched.c          |   51 +++++++++++++++++++-------------------
 kernel/sched_fair.c     |   62 ++++++++++++++++++++++++++++++----------------
 kernel/sched_features.h |    2 +-
 kernel/sched_stats.h    |    2 +-
 kernel/sysctl.c         |   10 +++++++
 6 files changed, 79 insertions(+), 50 deletions(-)
include/linux/sched.h +1 -1
index c226c7b..4f59c8e 100644
@@ -287,7 +287,6 @@ extern void trap_init(void);
 extern void account_process_tick(struct task_struct *task, int user);
 extern void update_process_times(int user);
 extern void scheduler_tick(void);
-extern void hrtick_resched(void);
 
 extern void sched_show_task(struct task_struct *p);
 
@@ -1622,6 +1621,7 @@ extern unsigned int sysctl_sched_features;
 extern unsigned int sysctl_sched_migration_cost;
 extern unsigned int sysctl_sched_nr_migrate;
 extern unsigned int sysctl_sched_shares_ratelimit;
+extern unsigned int sysctl_sched_shares_thresh;
 
 int sched_nr_latency_handler(struct ctl_table *table, int write,
 		struct file *file, void __user *buffer, size_t *length,
kernel/sched.c +26 -25

85 lines not on this page · raw message

kernel/sched_fair.c +40 -22

141 lines not on this page · raw message

kernel/sched_features.h +1 -1
index 7c9e8f4..fda0162 100644
@@ -5,7 +5,7 @@ SCHED_FEAT(START_DEBIT, 1)
 SCHED_FEAT(AFFINE_WAKEUPS, 1)
 SCHED_FEAT(CACHE_HOT_BUDDY, 1)
 SCHED_FEAT(SYNC_WAKEUPS, 1)
-SCHED_FEAT(HRTICK, 1)
+SCHED_FEAT(HRTICK, 0)
 SCHED_FEAT(DOUBLE_TICK, 0)
 SCHED_FEAT(ASYM_GRAN, 1)
 SCHED_FEAT(LB_BIAS, 1)
kernel/sched_stats.h +1 -1
index 8385d43..6757925 100644
@@ -9,7 +9,7 @@
 static int show_schedstat(struct seq_file *seq, void *v)
 {
 	int cpu;
-	int mask_len = NR_CPUS/32 * 9;
+	int mask_len = DIV_ROUND_UP(NR_CPUS, 32) * 9;
 	char *mask_str = kmalloc(mask_len, GFP_KERNEL);
 
 	if (mask_str == NULL)
kernel/sysctl.c +10 -0
index 617d41e..3d804f4 100644
@@ -276,6 +276,16 @@ static struct ctl_table kern_table[] = {
 	},
 	{
 		.ctl_name	= CTL_UNNUMBERED,
+		.procname	= "sched_shares_thresh",
+		.data		= &sysctl_sched_shares_thresh,
+		.maxlen		= sizeof(unsigned int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec_minmax,
+		.strategy	= &sysctl_intvec,
+		.extra1		= &zero,
+	},
+	{
+		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "sched_child_runs_first",
 		.data		= &sysctl_sched_child_runs_first,
 		.maxlen		= sizeof(unsigned int),