rpms/kernel/F-8 linux-2.6-futex-fix-fixups.patch, NONE, 1.1 kernel.spec, 1.326, 1.327
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Wed Jan 23 00:32:14 UTC 2008
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv770
Modified Files:
kernel.spec
Added Files:
linux-2.6-futex-fix-fixups.patch
Log Message:
* Tue Jan 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.14-118
- Fix futex oops on uniprocessor machine. (#429412)
linux-2.6-futex-fix-fixups.patch:
--- NEW FILE linux-2.6-futex-fix-fixups.patch ---
Here it is for 2.6.23:
Subject: x86: fix missing exception entry for SMP alternatives in futex macros
From: Thomas Gleixner <tglx at linutronix.de>
The exception fixup for the futex macros __futex_atomic_op2 and
futex_atomic_cmpxchg_inatomic() is missing an entry when the lock
prefix is replaced by a NOP via SMP alternatives.
Chuck Ebert tracked this down from the information provided in:
https://bugzilla.redhat.com/show_bug.cgi?id=429412
The solution is to add another fixup after the LOCK_PREFIX, so both
the LOCK and NOP case have their own entry in the exception table.
The solution was pointed out by Andi Kleen.
Trivial backport to 2.6.23 by Chuck Ebbert.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Acked-by: Ingo Molnar <mingo at elte.hu>
---
include/asm-i386/futex.h | 8 ++++----
include/asm-x86_64/futex.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
Index: linux-2.6/include/asm-i386/futex.h
===================================================================
--- linux-2.6.orig/include/asm-i386/futex.h 2008-01-22 13:13:10.000000000 +0100
+++ linux-2.6/include/asm-i386/futex.h 2008-01-22 13:13:49.000000000 +0100
@@ -28,7 +28,7 @@
"1: movl %2, %0\n\
movl %0, %3\n" \
insn "\n" \
-"2: " LOCK_PREFIX "cmpxchgl %3, %2\n\
+"2: " LOCK_PREFIX "\n 5: cmpxchgl %3, %2\n\
jnz 1b\n\
3: .section .fixup,\"ax\"\n\
4: mov %5, %1\n\
@@ -36,7 +36,7 @@
.previous\n\
.section __ex_table,\"a\"\n\
.align 8\n\
- .long 1b,4b,2b,4b\n\
+ .long 1b,4b,2b,4b,5b,4b\n\
.previous" \
: "=&a" (oldval), "=&r" (ret), "+m" (*uaddr), \
"=&r" (tem) \
@@ -111,7 +111,7 @@ futex_atomic_cmpxchg_inatomic(int __user
return -EFAULT;
__asm__ __volatile__(
- "1: " LOCK_PREFIX "cmpxchgl %3, %1 \n"
+ "1: " LOCK_PREFIX "\n 4: cmpxchgl %3, %1 \n"
"2: .section .fixup, \"ax\" \n"
"3: mov %2, %0 \n"
@@ -120,7 +120,7 @@ futex_atomic_cmpxchg_inatomic(int __user
" .section __ex_table, \"a\" \n"
" .align 8 \n"
- " .long 1b,3b \n"
+ " .long 1b,3b,4b,3b \n"
" .previous \n"
: "=a" (oldval), "+m" (*uaddr)
Index: linux-2.6/include/asm-x86_64/futex.h
===================================================================
--- linux-2.6.orig/include/asm-x86_64/futex.h 2008-01-22 13:13:10.000000000 +0100
+++ linux-2.6/include/asm-x86_64/futex.h 2008-01-22 13:13:49.000000000 +0100
@@ -27,7 +27,7 @@
"1: movl %2, %0\n\
movl %0, %3\n" \
insn "\n" \
-"2: " LOCK_PREFIX "cmpxchgl %3, %2\n\
+"2: " LOCK_PREFIX "\n 5: cmpxchgl %3, %2\n\
jnz 1b\n\
3: .section .fixup,\"ax\"\n\
4: mov %5, %1\n\
@@ -35,7 +35,7 @@
.previous\n\
.section __ex_table,\"a\"\n\
.align 8\n\
- .quad 1b,4b,2b,4b\n\
+ .quad 1b,4b,2b,4b,5b,4b\n\
.previous" \
: "=&a" (oldval), "=&r" (ret), "=m" (*uaddr), \
"=&r" (tem) \
@@ -101,7 +101,7 @@ futex_atomic_cmpxchg_inatomic(int __user
return -EFAULT;
__asm__ __volatile__(
- "1: " LOCK_PREFIX "cmpxchgl %3, %1 \n"
+ "1: " LOCK_PREFIX "\n 4: cmpxchgl %3, %1 \n"
"2: .section .fixup, \"ax\" \n"
"3: mov %2, %0 \n"
@@ -110,7 +110,7 @@ futex_atomic_cmpxchg_inatomic(int __user
" .section __ex_table, \"a\" \n"
" .align 8 \n"
- " .quad 1b,3b \n"
+ " .quad 1b,3b,4b,3b \n"
" .previous \n"
: "=a" (oldval), "=m" (*uaddr)
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- kernel.spec 23 Jan 2008 00:08:16 -0000 1.326
+++ kernel.spec 23 Jan 2008 00:31:40 -0000 1.327
@@ -675,6 +675,7 @@
Patch602: linux-2.6-mm-fix-ptrace-access-beyond-vma.patch
Patch603: linux-2.6-dio-fix-cache-invalidation-after-sync-writes.patch
Patch604: linux-2.6-slub-provide-proc-slabinfo.patch
+Patch605: linux-2.6-futex-fix-fixups.patch
Patch610: linux-2.6-defaults-fat-utf8.patch
Patch620: linux-2.6-defaults-unicode-vt.patch
@@ -1297,6 +1298,8 @@
ApplyPatch linux-2.6-dio-fix-cache-invalidation-after-sync-writes.patch
# restore /proc/slabinfo
ApplyPatch linux-2.6-slub-provide-proc-slabinfo.patch
+# fix oops with futex on uniprocessor machine
+ApplyPatch linux-2.6-futex-fix-fixups.patch
# Changes to upstream defaults.
# Use UTF-8 by default on VFAT.
@@ -2055,6 +2058,9 @@
%changelog
+* Tue Jan 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.14-118
+- Fix futex oops on uniprocessor machine. (#429412)
+
* Tue Jan 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.14-117
- Work around broken Seagate LBA48 disks (#429364)
More information about the fedora-extras-commits
mailing list