Commit 72dc6db7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'wq-for-6.5-cleanup-ordered' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

Pull ordered workqueue creation updates from Tejun Heo:
 "For historical reasons, unbound workqueues with max concurrency limit
  of 1 are considered ordered, even though the concurrency limit hasn't
  been system-wide for a long time.

  This creates ambiguity around whether ordered execution is actually
  required for correctness, which was actually confusing for e.g. btrfs
  (btrfs updates are being routed through the btrfs tree).

  There aren't that many users in the tree which use the combination and
  there are pending improvements to unbound workqueue affinity handling
  which will make inadvertent use of ordered workqueue a bigger loss.

  This clarifies the situation for most of them by updating the ones
  which require ordered execution to use alloc_ordered_workqueue().

  There are some conversions being routed through subsystem-specific
  trees and likely a few stragglers. Once they're all converted,
  workqueue can trigger a warning on unbound + @max_active==1 usages and
  eventually drop the implicit ordered behavior"

* tag 'wq-for-6.5-cleanup-ordered' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  rxrpc: Use alloc_ordered_workqueue() to create ordered workqueues
  net: qrtr: Use alloc_ordered_workqueue() to create ordered workqueues
  net: wwan: t7xx: Use alloc_ordered_workqueue() to create ordered workqueues
  dm integrity: Use alloc_ordered_workqueue() to create ordered workqueues
  media: amphion: Use alloc_ordered_workqueue() to create ordered workqueues
  scsi: NCR5380: Use default @max_active for hostdata->work_q
  media: coda: Use alloc_ordered_workqueue() to create ordered workqueues
  crypto: octeontx2: Use alloc_ordered_workqueue() to create ordered workqueues
  wifi: ath10/11/12k: Use alloc_ordered_workqueue() to create ordered workqueues
  wifi: mwifiex: Use default @max_active for workqueues
  wifi: iwlwifi: Use default @max_active for trans_pcie->rba.alloc_wq
  xen/pvcalls: Use alloc_ordered_workqueue() to create ordered workqueues
  virt: acrn: Use alloc_ordered_workqueue() to create ordered workqueues
  net: octeontx2: Use alloc_ordered_workqueue() to create ordered workqueues
  net: thunderx: Use alloc_ordered_workqueue() to create ordered workqueues
  greybus: Use alloc_ordered_workqueue() to create ordered workqueues
  powerpc, workqueue: Use alloc_ordered_workqueue() to create ordered workqueues
parents 7ab044a4 78ef9703

arch/powerpc/kernel/tau_6xx.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int __init TAU_init(void) 
	tau_int_enable = IS_ENABLED(CONFIG_TAU_INT) &&

			 !strcmp(cur_cpu_spec->platform, "ppc750");



	tau_workq = alloc_workqueue("tau", WQ_UNBOUND, 1);

	tau_workq = alloc_ordered_workqueue("tau", 0);

	if (!tau_workq)

		return -ENOMEM;

arch/powerpc/platforms/pseries/dlpar.c

+1 −2
Original line number Diff line number Diff line
@@ -564,8 +564,7 @@ int __init dlpar_workqueue_init(void) 
	if (pseries_hp_wq)

		return 0;



	pseries_hp_wq = alloc_workqueue("pseries hotplug workqueue",

			WQ_UNBOUND, 1);

	pseries_hp_wq = alloc_ordered_workqueue("pseries hotplug workqueue", 0);



	return pseries_hp_wq ? 0 : -ENOMEM;

}

drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c

+6 −6
Original line number Diff line number Diff line
@@ -357,9 +357,9 @@ static int cptpf_vfpf_mbox_init(struct otx2_cptpf_dev *cptpf, int num_vfs) 
	u64 vfpf_mbox_base;

	int err, i;



	cptpf->vfpf_mbox_wq = alloc_workqueue("cpt_vfpf_mailbox",

					      WQ_UNBOUND | WQ_HIGHPRI |

					      WQ_MEM_RECLAIM, 1);

	cptpf->vfpf_mbox_wq =

		alloc_ordered_workqueue("cpt_vfpf_mailbox",

					WQ_HIGHPRI | WQ_MEM_RECLAIM);

	if (!cptpf->vfpf_mbox_wq)

		return -ENOMEM;
@@ -453,9 +453,9 @@ static int cptpf_afpf_mbox_init(struct otx2_cptpf_dev *cptpf) 
	resource_size_t offset;

	int err;



	cptpf->afpf_mbox_wq = alloc_workqueue("cpt_afpf_mailbox",

					      WQ_UNBOUND | WQ_HIGHPRI |

					      WQ_MEM_RECLAIM, 1);

	cptpf->afpf_mbox_wq =

		alloc_ordered_workqueue("cpt_afpf_mailbox",

					WQ_HIGHPRI | WQ_MEM_RECLAIM);

	if (!cptpf->afpf_mbox_wq)

		return -ENOMEM;

drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c

+3 −3
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ static int cptvf_pfvf_mbox_init(struct otx2_cptvf_dev *cptvf) 
	resource_size_t offset, size;

	int ret;



	cptvf->pfvf_mbox_wq = alloc_workqueue("cpt_pfvf_mailbox",

					      WQ_UNBOUND | WQ_HIGHPRI |

					      WQ_MEM_RECLAIM, 1);

	cptvf->pfvf_mbox_wq =

		alloc_ordered_workqueue("cpt_pfvf_mailbox",

					WQ_HIGHPRI | WQ_MEM_RECLAIM);

	if (!cptvf->pfvf_mbox_wq)

		return -ENOMEM;

drivers/greybus/connection.c

+2 −2
Original line number Diff line number Diff line
@@ -187,8 +187,8 @@ _gb_connection_create(struct gb_host_device *hd, int hd_cport_id, 
	spin_lock_init(&connection->lock);

	INIT_LIST_HEAD(&connection->operations);



	connection->wq = alloc_workqueue("%s:%d", WQ_UNBOUND, 1,

					 dev_name(&hd->dev), hd_cport_id);

	connection->wq = alloc_ordered_workqueue("%s:%d", 0, dev_name(&hd->dev),

						 hd_cport_id);

	if (!connection->wq) {

		ret = -ENOMEM;

		goto err_free_connection;