From: Ian Rogers <irogers@google.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Yonghong Song <yhs@fb.com>, Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
bpf@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>,
Petar Penkov <ppenkov@google.com>
Cc: Ian Rogers <irogers@google.com>
Subject: [PATCH v3] btf_encoder: Make BTF_KIND_TAG conditional
Date: Thu, 21 Oct 2021 11:33:30 -0700 [thread overview]
Message-ID: <20211021183330.460681-1-irogers@google.com> (raw)
BTF_KIND_TAG is present in libbtf 6.0 but not libbtf in 5.15rc4. Make
the code requiring it conditionally compiled in.
Signed-off-by: Ian Rogers <irogers@google.com>
---
btf_encoder.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/btf_encoder.c b/btf_encoder.c
index c341f95..5e523f1 100644
--- a/btf_encoder.c
+++ b/btf_encoder.c
@@ -31,6 +31,15 @@
#include <errno.h>
#include <stdint.h>
+#ifndef LIBBPF_MINOR_VERSION
+/*
+ * The libbpf version is not defined in older versions, workaround by assuming
+ * version 0.5.
+ */
+#define LIBBPF_MAJOR_VERSION 0
+#define LIBBPF_MINOR_VERSION 5
+#endif
+
struct elf_function {
const char *name;
bool generated;
@@ -141,7 +150,9 @@ static const char * const btf_kind_str[NR_BTF_KINDS] = {
[BTF_KIND_VAR] = "VAR",
[BTF_KIND_DATASEC] = "DATASEC",
[BTF_KIND_FLOAT] = "FLOAT",
+#if LIBBPF_MAJOR_VERSION > 0 || LIBBPF_MINOR_VERSION > 5
[BTF_KIND_TAG] = "TAG",
+#endif
};
static const char *btf__printable_name(const struct btf *btf, uint32_t offset)
@@ -648,6 +659,7 @@ static int32_t btf_encoder__add_datasec(struct btf_encoder *encoder, const char
static int32_t btf_encoder__add_tag(struct btf_encoder *encoder, const char *value, uint32_t type,
int component_idx)
{
+#if LIBBPF_MAJOR_VERSION > 0 || LIBBPF_MINOR_VERSION > 5
struct btf *btf = encoder->btf;
const struct btf_type *t;
int32_t id;
@@ -663,6 +675,10 @@ static int32_t btf_encoder__add_tag(struct btf_encoder *encoder, const char *val
}
return id;
+#else
+ fprintf(stderr, "error: unable to encode BTF_KIND_TAG due to old libbtf\n");
+ return -ENOTSUP;
+#endif
}
/*
--
2.33.0.1079.g6e70778dc9-goog
reply other threads:[~2021-10-21 18:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211021183330.460681-1-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=ppenkov@google.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox