mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 14:26:00 +00:00
fix: catch KGSL GEM_CLOSE at ioctl instead of exporting drmIoctl (#305)
* fix: avoid reusing retired KGSL GEM handles
* fix: defer closing GEM_CLOSE'd KGSL dma-buf descriptors
* Revert "fix: defer closing GEM_CLOSE'd KGSL dma-buf descriptors"
This reverts commit 191bf4b6f2.
* test: interpose drmIoctl without releasing GEM_CLOSE handles
* fix: catch KGSL GEM_CLOSE at ioctl instead of exporting drmIoctl
This commit is contained in:
1 parent
d61af961c1
commit
ffaa906cd1
3 files changed
+103
-28
No files matched your search
@@ -363,9 +363,13 @@ jobs:
|
|||||||
echo "::error::libfakeinput.so exports the C++ runtime"; exit 1
|
echo "::error::libfakeinput.so exports the C++ runtime"; exit 1
|
||||||
fi
|
fi
|
||||||
SESSION=$(syms "$D/libblsession.so")
|
SESSION=$(syms "$D/libblsession.so")
|
||||||
for sym in socket bind getsockname setsockopt statfs statvfs syscall shm_open shm_unlink mmap mmap64 munmap drmPrimeFDToHandle drmCloseBufferHandle drmIoctl; do
|
for sym in socket bind getsockname setsockopt statfs statvfs syscall shm_open shm_unlink mmap mmap64 munmap drmPrimeFDToHandle drmCloseBufferHandle; do
|
||||||
grep -qx "$sym" <<<"$SESSION" || { echo "::error::libblsession.so does not export $sym"; exit 1; }
|
grep -qx "$sym" <<<"$SESSION" || { echo "::error::libblsession.so does not export $sym"; exit 1; }
|
||||||
done
|
done
|
||||||
|
# Zink's GEM_CLOSE is caught at ioctl(); an exported drmIoctl made NMS replay old frames.
|
||||||
|
if grep -qx drmIoctl <<<"$SESSION"; then
|
||||||
|
echo "::error::libblsession.so exports drmIoctl"; exit 1
|
||||||
|
fi
|
||||||
SSBS=$(syms "$D/libssbs.so")
|
SSBS=$(syms "$D/libssbs.so")
|
||||||
for sym in sigaction signal bsd_signal sysv_signal; do
|
for sym in sigaction signal bsd_signal sysv_signal; do
|
||||||
grep -qx "$sym" <<<"$SSBS" || { echo "::error::libssbs.so does not export $sym"; exit 1; }
|
grep -qx "$sym" <<<"$SSBS" || { echo "::error::libssbs.so does not export $sym"; exit 1; }
|
||||||
|
|||||||
+96
-27
@@ -14,6 +14,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
#include <sys/syscall.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#define MAX_HANDLES 4096
|
#define MAX_HANDLES 4096
|
||||||
@@ -25,8 +26,15 @@ struct gem_close {
|
|||||||
};
|
};
|
||||||
#define GEM_CLOSE _IOW('d', 0x09, struct gem_close)
|
#define GEM_CLOSE _IOW('d', 0x09, struct gem_close)
|
||||||
|
|
||||||
|
struct handle_entry {
|
||||||
|
uint32_t handle;
|
||||||
|
int dma_fd;
|
||||||
|
int drm_fd;
|
||||||
|
};
|
||||||
|
|
||||||
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
|
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
|
||||||
static int handle_fds[MAX_HANDLES];
|
static struct handle_entry handle_entries[MAX_HANDLES];
|
||||||
|
static uint32_t next_handle = 1;
|
||||||
static dev_t kgsl_dev;
|
static dev_t kgsl_dev;
|
||||||
static int kgsl_state; /* 0 unknown, 1 known, -1 absent */
|
static int kgsl_state; /* 0 unknown, 1 known, -1 absent */
|
||||||
|
|
||||||
@@ -49,6 +57,58 @@ static void *real(const char *name) {
|
|||||||
return fn;
|
return fn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int same_file_description(int a, int b) {
|
||||||
|
if (a == b) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
#ifdef SYS_kcmp
|
||||||
|
int saved_errno = errno;
|
||||||
|
long ret = syscall(SYS_kcmp, getpid(), getpid(), 0 /* KCMP_FILE */, a, b);
|
||||||
|
errno = saved_errno;
|
||||||
|
return ret == 0;
|
||||||
|
#else
|
||||||
|
return 0;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static int find_handle_locked(int fd, uint32_t handle) {
|
||||||
|
for (int i = 0; i < MAX_HANDLES; i++) {
|
||||||
|
if (handle_entries[i].handle == handle &&
|
||||||
|
same_file_description(handle_entries[i].drm_fd, fd)) {
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The old table used its slot index as the public handle. Once #275 started freeing slots,
|
||||||
|
* rapidly recreated swapchains immediately reused those numbers. Keep storage slots reusable but
|
||||||
|
* make the public token monotonic so a stale handle can fail instead of aliasing a newer buffer.
|
||||||
|
*/
|
||||||
|
static uint32_t alloc_handle_locked(void) {
|
||||||
|
for (int tries = 0; tries <= MAX_HANDLES; tries++) {
|
||||||
|
uint32_t candidate = next_handle++;
|
||||||
|
if (next_handle == 0) {
|
||||||
|
next_handle = 1;
|
||||||
|
}
|
||||||
|
if (candidate == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
int used = 0;
|
||||||
|
for (int i = 0; i < MAX_HANDLES; i++) {
|
||||||
|
if (handle_entries[i].handle == candidate) {
|
||||||
|
used = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!used) {
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int drmPrimeFDToHandle(int fd, int prime_fd, uint32_t *handle) {
|
int drmPrimeFDToHandle(int fd, int prime_fd, uint32_t *handle) {
|
||||||
if (!is_kgsl(fd)) {
|
if (!is_kgsl(fd)) {
|
||||||
int (*fn)(int, int, uint32_t *) = (int (*)(int, int, uint32_t *)) real("drmPrimeFDToHandle");
|
int (*fn)(int, int, uint32_t *) = (int (*)(int, int, uint32_t *)) real("drmPrimeFDToHandle");
|
||||||
@@ -60,10 +120,16 @@ int drmPrimeFDToHandle(int fd, int prime_fd, uint32_t *handle) {
|
|||||||
}
|
}
|
||||||
int ret = -ENOMEM;
|
int ret = -ENOMEM;
|
||||||
pthread_mutex_lock(&lock);
|
pthread_mutex_lock(&lock);
|
||||||
for (uint32_t i = 1; i < MAX_HANDLES; i++) {
|
for (int i = 0; i < MAX_HANDLES; i++) {
|
||||||
if (handle_fds[i] == 0) {
|
if (handle_entries[i].handle == 0) {
|
||||||
handle_fds[i] = dup_fd;
|
uint32_t token = alloc_handle_locked();
|
||||||
*handle = i;
|
if (!token) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
handle_entries[i].handle = token;
|
||||||
|
handle_entries[i].dma_fd = dup_fd;
|
||||||
|
handle_entries[i].drm_fd = fd;
|
||||||
|
*handle = token;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -82,21 +148,23 @@ int drmPrimeHandleToFD(int fd, uint32_t handle, uint32_t flags, int *prime_fd) {
|
|||||||
}
|
}
|
||||||
int ret = -EINVAL;
|
int ret = -EINVAL;
|
||||||
pthread_mutex_lock(&lock);
|
pthread_mutex_lock(&lock);
|
||||||
if (handle > 0 && handle < MAX_HANDLES && handle_fds[handle] > 0) {
|
int index = find_handle_locked(fd, handle);
|
||||||
*prime_fd = fcntl(handle_fds[handle], F_DUPFD_CLOEXEC, 0);
|
if (index >= 0) {
|
||||||
|
*prime_fd = fcntl(handle_entries[index].dma_fd, F_DUPFD_CLOEXEC, 0);
|
||||||
ret = *prime_fd < 0 ? -errno : 0;
|
ret = *prime_fd < 0 ? -errno : 0;
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&lock);
|
pthread_mutex_unlock(&lock);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Drops a handle's descriptor; false when the handle was never given out. */
|
/* Drops only a handle belonging to this KGSL file description. */
|
||||||
static int release_handle(uint32_t handle) {
|
static int release_handle(int fd, uint32_t handle) {
|
||||||
int found = 0;
|
int found = 0;
|
||||||
pthread_mutex_lock(&lock);
|
pthread_mutex_lock(&lock);
|
||||||
if (handle > 0 && handle < MAX_HANDLES && handle_fds[handle] > 0) {
|
int index = find_handle_locked(fd, handle);
|
||||||
close(handle_fds[handle]);
|
if (index >= 0) {
|
||||||
handle_fds[handle] = 0;
|
close(handle_entries[index].dma_fd);
|
||||||
|
handle_entries[index] = (struct handle_entry){0};
|
||||||
found = 1;
|
found = 1;
|
||||||
}
|
}
|
||||||
pthread_mutex_unlock(&lock);
|
pthread_mutex_unlock(&lock);
|
||||||
@@ -108,29 +176,30 @@ int drmCloseBufferHandle(int fd, uint32_t handle) {
|
|||||||
int (*fn)(int, uint32_t) = (int (*)(int, uint32_t)) real("drmCloseBufferHandle");
|
int (*fn)(int, uint32_t) = (int (*)(int, uint32_t)) real("drmCloseBufferHandle");
|
||||||
return fn ? fn(fd, handle) : -ENOSYS;
|
return fn ? fn(fd, handle) : -ENOSYS;
|
||||||
}
|
}
|
||||||
return release_handle(handle) ? 0 : -EINVAL;
|
return release_handle(fd, handle) ? 0 : -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Zink gives its handles back with the GEM_CLOSE ioctl itself, not drmCloseBufferHandle
|
* Zink gives its handles back with the GEM_CLOSE ioctl itself, not drmCloseBufferHandle
|
||||||
* (zink_bo.c, bo_destroy). KGSL refuses the ioctl, so the duplicated descriptor stayed open and
|
* (zink_bo.c, bo_destroy). KGSL refuses the ioctl, so the duplicated descriptor stayed open and
|
||||||
* kept the whole buffer alive: Xwayland asks for a handle for every buffer it imports, and a game
|
* kept the whole buffer alive. Preserve #275's reclamation without letting another KGSL file
|
||||||
* whose swapchain was recreated on each resize piled up gigabytes of old swapchain images until
|
* description release the token or making a new buffer immediately inherit a retired token.
|
||||||
* Android killed the session.
|
*
|
||||||
|
* Caught at ioctl() (netif.c), which libdrm's drmIoctl calls, rather than by exporting drmIoctl:
|
||||||
|
* every session process preloads this library, and exporting drmIoctl from it brought on a
|
||||||
|
* judder replaying old frames in No Man's Sky on an Adreno 840 even with no handle released.
|
||||||
*/
|
*/
|
||||||
int drmIoctl(int fd, unsigned long request, void *arg) {
|
__attribute__((visibility("hidden"))) int bl_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) {
|
||||||
if (request == GEM_CLOSE && arg && is_kgsl(fd)) {
|
if (request != GEM_CLOSE || !arg || !is_kgsl(fd)) {
|
||||||
if (release_handle(((struct gem_close *) arg)->handle)) {
|
return 0;
|
||||||
return 0;
|
}
|
||||||
}
|
if (release_handle(fd, ((struct gem_close *) arg)->handle)) {
|
||||||
|
*rc = 0;
|
||||||
|
} else {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
return -1;
|
*rc = -1;
|
||||||
}
|
}
|
||||||
int (*fn)(int, unsigned long, void *) = (int (*)(int, unsigned long, void *)) real("drmIoctl");
|
return 1;
|
||||||
if (!fn) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
return fn(fd, request, arg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -353,6 +353,7 @@ void bl_kgsl_chip_id_fixup(unsigned long request, void *arg, int rc); /* kgslid.
|
|||||||
int bl_kgsl_poll(int (*real)(int, unsigned long, void *), int fd, unsigned long request,
|
int bl_kgsl_poll(int (*real)(int, unsigned long, void *), int fd, unsigned long request,
|
||||||
void *arg, int *rc) __attribute__((visibility("hidden")));
|
void *arg, int *rc) __attribute__((visibility("hidden")));
|
||||||
int bl_ntsync_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden")));
|
int bl_ntsync_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden")));
|
||||||
|
int bl_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden")));
|
||||||
|
|
||||||
/* Every DRM and evdev call comes through here, so the lookup is done once. Two threads racing
|
/* Every DRM and evdev call comes through here, so the lookup is done once. Two threads racing
|
||||||
* to store it store the same pointer. */
|
* to store it store the same pointer. */
|
||||||
@@ -366,6 +367,7 @@ int ioctl(int fd, unsigned long request, ...) {
|
|||||||
|
|
||||||
int rc;
|
int rc;
|
||||||
if (bl_ntsync_ioctl(fd, request, arg, &rc)) return rc;
|
if (bl_ntsync_ioctl(fd, request, arg, &rc)) return rc;
|
||||||
|
if (bl_drm_gem_close(fd, request, arg, &rc)) return rc;
|
||||||
if (real == NULL) real = (ioctl_fn) dlsym(RTLD_NEXT, "ioctl");
|
if (real == NULL) real = (ioctl_fn) dlsym(RTLD_NEXT, "ioctl");
|
||||||
if (!bl_kgsl_poll(real, fd, request, arg, &rc)) rc = real(fd, request, arg);
|
if (!bl_kgsl_poll(real, fd, request, arg, &rc)) rc = real(fd, request, arg);
|
||||||
bl_kgsl_chip_id_fixup(request, arg, rc);
|
bl_kgsl_chip_id_fixup(request, arg, rc);
|
||||||
|
|||||||
Reference in new issue
Block a user