| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 31 Jul 2019 03:48:20 +0900
From: "Daniel T. Lee" <danieltimlee@...il.com>
To: Daniel Borkmann <daniel@...earbox.net>,
Alexei Starovoitov <ast@...nel.org>
Cc: netdev@...r.kernel.org
Subject: [PATCH 1/2] tools: bpftool: add net load command to load XDP on interface
By this commit, using `bpftool net load`, user can load XDP prog on
interface. New type of enum 'net_load_type' has been made, as stated at
cover-letter, the meaning of 'load' is, prog will be loaded on interface.
BPF prog will be loaded through libbpf 'bpf_set_link_xdp_fd'.
Signed-off-by: Daniel T. Lee <danieltimlee@...il.com>
---
tools/bpf/bpftool/net.c | 107 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 106 insertions(+), 1 deletion(-)
diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c
index 67e99c56bc88..d3a4f18b5b95 100644
--- a/tools/bpf/bpftool/net.c
+++ b/tools/bpf/bpftool/net.c
@@ -55,6 +55,35 @@ struct bpf_attach_info {
__u32 flow_dissector_id;
};
+enum net_load_type {
+ NET_LOAD_TYPE_XDP,
+ NET_LOAD_TYPE_XDP_GENERIC,
+ NET_LOAD_TYPE_XDP_DRIVE,
+ NET_LOAD_TYPE_XDP_OFFLOAD,
+ __MAX_NET_LOAD_TYPE
+};
+
+static const char * const load_type_strings[] = {
+ [NET_LOAD_TYPE_XDP] = "xdp",
+ [NET_LOAD_TYPE_XDP_GENERIC] = "xdpgeneric",
+ [NET_LOAD_TYPE_XDP_DRIVE] = "xdpdrv",
+ [NET_LOAD_TYPE_XDP_OFFLOAD] = "xdpoffload",
+ [__MAX_NET_LOAD_TYPE] = NULL,
+};
+
+static enum net_load_type parse_load_type(const char *str)
+{
+ enum net_load_type type;
+
+ for (type = 0; type < __MAX_NET_LOAD_TYPE; type++) {
+ if (load_type_strings[type] &&
+ is_prefix(str, load_type_strings[type]))
+ return type;
+ }
+
+ return __MAX_NET_LOAD_TYPE;
+}
+
static int dump_link_nlmsg(void *cookie, void *msg, struct nlattr **tb)
{
struct bpf_netdev_t *netinfo = cookie;
@@ -223,6 +252,77 @@ static int query_flow_dissector(struct bpf_attach_info *attach_info)
return 0;
}
+static int parse_load_args(int argc, char **argv, int *progfd,
+ enum net_load_type *load_type, int *ifindex)
+{
+ if (!REQ_ARGS(3))
+ return -EINVAL;
+
+ *progfd = prog_parse_fd(&argc, &argv);
+ if (*progfd < 0)
+ return *progfd;
+
+ *load_type = parse_load_type(*argv);
+ if (*load_type == __MAX_NET_LOAD_TYPE) {
+ p_err("invalid net load/unload type");
+ return -EINVAL;
+ }
+
+ NEXT_ARG();
+ if (!REQ_ARGS(1))
+ return -EINVAL;
+
+ *ifindex = if_nametoindex(*argv);
+ if (!*ifindex) {
+ p_err("Invalid ifname");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int do_load_unload_xdp(int *progfd, enum net_load_type *load_type,
+ int *ifindex)
+{
+ __u32 flags;
+ int err;
+
+ flags = XDP_FLAGS_UPDATE_IF_NOEXIST;
+ if (*load_type == NET_LOAD_TYPE_XDP_GENERIC)
+ flags |= XDP_FLAGS_SKB_MODE;
+ if (*load_type == NET_LOAD_TYPE_XDP_DRIVE)
+ flags |= XDP_FLAGS_DRV_MODE;
+ if (*load_type == NET_LOAD_TYPE_XDP_OFFLOAD)
+ flags |= XDP_FLAGS_HW_MODE;
+
+ err = bpf_set_link_xdp_fd(*ifindex, *progfd, flags);
+
+ return err;
+}
+
+static int do_load(int argc, char **argv)
+{
+ enum net_load_type load_type;
+ int err, progfd, ifindex;
+
+ err = parse_load_args(argc, argv, &progfd, &load_type, &ifindex);
+ if (err)
+ return err;
+
+ if (is_prefix("xdp", load_type_strings[load_type]))
+ err = do_load_unload_xdp(&progfd, &load_type, &ifindex);
+
+ if (err < 0) {
+ p_err("link set %s failed", load_type_strings[load_type]);
+ return -1;
+ }
+
+ if (json_output)
+ jsonw_null(json_wtr);
+
+ return 0;
+}
+
static int do_show(int argc, char **argv)
{
struct bpf_attach_info attach_info = {};
@@ -305,13 +405,17 @@ static int do_help(int argc, char **argv)
fprintf(stderr,
"Usage: %s %s { show | list } [dev <devname>]\n"
+ " %s %s load PROG LOAD_TYPE <devname>\n"
" %s %s help\n"
+ "\n"
+ " " HELP_SPEC_PROGRAM "\n"
+ " LOAD_TYPE := { xdp | xdpgeneric | xdpdrv | xdpoffload }\n"
"Note: Only xdp and tc attachments are supported now.\n"
" For progs attached to cgroups, use \"bpftool cgroup\"\n"
" to dump program attachments. For program types\n"
" sk_{filter,skb,msg,reuseport} and lwt/seg6, please\n"
" consult iproute2.\n",
- bin_name, argv[-2], bin_name, argv[-2]);
+ bin_name, argv[-2], bin_name, argv[-2], bin_name, argv[-2]);
return 0;
}
@@ -319,6 +423,7 @@ static int do_help(int argc, char **argv)
static const struct cmd cmds[] = {
{ "show", do_show },
{ "list", do_show },
+ { "load", do_load },
{ "help", do_help },
{ 0 }
};
--
2.20.1
Powered by blists - more mailing lists