bpf: allow requesting XDP HW offload

Let XDP link set command request that the program be offloaded.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/ip/iplink.c b/ip/iplink.c
index 811513c01c25fa3bd66189d4ca6b463b67f55b3a..9674cb657322623031be9dce0f9302aaf7dbe6e0 100644 (file)
--- 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 cabb2348562e9721f7f7487005cc2b6212151483..9ae9ee5d06650cee5bb4f4ce607a7d3e0247eb06 100644 (file)
--- 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 5f594132f494fae4ca2e0e3ba21ea475eca86fa0..ba897a29af5849fb5a966c760b37d60ce651581a 100644 (file)
--- 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 326002d95e8754d9221fbca4316bd9cbc9049974..141d3597f945b659a89f3b5c90d38ff0f69da1ae 100644 (file)
--- 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