From 0bf9219e072401d13b71db519dc7d29455215586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 1 Jul 2021 14:49:00 -0700 Subject: [PATCH] bpf - move to v0.1 .o struct formatting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We cannot submit this as long as we want current mainline releases bpf .o objects to be loaded by images with bpfloader v0.0. Bug: 190519702 Test: atest, TreeHugger - existing bpf programs load examination of bpfloader logs Signed-off-by: Maciej Żenczykowski Change-Id: I157458a4f798e455fb563fad569e20bfde5248fd --- progs/include/bpf_helpers.h | 4 ++++ progs/include/bpf_map_def.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 @@ static int (*bpf_map_delete_elem_unsafe)(const struct bpf_map_def* map, .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 @@ static unsigned long long (*bpf_get_smp_processor_id)(void) = (void*) BPF_FUNC_g .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 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