From 0d93270f77dbaea03feb05a581f7f7f79e3174da Mon Sep 17 00:00:00 2001 From: Paul Turner Date: Mon, 15 Nov 2010 15:47:06 -0800 Subject: [PATCH] --- yaml --- r: 223991 b: refs/heads/master c: a7a4f8a752ec734b2eab904fc863d5dc873de338 h: refs/heads/master i: 223989: b463cbd63a17aee26d862d7f43104d18c96156ae 223987: 8958273c922163f50c3dde06aa00d149fe4bbaab 223983: 4c2204d2d9907bfd7029c5bdc4d6fcb9622bff1c v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 1 + trunk/kernel/sched_fair.c | 9 ++++++++- trunk/kernel/sysctl.c | 7 +++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d982a960acd5..aba9c632dca0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67e86250f8ea7b8f7da53ac25ea73c6bd71f5cd9 +refs/heads/master: a7a4f8a752ec734b2eab904fc863d5dc873de338 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 8abb8aa59664..840f1277492f 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1900,6 +1900,7 @@ 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, diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index b320753aa6c9..6c84439ce987 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -89,6 +89,13 @@ unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL; const_debug unsigned int sysctl_sched_migration_cost = 500000UL; +/* + * The exponential sliding window over which load is averaged for shares + * distribution. + * (default: 10msec) + */ +unsigned int __read_mostly sysctl_sched_shares_window = 10000000UL; + static const struct sched_class fair_sched_class; /************************************************************** @@ -688,7 +695,7 @@ account_entity_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se) #if defined CONFIG_SMP && defined CONFIG_FAIR_GROUP_SCHED static void update_cfs_load(struct cfs_rq *cfs_rq) { - u64 period = sched_avg_period(); + u64 period = sysctl_sched_shares_window; u64 now, delta; unsigned long load = cfs_rq->load.weight; diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 3132b25193db..9b520d74f052 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -332,6 +332,13 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, + { + .procname = "sched_shares_window", + .data = &sysctl_sched_shares_window, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, { .procname = "timer_migration", .data = &sysctl_timer_migration,