Skip to content

Commit

Permalink
ps3: Remove deprecated create_singlethread_workqueue
Browse files Browse the repository at this point in the history
The workqueue "ps3av->wq" queues a single work item &ps3av->work and hence
doesn't require ordering. It is involved in waking up ps3avd to do the
video mode setting and hence it's not being used on a memory reclaim
path. Hence, it has been converted to use system_wq.

System workqueues have been able to handle high level of concurrency
for a long time now and hence it's not required to have a singlethreaded
workqueue just to gain concurrency. Unlike a dedicated per-cpu workqueue
created with create_singlethread_workqueue(), system_wq allows multiple
work items to overlap executions even on the same CPU; however, a
per-cpu workqueue doesn't have any CPU locality or global ordering
guarantee unless the target CPU is explicitly specified and thus the
increase of local concurrency shouldn't make any difference.

The work item has been flushed in ps3av_remove to ensure that
there are no pending tasks while disconnecting the driver.

Signed-off-by: Bhaktipriya Shridhar <[email protected]>
Acked-by: Tejun Heo <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
  • Loading branch information
bhaktipriya authored and mpe committed Dec 4, 2017
1 parent 0aa8ff9 commit f0200c0
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/ps3/ps3av.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ static struct ps3av {
struct mutex mutex;
struct work_struct work;
struct completion done;
struct workqueue_struct *wq;
int open_count;
struct ps3_system_bus_device *dev;

Expand Down Expand Up @@ -485,7 +484,7 @@ static int ps3av_set_videomode(void)
ps3av_set_av_video_mute(PS3AV_CMD_MUTE_ON);

/* wake up ps3avd to do the actual video mode setting */
queue_work(ps3av->wq, &ps3av->work);
schedule_work(&ps3av->work);

return 0;
}
Expand Down Expand Up @@ -956,11 +955,6 @@ static int ps3av_probe(struct ps3_system_bus_device *dev)
INIT_WORK(&ps3av->work, ps3avd);
init_completion(&ps3av->done);
complete(&ps3av->done);
ps3av->wq = create_singlethread_workqueue("ps3avd");
if (!ps3av->wq) {
res = -ENOMEM;
goto fail;
}

switch (ps3_os_area_get_av_multi_out()) {
case PS3_PARAM_AV_MULTI_OUT_NTSC:
Expand Down Expand Up @@ -1018,8 +1012,7 @@ static int ps3av_remove(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, " -> %s:%d\n", __func__, __LINE__);
if (ps3av) {
ps3av_cmd_fin();
if (ps3av->wq)
destroy_workqueue(ps3av->wq);
flush_work(&ps3av->work);
kfree(ps3av);
ps3av = NULL;
}
Expand Down

0 comments on commit f0200c0

Please sign in to comment.