Use bpf_builtins.h

Author: mmat11

bpf/bpfcore/bpf_builtins.h

@@ -905,7 +905,8 @@ __bpf_no_builtin_memset(void *d __maybe_unused, __u8 c __maybe_unused, __u64 len
 }
 
 /* Redirect any direct use in our code to throw an error. */
-#define __builtin_memset __bpf_no_builtin_memset
+// TODO: re-enable once all __builtin_memset() are replaced with the optimized version
+// #define __builtin_memset __bpf_no_builtin_memset
 
 static __always_inline __maybe_unused __nobuiltin("memset") void bpf_memset(void *d,
                                                                             int c,
@@ -1795,7 +1796,8 @@ static __always_inline __maybe_unused void *__bpf_no_builtin_memcpy(void *d __ma
 }
 
 /* Redirect any direct use in our code to throw an error. */
-#define __builtin_memcpy __bpf_no_builtin_memcpy
+// TODO: re-enable once all __builtin_memcpy() are replaced with the optimized version
+// #define __builtin_memcpy __bpf_no_builtin_memcpy
 
 static __always_inline __maybe_unused __nobuiltin("memcpy") void bpf_memcpy(void *d,
                                                                             const void *s,
@@ -2692,7 +2694,8 @@ static __always_inline __maybe_unused __u64 __bpf_no_builtin_memcmp(const void *
 }
 
 /* Redirect any direct use in our code to throw an error. */
-#define __builtin_memcmp __bpf_no_builtin_memcmp
+// TODO: re-enable once all __builtin_memcmp() are replaced with the optimized version
+// #define __builtin_memcmp __bpf_no_builtin_memcmp
 
 /* Modified for our needs in that we only return either zero (x and y
  * are equal) or non-zero (x and y are non-equal).

bpf/common/trace_common.h

@@ -23,7 +23,6 @@
 #include <maps/server_traces.h>
 #include <maps/tp_info_mem.h>
 #include <maps/tp_char_buf_mem.h>
-#include <maps/zeros.h>
 
 #include <pid/pid_helpers.h>
 
@@ -33,14 +32,6 @@ enum { k_bpf_traceparent_enabled = 1 };
 enum { k_bpf_traceparent_enabled = 0 };
 #endif
 
-static __always_inline void cheap_bzero(unsigned char *buf, u16 size) {
-    void *z = bpf_map_lookup_elem(&zeros, &(u16){0});
-    if (!z) {
-        return;
-    }
-    bpf_probe_read(buf, size, z);
-}
-
 static __always_inline unsigned char *tp_char_buf() {
     int zero = 0;
     return bpf_map_lookup_elem(&tp_char_buf_mem, &zero);

bpf/generictracer/protocol_http.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <bpfcore/vmlinux.h>
+#include <bpfcore/bpf_builtins.h>
 #include <bpfcore/bpf_helpers.h>
 
 #include <common/http_types.h>
@@ -148,7 +149,10 @@ http_get_or_create_trace_info(http_connection_metadata_t *meta,
         unsigned char *buf = tp_char_buf();
         if (buf) {
             const u16 buf_len = bytes_len & (TRACE_BUF_SIZE - 1);
-            cheap_bzero(buf, TRACE_BUF_SIZE);
+            _Static_assert(TRACE_BUF_SIZE == 1024, "Please fix the __bpf_memzero statements below this line");
+            __bpf_memzero(buf, 512);
+            __bpf_memzero(buf + 512, 512);
+
             bpf_probe_read(buf, buf_len, u_buf);
 
             unsigned char *res = tp_loop_fn(buf, buf_len);