Skip to content

Revert "Serialize "check and create" map logic in ebpf_native to fix … #4694

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
merged 1 commit into from
Oct 1, 2025
Merged

Revert "Serialize "check and create" map logic in ebpf_native to fix … #4694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 0 additions & 23 deletions libs/execution_context/ebpf_native.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@ static HANDLE _ebpf_native_nmr_provider_handle = NULL;
static ebpf_lock_t _ebpf_native_client_table_lock = {0};
static _Guarded_by_(_ebpf_native_client_table_lock) ebpf_hash_table_t* _ebpf_native_client_table = NULL;

static ebpf_lock_t _ebpf_native_map_pinning_lock = {0};

static ebpf_lock_t _ebpf_native_authorized_module_table_lock = {0};
static _Guarded_by_(_ebpf_native_authorized_module_table_lock)
ebpf_hash_table_t* _ebpf_native_authorized_module_table = NULL;
Expand Down Expand Up @@ -667,7 +665,6 @@ ebpf_native_terminate()
ebpf_hash_table_destroy(_ebpf_native_client_table);
_ebpf_native_client_table = NULL;
ebpf_lock_destroy(&_ebpf_native_client_table_lock);
ebpf_lock_destroy(&_ebpf_native_map_pinning_lock);

EBPF_RETURN_VOID();
}
Expand Down Expand Up @@ -1025,7 +1022,6 @@ ebpf_native_initiate()
bool authorized_module_cleanup_work_item_created = false;

ebpf_lock_create(&_ebpf_native_client_table_lock);
ebpf_lock_create(&_ebpf_native_map_pinning_lock);

const ebpf_hash_table_creation_options_t options = {
.key_size = sizeof(GUID),
Expand Down Expand Up @@ -1079,7 +1075,6 @@ ebpf_native_initiate()
_ebpf_native_client_table = NULL;
}
ebpf_lock_destroy(&_ebpf_native_client_table_lock);
ebpf_lock_destroy(&_ebpf_native_map_pinning_lock);
if (authorized_module_table_created) {
ebpf_hash_table_destroy(_ebpf_native_authorized_module_table);
_ebpf_native_authorized_module_table = NULL;
Expand Down Expand Up @@ -1486,8 +1481,6 @@ _ebpf_native_create_maps(_Inout_ ebpf_native_module_instance_t* instance)
cxplat_utf8_string_t map_name = {0};
ebpf_map_definition_in_memory_t map_definition = {0};
const ebpf_native_module_t* module = instance->module;
bool map_pinning_lock_acquired = false;
ebpf_lock_state_t pinning_lock_state = 0;

// Get the maps
module->table.maps(&maps, &map_count);
Expand Down Expand Up @@ -1523,18 +1516,11 @@ _ebpf_native_create_maps(_Inout_ ebpf_native_module_instance_t* instance)
}

if (native_map->entry.definition.pinning == LIBBPF_PIN_BY_NAME) {
// Serialize the "check and create" map logic for LIBBPF_PIN_BY_NAME maps
// to prevent race conditions when multiple threads load programs in parallel.
pinning_lock_state = ebpf_lock_lock(&_ebpf_native_map_pinning_lock);
map_pinning_lock_acquired = true;

result = _ebpf_native_reuse_map(native_map);
if (result != EBPF_SUCCESS) {
break;
}
if (native_map->reused) {
ebpf_lock_unlock(&_ebpf_native_map_pinning_lock, pinning_lock_state);
map_pinning_lock_acquired = false;
continue;
}
}
Expand Down Expand Up @@ -1568,18 +1554,9 @@ _ebpf_native_create_maps(_Inout_ ebpf_native_module_instance_t* instance)
}
native_map->pinned = true;
}

if (map_pinning_lock_acquired) {
ebpf_lock_unlock(&_ebpf_native_map_pinning_lock, pinning_lock_state);
map_pinning_lock_acquired = false;
}
}

Done:
if (map_pinning_lock_acquired) {
ebpf_lock_unlock(&_ebpf_native_map_pinning_lock, pinning_lock_state);
map_pinning_lock_acquired = false;
}
if (result != EBPF_SUCCESS) {
_ebpf_native_clean_up_maps(instance->maps, instance->map_count, true, true);
instance->maps = NULL;
Expand Down
Loading