mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 15:12:13 +02:00
drm/i915: replace use of system_unbound_wq with system_dfl_wq
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 lack of consistency cannot be addressed without refactoring the API.
system_unbound_wq should be the default workqueue so as not to enforce
locality constraints for random work whenever it's not required.
This patch continues the effort to refactor worqueue APIs, which has
begun with the change introducing new workqueues:
commit 128ea9f6cc ("workqueue: Add system_percpu_wq and system_dfl_wq")
The old system_unbound_wq will be kept for a few release cycles.
Suggested-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Marco Crivellari <marco.crivellari@suse.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
Link: https://patch.msgid.link/20251104100032.61525-2-marco.crivellari@suse.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
parent
93f3a267c3
commit
36ed3648a2
|
|
@ -645,7 +645,7 @@ queue_async_put_domains_work(struct i915_power_domains *power_domains,
|
|||
power.domains);
|
||||
drm_WARN_ON(display->drm, power_domains->async_put_wakeref);
|
||||
power_domains->async_put_wakeref = wakeref;
|
||||
drm_WARN_ON(display->drm, !queue_delayed_work(system_unbound_wq,
|
||||
drm_WARN_ON(display->drm, !queue_delayed_work(system_dfl_wq,
|
||||
&power_domains->async_put_work,
|
||||
msecs_to_jiffies(delay_ms)));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1844,7 +1844,7 @@ bool intel_tc_port_link_reset(struct intel_digital_port *dig_port)
|
|||
if (!intel_tc_port_link_needs_reset(dig_port))
|
||||
return false;
|
||||
|
||||
queue_delayed_work(system_unbound_wq,
|
||||
queue_delayed_work(system_dfl_wq,
|
||||
&to_tc_port(dig_port)->link_reset_work,
|
||||
msecs_to_jiffies(2000));
|
||||
|
||||
|
|
@ -1925,7 +1925,7 @@ void intel_tc_port_unlock(struct intel_digital_port *dig_port)
|
|||
struct intel_tc_port *tc = to_tc_port(dig_port);
|
||||
|
||||
if (!tc->link_refcount && tc->mode != TC_PORT_DISCONNECTED)
|
||||
queue_delayed_work(system_unbound_wq, &tc->disconnect_phy_work,
|
||||
queue_delayed_work(system_dfl_wq, &tc->disconnect_phy_work,
|
||||
msecs_to_jiffies(1000));
|
||||
|
||||
mutex_unlock(&tc->lock);
|
||||
|
|
|
|||
|
|
@ -408,7 +408,7 @@ static void __memcpy_cb(struct dma_fence *fence, struct dma_fence_cb *cb)
|
|||
|
||||
if (unlikely(fence->error || I915_SELFTEST_ONLY(fail_gpu_migration))) {
|
||||
INIT_WORK(©_work->work, __memcpy_work);
|
||||
queue_work(system_unbound_wq, ©_work->work);
|
||||
queue_work(system_dfl_wq, ©_work->work);
|
||||
} else {
|
||||
init_irq_work(©_work->irq_work, __memcpy_irq_work);
|
||||
irq_work_queue(©_work->irq_work);
|
||||
|
|
|
|||
|
|
@ -624,7 +624,7 @@ int intel_guc_crash_process_msg(struct intel_guc *guc, u32 action)
|
|||
else
|
||||
guc_err(guc, "Unknown crash notification: 0x%04X\n", action);
|
||||
|
||||
queue_work(system_unbound_wq, &guc->dead_guc_worker);
|
||||
queue_work(system_dfl_wq, &guc->dead_guc_worker);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -646,7 +646,7 @@ int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,
|
|||
guc_err(guc, "Received early exception notification!\n");
|
||||
|
||||
if (msg & (INTEL_GUC_RECV_MSG_CRASH_DUMP_POSTED | INTEL_GUC_RECV_MSG_EXCEPTION))
|
||||
queue_work(system_unbound_wq, &guc->dead_guc_worker);
|
||||
queue_work(system_dfl_wq, &guc->dead_guc_worker);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ static void ct_dead_ct_worker_func(struct work_struct *w);
|
|||
do { \
|
||||
if (!(ct)->dead_ct_reported) { \
|
||||
(ct)->dead_ct_reason |= 1 << CT_DEAD_##reason; \
|
||||
queue_work(system_unbound_wq, &(ct)->dead_ct_worker); \
|
||||
queue_work(system_dfl_wq, &(ct)->dead_ct_worker); \
|
||||
} \
|
||||
} while (0)
|
||||
#else
|
||||
|
|
@ -1238,7 +1238,7 @@ static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *requ
|
|||
list_add_tail(&request->link, &ct->requests.incoming);
|
||||
spin_unlock_irqrestore(&ct->requests.lock, flags);
|
||||
|
||||
queue_work(system_unbound_wq, &ct->requests.worker);
|
||||
queue_work(system_dfl_wq, &ct->requests.worker);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3385,7 +3385,7 @@ static void guc_context_sched_disable(struct intel_context *ce)
|
|||
} else if (!intel_context_is_closed(ce) && !guc_id_pressure(guc, ce) &&
|
||||
delay) {
|
||||
spin_unlock_irqrestore(&ce->guc_state.lock, flags);
|
||||
mod_delayed_work(system_unbound_wq,
|
||||
mod_delayed_work(system_dfl_wq,
|
||||
&ce->guc_state.sched_disable_delay_work,
|
||||
msecs_to_jiffies(delay));
|
||||
} else {
|
||||
|
|
@ -3611,7 +3611,7 @@ static void guc_context_destroy(struct kref *kref)
|
|||
* take the GT PM for the first time which isn't allowed from an atomic
|
||||
* context.
|
||||
*/
|
||||
queue_work(system_unbound_wq, &guc->submission_state.destroyed_worker);
|
||||
queue_work(system_dfl_wq, &guc->submission_state.destroyed_worker);
|
||||
}
|
||||
|
||||
static int guc_context_alloc(struct intel_context *ce)
|
||||
|
|
@ -5380,7 +5380,7 @@ int intel_guc_engine_failure_process_msg(struct intel_guc *guc,
|
|||
* A GT reset flushes this worker queue (G2H handler) so we must use
|
||||
* another worker to trigger a GT reset.
|
||||
*/
|
||||
queue_work(system_unbound_wq, &guc->submission_state.reset_fail_worker);
|
||||
queue_work(system_dfl_wq, &guc->submission_state.reset_fail_worker);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ active_retire(struct i915_active *ref)
|
|||
return;
|
||||
|
||||
if (ref->flags & I915_ACTIVE_RETIRE_SLEEPS) {
|
||||
queue_work(system_unbound_wq, &ref->work);
|
||||
queue_work(system_dfl_wq, &ref->work);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ fence_notify(struct i915_sw_fence *fence, enum i915_sw_fence_notify state)
|
|||
if (test_bit(DMA_FENCE_WORK_IMM, &f->dma.flags))
|
||||
fence_work(&f->work);
|
||||
else
|
||||
queue_work(system_unbound_wq, &f->work);
|
||||
queue_work(system_dfl_wq, &f->work);
|
||||
} else {
|
||||
fence_complete(f);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ i915_vma_resource_fence_notify(struct i915_sw_fence *fence,
|
|||
i915_vma_resource_unbind_work(&vma_res->work);
|
||||
} else {
|
||||
INIT_WORK(&vma_res->work, i915_vma_resource_unbind_work);
|
||||
queue_work(system_unbound_wq, &vma_res->work);
|
||||
queue_work(system_dfl_wq, &vma_res->work);
|
||||
}
|
||||
break;
|
||||
case FENCE_FREE:
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ static void pxp_queue_termination(struct intel_pxp *pxp)
|
|||
spin_lock_irq(gt->irq_lock);
|
||||
intel_pxp_mark_termination_in_progress(pxp);
|
||||
pxp->session_events |= PXP_TERMINATION_REQUEST;
|
||||
queue_work(system_unbound_wq, &pxp->session_work);
|
||||
queue_work(system_dfl_wq, &pxp->session_work);
|
||||
spin_unlock_irq(gt->irq_lock);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ void intel_pxp_irq_handler(struct intel_pxp *pxp, u16 iir)
|
|||
pxp->session_events |= PXP_TERMINATION_COMPLETE | PXP_EVENT_TYPE_IRQ;
|
||||
|
||||
if (pxp->session_events)
|
||||
queue_work(system_unbound_wq, &pxp->session_work);
|
||||
queue_work(system_dfl_wq, &pxp->session_work);
|
||||
}
|
||||
|
||||
static inline void __pxp_set_interrupts(struct intel_gt *gt, u32 interrupts)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user