From 66dc7dbb33c5da99eb451a35a58a3b20daf95b09 Mon Sep 17 00:00:00 2001 From: Maksim Sisov Date: Tue, 18 May 2021 08:23:56 +0300 Subject: [PATCH] iris: export GEM handle with RDWR access rights There is a regression that made it impossible to export gem handles with write access. That is, a client may export gem handles of each buffer plane, then export dmabuf fds using these handles, and mmap these dmabuf in a different process (this is what Chromium does). After https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4861, it became impossible as mmap resulted in EACCESS error as slightly different approach was taken for exporting these gem handles. This CL fixes exporting gem handles (which are exported from dmabuf fds) by adding the DRM_RDWR flag. Cc: mesa-stable Fixes #3119 Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit b74898ef699486d0513fcd3af2587a831df99dff) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_bufmgr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 59048fda2d1..374928956fc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -553,7 +553,7 @@ "description": "iris: export GEM handle with RDWR access rights", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index be50e5b5488..9fc6e49df62 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -1505,7 +1505,7 @@ iris_bo_export_dmabuf(struct iris_bo *bo, int *prime_fd) iris_bo_make_external(bo); if (drmPrimeHandleToFD(bufmgr->fd, bo->gem_handle, - DRM_CLOEXEC, prime_fd) != 0) + DRM_CLOEXEC | DRM_RDWR, prime_fd) != 0) return -errno; return 0;