fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-10 08:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: fix shaders memleak when importing pipeline binaries with GPL

Browse source 
The implementation must use the data in VkPipelineBinaryInfoKHR when
provided instead of importing binaries from libraries.

This fixes a memleak with shaders found with ASAN.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37844>
(cherry picked from commit e982f6e2c8)
This commit is contained in:
Samuel Pitoiset 2025-10-13 14:57:42 +02:00 • committed by Eric Engestrom
parent 8b8fdc5ae7
commit a2e7a1bebf
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1384,7 +1384,7 @@
"description": "radv: fix shaders memleak when importing pipeline binaries with GPL",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

23
src/amd/vulkan/radv_pipeline_graphics.c
View file

@ -621,7 +621,7 @@ radv_should_import_lib_binaries(const VkPipelineCreateFlags2 create_flags)
static void
radv_graphics_pipeline_import_lib(const struct radv_device *device, struct radv_graphics_pipeline *pipeline,
struct radv_graphics_lib_pipeline *lib)
struct radv_graphics_lib_pipeline *lib, bool import_pipeline_binaries)
{
bool import_binaries = false;
@ -634,7 +634,8 @@ radv_graphics_pipeline_import_lib(const struct radv_device *device, struct radv_
pipeline->active_stages |= lib->base.active_stages;
/* Import binaries when LTO is disabled and when the library doesn't retain any shaders. */
if (lib->base.has_pipeline_binaries || radv_should_import_lib_binaries(pipeline->base.create_flags)) {
if (!import_pipeline_binaries &&
(lib->base.has_pipeline_binaries || radv_should_import_lib_binaries(pipeline->base.create_flags))) {
import_binaries = true;
}
@ -3425,6 +3426,9 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv
const VkPipelineLibraryCreateInfoKHR *libs_info =
vk_find_struct_const(pCreateInfo->pNext, PIPELINE_LIBRARY_CREATE_INFO_KHR);
const VkPipelineBinaryInfoKHR *binary_info = vk_find_struct_const(pCreateInfo->pNext, PIPELINE_BINARY_INFO_KHR);
const bool import_pipeline_binaries = binary_info && binary_info->binaryCount > 0;
/* If we have libraries, import them first. */
if (libs_info) {
for (uint32_t i = 0; i < libs_info->libraryCount; i++) {
@ -3433,7 +3437,7 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv
assert(pipeline_lib->type == RADV_PIPELINE_GRAPHICS_LIB);
radv_graphics_pipeline_import_lib(device, pipeline, gfx_pipeline_lib);
radv_graphics_pipeline_import_lib(device, pipeline, gfx_pipeline_lib, import_pipeline_binaries);
}
}
@ -3443,9 +3447,7 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv
if (result != VK_SUCCESS)
return result;
const VkPipelineBinaryInfoKHR *binary_info = vk_find_struct_const(pCreateInfo->pNext, PIPELINE_BINARY_INFO_KHR);
if (binary_info && binary_info->binaryCount > 0) {
if (import_pipeline_binaries) {
result = radv_graphics_pipeline_import_binaries(device, pipeline, binary_info);
} else {
if (gfx_state.compilation_required) {
@ -3556,6 +3558,9 @@ radv_graphics_lib_pipeline_init(struct radv_graphics_lib_pipeline *pipeline, str
radv_pipeline_layout_init(device, &pipeline->layout, false);
const VkPipelineBinaryInfoKHR *binary_info = vk_find_struct_const(pCreateInfo->pNext, PIPELINE_BINARY_INFO_KHR);
const bool import_pipeline_binaries = binary_info && binary_info->binaryCount > 0;
/* If we have libraries, import them first. */
if (libs_info) {
for (uint32_t i = 0; i < libs_info->libraryCount; i++) {
@ -3566,7 +3571,7 @@ radv_graphics_lib_pipeline_init(struct radv_graphics_lib_pipeline *pipeline, str
radv_graphics_pipeline_import_layout(&pipeline->layout, &gfx_pipeline_lib->layout);
radv_graphics_pipeline_import_lib(device, &pipeline->base, gfx_pipeline_lib);
radv_graphics_pipeline_import_lib(device, &pipeline->base, gfx_pipeline_lib, import_pipeline_binaries);
pipeline->lib_flags |= gfx_pipeline_lib->lib_flags;
}
@ -3582,9 +3587,7 @@ radv_graphics_lib_pipeline_init(struct radv_graphics_lib_pipeline *pipeline, str
if (pipeline_layout)
radv_graphics_pipeline_import_layout(&pipeline->layout, pipeline_layout);
const VkPipelineBinaryInfoKHR *binary_info = vk_find_struct_const(pCreateInfo->pNext, PIPELINE_BINARY_INFO_KHR);
if (binary_info && binary_info->binaryCount > 0) {
if (import_pipeline_binaries) {
result = radv_graphics_pipeline_import_binaries(device, &pipeline->base, binary_info);
} else {
struct radv_graphics_pipeline_state gfx_state;