This prevents a user from using a cache created on one hardware generation on a different one. Of course, with Intel hardware, this requires moving their drive from one machine to another but it's still possible and we should prevent it.
Reviewed-by: Chad Versace <[email protected]> --- src/intel/vulkan/anv_device.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index be2b2f3..5db0a6c 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -32,6 +32,7 @@ #include "util/strtod.h" #include "util/debug.h" #include "util/build_id.h" +#include "util/mesa-sha1.h" #include "util/vk_util.h" #include "genxml/gen7_pack.h" @@ -53,17 +54,28 @@ compiler_perf_log(void *data, const char *fmt, ...) } static bool -anv_device_get_cache_uuid(void *uuid) +anv_device_get_cache_uuid(void *uuid, uint16_t pci_id) { const struct build_id_note *note = build_id_find_nhdr("libvulkan_intel.so"); if (!note) return false; - unsigned len = build_id_length(note); - if (len < VK_UUID_SIZE) + unsigned build_id_len = build_id_length(note); + if (build_id_len < 20) /* It should be a SHA-1 */ return false; - memcpy(uuid, build_id_data(note), VK_UUID_SIZE); + uint8_t sha1[20]; + STATIC_ASSERT(VK_UUID_SIZE <= sizeof(sha1)); + + struct mesa_sha1 *sha1_ctx = _mesa_sha1_init(); + if (sha1_ctx == NULL) + return false; + + _mesa_sha1_update(sha1_ctx, build_id_data(note), build_id_len); + _mesa_sha1_update(sha1_ctx, &pci_id, sizeof(pci_id)); + _mesa_sha1_final(sha1_ctx, sha1); + + memcpy(uuid, sha1, VK_UUID_SIZE); return true; } @@ -148,7 +160,7 @@ anv_physical_device_init(struct anv_physical_device *device, goto fail; } - if (!anv_device_get_cache_uuid(device->uuid)) { + if (!anv_device_get_cache_uuid(device->uuid, device->chipset_id)) { result = vk_errorf(VK_ERROR_INITIALIZATION_FAILED, "cannot generate UUID"); goto fail; -- 2.5.0.400.gff86faf _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
