AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hk: Replace alloca with malloc in queue_submit

Browse Source 
`command_count` is under control of the vulkan application and can
become quite large. At a command count around 30000 the size of the
alloca() allocated buffers exceeds the default stack size of 16MB.

Fixes fixes segfaults in 'gtk:compare vulkan lots-of-offscreens-nogl*'
gtk 4 test cases which end up with a `command_count` around 32768.

Fixes: https://gitlab.freedesktop.org/asahi/mesa/-/issues/47
Signed-off-by: Janne Grunau <j@jannau.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33682>
This commit is contained in:
Janne Grunau
2025-01-05 15:59:33 +01:00
committed by Marge Bot
parent 3e9f70570a
commit 9c704dd759
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/asahi/vulkan/hk_queue.c
+18 -5
View File
@@ -494,11 +494,17 @@ queue_submit(struct hk_device *dev, struct hk_queue *queue,
};
/* Now setup the command structs */
struct drm_asahi_command *cmds = alloca(sizeof(*cmds) * command_count);
struct drm_asahi_command *cmds = malloc(sizeof(*cmds) * command_count);
union drm_asahi_cmd *cmds_inner =
alloca(sizeof(*cmds_inner) * command_count);
malloc(sizeof(*cmds_inner) * command_count);
union drm_asahi_user_timestamps *ts_inner =
alloca(sizeof(*ts_inner) * command_count);
malloc(sizeof(*ts_inner) * command_count);
if (cmds == NULL || cmds_inner == NULL || ts_inner == NULL) {
free(ts_inner);
free(cmds_inner);
free(cmds);
return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
}
unsigned cmd_it = 0;
unsigned nr_vdm = 0, nr_cdm = 0;
@@ -589,10 +595,17 @@ queue_submit(struct hk_device *dev, struct hk_queue *queue,
.commands = (uint64_t)(uintptr_t)(cmds),
};
VkResult result;
if (command_count <= max_commands_per_submit(dev))
return queue_submit_single(dev, &submit_ioctl);
result = queue_submit_single(dev, &submit_ioctl);
else
return queue_submit_looped(dev, &submit_ioctl);
result = queue_submit_looped(dev, &submit_ioctl);
free(ts_inner);
free(cmds_inner);
free(cmds);
return result;
}
static VkResult