Skip to content
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.

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

Cherry pick needed commits from main to 0.20 release branch. #4056

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions libs/execution_context/ebpf_maps.c
Original file line number Diff line number Diff line change
Expand Up @@ -2576,6 +2576,8 @@ ebpf_map_find_entry(
return EBPF_OPERATION_NOT_SUPPORTED;
}

EBPF_LOG_MAP_OPERATION(flags, "find", map, key);

if ((flags & EBPF_MAP_FLAG_HELPER) && (table->get_object_from_entry != NULL)) {

// Disallow reads to prog array maps from this helper call for now.
Expand Down Expand Up @@ -2708,6 +2710,8 @@ ebpf_map_update_entry(
return EBPF_OPERATION_NOT_SUPPORTED;
}

EBPF_LOG_MAP_OPERATION(flags, "update", map, key);

if ((flags & EBPF_MAP_FLAG_HELPER) && (table->update_entry_per_cpu != NULL)) {
result = table->update_entry_per_cpu(map, key, value, option);
} else {
Expand Down Expand Up @@ -2773,6 +2777,8 @@ ebpf_map_delete_entry(_In_ ebpf_map_t* map, size_t key_size, _In_reads_(key_size
return EBPF_OPERATION_NOT_SUPPORTED;
}

EBPF_LOG_MAP_OPERATION(flags, "delete", map, key);

ebpf_result_t result = table->delete_entry(map, key);
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion netebpfext/net_ebpf_ext_hook_provider.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "ebpf_extension_uuids.h"
#include "net_ebpf_ext_hook_provider.h"

#define NET_EBPF_EXT_STACK_EXPANSION_SIZE 1024 * 4
#define NET_EBPF_EXT_STACK_EXPANSION_SIZE 1024 * 16

typedef struct _net_ebpf_ext_hook_client_rundown
{
Expand Down
Binary file modified spd/EbpfCore.spd
Binary file not shown.
Loading