From: Jakub Kicinski Date: Tue, 27 Jun 2017 00:23:53 +0000 (-0700) Subject: bpf: allow requesting XDP HW offload X-Git-Tag: v4.13.0~111 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b5e809466376df1be0e9e7e5460605c974ad42b;p=thirdparty%2Fiproute2.git bpf: allow requesting XDP HW offload Let XDP link set command request that the program be offloaded. Signed-off-by: Jakub Kicinski Acked-by: Daniel Borkmann --- diff --git a/ip/iplink.c b/ip/iplink.c index 811513c01..9674cb657 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -616,12 +616,15 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, addattr_l(&req->n, sizeof(*req), IFLA_MTU, &mtu, 4); } else if (strcmp(*argv, "xdpgeneric") == 0 || strcmp(*argv, "xdpdrv") == 0 || + strcmp(*argv, "xdpoffload") == 0 || strcmp(*argv, "xdp") == 0) { bool generic = strcmp(*argv, "xdpgeneric") == 0; bool drv = strcmp(*argv, "xdpdrv") == 0; + bool offload = strcmp(*argv, "xdpoffload") == 0; NEXT_ARG(); - if (xdp_parse(&argc, &argv, req, generic, drv)) + if (xdp_parse(&argc, &argv, req, generic, drv, + offload)) exit(-1); } else if (strcmp(*argv, "netns") == 0) { NEXT_ARG(); diff --git a/ip/iplink_xdp.c b/ip/iplink_xdp.c index cabb23485..9ae9ee5d0 100644 --- a/ip/iplink_xdp.c +++ b/ip/iplink_xdp.c @@ -48,7 +48,7 @@ static int xdp_delete(struct xdp_req *xdp) } int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic, - bool drv) + bool drv, bool offload) { struct bpf_cfg_in cfg = { .argc = *argc, @@ -64,6 +64,8 @@ int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic, xdp.flags |= XDP_FLAGS_SKB_MODE; if (drv) xdp.flags |= XDP_FLAGS_DRV_MODE; + if (offload) + xdp.flags |= XDP_FLAGS_HW_MODE; if (*argc == 1) { if (strcmp(**argv, "none") == 0 || diff --git a/ip/xdp.h b/ip/xdp.h index 5f594132f..ba897a29a 100644 --- a/ip/xdp.h +++ b/ip/xdp.h @@ -4,7 +4,7 @@ #include "utils.h" int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic, - bool drv); + bool drv, bool offload); void xdp_dump(FILE *fp, struct rtattr *tb); #endif /* __XDP__ */ diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 326002d95..141d3597f 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -126,7 +126,7 @@ ip-link \- network device configuration .RB "[ " port_guid " eui64 ] ]" .br .in -9 -.RB "[ { " xdp " | " xdpgeneric " | " xdpdrv " } { " off " | " +.RB "[ { " xdp " | " xdpgeneric " | " xdpdrv " | " xdpoffload " } { " off " | " .br .in +8 .BR object @@ -1595,6 +1595,11 @@ generic XDP variant be disabled and in case driver is not XDP-capable error should be returned. .B xdpdrv also disables hardware offloads. +.B xdpoffload +in ip link output indicates that the program has been offloaded to hardware +and can also be used to request the "offload" mode, much like +.B xdpgeneric +it forces program to be installed specifically in HW/FW of the apater. .B off (or