Skip to content

Fixup OUT_OF_HOST_MEMORY error handling and allocation failure tests #2043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charles-lunarg merged 4 commits into from
Sep 30, 2026
Merged

Fixup OUT_OF_HOST_MEMORY error handling and allocation failure tests #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcfdb6c
Check for OUT_OF_HOST_MEMORY errors
charles-lunarg Sep 30, 2026
30cb227
Do not skip cleanup if verify_all_meta_layers() fails
charles-lunarg Sep 30, 2026
9991480
Make allocation failure tests more robust
charles-lunarg Sep 30, 2026
adf0ce2
Add more to Allocation.CreateInstanceDeviceIntentionalAllocFail
charles-lunarg Sep 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion loader/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3321,6 +3321,9 @@ VkResult loader_add_layer_properties(const struct loader_instance *inst, struct
} else {
do {
result = loader_read_layer_json(inst, layer_instance_list, layer_node, json_version, is_implicit, filename);
if (result == VK_ERROR_OUT_OF_HOST_MEMORY) {
goto out;
}
layer_node = layer_node->next;
} while (layer_node != NULL);
}
Expand Down Expand Up @@ -4383,7 +4386,7 @@ VkResult loader_scan_for_layers(struct loader_instance *inst, struct loader_laye
// actually present in the available layer list
res = verify_all_meta_layers(inst, filters, &regular_instance_layers, &override_layer_valid);
if (VK_ERROR_OUT_OF_HOST_MEMORY == res) {
return res;
goto out;
}

if (override_layer_valid) {
Expand Down
16 changes: 8 additions & 8 deletions loader/settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,13 +497,13 @@ VkResult get_unix_settings_path(const struct loader_instance* inst, char** setti

VkResult res = check_if_settings_path_exists(
inst, xdg_config_home, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path);
if (res == VK_SUCCESS) {
if (res == VK_SUCCESS || res == VK_ERROR_OUT_OF_HOST_MEMORY) {
return res;
}

res = check_if_settings_path_exists(inst, xdg_data_home, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME,
settings_file_path);
if (res == VK_SUCCESS) {
if (res == VK_SUCCESS || res == VK_ERROR_OUT_OF_HOST_MEMORY) {
return res;
}

Expand All @@ -513,41 +513,41 @@ VkResult get_unix_settings_path(const struct loader_instance* inst, char** setti
if (NULL == xdg_config_home || '\0' == xdg_config_home[0]) {
res = check_if_settings_path_exists(
inst, home, "/.config/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path);
if (res == VK_SUCCESS) {
if (res == VK_SUCCESS || res == VK_ERROR_OUT_OF_HOST_MEMORY) {
return res;
}
}
if (NULL == xdg_data_home || '\0' == xdg_data_home[0]) {
res = check_if_settings_path_exists(
inst, home, "/.local/share/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path);
if (res == VK_SUCCESS) {
if (res == VK_SUCCESS || res == VK_ERROR_OUT_OF_HOST_MEMORY) {
return res;
}
}
}

res = check_if_settings_path_exists(inst, xdg_config_dirs, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME,
settings_file_path);
if (res == VK_SUCCESS) {
if (res == VK_SUCCESS || res == VK_ERROR_OUT_OF_HOST_MEMORY) {
return res;
}

res = check_if_settings_path_exists(inst, SYSCONFDIR, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME,
settings_file_path);
if (res == VK_SUCCESS) {
if (res == VK_SUCCESS || res == VK_ERROR_OUT_OF_HOST_MEMORY) {
return res;
}
#if defined(EXTRASYSCONFDIR)

res = check_if_settings_path_exists(inst, EXTRASYSCONFDIR, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME,
settings_file_path);
if (res == VK_SUCCESS) {
if (res == VK_SUCCESS || res == VK_ERROR_OUT_OF_HOST_MEMORY) {
return res;
}
#endif
res = check_if_settings_path_exists(inst, xdg_data_dirs, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME,
settings_file_path);
if (res == VK_SUCCESS) {
if (res == VK_SUCCESS || res == VK_ERROR_OUT_OF_HOST_MEMORY) {
return res;
}

Expand Down
35 changes: 32 additions & 3 deletions tests/loader_alloc_callback_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class MemoryTracker {
std::unordered_map<void*, AllocationDetails> allocations;

void* allocate(size_t size, size_t alignment, VkSystemAllocationScope alloc_scope) {
if ((settings.should_fail_on_allocation && allocation_count == settings.fail_after_allocations) ||
(settings.should_fail_after_set_number_of_calls && call_count == settings.fail_after_calls)) {
if ((settings.should_fail_on_allocation && allocation_count >= settings.fail_after_allocations) ||
(settings.should_fail_after_set_number_of_calls && call_count >= settings.fail_after_calls)) {
return nullptr;
}
call_count++;
Expand Down Expand Up @@ -97,7 +97,7 @@ class MemoryTracker {
}
growing_reallocations_to_skip--;
}
if (size >= original_size && settings.should_fail_after_set_number_of_calls && call_count == settings.fail_after_calls)
if (size >= original_size && settings.should_fail_after_set_number_of_calls && call_count >= settings.fail_after_calls)
return nullptr;
call_count++;
if (size == 0) {
Expand Down Expand Up @@ -914,6 +914,21 @@ TEST(Allocation, CreateInstanceDeviceIntentionalAllocFail) {
ddl_list.driverCount = 1;
ddl_list.pDrivers = &ddl_info;

const char* regular_layer_name = "VK_LAYER_TestLayer";
env.add_explicit_layer({}, ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
.set_name(regular_layer_name)
.set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
.set_api_version(VK_MAKE_API_VERSION(0, 1, 1, 0))
.add_device_extension({"NeverGonnaLetYouDown"})));

const char* override_layer_name = "VK_LAYER_LUNARG_override";
env.add_implicit_layer({}, ManifestLayer{}
.set_file_format_version(ManifestVersion{1, 1, 2})
.add_layer(ManifestLayer::LayerDescription{}
.set_name(override_layer_name)
.set_disable_environment("DISABLE_ENV")
.add_component_layer(regular_layer_name)));

const char* layer_name = "VK_LAYER_ImplicitAllocFail";
env.add_implicit_layer({}, ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
.set_name(layer_name)
Expand Down Expand Up @@ -980,6 +995,20 @@ TEST(Allocation, CreateInstanceDeviceIntentionalAllocFail) {
ASSERT_EQ(family.queueCount, family_count);
ASSERT_EQ(family.timestampValidBits, 0U);

uint32_t extension_count = 0;
result = env.vulkan_functions.vkEnumerateDeviceExtensionProperties(physical_devices.at(1), nullptr, &extension_count,
nullptr);
if (result == VK_ERROR_OUT_OF_HOST_MEMORY) {
break;
}

std::vector<VkExtensionProperties> queried_extensions{extension_count};
result = env.vulkan_functions.vkEnumerateDeviceExtensionProperties(physical_devices.at(1), nullptr, &extension_count,
queried_extensions.data());
if (result == VK_ERROR_OUT_OF_HOST_MEMORY) {
break;
}

DeviceCreateInfo dev_create_info;
dev_create_info.add_device_queue(DeviceQueueCreateInfo{}.add_priority(0.0f));

Expand Down
Loading