Merge branch 'main' into bpf2bpf-multistack

microsoft · Nov 26, 2024 · 532c9ce · 532c9ce
2 parents b63c5ee + ea940eb
commit 532c9ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/libs/execution_context/ebpf_maps.c b/libs/execution_context/ebpf_maps.c
@@ -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.
@@ -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 {
@@ -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;
 }

diff --git a/netebpfext/net_ebpf_ext_hook_provider.c b/netebpfext/net_ebpf_ext_hook_provider.c
@@ -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
 {