kernel26-magellan/patches-2.6.21-r4/0002-2.6.21-sched-sd-0.48-interactive_tunable.patch

Add "interactive" tunable and enable by default.

The staircase-deadline cpu scheduler can be set in either purely
forward-looking mode for absolutely rigid fairness and cpu distribution
according to nice level, or it can allow a small per-process history
to smooth out cpu usage perturbations common in interactive tasks by
enabling this sysctl. While small fairness issues can arise with this
enabled, overall fairness is usually still strongly maintained and
starvation is never possible. Enabling this can significantly smooth
out 3d graphics and games.

Signed-off-by: Con Kolivas <kernel@kolivas.org>

---
 Documentation/sysctl/kernel.txt |   16 ++++++++++++++++
 kernel/sched.c                  |   17 +++++++++++++++--
 kernel/sysctl.c                 |    9 +++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

Index: linux-2.6.21-ck2/kernel/sched.c
===================================================================
--- linux-2.6.21-ck2.orig/kernel/sched.c	2007-05-14 19:30:30.000000000 +1000
+++ linux-2.6.21-ck2/kernel/sched.c	2007-05-14 19:30:30.000000000 +1000
@@ -101,6 +101,7 @@ unsigned long long __attribute__((weak))
  * Tunable via /proc interface.
  */
 int rr_interval __read_mostly = 8;
