* (no subject)
@ 2011-01-03 16:38 castet.matthieu
2011-01-03 16:41 ` [PATCH 19/32] usb/ueagle-atm: use system_wq instead of dedicated workqueues castet.matthieu
2011-01-03 17:03 ` your mail Stanislaw Gruszka
0 siblings, 2 replies; 5+ messages in thread
From: castet.matthieu @ 2011-01-03 16:38 UTC (permalink / raw)
To: linux-kernel, linux-usb; +Cc: stf_xl, tj
Hi,
could you CC me on ueagle-atm.c patches.
>From what I remind we sleep in the workqueue, that's why we couldn't use the
system one (freeze keyboard...). But may be the code changed.
Matthieu
Tejun Heo a écrit :
> With cmwq, there's no reason to use separate workqueues. Drop
> uea_softc->work_q and use system_wq instead. The used work item is
> sync flushed on driver detach.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stanislaw Gruszka <stf_xl@wp.pl>
> Cc: linux-usb@vger.kernel.org
> ---
> Only compile tested. Please feel free to take it into the subsystem
> tree or simply ack - I'll route it through the wq tree.
>
> Thanks.
>
> drivers/usb/atm/ueagle-atm.c | 19 +++++--------------
> 1 files changed, 5 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
> index 44447f5..55c1d3b 100644
> --- a/drivers/usb/atm/ueagle-atm.c
> +++ b/drivers/usb/atm/ueagle-atm.c
> @@ -168,7 +168,6 @@ struct uea_softc {
> union cmv_dsc cmv_dsc;
>
> struct work_struct task;
> - struct workqueue_struct *work_q;
> u16 pageno;
> u16 ovl;
>
> @@ -1879,7 +1878,7 @@ static int uea_start_reset(struct uea_softc *sc)
> /* start loading DSP */
> sc->pageno = 0;
> sc->ovl = 0;
> - queue_work(sc->work_q, &sc->task);
> + schedule_work(&sc->task);
>
> /* wait for modem ready CMV */
> ret = wait_cmv_ack(sc);
> @@ -2091,14 +2090,14 @@ static void uea_schedule_load_page_e1(struct uea_softc
*sc,
> {
> sc->pageno = intr->e1_bSwapPageNo;
> sc->ovl = intr->e1_bOvl >> 4 | intr->e1_bOvl << 4;
> - queue_work(sc->work_q, &sc->task);
> + schedule_work(&sc->task);
> }
>
> static void uea_schedule_load_page_e4(struct uea_softc *sc,
> struct intr_pkt *intr)
> {
> sc->pageno = intr->e4_bSwapPageNo;
> - queue_work(sc->work_q, &sc->task);
> + schedule_work(&sc->task);
> }
>
> /*
> @@ -2170,13 +2169,6 @@ static int uea_boot(struct uea_softc *sc)
>
> init_waitqueue_head(&sc->sync_q);
>
> - sc->work_q = create_workqueue("ueagle-dsp");
> - if (!sc->work_q) {
> - uea_err(INS_TO_USBDEV(sc), "cannot allocate workqueue\n");
> - uea_leaves(INS_TO_USBDEV(sc));
> - return -ENOMEM;
> - }
> -
> if (UEA_CHIP_VERSION(sc) == ADI930)
> load_XILINX_firmware(sc);
>
> @@ -2222,7 +2214,6 @@ err1:
> sc->urb_int = NULL;
> kfree(intr);
> err0:
> - destroy_workqueue(sc->work_q);
> uea_leaves(INS_TO_USBDEV(sc));
> return -ENOMEM;
> }
> @@ -2243,8 +2234,8 @@ static void uea_stop(struct uea_softc *sc)
> kfree(sc->urb_int->transfer_buffer);
> usb_free_urb(sc->urb_int);
>
> - /* stop any pending boot process, when no one can schedule work */
> - destroy_workqueue(sc->work_q);
> + /* flush the work item, when no one can schedule it */
> + flush_work_sync(&sc->task);
>
> if (sc->dsp_firm)
> release_firmware(sc->dsp_firm);
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 19/32] usb/ueagle-atm: use system_wq instead of dedicated workqueues
2011-01-03 16:38 castet.matthieu
@ 2011-01-03 16:41 ` castet.matthieu
2011-01-03 17:03 ` your mail Stanislaw Gruszka
1 sibling, 0 replies; 5+ messages in thread
From: castet.matthieu @ 2011-01-03 16:41 UTC (permalink / raw)
To: tj; +Cc: linux-kernel, linux-usb, stf_xl
Quoting castet.matthieu@free.fr:
> Hi,
>
> could you CC me on ueagle-atm.c patches.
>
> From what I remind we sleep in the workqueue, that's why we couldn't use the
> system one (freeze keyboard...). But may be the code changed.
For the record we still do blocking usb transfert on the workqueue.
>
>
> Matthieu
>
> Tejun Heo a écrit :
> > With cmwq, there's no reason to use separate workqueues. Drop
> > uea_softc->work_q and use system_wq instead. The used work item is
> > sync flushed on driver detach.
> >
> > Signed-off-by: Tejun Heo <tj@kernel.org>
> > Cc: Stanislaw Gruszka <stf_xl@wp.pl>
> > Cc: linux-usb@vger.kernel.org
> > ---
> > Only compile tested. Please feel free to take it into the subsystem
> > tree or simply ack - I'll route it through the wq tree.
> >
> > Thanks.
> >
> > drivers/usb/atm/ueagle-atm.c | 19 +++++--------------
> > 1 files changed, 5 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
> > index 44447f5..55c1d3b 100644
> > --- a/drivers/usb/atm/ueagle-atm.c
> > +++ b/drivers/usb/atm/ueagle-atm.c
> > @@ -168,7 +168,6 @@ struct uea_softc {
> > union cmv_dsc cmv_dsc;
> >
> > struct work_struct task;
> > - struct workqueue_struct *work_q;
> > u16 pageno;
> > u16 ovl;
> >
> > @@ -1879,7 +1878,7 @@ static int uea_start_reset(struct uea_softc *sc)
> > /* start loading DSP */
> > sc->pageno = 0;
> > sc->ovl = 0;
> > - queue_work(sc->work_q, &sc->task);
> > + schedule_work(&sc->task);
> >
> > /* wait for modem ready CMV */
> > ret = wait_cmv_ack(sc);
> > @@ -2091,14 +2090,14 @@ static void uea_schedule_load_page_e1(struct
> uea_softc
> *sc,
> > {
> > sc->pageno = intr->e1_bSwapPageNo;
> > sc->ovl = intr->e1_bOvl >> 4 | intr->e1_bOvl << 4;
> > - queue_work(sc->work_q, &sc->task);
> > + schedule_work(&sc->task);
> > }
> >
> > static void uea_schedule_load_page_e4(struct uea_softc *sc,
> > struct intr_pkt *intr)
> > {
> > sc->pageno = intr->e4_bSwapPageNo;
> > - queue_work(sc->work_q, &sc->task);
> > + schedule_work(&sc->task);
> > }
> >
> > /*
> > @@ -2170,13 +2169,6 @@ static int uea_boot(struct uea_softc *sc)
> >
> > init_waitqueue_head(&sc->sync_q);
> >
> > - sc->work_q = create_workqueue("ueagle-dsp");
> > - if (!sc->work_q) {
> > - uea_err(INS_TO_USBDEV(sc), "cannot allocate workqueue\n");
> > - uea_leaves(INS_TO_USBDEV(sc));
> > - return -ENOMEM;
> > - }
> > -
> > if (UEA_CHIP_VERSION(sc) == ADI930)
> > load_XILINX_firmware(sc);
> >
> > @@ -2222,7 +2214,6 @@ err1:
> > sc->urb_int = NULL;
> > kfree(intr);
> > err0:
> > - destroy_workqueue(sc->work_q);
> > uea_leaves(INS_TO_USBDEV(sc));
> > return -ENOMEM;
> > }
> > @@ -2243,8 +2234,8 @@ static void uea_stop(struct uea_softc *sc)
> > kfree(sc->urb_int->transfer_buffer);
> > usb_free_urb(sc->urb_int);
> >
> > - /* stop any pending boot process, when no one can schedule work */
> > - destroy_workqueue(sc->work_q);
> > + /* flush the work item, when no one can schedule it */
> > + flush_work_sync(&sc->task);
> >
> > if (sc->dsp_firm)
> > release_firmware(sc->dsp_firm);
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: your mail
2011-01-03 16:38 castet.matthieu
2011-01-03 16:41 ` [PATCH 19/32] usb/ueagle-atm: use system_wq instead of dedicated workqueues castet.matthieu
@ 2011-01-03 17:03 ` Stanislaw Gruszka
2011-01-04 5:17 ` Tejun Heo
1 sibling, 1 reply; 5+ messages in thread
From: Stanislaw Gruszka @ 2011-01-03 17:03 UTC (permalink / raw)
To: castet.matthieu; +Cc: linux-kernel, linux-usb, stf_xl, tj
On Mon, Jan 03, 2011 at 05:38:00PM +0100, castet.matthieu@free.fr wrote:
> Hi,
>
> could you CC me on ueagle-atm.c patches.
>
> From what I remind we sleep in the workqueue, that's why we couldn't use the
> system one (freeze keyboard...). But may be the code changed.
In case when firmware is not available we can sleep for a few seconds in
work function. That's block keyboard driver who also use common workqueue.
If recent Tejun workqueue rewrite allow to long sleep in work func and
not hurt other workqueue users, patch is ok.
Unfortunately I'm not able to test the patch, my ueagle device was physically
damaged a few months ago.
Stanislaw
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: your mail
2011-01-03 17:03 ` your mail Stanislaw Gruszka
@ 2011-01-04 5:17 ` Tejun Heo
0 siblings, 0 replies; 5+ messages in thread
From: Tejun Heo @ 2011-01-04 5:17 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: castet.matthieu, linux-kernel, linux-usb, stf_xl
On Mon, Jan 03, 2011 at 06:03:17PM +0100, Stanislaw Gruszka wrote:
> On Mon, Jan 03, 2011 at 05:38:00PM +0100, castet.matthieu@free.fr wrote:
> > could you CC me on ueagle-atm.c patches.
Will try to, but maybe it's a good idea to add a MAINTAINERS entry?
> > From what I remind we sleep in the workqueue, that's why we couldn't use the
> > system one (freeze keyboard...). But may be the code changed.
> In case when firmware is not available we can sleep for a few seconds in
> work function. That's block keyboard driver who also use common workqueue.
> If recent Tejun workqueue rewrite allow to long sleep in work func and
> not hurt other workqueue users, patch is ok.
Yeap, work items can sleep all they want on the system_wq. It won't
delay execution of other work items.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCHSET] workqueue: update workqueue users - replace create_workqueue()
@ 2011-01-03 13:49 Tejun Heo
2011-01-03 13:49 ` [PATCH 19/32] usb/ueagle-atm: use system_wq instead of dedicated workqueues Tejun Heo
0 siblings, 1 reply; 5+ messages in thread
From: Tejun Heo @ 2011-01-03 13:49 UTC (permalink / raw)
To: linux-kernel
Hello,
This patchset examines each user of create_workqueue() and update them
to better fit the new workqueue implementation. For backward
compatibility, create_workqueue() is mapped to
alloc_workqueue(@name, WQ_MEM_RECLAIM, 1)
but for a lot of its users, WQ_MEM_RECLAIM is not required,
@max_active of 1 is unnecessarily strict, or the dedicated workqueue
simply isn't needed.
* As the system workqueues can now host higher concurrency, a lot of
users can drop dedicated workqueues and use the system ones.
* There are cases where keeping dedicated workqueues are necessary.
e.g. They are depended upon during memory reclaim, need to be
highpri or CPU intensive, serve work items which free themselves
(and thus work items can't be explicitly queued), or need to limit
max concurrency level from workqueue. In these cases,
alloc_workqueue() calls with better fitting parameters are used.
* This patchset mostly concentrates on converting create_workqueue()
users but it also updates general workqueue usages when it makes
sense to update them together. Please read description of each
patch for deatils.
This simplifies code, removes unnecessary rescuer kernel thread and
makes workqueue utilized more efficiently.
This patchset contains the following 32 patches.
0001-arm-omap-use-system_wq-in-mailbox.patch
0002-powerpc-cell-use-system_wq-in-cpufreq_spudemand.patch
0003-block-make-kblockd_workqueue-smarter.patch
0004-bio-integrity-mark-kintegrityd_wq-highpri-and-CPU-in.patch
0005-crypto-mark-crypto-workqueues-CPU_INTENSIVE.patch
0006-acpi-kacpi-_wq-don-t-need-WQ_MEM_RECLAIM.patch
0007-cpufreq-use-system_wq-instead-of-dedicated-workqueue.patch
0008-drm-nouveau-use-system_wq-instead-of-dev_priv-wq.patch
0009-drm-radeon-use-system_wq-instead-of-dev_priv-wq.patch
0010-input-tps6507x-ts-use-system_wq-instead-of-dedicated.patch
0011-v4l-cx18-update-workqueue-usage.patch
0012-i2o-use-alloc_workqueue-instead-of-create_workqueue.patch
0013-misc-iwmc3200top-use-system_wq-instead-of-dedicated-.patch
0014-wireless-ipw2x00-use-system_wq-instead-of-dedicated-.patch
0015-wireless-libertas-_tf-use-system_wq-instead-of-dedic.patch
0016-scsi-be2iscsi-qla2xxx-convert-to-alloc_workqueue.patch
0017-scsi-ibmvstgt-use-system_wq-instead-of-vtgtd-workque.patch
0018-scsi-scsi_tgt_lib-scsi_tgtd-isn-t-used-in-memory-rec.patch
0019-usb-ueagle-atm-use-system_wq-instead-of-dedicated-wo.patch
0020-video-msm_fb-use-system_wq-instead-of-dedicated-work.patch
0021-fs-aio-aio_wq-isn-t-used-in-memory-reclaim-path.patch
0022-ceph-fsc-_wq-s-aren-t-used-in-memory-reclaim-path.patch
0023-net-ceph-make-ceph_msgr_wq-non-reentrant.patch
0024-dlm-dlm-workqueues-aren-t-used-in-memory-reclaim-pat.patch
0025-ext4-convert-to-alloc_workqueue.patch
0026-ocfs2-use-system_wq-instead-of-ocfs2_quota_wq.patch
0027-reiserfs-make-commit_wq-use-the-default-concurrency-.patch
0028-xfs-convert-to-alloc_workqueue.patch
0029-net-9p-use-system_wq-instead-of-p9_mux_wq.patch
0030-net-9p-replace-p9_poll_task-with-a-work.patch
0031-rds-ib-use-system_wq-instead-of-rds_ib_fmr_wq.patch
0032-rxrpc-rxrpc_workqueue-isn-t-used-during-memory-recla.patch
The patches are based on 2.6.37-rc8 (b518a649) and available in the
following git branch.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.g replace-create_workqueue
arch/arm/plat-omap/mailbox.c | 10 -
arch/powerpc/platforms/cell/cpufreq_spudemand.c | 20 --
block/blk-core.c | 4
crypto/crypto_wq.c | 3
crypto/pcrypt.c | 3
drivers/acpi/osl.c | 6
drivers/cpufreq/cpufreq_conservative.c | 22 --
drivers/cpufreq/cpufreq_ondemand.c | 20 --
drivers/gpu/drm/nouveau/nouveau_drv.h | 1
drivers/gpu/drm/nouveau/nouveau_irq.c | 9 -
drivers/gpu/drm/nouveau/nouveau_state.c | 19 +-
drivers/gpu/drm/nouveau/nv50_display.c | 4
drivers/gpu/drm/radeon/evergreen.c | 2
drivers/gpu/drm/radeon/r100.c | 2
drivers/gpu/drm/radeon/r600.c | 2
drivers/gpu/drm/radeon/radeon.h | 1
drivers/gpu/drm/radeon/radeon_device.c | 6
drivers/gpu/drm/radeon/radeon_irq_kms.c | 5
drivers/gpu/drm/radeon/radeon_pm.c | 47 +----
drivers/gpu/drm/radeon/rs600.c | 2
drivers/input/touchscreen/tps6507x-ts.c | 12 -
drivers/media/video/cx18/cx18-driver.c | 24 --
drivers/media/video/cx18/cx18-driver.h | 3
drivers/media/video/cx18/cx18-streams.h | 3
drivers/message/i2o/driver.c | 3
drivers/misc/iwmc3200top/iwmc3200top.h | 4
drivers/misc/iwmc3200top/main.c | 14 -
drivers/net/wireless/ipw2x00/ipw2100.c | 70 +++-----
drivers/net/wireless/ipw2x00/ipw2100.h | 1
drivers/net/wireless/ipw2x00/ipw2200.c | 196 ++++++++++--------------
drivers/net/wireless/ipw2x00/ipw2200.h | 2
drivers/net/wireless/libertas/if_sdio.c | 10 -
drivers/net/wireless/libertas_tf/cmd.c | 6
drivers/net/wireless/libertas_tf/libertas_tf.h | 2
drivers/net/wireless/libertas_tf/main.c | 16 -
drivers/scsi/be2iscsi/be_main.c | 2
drivers/scsi/ibmvscsi/ibmvstgt.c | 15 -
drivers/scsi/qla2xxx/qla_os.c | 2
drivers/scsi/scsi_tgt_lib.c | 2
drivers/usb/atm/ueagle-atm.c | 19 --
drivers/video/msm/msm_fb.c | 11 -
fs/aio.c | 4
fs/bio-integrity.c | 7
fs/ceph/super.c | 10 -
fs/dlm/lowcomms.c | 19 --
fs/ext4/super.c | 7
fs/ocfs2/quota.h | 3
fs/ocfs2/quota_global.c | 27 ---
fs/ocfs2/super.c | 7
fs/reiserfs/journal.c | 2
fs/xfs/linux-2.6/xfs_buf.c | 5
fs/xfs/xfs_mru_cache.c | 2
include/linux/ceph/messenger.h | 5
net/9p/trans_fd.c | 52 +-----
net/ceph/messenger.c | 46 -----
net/rds/ib.c | 9 -
net/rds/ib.h | 2
net/rds/ib_rdma.c | 27 ---
net/rxrpc/af_rxrpc.c | 2
59 files changed, 270 insertions(+), 571 deletions(-)
--
tejun
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 19/32] usb/ueagle-atm: use system_wq instead of dedicated workqueues
2011-01-03 13:49 [PATCHSET] workqueue: update workqueue users - replace create_workqueue() Tejun Heo
@ 2011-01-03 13:49 ` Tejun Heo
0 siblings, 0 replies; 5+ messages in thread
From: Tejun Heo @ 2011-01-03 13:49 UTC (permalink / raw)
To: linux-kernel; +Cc: Tejun Heo, Stanislaw Gruszka, linux-usb
With cmwq, there's no reason to use separate workqueues. Drop
uea_softc->work_q and use system_wq instead. The used work item is
sync flushed on driver detach.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Cc: linux-usb@vger.kernel.org
---
Only compile tested. Please feel free to take it into the subsystem
tree or simply ack - I'll route it through the wq tree.
Thanks.
drivers/usb/atm/ueagle-atm.c | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index 44447f5..55c1d3b 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -168,7 +168,6 @@ struct uea_softc {
union cmv_dsc cmv_dsc;
struct work_struct task;
- struct workqueue_struct *work_q;
u16 pageno;
u16 ovl;
@@ -1879,7 +1878,7 @@ static int uea_start_reset(struct uea_softc *sc)
/* start loading DSP */
sc->pageno = 0;
sc->ovl = 0;
- queue_work(sc->work_q, &sc->task);
+ schedule_work(&sc->task);
/* wait for modem ready CMV */
ret = wait_cmv_ack(sc);
@@ -2091,14 +2090,14 @@ static void uea_schedule_load_page_e1(struct uea_softc *sc,
{
sc->pageno = intr->e1_bSwapPageNo;
sc->ovl = intr->e1_bOvl >> 4 | intr->e1_bOvl << 4;
- queue_work(sc->work_q, &sc->task);
+ schedule_work(&sc->task);
}
static void uea_schedule_load_page_e4(struct uea_softc *sc,
struct intr_pkt *intr)
{
sc->pageno = intr->e4_bSwapPageNo;
- queue_work(sc->work_q, &sc->task);
+ schedule_work(&sc->task);
}
/*
@@ -2170,13 +2169,6 @@ static int uea_boot(struct uea_softc *sc)
init_waitqueue_head(&sc->sync_q);
- sc->work_q = create_workqueue("ueagle-dsp");
- if (!sc->work_q) {
- uea_err(INS_TO_USBDEV(sc), "cannot allocate workqueue\n");
- uea_leaves(INS_TO_USBDEV(sc));
- return -ENOMEM;
- }
-
if (UEA_CHIP_VERSION(sc) == ADI930)
load_XILINX_firmware(sc);
@@ -2222,7 +2214,6 @@ err1:
sc->urb_int = NULL;
kfree(intr);
err0:
- destroy_workqueue(sc->work_q);
uea_leaves(INS_TO_USBDEV(sc));
return -ENOMEM;
}
@@ -2243,8 +2234,8 @@ static void uea_stop(struct uea_softc *sc)
kfree(sc->urb_int->transfer_buffer);
usb_free_urb(sc->urb_int);
- /* stop any pending boot process, when no one can schedule work */
- destroy_workqueue(sc->work_q);
+ /* flush the work item, when no one can schedule it */
+ flush_work_sync(&sc->task);
if (sc->dsp_firm)
release_firmware(sc->dsp_firm);
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-04 5:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-03 16:38 castet.matthieu
2011-01-03 16:41 ` [PATCH 19/32] usb/ueagle-atm: use system_wq instead of dedicated workqueues castet.matthieu
2011-01-03 17:03 ` your mail Stanislaw Gruszka
2011-01-04 5:17 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2011-01-03 13:49 [PATCHSET] workqueue: update workqueue users - replace create_workqueue() Tejun Heo
2011-01-03 13:49 ` [PATCH 19/32] usb/ueagle-atm: use system_wq instead of dedicated workqueues Tejun Heo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.