]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
scsi: scsi_transport_srp: Move long delayed work to system_dfl_long_wq
authorMarco Crivellari <marco.crivellari@suse.com>
Thu, 7 May 2026 14:34:10 +0000 (16:34 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 15 May 2026 01:57:28 +0000 (21:57 -0400)
Currently the code enqueue work items using {queue|mod}_delayed_work(),
using system_long_wq. This workqueue should be used when long works are
expected and it is a per-cpu workqueue.

The function(s) end up calling __queue_delayed_work(), which set a
global timer that could fire anywhere, enqueuing the work where the
timer fired.

Unbound works could benefit from scheduler task placement, to optimize
performance and power consumption. Long work shouldn't stick to a single
CPU.

Recently, a new unbound workqueue specific for long running work has
been added:

    c116737e972e ("workqueue: Add system_dfl_long_wq for long unbound works")

Since the workqueue work doesn't rely on per-cpu variables, there is no
obvious reason that justify the use of a per-cpu workqueue. So change
system_long_wq with system_dfl_long_wq so that the work may benefit from
scheduler task placement.

Signed-off-by: Marco Crivellari <marco.crivellari@suse.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20260507143410.337267-1-marco.crivellari@suse.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/scsi_transport_srp.c

index d71ab5fdb75882645a9b9cd96ab28b2add989930..a61cbb079ab4ed3af67ced99e7977dfac37aabc6 100644 (file)
@@ -234,7 +234,7 @@ static ssize_t store_reconnect_delay(struct device *dev,
 
        if (rport->reconnect_delay <= 0 && delay > 0 &&
            rport->state != SRP_RPORT_RUNNING) {
-               queue_delayed_work(system_long_wq, &rport->reconnect_work,
+               queue_delayed_work(system_dfl_long_wq, &rport->reconnect_work,
                                   delay * HZ);
        } else if (delay <= 0) {
                cancel_delayed_work(&rport->reconnect_work);
@@ -390,7 +390,7 @@ static void srp_reconnect_work(struct work_struct *work)
                delay = rport->reconnect_delay *
                        clamp(rport->failed_reconnects - 10, 1, 100);
                if (delay > 0)
-                       queue_delayed_work(system_long_wq,
+                       queue_delayed_work(system_dfl_long_wq,
                                           &rport->reconnect_work, delay * HZ);
        }
 }
@@ -474,7 +474,7 @@ static void __srp_start_tl_fail_timers(struct srp_rport *rport)
        if (rport->state == SRP_RPORT_LOST)
                return;
        if (delay > 0)
-               queue_delayed_work(system_long_wq, &rport->reconnect_work,
+               queue_delayed_work(system_dfl_long_wq, &rport->reconnect_work,
                                   1UL * delay * HZ);
        if ((fast_io_fail_tmo >= 0 || dev_loss_tmo >= 0) &&
            srp_rport_set_state(rport, SRP_RPORT_BLOCKED) == 0) {
@@ -482,11 +482,11 @@ static void __srp_start_tl_fail_timers(struct srp_rport *rport)
                         rport->state);
                scsi_block_targets(shost, &shost->shost_gendev);
                if (fast_io_fail_tmo >= 0)
-                       queue_delayed_work(system_long_wq,
+                       queue_delayed_work(system_dfl_long_wq,
                                           &rport->fast_io_fail_work,
                                           1UL * fast_io_fail_tmo * HZ);
                if (dev_loss_tmo >= 0)
-                       queue_delayed_work(system_long_wq,
+                       queue_delayed_work(system_dfl_long_wq,
                                           &rport->dev_loss_work,
                                           1UL * dev_loss_tmo * HZ);
        }