From: Hangbin Liu <haliu@redhat.com>
To: Stephen Hemminger <stephen@networkplumber.org>,
David Ahern <dsahern@gmail.com>
Cc: "Daniel Borkmann" <daniel@iogearbox.net>,
"Martin KaFai Lau" <kafai@fb.com>,
"Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>,
"David Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
"Jiri Benc" <jbenc@redhat.com>,
"Toke Høiland-Jørgensen" <toke@redhat.com>,
"Jesper Dangaard Brouer" <brouer@redhat.com>,
"Alexei Starovoitov" <alexei.starovoitov@gmail.com>,
"Hangbin Liu" <haliu@redhat.com>
Subject: [PATCHv6 iproute2-next 2/5] lib: make ipvrf able to use libbpf and fix function name conflicts
Date: Mon, 23 Nov 2020 21:11:58 +0800 [thread overview]
Message-ID: <20201123131201.4108483-3-haliu@redhat.com> (raw)
In-Reply-To: <20201123131201.4108483-1-haliu@redhat.com>
There are directly calls in libbpf for bpf program load/attach.
So we could just use two wrapper functions for ipvrf and convert
them with libbpf support.
Function bpf_prog_load() is removed as it's conflict with libbpf
function name.
bpf.c is moved to bpf_legacy.c for later main libbpf support in
iproute2.
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Hangbin Liu <haliu@redhat.com>
---
v6: bpf_glue.c is created in previous patch. So I changed the commit
description.
v5: Fix bpf_prog_load_dev typo.
v4: Add new file bpf_glue.c
v2-v3: no update
---
include/bpf_util.h | 10 +++++++---
ip/ipvrf.c | 6 +++---
lib/Makefile | 2 +-
lib/bpf_glue.c | 23 +++++++++++++++++++++++
lib/{bpf.c => bpf_legacy.c} | 15 +++------------
5 files changed, 37 insertions(+), 19 deletions(-)
rename lib/{bpf.c => bpf_legacy.c} (99%)
diff --git a/include/bpf_util.h b/include/bpf_util.h
index dee5bb02..3235c34e 100644
--- a/include/bpf_util.h
+++ b/include/bpf_util.h
@@ -274,12 +274,16 @@ int bpf_trace_pipe(void);
void bpf_print_ops(struct rtattr *bpf_ops, __u16 len);
-int bpf_prog_load(enum bpf_prog_type type, const struct bpf_insn *insns,
- size_t size_insns, const char *license, char *log,
- size_t size_log);
+int bpf_prog_load_dev(enum bpf_prog_type type, const struct bpf_insn *insns,
+ size_t size_insns, const char *license, __u32 ifindex,
+ char *log, size_t size_log);
+int bpf_program_load(enum bpf_prog_type type, const struct bpf_insn *insns,
+ size_t size_insns, const char *license, char *log,
+ size_t size_log);
int bpf_prog_attach_fd(int prog_fd, int target_fd, enum bpf_attach_type type);
int bpf_prog_detach_fd(int target_fd, enum bpf_attach_type type);
+int bpf_program_attach(int prog_fd, int target_fd, enum bpf_attach_type type);
int bpf_dump_prog_info(FILE *f, uint32_t id);
diff --git a/ip/ipvrf.c b/ip/ipvrf.c
index 28dd8e25..42779e5c 100644
--- a/ip/ipvrf.c
+++ b/ip/ipvrf.c
@@ -256,8 +256,8 @@ static int prog_load(int idx)
BPF_EXIT_INSN(),
};
- return bpf_prog_load(BPF_PROG_TYPE_CGROUP_SOCK, prog, sizeof(prog),
- "GPL", bpf_log_buf, sizeof(bpf_log_buf));
+ return bpf_program_load(BPF_PROG_TYPE_CGROUP_SOCK, prog, sizeof(prog),
+ "GPL", bpf_log_buf, sizeof(bpf_log_buf));
}
static int vrf_configure_cgroup(const char *path, int ifindex)
@@ -288,7 +288,7 @@ static int vrf_configure_cgroup(const char *path, int ifindex)
goto out;
}
- if (bpf_prog_attach_fd(prog_fd, cg_fd, BPF_CGROUP_INET_SOCK_CREATE)) {
+ if (bpf_program_attach(prog_fd, cg_fd, BPF_CGROUP_INET_SOCK_CREATE)) {
fprintf(stderr, "Failed to attach prog to cgroup: '%s'\n",
strerror(errno));
goto out;
diff --git a/lib/Makefile b/lib/Makefile
index a02775a5..7c8a197c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,7 +5,7 @@ CFLAGS += -fPIC
UTILOBJ = utils.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \
inet_proto.o namespace.o json_writer.o json_print.o \
- names.o color.o bpf.o bpf_glue.o exec.o fs.o cg_map.o
+ names.o color.o bpf_legacy.o bpf_glue.o exec.o fs.o cg_map.o
NLOBJ=libgenl.o libnetlink.o mnl_utils.o
diff --git a/lib/bpf_glue.c b/lib/bpf_glue.c
index 67c41c22..fa609bfe 100644
--- a/lib/bpf_glue.c
+++ b/lib/bpf_glue.c
@@ -5,6 +5,29 @@
*
*/
#include "bpf_util.h"
+#ifdef HAVE_LIBBPF
+#include <bpf/bpf.h>
+#endif
+
+int bpf_program_load(enum bpf_prog_type type, const struct bpf_insn *insns,
+ size_t size_insns, const char *license, char *log,
+ size_t size_log)
+{
+#ifdef HAVE_LIBBPF
+ return bpf_load_program(type, insns, size_insns, license, 0, log, size_log);
+#else
+ return bpf_prog_load_dev(type, insns, size_insns, license, 0, log, size_log);
+#endif
+}
+
+int bpf_program_attach(int prog_fd, int target_fd, enum bpf_attach_type type)
+{
+#ifdef HAVE_LIBBPF
+ return bpf_prog_attach(prog_fd, target_fd, type, 0);
+#else
+ return bpf_prog_attach_fd(prog_fd, target_fd, type);
+#endif
+}
#ifdef HAVE_LIBBPF
static const char *_libbpf_compile_version = LIBBPF_VERSION;
diff --git a/lib/bpf.c b/lib/bpf_legacy.c
similarity index 99%
rename from lib/bpf.c
rename to lib/bpf_legacy.c
index c7d45077..4246fb76 100644
--- a/lib/bpf.c
+++ b/lib/bpf_legacy.c
@@ -1087,10 +1087,9 @@ int bpf_prog_detach_fd(int target_fd, enum bpf_attach_type type)
return bpf(BPF_PROG_DETACH, &attr, sizeof(attr));
}
-static int bpf_prog_load_dev(enum bpf_prog_type type,
- const struct bpf_insn *insns, size_t size_insns,
- const char *license, __u32 ifindex,
- char *log, size_t size_log)
+int bpf_prog_load_dev(enum bpf_prog_type type, const struct bpf_insn *insns,
+ size_t size_insns, const char *license, __u32 ifindex,
+ char *log, size_t size_log)
{
union bpf_attr attr = {};
@@ -1109,14 +1108,6 @@ static int bpf_prog_load_dev(enum bpf_prog_type type,
return bpf(BPF_PROG_LOAD, &attr, sizeof(attr));
}
-int bpf_prog_load(enum bpf_prog_type type, const struct bpf_insn *insns,
- size_t size_insns, const char *license, char *log,
- size_t size_log)
-{
- return bpf_prog_load_dev(type, insns, size_insns, license, 0,
- log, size_log);
-}
-
#ifdef HAVE_ELF
struct bpf_elf_prog {
enum bpf_prog_type type;
--
2.25.4
next prev parent reply other threads:[~2020-11-23 13:14 UTC|newest]
Thread overview: 167+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 3:38 [PATCH iproute2-next 0/5] iproute2: add libbpf support Hangbin Liu
2020-10-23 3:38 ` [PATCH iproute2-next 1/5] configure: add check_libbpf() for later " Hangbin Liu
2020-10-23 3:38 ` [PATCH iproute2-next 2/5] lib: rename bpf.c to bpf_legacy.c Hangbin Liu
2020-10-23 3:38 ` [PATCH iproute2-next 3/5] lib: add libbpf support Hangbin Liu
2020-10-23 14:34 ` David Ahern
2020-10-25 15:13 ` Toke Høiland-Jørgensen
2020-10-25 22:12 ` David Ahern
2020-10-26 8:56 ` Hangbin Liu
2020-10-26 15:15 ` David Ahern
2020-10-27 2:58 ` Hangbin Liu
2020-10-24 0:21 ` Andrii Nakryiko
2020-10-25 15:11 ` Toke Høiland-Jørgensen
2020-10-26 8:10 ` Hangbin Liu
2020-10-23 3:38 ` [PATCH iproute2-next 4/5] examples/bpf: move struct bpf_elf_map defined maps to legacy folder Hangbin Liu
2020-10-23 3:38 ` [PATCH iproute2-next 5/5] examples/bpf: add bpf examples with BTF defined maps Hangbin Liu
2020-10-28 13:25 ` [PATCHv2 iproute2-next 0/5] iproute2: add libbpf support Hangbin Liu
2020-10-28 13:25 ` [PATCHv2 iproute2-next 1/5] configure: add check_libbpf() for later " Hangbin Liu
2020-10-28 13:25 ` [PATCHv2 iproute2-next 2/5] lib: rename bpf.c to bpf_legacy.c Hangbin Liu
2020-10-28 13:25 ` [PATCHv2 iproute2-next 3/5] lib: add libbpf support Hangbin Liu
2020-10-28 13:25 ` [PATCHv2 iproute2-next 4/5] examples/bpf: move struct bpf_elf_map defined maps to legacy folder Hangbin Liu
2020-10-28 13:25 ` [PATCHv2 iproute2-next 5/5] examples/bpf: add bpf examples with BTF defined maps Hangbin Liu
2020-10-28 21:17 ` [PATCHv2 iproute2-next 0/5] iproute2: add libbpf support Alexei Starovoitov
2020-10-28 23:02 ` David Ahern
2020-10-29 2:06 ` Hangbin Liu
2020-10-29 2:20 ` David Ahern
2020-10-29 2:45 ` Hangbin Liu
2020-10-29 3:00 ` David Ahern
2020-10-29 3:17 ` Hangbin Liu
2020-10-29 10:26 ` Hangbin Liu
2020-10-29 10:51 ` Toke Høiland-Jørgensen
2020-10-29 2:27 ` Andrii Nakryiko
2020-10-29 2:33 ` David Ahern
2020-10-29 2:46 ` Andrii Nakryiko
2020-10-29 2:34 ` Stephen Hemminger
2020-10-29 2:50 ` Andrii Nakryiko
2020-10-29 11:38 ` Jesper Dangaard Brouer
2020-10-29 20:30 ` Andrii Nakryiko
2020-10-29 2:33 ` Stephen Hemminger
2020-10-29 15:11 ` [PATCHv3 " Hangbin Liu
2020-10-29 15:11 ` [PATCHv3 iproute2-next 1/5] configure: add check_libbpf() for later " Hangbin Liu
2020-10-29 15:26 ` Toke Høiland-Jørgensen
2020-11-02 15:37 ` David Ahern
2020-11-03 5:54 ` Hangbin Liu
2020-11-03 17:32 ` David Ahern
2020-11-04 8:51 ` Hangbin Liu
2020-11-04 11:09 ` Toke Høiland-Jørgensen
2020-11-04 11:40 ` Hangbin Liu
2020-10-29 15:11 ` [PATCHv3 iproute2-next 2/5] lib: rename bpf.c to bpf_legacy.c Hangbin Liu
2020-10-29 15:11 ` [PATCHv3 iproute2-next 3/5] lib: add libbpf support Hangbin Liu
2020-11-02 15:41 ` David Ahern
2020-11-03 5:48 ` Hangbin Liu
2020-11-03 17:19 ` David Ahern
2020-11-04 8:22 ` Hangbin Liu
2020-11-05 2:33 ` David Ahern
2020-11-05 7:51 ` Hangbin Liu
2020-11-05 15:25 ` David Ahern
2020-11-05 15:57 ` Toke Høiland-Jørgensen
2020-11-05 16:02 ` David Ahern
2020-11-06 0:56 ` Hangbin Liu
2020-11-06 0:41 ` Hangbin Liu
2020-10-29 15:11 ` [PATCHv3 iproute2-next 4/5] examples/bpf: move struct bpf_elf_map defined maps to legacy folder Hangbin Liu
2020-10-29 15:11 ` [PATCHv3 iproute2-next 5/5] examples/bpf: add bpf examples with BTF defined maps Hangbin Liu
2020-11-02 15:47 ` [PATCHv3 iproute2-next 0/5] iproute2: add libbpf support David Ahern
2020-11-03 6:58 ` Andrii Nakryiko
2020-11-03 8:42 ` Jiri Benc
2020-11-03 17:45 ` David Ahern
2020-11-03 17:48 ` Alexei Starovoitov
2020-11-03 8:46 ` Daniel Borkmann
2020-11-03 17:35 ` David Ahern
2020-11-03 17:47 ` Alexei Starovoitov
2020-11-03 18:23 ` Stephen Hemminger
2020-11-03 22:32 ` David Ahern
2020-11-03 22:55 ` Alexei Starovoitov
2020-11-04 1:40 ` David Ahern
2020-11-04 2:45 ` Alexei Starovoitov
2020-11-04 9:28 ` Jiri Benc
2020-11-05 2:39 ` David Ahern
2020-11-04 2:17 ` Hangbin Liu
2020-11-04 3:11 ` Alexei Starovoitov
2020-11-04 10:01 ` Jiri Benc
2020-11-04 10:21 ` Daniel Borkmann
2020-11-04 11:20 ` Toke Høiland-Jørgensen
2020-11-04 13:12 ` Daniel Borkmann
2020-11-04 19:17 ` Jakub Kicinski
2020-11-04 20:43 ` Andrii Nakryiko
2020-11-04 22:24 ` Toke Høiland-Jørgensen
2020-11-05 20:14 ` Andrii Nakryiko
2020-11-05 3:48 ` David Ahern
2020-11-05 20:53 ` Andrii Nakryiko
2020-11-05 3:19 ` David Ahern
2020-11-05 14:05 ` Jamal Hadi Salim
2020-11-05 21:01 ` Andrii Nakryiko
2020-11-06 15:27 ` Jamal Hadi Salim
2020-11-06 21:25 ` Andrii Nakryiko
2020-11-10 12:47 ` Edward Cree
2020-11-11 0:53 ` Alexei Starovoitov
2020-11-11 11:31 ` Edward Cree
2020-11-11 18:08 ` Alexei Starovoitov
2020-11-05 20:45 ` Andrii Nakryiko
2020-11-06 9:00 ` Jiri Benc
2020-11-06 21:07 ` Andrii Nakryiko
2020-11-04 21:15 ` Edward Cree
2020-11-04 22:10 ` Alexei Starovoitov
2020-11-04 22:35 ` Toke Høiland-Jørgensen
2020-11-04 23:05 ` Edward Cree
2020-11-05 20:19 ` Andrii Nakryiko
2020-11-06 8:44 ` Jiri Benc
2020-11-06 20:57 ` Andrii Nakryiko
2020-11-06 21:04 ` Alexei Starovoitov
2020-11-06 23:25 ` Stephen Hemminger
2020-11-06 23:30 ` Andrii Nakryiko
2020-11-07 0:41 ` Stephen Hemminger
2020-11-07 1:07 ` Andrii Nakryiko
2020-11-06 23:38 ` David Ahern
2020-11-09 1:45 ` Alexei Starovoitov
2020-11-10 4:09 ` David Ahern
2020-11-11 0:47 ` Alexei Starovoitov
2020-11-11 11:02 ` Toke Høiland-Jørgensen
2020-11-11 15:06 ` Daniel Borkmann
2020-11-11 16:33 ` David Ahern
2020-11-12 22:36 ` Toke Høiland-Jørgensen
2020-11-12 23:20 ` Daniel Borkmann
2020-11-13 0:04 ` Stephen Hemminger
2020-11-13 0:40 ` Alexei Starovoitov
2020-11-13 3:55 ` David Ahern
2020-11-09 7:07 ` [PATCHv4 " Hangbin Liu
2020-11-09 7:07 ` [PATCHv4 iproute2-next 1/5] configure: add check_libbpf() for later " Hangbin Liu
2020-11-14 3:26 ` David Ahern
2020-11-16 4:30 ` Hangbin Liu
2020-11-16 4:33 ` David Ahern
2020-11-09 7:07 ` [PATCHv4 iproute2-next 2/5] lib: rename bpf.c to bpf_legacy.c Hangbin Liu
2020-11-14 3:24 ` David Ahern
2020-11-16 3:55 ` Hangbin Liu
2020-11-09 7:08 ` [PATCHv4 iproute2-next 3/5] lib: add libbpf support Hangbin Liu
2020-11-09 7:08 ` [PATCHv4 iproute2-next 4/5] examples/bpf: move struct bpf_elf_map defined maps to legacy folder Hangbin Liu
2020-11-09 7:08 ` [PATCHv4 iproute2-next 5/5] examples/bpf: add bpf examples with BTF defined maps Hangbin Liu
2020-11-16 6:53 ` [PATCHv5 iproute2-next 0/5] iproute2: add libbpf support Hangbin Liu
2020-11-16 6:53 ` [PATCHv5 iproute2-next 1/5] configure: add check_libbpf() for later " Hangbin Liu
2020-11-16 6:53 ` [PATCHv5 iproute2-next 2/5] lib: rename bpf.c to bpf_legacy.c Hangbin Liu
2020-11-16 6:53 ` [PATCHv5 iproute2-next 3/5] lib: add libbpf support Hangbin Liu
2020-11-16 6:53 ` [PATCHv5 iproute2-next 4/5] examples/bpf: move struct bpf_elf_map defined maps to legacy folder Hangbin Liu
2020-11-16 6:53 ` [PATCHv5 iproute2-next 5/5] examples/bpf: add bpf examples with BTF defined maps Hangbin Liu
2020-11-16 7:19 ` [PATCHv5 iproute2-next 0/5] iproute2: add libbpf support Alexei Starovoitov
2020-11-16 14:54 ` Jesper Dangaard Brouer
2020-11-16 23:29 ` Toke Høiland-Jørgensen
2020-11-17 2:37 ` Alexei Starovoitov
2020-11-17 3:19 ` Hangbin Liu
2020-11-17 18:27 ` Alexei Starovoitov
2020-11-17 11:56 ` Edward Cree
2020-11-17 3:38 ` David Ahern
2020-11-17 18:19 ` Alexei Starovoitov
2020-11-16 16:45 ` Stephen Hemminger
2020-11-23 13:11 ` [PATCHv6 " Hangbin Liu
2020-11-23 13:11 ` [PATCHv6 iproute2-next 1/5] iproute2: add check_libbpf() and get_libbpf_version() Hangbin Liu
2020-11-23 13:11 ` Hangbin Liu [this message]
2020-11-23 13:11 ` [PATCHv6 iproute2-next 3/5] lib: add libbpf support Hangbin Liu
2020-11-23 13:12 ` [PATCHv6 iproute2-next 4/5] examples/bpf: move struct bpf_elf_map defined maps to legacy folder Hangbin Liu
2020-11-23 13:12 ` [PATCHv6 iproute2-next 5/5] examples/bpf: add bpf examples with BTF defined maps Hangbin Liu
2020-11-25 5:28 ` [PATCHv6 iproute2-next 0/5] iproute2: add libbpf support David Ahern
2020-11-25 5:30 ` patchwork-bot+netdevbpf
2020-11-29 6:16 ` [PATCH " Stephen Hemminger
2020-11-29 6:22 ` Greg KH
2020-11-30 11:39 ` Michal Kubecek
2020-11-29 17:33 ` Alexei Starovoitov
2020-11-29 19:41 ` David Ahern
2020-11-30 11:04 ` Toke Høiland-Jørgensen
2020-12-01 14:22 ` Jesper Dangaard Brouer
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=20201123131201.4108483-3-haliu@redhat.com \
--to=haliu@redhat.com \
--cc=alexei.starovoitov@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=jbenc@redhat.com \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=stephen@networkplumber.org \
--cc=toke@redhat.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;
as well as URLs for NNTP newsgroup(s).