rpms/kernel/F-7 linux-2.6-singlethread-freezable-workqueues.patch, NONE, 1.1 kernel-2.6.spec, 1.3182, 1.3183
Dave Jones (davej)
fedora-extras-commits at redhat.com
Tue May 22 04:01:00 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9149
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-singlethread-freezable-workqueues.patch
Log Message:
* Tue May 22 2007 Dave Jones <davej at redhat.com>
- Make freezable workqueues singlethreaded.
linux-2.6-singlethread-freezable-workqueues.patch:
--- NEW FILE linux-2.6-singlethread-freezable-workqueues.patch ---
>From davej Mon May 21 13:21:54 2007
Return-Path: <cebbert at redhat.com>
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
gelk.kernelslacker.org
X-Spam-Level:
X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,
UNPARSEABLE_RELAY autolearn=ham version=3.1.8
Received: from pobox.devel.redhat.com [10.11.255.8]
by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
for <davej at localhost> (single-drop); Mon, 21 May 2007 13:21:54 -0400 (EDT)
Received: from pobox.devel.redhat.com ([unix socket])
by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA;
Mon, 21 May 2007 13:18:03 -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 l4LHI3BA031332
for <davej at pobox.devel.redhat.com>; Mon, 21 May 2007 13:18:03 -0400
Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12])
by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l4LHI2wN024390
for <davej at int-mx1.corp.redhat.com>; Mon, 21 May 2007 13:18:03 -0400
Received: from [172.16.83.145] (dhcp83-145.boston.redhat.com [172.16.83.145])
by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id l4LHI29x005151
for <davej at redhat.com>; Mon, 21 May 2007 13:18:02 -0400
Message-ID: <4651D44A.1020601 at redhat.com>
Date: Mon, 21 May 2007 13:18:02 -0400
From: Chuck Ebbert <cebbert at redhat.com>
Organization: Red Hat
User-Agent: Thunderbird 1.5.0.10 (X11/20070302)
MIME-Version: 1.0
To: Dave Jones <davej at redhat.com>
Subject: [Fwd: make freezeable workqueues singlethread]
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Status: RO
X-Status: A
Content-Length: 4691
Lines: 76
Should fix suspend/resume problems with tifm driver at least...
-------- Original Message --------
From: - Thu May 17 09:50:11 2007
X-Mozilla-Status: 0001
X-Mozilla-Status2: 08000000
Return-Path: <git-commits-head-owner at vger.kernel.org>
Received: from mail.boston.redhat.com ([unix socket]) by mail.boston.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA; Thu, 17 May 2007 08:59:44 -0400
X-Sieve: CMU Sieve 2.2
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mail.boston.redhat.com (8.13.1/8.13.1) with ESMTP id l4HCxh7U020214; Thu, 17 May 2007 08:59:43 -0400
Received: from mx2.redhat.com (mx2.redhat.com [10.255.15.25]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l4HCxgbb002834; Thu, 17 May 2007 08:59:42 -0400
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by mx2.redhat.com (8.13.1/8.13.1) with ESMTP id l4HCxBmQ017405; Thu, 17 May 2007 08:59:41 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand id S1755850AbXEQM71 (ORCPT <rfc822;cebbert at redhat.com> + 6 others); Thu, 17 May 2007 08:59:27 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1755904AbXEQM71 (ORCPT <rfc822;git-commits-head-outgoing>); Thu, 17 May 2007 08:59:27 -0400
Received: from hera.kernel.org ([140.211.167.34]:50815 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755850AbXEQM7R (ORCPT <rfc822;git-commits-head at vger.kernel.org>); Thu, 17 May 2007 08:59:17 -0400
Received: from hera.kernel.org (IDENT:U2FsdGVkX19IC8w8qxynKtvRQaTH5vetqhS32u+f3c8 at localhost [127.0.0.1]) by hera.kernel.org (8.13.8/8.13.7) with ESMTP id l4HCxGE8017869 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for <git-commits-head at vger.kernel.org>; Thu, 17 May 2007 12:59:17 GMT
Received: (from dwmw2 at localhost) by hera.kernel.org (8.13.8/8.13.1/Submit) id l4HCxGOp017851 for git-commits-head at vger.kernel.org; Thu, 17 May 2007 12:59:16 GMT
Date: Thu, 17 May 2007 12:59:16 GMT
Message-Id: <200705171259.l4HCxGOp017851 at hera.kernel.org>
From: Linux Kernel Mailing List <linux-kernel at vger.kernel.org>
To: git-commits-head at vger.kernel.org
Subject: make freezeable workqueues singlethread
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Git-Commit: e3dfd2964ea86ae65f511b10d62ea54d46db3708
X-Git-Parent: a1a4849c419337f649c6633219b555eb4d4d955a
X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.8
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on hera.kernel.org
Sender: git-commits-head-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List: git-commits-head at vger.kernel.org
X-RedHat-Spam-Score: 0.303
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e3dfd2964ea86ae65f511b10d62ea54d46db3708
Commit: e3dfd2964ea86ae65f511b10d62ea54d46db3708
Parent: a1a4849c419337f649c6633219b555eb4d4d955a
Author: Oleg Nesterov <oleg at tv-sign.ru>
AuthorDate: Wed May 16 22:11:11 2007 -0700
Committer: Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Thu May 17 05:23:05 2007 -0700
make freezeable workqueues singlethread
It is a known fact that freezeable multithreaded workqueues doesn't like
CPU_DEAD. We keep them only for the incoming CPU-hotplug rework.
Sadly, we can't just kill create_freezeable_workqueue() right now, make
them singlethread.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Cc: Gautham R Shenoy <ego at in.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
include/linux/workqueue.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index d555f31..7eae866 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -122,7 +122,7 @@ extern struct workqueue_struct *__create_workqueue(const char *name,
int singlethread,
int freezeable);
#define create_workqueue(name) __create_workqueue((name), 0, 0)
-#define create_freezeable_workqueue(name) __create_workqueue((name), 0, 1)
+#define create_freezeable_workqueue(name) __create_workqueue((name), 1, 1)
#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0)
extern void destroy_workqueue(struct workqueue_struct *wq);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
>From davej Mon May 21 10:55:24 2007
Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S1761594AbXEUOv4 at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
gelk.kernelslacker.org
X-Spam-Level:
X-Spam-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,INFO_TLD
autolearn=no version=3.1.8
Envelope-to: davej at kernelslacker.org
Delivery-date: Mon, 21 May 2007 15:52:24 +0100
Received: from testure.choralone.org [194.9.77.134]
by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
for <davej at localhost> (single-drop); Mon, 21 May 2007 10:55:24 -0400 (EDT)
Received: from vger.kernel.org ([209.132.176.167])
by testure.choralone.org with esmtp (Exim 4.63)
(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S1761594AbXEUOv4 at vger.kernel.org>)
id 1Hq9FI-0003n3-As
for davej at kernelslacker.org; Mon, 21 May 2007 15:52:24 +0100
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
id S1761594AbXEUOv4 (ORCPT <rfc822;davej at kernelslacker.org>);
Mon, 21 May 2007 10:51:56 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1756786AbXEUOvo
(ORCPT <rfc822;linux-kernel-outgoing>);
Mon, 21 May 2007 10:51:44 -0400
Received: from iolanthe.rowland.org ([192.131.102.54]:60351 "HELO
iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with SMTP id S1754696AbXEUOvn (ORCPT
<rfc822;linux-kernel at vger.kernel.org>);
Mon, 21 May 2007 10:51:43 -0400
Received: (qmail 4515 invoked by uid 2102); 21 May 2007 10:51:42 -0400
Received: from localhost (sendmail-bs at 127.0.0.1)
by localhost with SMTP; 21 May 2007 10:51:42 -0400
Date: Mon, 21 May 2007 10:51:42 -0400 (EDT)
From: Alan Stern <stern at rowland.harvard.edu>
X-X-Sender: stern at iolanthe.rowland.org
To: Andrey Borzenkov <arvidjaar at mail.ru>,
Soeren Sonnenburg <kernel at nn7.de>,
Avuton Olrich <avuton at gmail.com>, Greg KH <greg at kroah.com>
cc: "Rafael J. Wysocki" <rjw at sisk.pl>,
Jiri Slaby <jirislaby at gmail.com>,
Andrew Morton <akpm at linux-foundation.org>,
USB development list <linux-usb-devel at lists.sourceforge.net>,
Linux-pm mailing list <linux-pm at lists.linux-foundation.org>,
Kernel development list <linux-kernel at vger.kernel.org>
Subject: [Bug 8498], [Bug 8510], and Re: Can't s2ram 22-rc2
In-Reply-To: <20070519164504.GA10675 at kroah.com>
Message-ID: <Pine.LNX.4.44L0.0705211040330.4496-100000 at iolanthe.rowland.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List: linux-kernel at vger.kernel.org
Status: RO
Content-Length: 3355
Lines: 95
On Sat, 19 May 2007, Greg KH wrote:
> On Sat, May 19, 2007 at 11:16:44AM -0400, Alan Stern wrote:
> > Greg:
> >
> > The patch in $SUBJECT (already in your development tree) fixes a problem
> > with system suspend in 2.6.22-rc1, as described in
> >
> > http://bugzilla.kernel.org/show_bug.cgi?id=8498
> >
> > (For people on the PM development list, it's worth pointing out that all
> > the patch does is make a particular kernel thread freezable.)
> >
> > Can you please expedite getting it sent up to Linus?
>
> Will do, I have a number of USB bugfixes to go to Linus, just been
> traveling too much. Next week I'll be able to get to it...
On Sun, 20 May 2007, Andrey Borzenkov wrote:
> No. Unfortunately. Here is dmesg with patch and USB_DEBUG
>
> swsusp: Marking nosave pages: 000000000009f000 - 0000000000100000
> swsusp: Basic memory bitmaps created
> Stopping tasks ... done.
> Shrinking memory... done (61536 pages freed)
> Freed 246144 kbytes in 1.99 seconds (123.69 MB/s)
> Suspending console(s)
> hub 1-0:1.0: hub_suspend
> ohci_hcd 0000:00:02.0: suspend root hub
> usb usb1: usb suspend
> usb usb1: usb resume
> usb usb1: finish resume
> hub 1-0:1.0: hub_resume
> ohci_hcd 0000:00:02.0: wakeup root hub
> sd 0:0:0:0: [sda] Synchronizing SCSI cache
> pnp: Device 00:09 disabled.
> Trying to free already-free IRQ 11
> ACPI: PCI interrupt for device 0000:00:06.0 disabled
> ACPI: Unable to derive IRQ for device 0000:00:04.0
> pci_device_suspend(): usb_hcd_pci_suspend+0x0/0x230 [usbcore]() returns -16
> suspend_device(): pci_device_suspend+0x0/0x70() returns -16
> Could not suspend device 0000:00:02.0: error -16
On Mon, 21 May 2007, Rafael J. Wysocki wrote:
> > pci_device_suspend(): usb_hcd_pci_suspend+0x0/0x170() returns -16
> > suspend_device(): pci_device_suspend+0x0/0x60() returns -16
> > Could not suspend device 0000:00:1d.0: error -16
> >
> > 00:1d.0 USB Controller: Intel Corporation 82801G (ICH7 Family) USB UHCI #1 (rev 02)
> >
> > lspci/dmesg are in this mail:
> > http://marc.info/?l=linux-kernel&m=117973679209855&w=2
>
> Well, I think Alan should have a look at this too.
It turns out that the patch I originally wrote to fix this is in
conflict with one of Raphael's patches (make freezeable workqueues
singlethread) already added to 2.6.22-rc2. So here's an updated
version for that kernel.
Andrey, Soeren, and Avuton: Please try this patch with 2.6.22-rc2 or
later and see if it fixes your problems.
Greg, if this works then I'll send it in the proper form for a patch,
and you can use it to replace
usb-make-the-autosuspend-workqueue-thread-freezable.patch
Alan Stern
Index: 2.6.22-rc2/drivers/usb/core/usb.c
===================================================================
--- 2.6.22-rc2.orig/drivers/usb/core/usb.c
+++ 2.6.22-rc2/drivers/usb/core/usb.c
@@ -205,7 +205,7 @@ struct device_type usb_device_type = {
static int ksuspend_usb_init(void)
{
- ksuspend_usb_wq = create_singlethread_workqueue("ksuspend_usbd");
+ ksuspend_usb_wq = create_freezeable_workqueue("ksuspend_usbd");
if (!ksuspend_usb_wq)
return -ENOMEM;
return 0;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3182
retrieving revision 1.3183
diff -u -r1.3182 -r1.3183
--- kernel-2.6.spec 22 May 2007 01:26:59 -0000 1.3182
+++ kernel-2.6.spec 22 May 2007 04:00:24 -0000 1.3183
@@ -581,6 +581,7 @@
Patch1720: linux-2.6-proc-self-maps-fix.patch
Patch1730: linux-2.6-suspend-ordering.patch
Patch1740: linux-2.6-softlockup-disable.patch
+Patch1750: linux-2.6-singlethread-freezable-workqueues.patch
Patch1770: linux-2.6-optimise-spinlock-debug.patch
Patch1771: linux-2.6-silence-noise.patch
Patch1791: linux-2.6-libertas.diff
@@ -1334,6 +1335,8 @@
%patch1730 -p1
# Add a safety net to softlockup so that it doesn't prevent installs.
%patch1740 -p1
+# Make freezable workqueues single threaded.
+%patch1750 -p1
# Speed up spinlock debug.
%patch1770 -p1
# Silence some useless messages that still get printed with 'quiet'
@@ -2404,6 +2407,9 @@
%endif
%changelog
+* Tue May 22 2007 Dave Jones <davej at redhat.com>
+- Make freezable workqueues singlethreaded.
+
* Mon May 21 2007 Dave Jones <davej at redhat.com>
- Fix up oops in e1000 driver. (#240339)
More information about the fedora-extras-commits
mailing list