Skip to content

Commit cfba44d

Browse files
shankarsealSharmiAlan-Jowettsaxena-anurag
authored
Cherry pick needed commits from main to 0.20 release branch. (#4056)
* expand stack to 16KB. (#4048) * Add EBPF_LOG_MAP_OPERATION in ebpf_map find, update and delete function (#4032) * Add EBPF_LOG_MAP_OPERATION in find,update and delete function * expand stack to 16KB. --------- Co-authored-by: Alan Jowett <alanjo@microsoft.com> Co-authored-by: Shankar Seal <sseal@microsoft.com> * update spd (#4049) --------- Co-authored-by: Sharmi <shpalan@microsoft.com> Co-authored-by: Alan Jowett <alanjo@microsoft.com> Co-authored-by: Anurag Saxena <43585259+saxena-anurag@users.noreply.github.com>
1 parent f3d92f5 commit cfba44d

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

libs/execution_context/ebpf_maps.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2576,6 +2576,8 @@ ebpf_map_find_entry(
25762576
return EBPF_OPERATION_NOT_SUPPORTED;
25772577
}
25782578

2579+
EBPF_LOG_MAP_OPERATION(flags, "find", map, key);
2580+
25792581
if ((flags & EBPF_MAP_FLAG_HELPER) && (table->get_object_from_entry != NULL)) {
25802582

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

2713+
EBPF_LOG_MAP_OPERATION(flags, "update", map, key);
2714+
27112715
if ((flags & EBPF_MAP_FLAG_HELPER) && (table->update_entry_per_cpu != NULL)) {
27122716
result = table->update_entry_per_cpu(map, key, value, option);
27132717
} else {
@@ -2773,6 +2777,8 @@ ebpf_map_delete_entry(_In_ ebpf_map_t* map, size_t key_size, _In_reads_(key_size
27732777
return EBPF_OPERATION_NOT_SUPPORTED;
27742778
}
27752779

2780+
EBPF_LOG_MAP_OPERATION(flags, "delete", map, key);
2781+
27762782
ebpf_result_t result = table->delete_entry(map, key);
27772783
return result;
27782784
}

netebpfext/net_ebpf_ext_hook_provider.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "ebpf_extension_uuids.h"
55
#include "net_ebpf_ext_hook_provider.h"
66

7-
#define NET_EBPF_EXT_STACK_EXPANSION_SIZE 1024 * 4
7+
#define NET_EBPF_EXT_STACK_EXPANSION_SIZE 1024 * 16
88

99
typedef struct _net_ebpf_ext_hook_client_rundown
1010
{

spd/EbpfCore.spd

-110 KB
Binary file not shown.

0 commit comments

Comments
 (0)