Pickup latest ubpf and fix breaking contract changes (#3531)

* Pickup latest ubpf and fix breaking contract changes Signed-off-by: Alan Jowett <alan.jowett@microsoft.com> * Suppress warnings in external code Signed-off-by: Alan Jowett <alan.jowett@microsoft.com> --------- Signed-off-by: Alan Jowett <alan.jowett@microsoft.com> Co-authored-by: Alan Jowett <alan.jowett@microsoft.com> Co-authored-by: Dave Thaler <dthaler1968@gmail.com>
microsoft · May 16, 2024 · fa56e03 · fa56e03
1 parent ec9df02
commit fa56e03
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git a/external/ubpf b/external/ubpf
diff --git a/libs/execution_context/ebpf_program.c b/libs/execution_context/ebpf_program.c
@@ -1087,7 +1087,7 @@ _ebpf_program_update_interpret_helpers(
         }
 
 #if !defined(CONFIG_BPF_INTERPRETER_DISABLED)
-        if (ubpf_register(program->code_or_vm.vm, (unsigned int)index, NULL, (void*)helper) < 0) {
+        if (ubpf_register(program->code_or_vm.vm, (unsigned int)index, NULL, (external_function_t)helper) < 0) {
             EBPF_LOG_MESSAGE_UINT64(
                 EBPF_TRACELOG_LEVEL_ERROR, EBPF_TRACELOG_KEYWORD_PROGRAM, "ubpf_register failed", index);
             result = EBPF_INVALID_ARGUMENT;

diff --git a/libs/service/api_service.cpp b/libs/service/api_service.cpp
@@ -350,7 +350,9 @@ ebpf_verify_and_load_program(
             }
 
             for (uint32_t helper_id = 0; (size_t)helper_id < helper_id_address.size(); helper_id++) {
-                if (ubpf_register(vm, helper_id, nullptr, reinterpret_cast<void*>(helper_id_address[helper_id])) < 0) {
+                if (ubpf_register(
+                        vm, helper_id, nullptr, reinterpret_cast<external_function_t>(helper_id_address[helper_id])) <
+                    0) {
                     result = EBPF_JIT_COMPILATION_FAILED;
                     goto Exit;
                 }

diff --git a/libs/ubpf/kernel/ubpf_kernel.c b/libs/ubpf/kernel/ubpf_kernel.c
@@ -56,12 +56,32 @@ map_register(int r)
     return 0;
 }
 
+#include "ubpf_int.h"
+
 // Thunk out JIT related calls.
 // Workaround until https://github.com/iovisor/ubpf/issues/185 is fixed.
-int
-ubpf_translate_x86_64(struct ubpf_vm* vm, uint8_t* buffer, size_t* size, char** errmsg)
+struct ubpf_jit_result
+ubpf_translate_x86_64(struct ubpf_vm* vm, uint8_t* buffer, size_t* size)
 {
-    return -1;
+    __fastfail(0);
+    struct ubpf_jit_result result = {0};
+    return result;
+}
+
+bool
+ubpf_jit_update_dispatcher_x86_64(
+    struct ubpf_vm* vm, external_function_dispatcher_t new_dispatcher, uint8_t* buffer, size_t size, uint32_t offset)
+{
+    __fastfail(0);
+    return false;
+}
+
+bool
+ubpf_jit_update_helper_x86_64(
+    struct ubpf_vm* vm, ext_func new_helper, unsigned int idx, uint8_t* buffer, size_t size, uint32_t offset)
+{
+    __fastfail(0);
+    return false;
 }
 
 #pragma warning(push)

diff --git a/libs/ubpf/user/ubpf_user.c b/libs/ubpf/user/ubpf_user.c
@@ -26,10 +26,13 @@
 #define free(X) ebpf_free(X)
 
 #pragma warning(push)
-#pragma warning(disable : 4100) // unreferenced formal parameter
-#pragma warning(disable : 4211) // nonstandard extension used: redefined extern to static
-#pragma warning(disable : 6387) // ubpf_jit.c(70): error C6387: 'buffer' could be '0'
+#pragma warning(disable : 4100)  // unreferenced formal parameter
+#pragma warning(disable : 4211)  // nonstandard extension used: redefined extern to static
+#pragma warning(disable : 6387)  // ubpf_jit.c(70): error C6387: 'buffer' could be '0'
+#pragma warning(disable : 26451) // Arithmetic overflow: Using operator '*' on a 4 byte value and then casting the
+                                 // result to a 8 byte value.
 #include "ubpf_jit.c"
+#include "ubpf_jit_support.c"
 #include "ubpf_jit_x86_64.c"
-#pragma warning(pop)
 #include "ubpf_vm.c"
+#pragma warning(pop)