commit 4db99f648e8e74c42e432d3396a2219bf1ab1f51
author Maciej Żenczykowski <maze@google.com> Sat Jul 03 06:44:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jul 03 06:44:35 2021 +0000
tree de07492f628cb069c93d32da9c1faaa4e668a673
parent 6e11c1c304dd4906bf754a3039e6ca33e140f143
parent 0bf9219e072401d13b71db519dc7d29455215586

bpf - move to v0.1 .o struct formatting am: 0bf9219e07

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1754795

Change-Id: I243b847f9f90f0209fd4893dc6b5d73b11579b77

progs/include/bpf_helpers.h

diff --git a/progs/include/bpf_helpers.h b/progs/include/bpf_helpers.h
index 82ed72e..6e5fe69 100644
--- a/progs/include/bpf_helpers.h
+++ b/progs/include/bpf_helpers.h
@@ -108,6 +108,8 @@
             .uid = (usr),                                                                        \
             .gid = (grp),                                                                        \
             .mode = (md),                                                                        \
+            .bpfloader_min_ver = DEFAULT_BPFLOADER_MIN_VER,                                      \
+            .bpfloader_max_ver = DEFAULT_BPFLOADER_MAX_VER,                                      \
     };                                                                                           \
                                                                                                  \
     static inline __always_inline __unused TypeOfValue* bpf_##the_map##_lookup_elem(             \
@@ -157,6 +159,8 @@
             .min_kver = (min_kv),                                                                  \
             .max_kver = (max_kv),                                                                  \
             .optional = (opt),                                                                     \
+            .bpfloader_min_ver = DEFAULT_BPFLOADER_MIN_VER,                                        \
+            .bpfloader_max_ver = DEFAULT_BPFLOADER_MAX_VER,                                        \
     };                                                                                             \
     SEC(SECTION_NAME)                                                                              \
     int the_prog

progs/include/bpf_map_def.h

diff --git a/progs/include/bpf_map_def.h b/progs/include/bpf_map_def.h
index b4fdd54..0034a35 100644
--- a/progs/include/bpf_map_def.h
+++ b/progs/include/bpf_map_def.h
@@ -42,9 +42,9 @@
  *                                                                            *
  ******************************************************************************/
 
-// For now we default to v0.0 format
+// We currently default to v0.1 format
 #ifndef BPFLOADER_VERSION
-#define BPFLOADER_VERSION 0u
+#define BPFLOADER_VERSION 1u
 #endif
 
 // These are the values used if these fields are missing