+int sched_interactive __read_mostly = 1;
 
 /*
  * This contains a bitmap for each dynamic priority level with empty slots
@@ -687,6 +688,18 @@ static int first_prio_slot(struct task_s
 }
 
 /*
+ * In sched_interactive mode priority allocation occurs per process per rq
+ * array swap. In !sched_interactive mode all waking tasks must obey the
+ * current prio level of all other tasks running per array swap.
+ */
+static int minprio(struct rq *rq, int uprio)
+{
+	if (sched_interactive)
+		return MAX_RT_PRIO;
+	return rq->prio_level[uprio];
+}
+
+/*
  * Find the first unused slot by this task that is also in its prio_matrix
  * level. SCHED_BATCH tasks do not use the priority matrix. They only take
  * priority slots from their static_prio and above.
@@ -714,11 +727,11 @@ static int next_entitled_slot(struct tas
 		if (likely(p->policy != SCHED_BATCH))
 			array->best_static_prio = p->static_prio;
 	} else if (p->static_prio == array->best_static_prio) {
-		search_prio = rq->prio_level[uprio];
+		search_prio = minprio(rq, uprio);
 	} else {
 		int i;
 
-		search_prio = rq->prio_level[uprio];
+		search_prio = minprio(rq, uprio);
 		/* A bound O(n) function, worst case n is 40 */
 		for (i = array->best_static_prio; i <= p->static_prio ; i++) {
 			if (!rq->prio_level[USER_PRIO(i)])
Index: linux-2.6.21-ck2/kernel/sysctl.c
===================================================================
--- linux-2.6.21-ck2.orig/kernel/sysctl.c	2007-05-14 19:30:30.000000000 +1000
+++ linux-2.6.21-ck2/kernel/sysctl.c	2007-05-14 19:30:30.000000000 +1000
@@ -77,6 +77,7 @@ extern int sysctl_drop_caches;
 extern int percpu_pagelist_fraction;
 extern int compat_log;
 extern int rr_interval;
+extern int sched_interactive;
 
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
 static int maxolduid = 65535;
@@ -519,6 +520,14 @@ static ctl_table kern_table[] = {
 		.extra1		= &one,
 		.extra2		= &five_thousand,
 	},
+	{
+		.ctl_name	= CTL_UNNUMBERED,
+		.procname	= "interactive",
+		.data		= &sched_interactive,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
+	},
 #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)
 	{
 		.ctl_name       = KERN_UNKNOWN_NMI_PANIC,
Index: linux-2.6.21-ck2/Documentation/sysctl/kernel.txt
===================================================================
--- linux-2.6.21-ck2.orig/Documentation/sysctl/kernel.txt	2007-05-14 19:30:30.000000000 +1000
+++ linux-2.6.21-ck2/Documentation/sysctl/kernel.txt	2007-05-14 19:30:30.000000000 +1000
@@ -25,6 +25,7 @@ show up in /proc/sys/kernel:
 - domainname
 - hostname
 - hotplug
+- interactive
 - java-appletviewer           [ binfmt_java, obsolete ]
 - java-interpreter            [ binfmt_java, obsolete ]
 - kstack_depth_to_print       [ X86 only ]
@@ -165,6 +166,21 @@ Default value is "/sbin/hotplug".
 
 ==============================================================
 
+interactive:
+
+The staircase-deadline cpu scheduler can be set in either purely
+forward-looking mode for absolutely rigid fairness and cpu distribution
+according to nice level, or it can allow a small per-process history
+to smooth out cpu usage perturbations common in interactive tasks by
+enabling this sysctl. While small fairness issues can arise with this
+enabled, overall fairness is usually still strongly maintained and
+starvation is never possible. Enabling this can significantly smooth
+out 3d graphics and games.
+
+Default value is 1 (enabled).
+
+==============================================================
+
 l2cr: (PPC only)
 
 This flag controls the L2 cache of G3 processor boards. If
1	niro	222	Add "interactive" tunable and enable by default.
2
3			The staircase-deadline cpu scheduler can be set in either purely
4			forward-looking mode for absolutely rigid fairness and cpu distribution
5			according to nice level, or it can allow a small per-process history
6			to smooth out cpu usage perturbations common in interactive tasks by
7			enabling this sysctl. While small fairness issues can arise with this
8			enabled, overall fairness is usually still strongly maintained and
9			starvation is never possible. Enabling this can significantly smooth
10			out 3d graphics and games.
11
12			Signed-off-by: Con Kolivas <kernel@kolivas.org>
13
14			---
15			Documentation/sysctl/kernel.txt \| 16 ++++++++++++++++
16			kernel/sched.c \| 17 +++++++++++++++--
17			kernel/sysctl.c \| 9 +++++++++
18			3 files changed, 40 insertions(+), 2 deletions(-)
19
20			Index: linux-2.6.21-ck2/kernel/sched.c
21			===================================================================
22			--- linux-2.6.21-ck2.orig/kernel/sched.c 2007-05-14 19:30:30.000000000 +1000
23			+++ linux-2.6.21-ck2/kernel/sched.c 2007-05-14 19:30:30.000000000 +1000
24			@@ -101,6 +101,7 @@ unsigned long long __attribute__((weak))
25			* Tunable via /proc interface.
26			*/
27			int rr_interval __read_mostly = 8;
28			+int sched_interactive __read_mostly = 1;
29
30			/*
31			* This contains a bitmap for each dynamic priority level with empty slots
32			@@ -687,6 +688,18 @@ static int first_prio_slot(struct task_s
33			}
34
35			/*
36			+ * In sched_interactive mode priority allocation occurs per process per rq
37			+ * array swap. In !sched_interactive mode all waking tasks must obey the
38			+ * current prio level of all other tasks running per array swap.
39			+ */
40			+static int minprio(struct rq *rq, int uprio)
41			+{
42			+ if (sched_interactive)
43			+ return MAX_RT_PRIO;
44			+ return rq->prio_level[uprio];
45			+}
46			+
47			+/*
48			* Find the first unused slot by this task that is also in its prio_matrix
49			* level. SCHED_BATCH tasks do not use the priority matrix. They only take
50			* priority slots from their static_prio and above.
51			@@ -714,11 +727,11 @@ static int next_entitled_slot(struct tas
52			if (likely(p->policy != SCHED_BATCH))
53			array->best_static_prio = p->static_prio;
54			} else if (p->static_prio == array->best_static_prio) {
55			- search_prio = rq->prio_level[uprio];
56			+ search_prio = minprio(rq, uprio);
57			} else {
58			int i;
59
60			- search_prio = rq->prio_level[uprio];
61			+ search_prio = minprio(rq, uprio);
62			/* A bound O(n) function, worst case n is 40 */
63			for (i = array->best_static_prio; i <= p->static_prio ; i++) {
64			if (!rq->prio_level[USER_PRIO(i)])
65			Index: linux-2.6.21-ck2/kernel/sysctl.c
66			===================================================================
67			--- linux-2.6.21-ck2.orig/kernel/sysctl.c 2007-05-14 19:30:30.000000000 +1000
68			+++ linux-2.6.21-ck2/kernel/sysctl.c 2007-05-14 19:30:30.000000000 +1000
69			@@ -77,6 +77,7 @@ extern int sysctl_drop_caches;
70			extern int percpu_pagelist_fraction;
71			extern int compat_log;
72			extern int rr_interval;
73			+extern int sched_interactive;
74
75			/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
76			static int maxolduid = 65535;
77			@@ -519,6 +520,14 @@ static ctl_table kern_table[] = {
78			.extra1 = &one,
79			.extra2 = &five_thousand,
80			},
81			+ {
82			+ .ctl_name = CTL_UNNUMBERED,
83			+ .procname = "interactive",
84			+ .data = &sched_interactive,
85			+ .maxlen = sizeof(int),
86			+ .mode = 0644,
87			+ .proc_handler = &proc_dointvec,
88			+ },
89			#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)
90			{
91			.ctl_name = KERN_UNKNOWN_NMI_PANIC,
92			Index: linux-2.6.21-ck2/Documentation/sysctl/kernel.txt
93			===================================================================
94			--- linux-2.6.21-ck2.orig/Documentation/sysctl/kernel.txt 2007-05-14 19:30:30.000000000 +1000
95			+++ linux-2.6.21-ck2/Documentation/sysctl/kernel.txt 2007-05-14 19:30:30.000000000 +1000
96			@@ -25,6 +25,7 @@ show up in /proc/sys/kernel:
97			- domainname
98			- hostname
99			- hotplug
100			+- interactive
101			- java-appletviewer [ binfmt_java, obsolete ]
102			- java-interpreter [ binfmt_java, obsolete ]
103			- kstack_depth_to_print [ X86 only ]
104			@@ -165,6 +166,21 @@ Default value is "/sbin/hotplug".
105
106			==============================================================
107
108			+interactive:
109			+
110			+The staircase-deadline cpu scheduler can be set in either purely
111			+forward-looking mode for absolutely rigid fairness and cpu distribution
112			+according to nice level, or it can allow a small per-process history
113			+to smooth out cpu usage perturbations common in interactive tasks by
114			+enabling this sysctl. While small fairness issues can arise with this
115			+enabled, overall fairness is usually still strongly maintained and
116			+starvation is never possible. Enabling this can significantly smooth
117			+out 3d graphics and games.
118			+
119			+Default value is 1 (enabled).
120			+
121			+==============================================================
122			+
123			l2cr: (PPC only)
124
125			This flag controls the L2 cache of G3 processor boards. If