Unverified Commit 0bc2c2e1 authored by Marco Crivellari's avatar Marco Crivellari Committed by Rodrigo Vivi
Browse files

drm/xe: add WQ_PERCPU to alloc_workqueue users 

This continues the effort to refactor workqueue APIs, which began with
the introduction of new workqueues and a new alloc_workqueue flag in:

   commit 128ea9f6 ("workqueue: Add system_percpu_wq and system_dfl_wq")
   commit 930c2ea5 ("workqueue: Add new WQ_PERCPU flag")

The refactoring is going to alter the default behavior of
alloc_workqueue() to be unbound by default.

With the introduction of the WQ_PERCPU flag (equivalent to !WQ_UNBOUND),
any alloc_workqueue() caller that doesn’t explicitly specify WQ_UNBOUND
must now use WQ_PERCPU. For more details see the Link tag below.

In order to keep alloc_workqueue() behavior identical, explicitly request
WQ_PERCPU.

Link: https://lore.kernel.org/all/20250221112


Suggested-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarMarco Crivellari <marco.crivellari@suse.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/20260202103756.62138-3-marco.crivellari@suse.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent fa171b80

drivers/gpu/drm/xe/xe_device.c

+2 −2
Original line number Diff line number Diff line
@@ -508,8 +508,8 @@ struct xe_device *xe_device_create(struct pci_dev *pdev, 
	xe->preempt_fence_wq = alloc_ordered_workqueue("xe-preempt-fence-wq",

						       WQ_MEM_RECLAIM);

	xe->ordered_wq = alloc_ordered_workqueue("xe-ordered-wq", 0);

	xe->unordered_wq = alloc_workqueue("xe-unordered-wq", 0, 0);

	xe->destroy_wq = alloc_workqueue("xe-destroy-wq", 0, 0);

	xe->unordered_wq = alloc_workqueue("xe-unordered-wq", WQ_PERCPU, 0);

	xe->destroy_wq = alloc_workqueue("xe-destroy-wq", WQ_PERCPU, 0);

	if (!xe->ordered_wq || !xe->unordered_wq ||

	    !xe->preempt_fence_wq || !xe->destroy_wq) {

		/*

drivers/gpu/drm/xe/xe_ggtt.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ int xe_ggtt_init_early(struct xe_ggtt *ggtt) 
	else

		ggtt->pt_ops = &xelp_pt_ops;



	ggtt->wq = alloc_workqueue("xe-ggtt-wq", WQ_MEM_RECLAIM, 0);

	ggtt->wq = alloc_workqueue("xe-ggtt-wq", WQ_MEM_RECLAIM | WQ_PERCPU, 0);

	if (!ggtt->wq)

		return -ENOMEM;

drivers/gpu/drm/xe/xe_hw_engine_group.c

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ hw_engine_group_alloc(struct xe_device *xe) 
	if (!group)

		return ERR_PTR(-ENOMEM);



	group->resume_wq = alloc_workqueue("xe-resume-lr-jobs-wq", 0, 0);

	group->resume_wq = alloc_workqueue("xe-resume-lr-jobs-wq", WQ_PERCPU,

					   0);

	if (!group->resume_wq)

		return ERR_PTR(-ENOMEM);

drivers/gpu/drm/xe/xe_sriov.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int xe_sriov_init(struct xe_device *xe) 
		xe_sriov_vf_init_early(xe);



	xe_assert(xe, !xe->sriov.wq);

	xe->sriov.wq = alloc_workqueue("xe-sriov-wq", 0, 0);

	xe->sriov.wq = alloc_workqueue("xe-sriov-wq", WQ_PERCPU, 0);

	if (!xe->sriov.wq)

		return -ENOMEM;