Patch "drm/xe/ufence: Flush xe ordered_wq in case of ufence timeout" has been added to the 6.11-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/xe/ufence: Flush xe ordered_wq in case of ufence timeout

to the 6.11-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-xe-ufence-flush-xe-ordered_wq-in-case-of-ufence-.patch
and it can be found in the queue-6.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit eb16327beafbed6cb88b8d064eb3df24c4f66d23
Author: Nirmoy Das <nirmoy.das@xxxxxxxxx>
Date:   Tue Oct 29 13:01:16 2024 +0100

    drm/xe/ufence: Flush xe ordered_wq in case of ufence timeout
    
    [ Upstream commit 7d1e2580ed166f36949b468373b468d188880cd3 ]
    
    Flush xe ordered_wq in case of ufence timeout which is observed
    on LNL and that points to recent scheduling issue with E-cores.
    
    This is similar to the recent fix:
    commit e51527233804 ("drm/xe/guc/ct: Flush g2h worker in case of g2h
    response timeout") and should be removed once there is a E-core
    scheduling fix for LNL.
    
    v2: Add platform check(Himal)
        s/__flush_workqueue/flush_workqueue(Jani)
    v3: Remove gfx platform check as the issue related to cpu
        platform(John)
    v4: Use the Common macro(John) and print when the flush resolves
        timeout(Matt B)
    
    Cc: Badal Nilawar <badal.nilawar@xxxxxxxxx>
    Cc: Matthew Auld <matthew.auld@xxxxxxxxx>
    Cc: John Harrison <John.C.Harrison@xxxxxxxxx>
    Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@xxxxxxxxx>
    Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
    Cc: stable@xxxxxxxxxxxxxxx # v6.11+
    Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2754
    Suggested-by: Matthew Brost <matthew.brost@xxxxxxxxx>
    Signed-off-by: Nirmoy Das <nirmoy.das@xxxxxxxxx>
    Reviewed-by: Matthew Auld <matthew.auld@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20241029120117.449694-2-nirmoy.das@xxxxxxxxx
    Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
    (cherry picked from commit 38c4c8722bd74452280951edc44c23de47612001)
    Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/xe/xe_wait_user_fence.c b/drivers/gpu/drm/xe/xe_wait_user_fence.c
index 92f65b9c52801..2bff43c5962e0 100644
--- a/drivers/gpu/drm/xe/xe_wait_user_fence.c
+++ b/drivers/gpu/drm/xe/xe_wait_user_fence.c
@@ -155,6 +155,13 @@ int xe_wait_user_fence_ioctl(struct drm_device *dev, void *data,
 		}
 
 		if (!timeout) {
+			LNL_FLUSH_WORKQUEUE(xe->ordered_wq);
+			err = do_compare(addr, args->value, args->mask,
+					 args->op);
+			if (err <= 0) {
+				drm_dbg(&xe->drm, "LNL_FLUSH_WORKQUEUE resolved ufence timeout\n");
+				break;
+			}
 			err = -ETIME;
 			break;
 		}