Commit b9837022 authored by Jay Cornwall's avatar Jay Cornwall Committed by Alex Deucher
Browse files

drm/amdkfd: Fix race in GWS queue scheduling 



q->gws is not updated atomically with qpd->mapped_gws_queue. If a
runlist is created between pqm_set_gws and update_queue it will
contain a queue which uses GWS in a process with no GWS allocated.
This will result in a scheduler hang.

Use q->properties.is_gws which is changed while holding the DQM lock.

Signed-off-by: default avatarJay Cornwall <jay.cornwall@amd.com>
Reviewed-by: default avatarHarish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3f4caf09

drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer, 


	packet->bitfields2.engine_sel =

		engine_sel__mes_map_queues__compute_vi;

	packet->bitfields2.gws_control_queue = q->gws ? 1 : 0;

	packet->bitfields2.gws_control_queue = q->properties.is_gws ? 1 : 0;

	packet->bitfields2.extended_engine_sel =

		extended_engine_sel__mes_map_queues__legacy_engine_sel;

	packet->bitfields2.queue_type =