clean_process_queues_cpsch would exit early if the memory was evicted, which would skip running the shader cleaner
Run the cleaner unconditionally, and track whether the fault was cleaned with a new boolean in the qcd struct. Signed-off-by: Kent Russell <[email protected]> --- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 ++++- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c index 86b70748617b..03d3a739d627 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c @@ -1571,9 +1571,12 @@ static int clean_process_queues_cpsch(struct device_queue_manager *dqm, int retval = 0; dqm_lock(dqm); - if (qpd->evicted++ > 0) /* already evicted, do nothing */ + if (qpd->fault_cleaned) goto out; + qpd->evicted++; + qpd->fault_cleaned = true; + pdd = qpd_to_pdd(qpd); /* The debugger creates processes that temporarily have not acquired diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c index 8dee8c43824d..0bd8e781adec 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c @@ -418,7 +418,7 @@ static void gfx_9_clean_fault(uint16_t pasid) if (!pdd) return; - /* To Clean the GFX on the faulting device */ + /* To clean the GFX fault state on the faulting device */ dqm = pdd->dev->dqm; dqm->ops.clean_process_queues_cpsch(dqm, &pdd->qpd); diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index 581fb7ceba40..3292e616d36f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -695,6 +695,11 @@ struct qcm_process_device { bool is_debug; unsigned int evicted; /* eviction counter, 0=active */ + /* Set after fault clean runs; never cleared. + * Prevents redundant cleaning from pipelined interrupt workers. + */ + bool fault_cleaned; + /* This flag tells if we should reset all wavefronts on * process termination */ -- 2.43.0
