[PATCH iproute2/master 11/11] iplink: communicate ifindex for xdp offload

[Jakub Kicinski]

When xdpoffload option is used, communicate the ifindex down
to the kernel to trigger device-specific load.

Signed-off-by: Jakub Kicinski <jakub.kicin...@netronome.com>
Reviewed-by: Quentin Monnet <quentin.mon...@netronome.com>
Acked-by: Daniel Borkmann <dan...@iogearbox.net>
---
 ip/iplink.c     |  4 ++--
 ip/iplink_xdp.c | 10 ++++++++--
 ip/xdp.h        |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ip/iplink.c b/ip/iplink.c
index 0360a0753d4a..4928f1d9489e 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -631,8 +631,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req 
*req,
                        bool offload = strcmp(*argv, "xdpoffload") == 0;
 
                        NEXT_ARG();
-                       if (xdp_parse(&argc, &argv, req, generic, drv,
-                                     offload))
+                       if (xdp_parse(&argc, &argv, req, dev_index,
+                                     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 edaec2a250e7..6eeb820af0c3 100644
--- a/ip/iplink_xdp.c
+++ b/ip/iplink_xdp.c
@@ -48,8 +48,8 @@ static int xdp_delete(struct xdp_req *xdp)
        return 0;
 }
 
-int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic,
-             bool drv, bool offload)
+int xdp_parse(int *argc, char ***argv, struct iplink_req *req, __u32 ifindex,
+             bool generic, bool drv, bool offload)
 {
        struct bpf_cfg_in cfg = {
                .type = BPF_PROG_TYPE_XDP,
@@ -60,6 +60,12 @@ int xdp_parse(int *argc, char ***argv, struct iplink_req 
*req, bool generic,
                .req = req,
        };
 
+       if (offload) {
+               if (!ifindex)
+                       incomplete_command();
+               cfg.ifindex = ifindex;
+       }
+
        if (!force)
                xdp.flags |= XDP_FLAGS_UPDATE_IF_NOEXIST;
        if (generic)
diff --git a/ip/xdp.h b/ip/xdp.h
index 1efd591b087c..7400792bbeb7 100644
--- a/ip/xdp.h
+++ b/ip/xdp.h
@@ -3,8 +3,8 @@
 
 #include "utils.h"
 
-int xdp_parse(int *argc, char ***argv, struct iplink_req *req, bool generic,
-             bool drv, bool offload);
+int xdp_parse(int *argc, char ***argv, struct iplink_req *req, __u32 ifindex,
+             bool generic, bool drv, bool offload);
 void xdp_dump(FILE *fp, struct rtattr *tb, bool link, bool details);
 
 #endif /* __XDP__ */
-- 
2.14.1