rpms/kernel/devel kernel-2.6.spec, 1.2776, 1.2777 linux-2.6-lockdep-fixes.patch, 1.38, 1.39
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Oct 12 16:45:31 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28252
Modified Files:
kernel-2.6.spec linux-2.6-lockdep-fixes.patch
Log Message:
rt-mutex: fixup rt-mutex debug code
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2776
retrieving revision 1.2777
diff -u -r1.2776 -r1.2777
--- kernel-2.6.spec 12 Oct 2006 16:40:27 -0000 1.2776
+++ kernel-2.6.spec 12 Oct 2006 16:45:29 -0000 1.2777
@@ -2053,6 +2053,7 @@
fixing bugs in DECNet of all things).
Both users will be very happy this fix made it into FC6.
- Improve mm debugging in rmap sanity checking.
+- rt-mutex: fixup rt-mutex debug code
* Wed Oct 11 2006 Jon Masters <jcm at redhat.com>
- Silence a stupid error in find-provides for non-kABI subpackages.
linux-2.6-lockdep-fixes.patch:
a/drivers/ieee1394/nodemgr.c | 9
a/drivers/net/forcedeth.c | 31 +-
a/fs/nfsd/nfsproc.c | 2
a/fs/nfsd/vfs.c | 8
a/include/linux/nfsd/nfsfh.h | 11 -
a/kernel/lockdep.c | 13 +
b/drivers/net/bonding/bond_main.c | 5
drivers/input/serio/libps2.c | 4
fs/block_dev.c | 11 -
kernel/lockdep.c | 1
linux-2.6.17-mm6/include/net/sock.h | 33 ++-
linux-2.6.18-rc1/drivers/input/serio/libps2.c | 6
linux-2.6.18-rc1/include/linux/libps2.h | 12 +
linux-2.6.18-rc1/net/socket.c | 8
linux-2.6.18.noarch/block/ioctl.c | 4
linux-2.6.18.noarch/drivers/char/sysrq.c | 1
linux-2.6.18.noarch/drivers/input/serio/libps2.c | 4
linux-2.6.18.noarch/drivers/input/serio/serio.c | 9
linux-2.6.18.noarch/drivers/md/md.c | 6
linux-2.6.18.noarch/drivers/usb/serial/cyberjack.c | 6
linux-2.6.18.noarch/drivers/usb/serial/generic.c | 6
linux-2.6.18.noarch/drivers/usb/serial/ipw.c | 6
linux-2.6.18.noarch/drivers/usb/serial/ir-usb.c | 6
linux-2.6.18.noarch/drivers/usb/serial/keyspan_pda.c | 6
linux-2.6.18.noarch/drivers/usb/serial/omninet.c | 6
linux-2.6.18.noarch/drivers/usb/serial/safe_serial.c | 6
linux-2.6.18.noarch/fs/block_dev.c | 180 +++++------------
linux-2.6.18.noarch/include/linux/fs.h | 17 -
linux-2.6.18.noarch/include/linux/libps2.h | 7
linux-2.6.18.noarch/include/linux/lockdep.h | 12 -
linux-2.6.18.noarch/include/linux/serio.h | 1
linux-2.6.18.noarch/include/net/sock.h | 19 +
linux-2.6.18.noarch/kernel/fork.c | 4
linux-2.6.18.noarch/kernel/lockdep.c | 10
linux-2.6.18.noarch/kernel/mutex-debug.c | 2
linux-2.6.18.noarch/lib/rwsem-spinlock.c | 2
linux-2.6.18.noarch/lib/rwsem.c | 2
linux-2.6.18.noarch/lib/spinlock_debug.c | 4
linux-2.6.18.noarch/net/core/sock.c | 2
linux-2.6.18.noarch/net/decnet/af_decnet.c | 5
linux-2.6.18.noarch/net/sunrpc/svcsock.c | 33 +++
linux-2.6.18.noarch/net/sunrpc/xprtsock.c | 33 +++
linux-2.6/arch/arm/kernel/ecard.c | 2
linux-2.6/arch/i386/kernel/smpboot.c | 2
linux-2.6/arch/powerpc/platforms/powermac/cpufreq_64.c | 2
linux-2.6/arch/powerpc/platforms/powermac/nvram.c | 4
linux-2.6/block/as-iosched.c | 2
linux-2.6/block/cfq-iosched.c | 2
linux-2.6/drivers/block/DAC960.c | 2
linux-2.6/drivers/block/cciss.c | 6
linux-2.6/drivers/block/cciss_scsi.c | 2
linux-2.6/drivers/block/paride/pd.c | 2
linux-2.6/drivers/block/pktcdvd.c | 2
linux-2.6/drivers/ide/ide-tape.c | 2
linux-2.6/drivers/macintosh/smu.c | 4
linux-2.6/drivers/macintosh/windfarm_smu_controls.c | 2
linux-2.6/drivers/macintosh/windfarm_smu_sensors.c | 2
linux-2.6/drivers/s390/scsi/zfcp_scsi.c | 2
linux-2.6/drivers/scsi/53c700.c | 2
linux-2.6/drivers/scsi/aic7xxx/aic79xx_osm.c | 4
linux-2.6/drivers/scsi/aic7xxx/aic7xxx_osm.c | 2
linux-2.6/drivers/scsi/gdth.c | 4
linux-2.6/drivers/scsi/qla1280.c | 4
linux-2.6/drivers/usb/gadget/inode.c | 2
linux-2.6/drivers/usb/gadget/omap_udc.c | 2
linux-2.6/mm/slab.c | 55 +++--
linux-2.6/net/ipv4/ipvs/ip_vs_sync.c | 2
net/core/sock.c | 23 --
68 files changed, 401 insertions(+), 292 deletions(-)
Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- linux-2.6-lockdep-fixes.patch 12 Oct 2006 08:07:07 -0000 1.38
+++ linux-2.6-lockdep-fixes.patch 12 Oct 2006 16:45:29 -0000 1.39
@@ -3367,3 +3367,89 @@
memcpy(sa, &scp->peer, sizeof(struct sockaddr_dn));
} else {
+From davej Thu Oct 12 11:07:22 2006
+Return-Path: <pzijlstr at redhat.com>
+X-Spam-Checker-Version: SpamAssassin 3.1.4 (2006-07-25) on
+ pressure.kernelslacker.org
+X-Spam-Level:
+X-Spam-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,
+ UNPARSEABLE_RELAY autolearn=ham version=3.1.4
+Received: from pobox.devel.redhat.com [10.11.255.8]
+ by pressure.kernelslacker.org with IMAP (fetchmail-6.3.4)
+ for <davej at localhost> (single-drop); Thu, 12 Oct 2006 11:07:22 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+ by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+ Thu, 12 Oct 2006 11:03:57 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+ by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k9CF3uhJ014684
+ for <davej at pobox.devel.redhat.com>; Thu, 12 Oct 2006 11:03:56 -0400
+Received: from pobox.stuttgart.redhat.com (pobox.stuttgart.redhat.com [172.16.2.10])
+ by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k9CF3s76019941;
+ Thu, 12 Oct 2006 11:03:54 -0400
+Received: from vpn-4-35.str.redhat.com (vpn-4-35.str.redhat.com [10.32.4.35])
+ by pobox.stuttgart.redhat.com (8.12.8/8.12.8) with ESMTP id k9CF3q3b001818;
+ Thu, 12 Oct 2006 17:03:52 +0200
+Subject: [RHEL5 PATCH] rt-mutex: fixup rt-mutex debug code
+From: Peter Zijlstra <pzijlstr at redhat.com>
+To: rhkernel-list at redhat.com
+Cc: Don Zickus <dzickus at redhat.com>, Dave Jones <davej at redhat.com>
+Content-Type: text/plain
+Date: Thu, 12 Oct 2006 17:04:07 +0200
+Message-Id: <1160665447.2006.123.camel at taijtu>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.6.3 (2.6.3-1.fc5.5)
+Content-Transfer-Encoding: 7bit
+Status: RO
+Content-Length: 1493
+Lines: 48
+
+BZ208165
+
+BUG: warning at kernel/rtmutex-debug.c:125/rt_mutex_debug_task_free() (Not tainted)
+ [<c04051e3>] show_trace_log_lvl+0x58/0x16a
+ [<c04057f0>] show_trace+0xd/0x10
+ [<c0405900>] dump_stack+0x19/0x1b
+ [<c043f03d>] rt_mutex_debug_task_free+0x35/0x6a
+ [<c04224c0>] free_task+0x15/0x24
+ [<c042378c>] copy_process+0x12bd/0x1324
+ [<c0423835>] do_fork+0x42/0x113
+ [<c04021dd>] sys_fork+0x19/0x1b
+ [<c0403fb7>] syscall_call+0x7/0xb
+
+In copy_process(), dup_task_struct() also duplicates the ->pi_lock,
+->pi_waiters and ->pi_blocked_on members. rt_mutex_debug_task_free()
+called from free_task() validates these members. However free_task()
+can be invoked before these members are reset for the new task.
+
+Move the initialization code before the first bail that can hit free_task().
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
+---
+ kernel/fork.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.18.noarch/kernel/fork.c
+===================================================================
+--- linux-2.6.18.noarch.orig/kernel/fork.c
++++ linux-2.6.18.noarch/kernel/fork.c
+@@ -979,6 +979,8 @@ static struct task_struct *copy_process(
+ if (!p)
+ goto fork_out;
+
++ rt_mutex_init_task(p);
++
+ p->tux_info = NULL;
+
+ #ifdef CONFIG_TRACE_IRQFLAGS
+@@ -1084,8 +1086,6 @@ static struct task_struct *copy_process(
+ p->lockdep_recursion = 0;
+ #endif
+
+- rt_mutex_init_task(p);
+-
+ #ifdef CONFIG_DEBUG_MUTEXES
+ p->blocked_on = NULL; /* not blocked yet */
+ #endif
+
+
More information about the fedora-cvs-commits
mailing list