Skip to contentSkip to conversation

i2c: testunit: Replace system_long_wq with system_dfl_long_wq

RFC PATCH Applied Marco Crivellari 2 participants 4 messages Apr 30 – May 4

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 i2c: testunit: Replace system_long_wq with system_dfl_long_wq

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, but it is a per-cpu workqueue.

This is important because queue_delayed_work() queue the work using:

   queue_delayed_work_on(WORK_CPU_UNBOUND, ...);

Note that WORK_CPU_UNBOUND = NR_CPUS.

This would end up calling __queue_delayed_work() that does:

    if (housekeeping_enabled(HK_TYPE_TIMER)) {
    //      [....]
    } else {
            if (likely(cpu == WORK_CPU_UNBOUND))
                    add_timer_global(timer);
            else
                    add_timer_on(timer, cpu);
    }

So when cpu == WORK_CPU_UNBOUND the timer is global and is not using a specific CPU. Later, when __queue_work() is called:

    if (req_cpu == WORK_CPU_UNBOUND) {
            if (wq->flags & WQ_UNBOUND)
                    cpu = wq_select_unbound_cpu(raw_smp_processor_id());
            else
                    cpu = raw_smp_processor_id();
    }

Because the wq is not unbound, it takes the CPU where the timer fired and enqueue the work on that CPU.
The consequence of all of this is that the work can run anywhere, depending on where the timer fired.

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

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

So change system_long_wq with system_dfl_long_wq so that the work may benefit from scheduler task placement.

---
 drivers/i2c/i2c-slave-testunit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-slave-testunit.c +1 -1
index 6de4307050dd..c6582ca86c7d 100644
@@ -124,7 +124,7 @@ static int i2c_slave_testunit_slave_cb(struct i2c_client *client,
 	case I2C_SLAVE_STOP:
 		if (tu->reg_idx == TU_NUM_REGS) {
 			set_bit(TU_FLAG_IN_PROCESS, &tu->flags);
-			queue_delayed_work(system_long_wq, &tu->worker,
+			queue_delayed_work(system_dfl_long_wq, &tu->worker,
 					   msecs_to_jiffies(10 * tu->regs[TU_REG_DELAY]));
 		}
 
Signature · 1 line
2.53.0
Applied
#1 lore raw
Quoted 39 lines · Marco Crivellari

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, but it is a per-cpu workqueue.

This is important because queue_delayed_work() queue the work using:

   queue_delayed_work_on(WORK_CPU_UNBOUND, ...);

Note that WORK_CPU_UNBOUND = NR_CPUS.

This would end up calling __queue_delayed_work() that does:

    if (housekeeping_enabled(HK_TYPE_TIMER)) {
    //      [....]
    } else {
            if (likely(cpu == WORK_CPU_UNBOUND))
                    add_timer_global(timer);
            else
                    add_timer_on(timer, cpu);
    }

So when cpu == WORK_CPU_UNBOUND the timer is global and is not using a specific CPU. Later, when __queue_work() is called:

    if (req_cpu == WORK_CPU_UNBOUND) {
            if (wq->flags & WQ_UNBOUND)
                    cpu = wq_select_unbound_cpu(raw_smp_processor_id());
            else
                    cpu = raw_smp_processor_id();
    }

Because the wq is not unbound, it takes the CPU where the timer fired and enqueue the work on that CPU.
The consequence of all of this is that the work can run anywhere, depending on where the timer fired.

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

Quoted 6 lines

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

So change system_long_wq with system_dfl_long_wq so that the work may benefit from scheduler task placement.

Applied to for-current, thanks!

BTW, what does _dfl_ stand for?

#2 lore raw
Quoted 2 lines · Wolfram Sang

[..]
Applied to for-current, thanks!

Many thanks, Wolfram!
I completely missed the FIXME on top.

Quoted 3 lines

BTW, what does _dfl_ stand for?

"dfl" stands for "default". We're keeping the same naming convention
used for the
unbound workqueue, system_dfl_wq.

Thanks!

Signature · 3 lines
Marco Crivellari

SUSE Labs
#3 lore raw
In reply to Marco Crivellari
Quoted 39 lines · Marco Crivellari

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, but it is a per-cpu workqueue.

This is important because queue_delayed_work() queue the work using:

   queue_delayed_work_on(WORK_CPU_UNBOUND, ...);

Note that WORK_CPU_UNBOUND = NR_CPUS.

This would end up calling __queue_delayed_work() that does:

    if (housekeeping_enabled(HK_TYPE_TIMER)) {
    //      [....]
    } else {
            if (likely(cpu == WORK_CPU_UNBOUND))
                    add_timer_global(timer);
            else
                    add_timer_on(timer, cpu);
    }

So when cpu == WORK_CPU_UNBOUND the timer is global and is not using a specific CPU. Later, when __queue_work() is called:

    if (req_cpu == WORK_CPU_UNBOUND) {
            if (wq->flags & WQ_UNBOUND)
                    cpu = wq_select_unbound_cpu(raw_smp_processor_id());
            else
                    cpu = raw_smp_processor_id();
    }

Because the wq is not unbound, it takes the CPU where the timer fired and enqueue the work on that CPU.
The consequence of all of this is that the work can run anywhere, depending on where the timer fired.

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

Quoted 6 lines

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

So change system_long_wq with system_dfl_long_wq so that the work may benefit from scheduler task placement.

Looks very reasonable to me. With your detailed explanation, we could probably also remove the FIXME next to the workqueue.h-include. This seems to be the proper workqueue now. I will fix it when applying.

Thank you!