Commit 51723bf9 authored by Marco Crivellari's avatar Marco Crivellari Committed by Jens Axboe
Browse files

drivers/block: replace use of system_wq with system_percpu_wq 



Currently if a user enqueue a work item using schedule_delayed_work() the
used wq is "system_wq" (per-cpu wq) while queue_delayed_work() use
WORK_CPU_UNBOUND (used when a cpu is not specified). The same applies to
schedule_work() that is using system_wq and queue_work(), that makes use
again of WORK_CPU_UNBOUND.

This lack of consistentcy cannot be addressed without refactoring the API.

system_unbound_wq should be the default workqueue so as not to enforce
locality constraints for random work whenever it's not required.

Adding system_dfl_wq to encourage its use when unbound work should be used.

queue_work() / queue_delayed_work() / mod_delayed_work() will now use the
new unbound wq: whether the user still use the old wq a warn will be
printed along with a wq redirect to the new one.

The old system_unbound_wq will be kept for a few release cycles.

Suggested-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarMarco Crivellari <marco.crivellari@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6214cadd

drivers/block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static void nbd_mark_nsock_dead(struct nbd_device *nbd, struct nbd_sock *nsock, 
		if (args) {

			INIT_WORK(&args->work, nbd_dead_link_work);

			args->index = nbd->index;

			queue_work(system_wq, &args->work);

			queue_work(system_percpu_wq, &args->work);

		}

	}

	if (!nsock->dead) {

drivers/block/sunvdc.c

+1 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,7 @@ static void vdc_ldc_reset(struct vdc_port *port) 
	}



	if (port->ldc_timeout)

		mod_delayed_work(system_wq, &port->ldc_reset_timer_work,

		mod_delayed_work(system_percpu_wq, &port->ldc_reset_timer_work,

			  round_jiffies(jiffies + HZ * port->ldc_timeout));

	mod_timer(&port->vio.timer, round_jiffies(jiffies + HZ));

	return;