fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: Add the pci_id into the shader cache UUID

Browse source 
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 <chadversary@chromium.org>
Cc: mesa-stable@lists.freedesktop.org
This commit is contained in:
Jason Ekstrand 2017-02-24 16:36:00 -08:00
parent 36f2101723
commit d2d6cf6c83
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/intel/vulkan/anv_device.c
View file

@ -34,6 +34,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"
@ -97,17 +98,26 @@ anv_compute_heap_size(int fd, uint64_t *heap_size)
}
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);
struct mesa_sha1 sha1_ctx;
uint8_t sha1[20];
STATIC_ASSERT(VK_UUID_SIZE <= sizeof(sha1));
_mesa_sha1_init(&sha1_ctx);
_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;
}
@ -192,7 +202,7 @@ anv_physical_device_init(struct anv_physical_device *device,
if (result != VK_SUCCESS)
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;