]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
accel/ivpu: Fix missing MMU events if file_priv is unbound
authorKarol Wachowski <karol.wachowski@intel.com>
Wed, 29 Jan 2025 12:56:33 +0000 (13:56 +0100)
committerJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Mon, 3 Feb 2025 09:40:34 +0000 (10:40 +0100)
Move the ivpu_mmu_discard_events() function to the common portion of
the abort work function. This ensures it is called only once, even if
there are no faulty contexts in context_xa, to guarantee that MMU events
are discarded and new events are not missed.

Reviewed-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Signed-off-by: Karol Wachowski <karol.wachowski@intel.com>
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250129125636.1047413-4-jacek.lawrynowicz@linux.intel.com
drivers/accel/ivpu/ivpu_job.c

index 3c162ac41a1dc345854f749addb39689cb100068..c1013f511efa68057dcfdbc4b774453d4ee1d2d1 100644 (file)
@@ -375,7 +375,6 @@ void ivpu_context_abort_locked(struct ivpu_file_priv *file_priv)
                ivpu_jsm_context_release(vdev, file_priv->ctx.id);
 
        ivpu_mmu_disable_ssid_events(vdev, file_priv->ctx.id);
-       ivpu_mmu_discard_events(vdev);
 
        file_priv->aborted = true;
 }
@@ -980,6 +979,13 @@ void ivpu_context_abort_work_fn(struct work_struct *work)
        }
        mutex_unlock(&vdev->context_list_lock);
 
+       /*
+        * We will not receive new MMU event interrupts until existing events are discarded
+        * however, we want to discard these events only after aborting the faulty context
+        * to avoid generating new faults from that context
+        */
+       ivpu_mmu_discard_events(vdev);
+
        if (vdev->fw->sched_mode != VPU_SCHEDULING_MODE_HW)
                return;