Commit b7864056 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.18-rc1.workqueue' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs workqueue updates from Christian Brauner:
 "This contains various workqueue changes affecting the filesystem
  layer.

  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 replaces the use of system_wq and system_unbound_wq. system_wq is
  a per-CPU workqueue which isn't very obvious from the name and
  system_unbound_wq is to be used when locality is not required.

  So this renames system_wq to system_percpu_wq, and system_unbound_wq
  to system_dfl_wq.

  This also adds a new WQ_PERCPU flag to allow the fs subsystem users to
  explicitly request the use of per-CPU behavior. Both WQ_UNBOUND and
  WQ_PERCPU flags coexist for one release cycle to allow callers to
  transition their calls. WQ_UNBOUND will be removed in a next release
  cycle"

* tag 'vfs-6.18-rc1.workqueue' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  fs: WQ_PERCPU added to alloc_workqueue users
  fs: replace use of system_wq with system_percpu_wq
  fs: replace use of system_unbound_wq with system_dfl_wq
parents df897265 56ce6c8b

fs/afs/callback.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void afs_volume_init_callback(struct afs_volume *volume) 
	list_for_each_entry(vnode, &volume->open_mmaps, cb_mmap_link) {

		if (vnode->cb_v_check != atomic_read(&volume->cb_v_break)) {

			afs_clear_cb_promise(vnode, afs_cb_promise_clear_vol_init_cb);

			queue_work(system_unbound_wq, &vnode->cb_work);

			queue_work(system_dfl_wq, &vnode->cb_work);

		}

	}
@@ -90,7 +90,7 @@ void __afs_break_callback(struct afs_vnode *vnode, enum afs_cb_break_reason reas 
		if (reason != afs_cb_break_for_deleted &&

		    vnode->status.type == AFS_FTYPE_FILE &&

		    atomic_read(&vnode->cb_nr_mmap))

			queue_work(system_unbound_wq, &vnode->cb_work);

			queue_work(system_dfl_wq, &vnode->cb_work);



		trace_afs_cb_break(&vnode->fid, vnode->cb_break, reason, true);

	} else {

fs/afs/main.c

+2 −2
Original line number Diff line number Diff line
@@ -169,13 +169,13 @@ static int __init afs_init(void) 


	printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n");



	afs_wq = alloc_workqueue("afs", 0, 0);

	afs_wq = alloc_workqueue("afs", WQ_PERCPU, 0);

	if (!afs_wq)

		goto error_afs_wq;

	afs_async_calls = alloc_workqueue("kafsd", WQ_MEM_RECLAIM | WQ_UNBOUND, 0);

	if (!afs_async_calls)

		goto error_async;

	afs_lock_manager = alloc_workqueue("kafs_lockd", WQ_MEM_RECLAIM, 0);

	afs_lock_manager = alloc_workqueue("kafs_lockd", WQ_MEM_RECLAIM | WQ_PERCPU, 0);

	if (!afs_lock_manager)

		goto error_lockmgr;

fs/afs/write.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static void afs_issue_write_worker(struct work_struct *work) 
void afs_issue_write(struct netfs_io_subrequest *subreq)

{

	subreq->work.func = afs_issue_write_worker;

	if (!queue_work(system_unbound_wq, &subreq->work))

	if (!queue_work(system_dfl_wq, &subreq->work))

		WARN_ON_ONCE(1);

}

fs/aio.c

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static void free_ioctx_reqs(struct percpu_ref *ref) 


	/* Synchronize against RCU protected table->table[] dereferences */

	INIT_RCU_WORK(&ctx->free_rwork, free_ioctx);

	queue_rcu_work(system_wq, &ctx->free_rwork);

	queue_rcu_work(system_percpu_wq, &ctx->free_rwork);

}



/*

fs/bcachefs/btree_write_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ int bch2_journal_keys_to_write_buffer_end(struct bch_fs *c, struct journal_keys_ 


	if (bch2_btree_write_buffer_should_flush(c) &&

	    __enumerated_ref_tryget(&c->writes, BCH_WRITE_REF_btree_write_buffer) &&

	    !queue_work(system_unbound_wq, &c->btree_write_buffer.flush_work))

	    !queue_work(system_dfl_wq, &c->btree_write_buffer.flush_work))

		enumerated_ref_put(&c->writes, BCH_WRITE_REF_btree_write_buffer);



	if (dst->wb == &wb->flushing)