Skip to content

Commit 72b1fe6

Browse files
committed
net: wwan: t7xx: Use alloc_ordered_workqueue() to create ordered workqueues
BACKGROUND ========== When multiple work items are queued to a workqueue, their execution order doesn't match the queueing order. They may get executed in any order and simultaneously. When fully serialized execution - one by one in the queueing order - is needed, an ordered workqueue should be used which can be created with alloc_ordered_workqueue(). However, alloc_ordered_workqueue() was a later addition. Before it, an ordered workqueue could be obtained by creating an UNBOUND workqueue with @max_active==1. This originally was an implementation side-effect which was broken by 4c16bd3 ("workqueue: restore WQ_UNBOUND/max_active==1 to be ordered"). Because there were users that depended on the ordered execution, 5c0338c ("workqueue: restore WQ_UNBOUND/max_active==1 to be ordered") made workqueue allocation path to implicitly promote UNBOUND workqueues w/ @max_active==1 to ordered workqueues. While this has worked okay, overloading the UNBOUND allocation interface this way creates other issues. It's difficult to tell whether a given workqueue actually needs to be ordered and users that legitimately want a min concurrency level wq unexpectedly gets an ordered one instead. With planned UNBOUND workqueue updates to improve execution locality and more prevalence of chiplet designs which can benefit from such improvements, this isn't a state we wanna be in forever. This patch series audits all callsites that create an UNBOUND workqueue w/ @max_active==1 and converts them to alloc_ordered_workqueue() as necessary. WHAT TO LOOK FOR ================ The conversions are from alloc_workqueue(WQ_UNBOUND | flags, 1, args..) to alloc_ordered_workqueue(flags, args...) which don't cause any functional changes. If you know that fully ordered execution is not necessary, please let me know. I'll drop the conversion and instead add a comment noting the fact to reduce confusion while conversion is in progress. If you aren't fully sure, it's completely fine to let the conversion through. The behavior will stay exactly the same and we can always reconsider later. As there are follow-up workqueue core changes, I'd really appreciate if the patch can be routed through the workqueue tree w/ your acks. Thanks. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Chandrashekar Devegowda <chandrashekar.devegowda@intel.com> Cc: Intel Corporation <linuxwwan@intel.com> Cc: Chiranjeevi Rapolu <chiranjeevi.rapolu@linux.intel.com> Cc: Liu Haijun <haijun.liu@mediatek.com> Cc: M Chetan Kumar <m.chetan.kumar@linux.intel.com> Cc: Ricardo Martinez <ricardo.martinez@linux.intel.com> Cc: Loic Poulain <loic.poulain@linaro.org> Cc: Sergey Ryazanov <ryazanov.s.a@gmail.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: netdev@vger.kernel.org
1 parent 57bbf99 commit 72b1fe6

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

drivers/net/wwan/t7xx/t7xx_hif_cldma.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,9 +1293,9 @@ int t7xx_cldma_init(struct cldma_ctrl *md_ctrl)
12931293
for (i = 0; i < CLDMA_TXQ_NUM; i++) {
12941294
md_cd_queue_struct_init(&md_ctrl->txq[i], md_ctrl, MTK_TX, i);
12951295
md_ctrl->txq[i].worker =
1296-
alloc_workqueue("md_hif%d_tx%d_worker",
1297-
WQ_UNBOUND | WQ_MEM_RECLAIM | (i ? 0 : WQ_HIGHPRI),
1298-
1, md_ctrl->hif_id, i);
1296+
alloc_ordered_workqueue("md_hif%d_tx%d_worker",
1297+
WQ_MEM_RECLAIM | (i ? 0 : WQ_HIGHPRI),
1298+
md_ctrl->hif_id, i);
12991299
if (!md_ctrl->txq[i].worker)
13001300
goto err_workqueue;
13011301

@@ -1306,9 +1306,10 @@ int t7xx_cldma_init(struct cldma_ctrl *md_ctrl)
13061306
md_cd_queue_struct_init(&md_ctrl->rxq[i], md_ctrl, MTK_RX, i);
13071307
INIT_WORK(&md_ctrl->rxq[i].cldma_work, t7xx_cldma_rx_done);
13081308

1309-
md_ctrl->rxq[i].worker = alloc_workqueue("md_hif%d_rx%d_worker",
1310-
WQ_UNBOUND | WQ_MEM_RECLAIM,
1311-
1, md_ctrl->hif_id, i);
1309+
md_ctrl->rxq[i].worker =
1310+
alloc_ordered_workqueue("md_hif%d_rx%d_worker",
1311+
WQ_MEM_RECLAIM,
1312+
md_ctrl->hif_id, i);
13121313
if (!md_ctrl->rxq[i].worker)
13131314
goto err_workqueue;
13141315
}

drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,9 @@ int t7xx_dpmaif_txq_init(struct dpmaif_tx_queue *txq)
618618
return ret;
619619
}
620620

621-
txq->worker = alloc_workqueue("md_dpmaif_tx%d_worker", WQ_UNBOUND | WQ_MEM_RECLAIM |
622-
(txq->index ? 0 : WQ_HIGHPRI), 1, txq->index);
621+
txq->worker = alloc_ordered_workqueue("md_dpmaif_tx%d_worker",
622+
WQ_MEM_RECLAIM | (txq->index ? 0 : WQ_HIGHPRI),
623+
txq->index);
623624
if (!txq->worker)
624625
return -ENOMEM;
625626

0 commit comments

Comments
 (0)