rpms/kernel/F-9 linux-2.6-sched-features-disable-hrtick.patch, NONE, 1.1 linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards, NONE, 1.1 kernel.spec, 1.819, 1.820

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12011

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-sched-features-disable-hrtick.patch 
	linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards 
Log Message:
Add scheduler patches approved for -stable.

linux-2.6-sched-features-disable-hrtick.patch:

--- NEW FILE linux-2.6-sched-features-disable-hrtick.patch ---
From: Ingo Molnar <mingo at elte.hu>
Date: Mon, 20 Oct 2008 12:27:43 +0000 (+0200)
Subject: sched: disable the hrtick for now
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0c4b83da58ec2e96ce9c44c211d6eac5f9dae478

sched: disable the hrtick for now

David Miller reported that hrtick update overhead has tripled the
wakeup overhead on Sparc64.

That is too much - disable the HRTICK feature for now by default,
until a faster implementation is found.

Reported-by: David Miller <davem at davemloft.net>
Acked-by: Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_features.h b/kernel/sched_features.h
index 7c9e8f4..fda0162 100644
--- a/kernel/sched_features.h
+++ b/kernel/sched_features.h
@@ -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)


--- NEW FILE linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards ---
From: Dave Kleikamp <shaggy at linux.vnet.ibm.com>
Date: Thu, 9 Oct 2008 18:21:30 +0000 (-0500)
Subject: sched_clock: prevent scd->clock from moving backwards
X-Git-Tag: v2.6.28-rc1~43^2~10^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=5b7dba4

sched_clock: prevent scd->clock from moving backwards

When sched_clock_cpu() couples the clocks between two cpus, it may
increment scd->clock beyond the GTOD tick window that __update_sched_clock()
uses to clamp the clock.  A later call to __update_sched_clock() may move
the clock back to scd->tick_gtod + TICK_NSEC, violating the clock's
monotonic property.

This patch ensures that scd->clock will not be set backward.

Signed-off-by: Dave Kleikamp <shaggy at linux.vnet.ibm.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index e8ab096..8178724 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -118,13 +118,13 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now)
 
 	/*
 	 * scd->clock = clamp(scd->tick_gtod + delta,
-	 * 		      max(scd->tick_gtod, scd->clock),
-	 * 		      scd->tick_gtod + TICK_NSEC);
+	 *		      max(scd->tick_gtod, scd->clock),
+	 *		      max(scd->clock, scd->tick_gtod + TICK_NSEC));
 	 */
 
 	clock = scd->tick_gtod + delta;
 	min_clock = wrap_max(scd->tick_gtod, scd->clock);
-	max_clock = scd->tick_gtod + TICK_NSEC;
+	max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC);
 
 	clock = wrap_max(clock, min_clock);
 	clock = wrap_min(clock, max_clock);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- kernel.spec	30 Oct 2008 07:54:23 -0000	1.819
+++ kernel.spec	30 Oct 2008 08:07:50 -0000	1.820
@@ -596,6 +596,9 @@
 
 Patch41: linux-2.6-sysrq-c.patch
 
+Patch60: linux-2.6-sched-features-disable-hrtick.patch
+Patch61: linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards
+
 Patch70: linux-2.6-x86-tune-generic.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch101: linux-2.6-x86-check-for-null-irq-context.patch
@@ -1048,6 +1051,10 @@
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
+# scheduler patches approved for -stable
+ApplyPatch linux-2.6-sched-features-disable-hrtick.patch
+ApplyPatch linux-2.6-sched_clock-prevent-scd-clock-from-moving-backwards
+
 # Architecture patches
 # x86(-64)
 # Compile 686 kernels tuned for Pentium4.
@@ -1829,6 +1836,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu Oct 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-7
+- Add scheduler patches approved for -stable.
+
 * Thu Oct 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-6
 - Add hdpvr driver.