commit a0f17b1347bb17833ba8f7f0bdd2c2b66e5e01a7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jul 06 01:10:28 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jul 06 01:10:28 2021 +0000
tree de07492f628cb069c93d32da9c1faaa4e668a673
parent 0c9dee131bdeaacb04b13634160353deee00d08f
parent 9de1fa570082f5297a3137fe1a64f7ec221c663e

Snap for 7524653 from 9de1fa570082f5297a3137fe1a64f7ec221c663e to sc-v2-release

Change-Id: I06f9bd8f625def12808ebf1898e5ece6a35e3c03

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