From: "Björn Töpel" <bjorn.topel@gmail.com>
To: bjorn.topel@gmail.com, magnus.karlsson@intel.com,
magnus.karlsson@gmail.com, ast@kernel.org, daniel@iogearbox.net,
netdev@vger.kernel.org
Cc: "Björn Töpel" <bjorn.topel@intel.com>,
brouer@redhat.com, u9012063@gmail.com, qi.z.zhang@intel.com,
jakub.kicinski@netronome.com, andrew@lunn.ch
Subject: [PATCH bpf-next v2 7/7] samples: bpf: add support for XDP_ATTACH to xdpsock
Date: Mon, 17 Dec 2018 11:25:01 +0100 [thread overview]
Message-ID: <20181217102501.22019-8-bjorn.topel@gmail.com> (raw)
In-Reply-To: <20181217102501.22019-1-bjorn.topel@gmail.com>
From: Björn Töpel <bjorn.topel@intel.com>
This commit adds support for the XDP_ATTACH bind() flag. If "-a" is
passed to the program XDP_ATTACH is passed to bind and the builtin
libbpf XDP program is loaded.
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
---
samples/bpf/xdpsock_user.c | 56 ++++++++++++++++++++++++++++++++++++--
1 file changed, 54 insertions(+), 2 deletions(-)
diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
index c72face0da05..53f9063bbdd9 100644
--- a/samples/bpf/xdpsock_user.c
+++ b/samples/bpf/xdpsock_user.c
@@ -650,6 +650,7 @@ static struct option long_options[] = {
{"interval", required_argument, 0, 'n'},
{"zero-copy", no_argument, 0, 'z'},
{"copy", no_argument, 0, 'c'},
+ {"attach", no_argument, 0, 'a'},
{0, 0, 0, 0}
};
@@ -670,6 +671,7 @@ static void usage(const char *prog)
" -n, --interval=n Specify statistics update interval (default 1 sec).\n"
" -z, --zero-copy Force zero-copy mode.\n"
" -c, --copy Force copy mode.\n"
+ " -a, --attach XDP_ATTACH mode.\n"
"\n";
fprintf(stderr, str, prog);
exit(EXIT_FAILURE);
@@ -682,7 +684,7 @@ static void parse_command_line(int argc, char **argv)
opterr = 0;
for (;;) {
- c = getopt_long(argc, argv, "rtli:q:psSNn:cz", long_options,
+ c = getopt_long(argc, argv, "rtli:q:psSNn:cza", long_options,
&option_index);
if (c == -1)
break;
@@ -725,6 +727,9 @@ static void parse_command_line(int argc, char **argv)
case 'c':
opt_xdp_bind_flags |= XDP_COPY;
break;
+ case 'a':
+ opt_xdp_bind_flags |= XDP_ATTACH;
+ break;
default:
usage(basename(argv[0]));
}
@@ -959,6 +964,45 @@ static void setup_xdp_xskmap(const char *pathprefix)
}
}
+static void setup_xdp_attach(void)
+{
+ struct bpf_program *prog;
+ struct bpf_object *obj;
+ int prog_fd, err;
+
+ obj = bpf_object__open_builtin(BPF_PROG_TYPE_XDP);
+ if (!obj) {
+ fprintf(stderr, "ERROR: opening builtin XDP\n");
+ exit(EXIT_FAILURE);
+ }
+
+ prog = bpf_object__find_xdp_builtin_program(
+ obj,
+ LIBBPF_BUILTIN_XDP__XSK_REDIRECT);
+ if (!prog) {
+ fprintf(stderr, "ERROR: finding builtin XDP program\n");
+ exit(EXIT_FAILURE);
+ }
+
+ err = bpf_program__load(prog, "GPL", 0);
+ if (err) {
+ fprintf(stderr, "ERROR: error loading XDP program\n");
+ exit(EXIT_FAILURE);
+ }
+
+ prog_fd = bpf_program__fd(prog);
+ if (prog_fd < 0) {
+ fprintf(stderr, "ERROR: no xdp_sock program found: %s\n",
+ strerror(prog_fd));
+ exit(EXIT_FAILURE);
+ }
+
+ if (bpf_set_link_xdp_fd(opt_ifindex, prog_fd, opt_xdp_flags) < 0) {
+ fprintf(stderr, "ERROR: link set xdp fd failed\n");
+ exit(EXIT_FAILURE);
+ }
+}
+
int main(int argc, char **argv)
{
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
@@ -981,11 +1025,19 @@ int main(int argc, char **argv)
xsks[num_socks++] = xsk_configure(NULL);
#if RR_LB
+ if (opt_xdp_bind_flags & XDP_ATTACH) {
+ fprintf(stderr, "ERROR: Not supported by application!\n");
+ exit(EXIT_FAILURE);
+ }
+
for (i = 0; i < MAX_SOCKS - 1; i++)
xsks[num_socks++] = xsk_configure(xsks[0]->umem);
#endif
- setup_xdp_xskmap(argv[0]);
+ if (opt_xdp_bind_flags & XDP_ATTACH)
+ setup_xdp_attach();
+ else
+ setup_xdp_xskmap(argv[0]);
setlocale(LC_ALL, "");
--
2.19.1
next prev parent reply other threads:[~2018-12-17 10:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 10:24 [PATCH bpf-next v2 0/7] Add support for XDP_ATTACH Björn Töpel
2018-12-17 10:24 ` [PATCH bpf-next v2 1/7] xsk: simplify AF_XDP socket teardown Björn Töpel
2018-12-17 10:24 ` [PATCH bpf-next v2 2/7] xsk: add XDP_ATTACH bind() flag Björn Töpel
2018-12-17 10:24 ` [PATCH bpf-next v2 3/7] bpf: add bpf_xsk_redirect function Björn Töpel
2018-12-17 10:24 ` [PATCH bpf-next v2 4/7] tools/bpf: sync kernel uapi bpf.h to tools directory Björn Töpel
2018-12-17 10:24 ` [PATCH bpf-next v2 5/7] libbpf: initial support for builtin BPF programs Björn Töpel
2018-12-17 10:25 ` [PATCH bpf-next v2 6/7] samples: bpf: simplify/cleanup xdpsock Björn Töpel
2018-12-17 10:25 ` Björn Töpel [this message]
2018-12-17 12:50 ` [PATCH bpf-next v2 0/7] Add support for XDP_ATTACH Jesper Dangaard Brouer
2018-12-17 13:39 ` Björn Töpel
2018-12-17 14:10 ` Jesper Dangaard Brouer
2018-12-17 14:55 ` Magnus Karlsson
2018-12-17 15:30 ` Björn Töpel
2018-12-18 23:04 ` Alexei Starovoitov
2018-12-19 9:34 ` Björn Töpel
2018-12-19 16:23 ` Jesper Dangaard Brouer
2018-12-20 0:48 ` Alexei Starovoitov
2018-12-18 2:36 ` Jakub Kicinski
2018-12-18 8:59 ` Björn Töpel
2018-12-18 18:18 ` Jakub Kicinski
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=20181217102501.22019-8-bjorn.topel@gmail.com \
--to=bjorn.topel@gmail.com \
--cc=andrew@lunn.ch \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=jakub.kicinski@netronome.com \
--cc=magnus.karlsson@gmail.com \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
--cc=qi.z.zhang@intel.com \
--cc=u9012063@gmail.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).