drm/amdkfd: Fix race in GWS queue scheduling
commit cfb05257ae168a0496c7637e1d9e3ab8a25cbffe upstream. 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: Jay Cornwall <jay.cornwall@amd.com> Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit b98370220eb3110e82248e3354e16a489a492cfb) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7946a10f8d
commit
76115eafad
@@ -225,7 +225,7 @@ static int pm_map_queues_v9(struct packet_manager *pm, uint32_t *buffer,
|
|||||||
|
|
||||||
packet->bitfields2.engine_sel =
|
packet->bitfields2.engine_sel =
|
||||||
engine_sel__mes_map_queues__compute_vi;
|
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 =
|
packet->bitfields2.extended_engine_sel =
|
||||||
extended_engine_sel__mes_map_queues__legacy_engine_sel;
|
extended_engine_sel__mes_map_queues__legacy_engine_sel;
|
||||||
packet->bitfields2.queue_type =
|
packet->bitfields2.queue_type =
|
||||||
|
Reference in New Issue
Block a user