Mesa (main): util/fossilize_db: Pull seek into lock.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Jun 21 10:27:39 UTC 2021


Module: Mesa
Branch: main
Commit: bd41c51c8f4d67d18d8a4407358ea4b71f153d2a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd41c51c8f4d67d18d8a4407358ea4b71f153d2a

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sat Jun 19 18:40:49 2021 +0200

util/fossilize_db: Pull seek into lock.

Otherwise the seek can overlap with other reads/writes.

Fixes: eca6bb9540d ("util/fossilize_db: add basic fossilize db util to read/write shader caches")
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11485>

---

 src/util/fossilize_db.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
index b77d7bcfa9b..0d26cb00cae 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -362,14 +362,14 @@ foz_read_entry(struct foz_db *foz_db, const uint8_t *cache_key_160bit,
          goto fail;
    }
 
+   /* Reset file offset to the end of the file ready for writing */
+   fseek(foz_db->file[file_idx], offset, SEEK_SET);
+
    simple_mtx_unlock(&foz_db->mtx);
 
    if (size)
       *size = data_sz;
 
-   /* Reset file offset to the end of the file ready for writing */
-   fseek(foz_db->file[file_idx], offset, SEEK_SET);
-
    return data;
 
 fail:



More information about the mesa-commit mailing list