qxl: Make sure qxl_cursor memory is pinned

QEMU keeps a vram reference to the last QXLCursorCmd it received.
This QXLCursorCmd command points to a QXLCursor instance (stored in vram
too). However, while the QXLCursorCmd memory is pinned, the QXLCursor
memory is not.

When booting a recent Fedora to its login screen while monitoring the
QXLCursorCmd QEMU holds, it's possible to see the QXLCursor memory
becoming invalid shortly after boot. Pinning that memory ensures that
that QXLCursor memory is not going to be moved by the guest kernel.

Moving the pin/unpin to qxl_release_list_add()/qxl_release_free_list()
would be a more generic fix. However, doing this quickly exhausts QXL
video memory, so more fixing would be needed before this is workable.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20181120162004.22807-3-cfergeau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index fc9f63cab5485d20ae308db3e6d1196993ce30b1..ce0b9c40fc212fb88ebc37391a1cf0be2a0a763a 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -622,10 +622,14 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
                if (ret)
                        goto out_kunmap;
 
-               ret = qxl_release_reserve_list(release, true);
+               ret = qxl_bo_pin(cursor_bo);
                if (ret)
                        goto out_free_bo;
 
+               ret = qxl_release_reserve_list(release, true);
+               if (ret)
+                       goto out_unpin;
+
                ret = qxl_bo_kmap(cursor_bo, (void **)&cursor);
                if (ret)
                        goto out_backoff;
@@ -670,6 +674,8 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
        qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
        qxl_release_fence_buffer_objects(release);
 
+       if (old_cursor_bo != NULL)
+               qxl_bo_unpin(old_cursor_bo);
        qxl_bo_unref(&old_cursor_bo);
        qxl_bo_unref(&cursor_bo);
 
@@ -677,6 +683,8 @@ static void qxl_cursor_atomic_update(struct drm_plane *plane,
 
 out_backoff:
        qxl_release_backoff_reserve_list(release);
+out_unpin:
+       qxl_bo_unpin(cursor_bo);
 out_free_bo:
        qxl_bo_unref(&cursor_bo);
 out_kunmap: