From 9388ef07d88f67d54e8428d7fba93c901fa1ac95 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Tue, 3 Nov 2026 10:26:24 -0500 Subject: [PATCH] fix(quest): grow the timestamp table instead of evicting an active context --- tools/quest/kgsl_compat.c | 28 ++++++++++++++++++---------- tools/quest/test_kgsl_compat.c | 5 ++--- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/tools/quest/kgsl_compat.c b/tools/quest/kgsl_compat.c index f3afa289a..f2c9e58b1 100644 --- a/tools/quest/kgsl_compat.c +++ b/tools/quest/kgsl_compat.c @@ -4,6 +4,7 @@ #include #include #include +#include #ifdef __ANDROID__ #include #endif @@ -29,11 +30,12 @@ static void report(const char *operation, int error) { errno = saved; } -#define TRACKED_CONTEXTS 128 - -static struct { +struct tracked_context { unsigned int context, queued, retired; -} tracked[TRACKED_CONTEXTS]; +}; + +static struct tracked_context *tracked; +static unsigned int tracked_count, tracked_capacity; static char tracked_lock; static void tracked_acquire(void) { @@ -46,15 +48,20 @@ static void tracked_release(void) { static int tracked_find(unsigned int context, int create) { int free_slot = -1; - for (int i = 0; i < TRACKED_CONTEXTS; i++) { - if (tracked[i].context == context) return i; - if (free_slot < 0 && tracked[i].context == 0) free_slot = i; + for (unsigned int i = 0; i < tracked_count; i++) { + if (tracked[i].context == context) return (int)i; + if (free_slot < 0 && tracked[i].context == 0) free_slot = (int)i; } if (!create) return -1; if (free_slot < 0) { - free_slot = (int)(context % TRACKED_CONTEXTS); - for (int i = 0; i < TRACKED_CONTEXTS; i++) - if (tracked[i].queued == tracked[i].retired) { free_slot = i; break; } + if (tracked_count == tracked_capacity) { + unsigned int capacity = tracked_capacity ? tracked_capacity * 2 : 32; + struct tracked_context *grown = realloc(tracked, capacity * sizeof *grown); + if (grown == NULL) return -1; + tracked = grown; + tracked_capacity = capacity; + } + free_slot = (int)tracked_count++; } tracked[free_slot].context = context; tracked[free_slot].queued = tracked[free_slot].retired = 0; @@ -65,6 +72,7 @@ static void track_submit(unsigned int context, unsigned int timestamp) { if (context == 0) return; tracked_acquire(); int slot = tracked_find(context, 1); + if (slot < 0) { tracked_release(); return; } if ((int)(timestamp - tracked[slot].queued) < 0) tracked[slot].retired = 0; tracked[slot].queued = timestamp; tracked_release(); diff --git a/tools/quest/test_kgsl_compat.c b/tools/quest/test_kgsl_compat.c index cc453635b..a44bd80a6 100644 --- a/tools/quest/test_kgsl_compat.c +++ b/tools/quest/test_kgsl_compat.c @@ -97,9 +97,8 @@ static void timestamp_scenarios(void) { struct kgsl_drawctxt_destroy gone = {.drawctxt_id = 5}; assert(quest_kgsl_ioctl(timestamp_mock, 42, IOCTL_KGSL_DRAWCTXT_DESTROY, &gone) == 0); assert(read_ts(5, KGSL_TIMESTAMP_QUEUED, &ts) == -1 && errno == EACCES); - for (unsigned int c = 100; c < 100 + 130; c++) submit(c, 7); - submit(200, 9); - assert(read_ts(200, KGSL_TIMESTAMP_QUEUED, &ts) == 0 && ts == 9); + for (unsigned int c = 100; c < 100 + 129; c++) submit(c, c); + for (unsigned int c = 100; c < 100 + 129; c++) assert(read_ts(c, KGSL_TIMESTAMP_QUEUED, &ts) == 0 && ts == c); read_error = EIO; submit(6, 3); assert(read_ts(6, KGSL_TIMESTAMP_QUEUED, &ts) == -1 && errno == EIO);