samples/bpf: use bpf_set_link_xdp_fd

Use bpf_set_link_xdp_fd instead of set_link_xdp_fd to remove some
code duplication and benefit of netlink ext ack errors message.

Signed-off-by: Eric Leblond <eric@regit.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

1 files changed, 0 insertions, 102 deletions

diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c
index 242631aa4ea2..69806d74fa53 100644
--- a/samples/bpf/bpf_load.c
+++ b/samples/bpf/bpf_load.c
@@ -695,105 +695,3 @@ struct ksym *ksym_search(long key)
         return &syms[0];
 }
 
-int set_link_xdp_fd(int ifindex, int fd, __u32 flags)
-{
-        struct sockaddr_nl sa;
-        int sock, seq = 0, len, ret = -1;
-        char buf[4096];
-        struct nlattr *nla, *nla_xdp;
-        struct {
-                struct nlmsghdr  nh;
-                struct ifinfomsg ifinfo;
-                char             attrbuf[64];
-        } req;
-        struct nlmsghdr *nh;
-        struct nlmsgerr *err;
-
-        memset(&sa, 0, sizeof(sa));
-        sa.nl_family = AF_NETLINK;
-
-        sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-        if (sock < 0) {
-                printf("open netlink socket: %s\n", strerror(errno));
-                return -1;
-        }
-
-        if (bind(sock, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
-                printf("bind to netlink: %s\n", strerror(errno));
-                goto cleanup;
-        }
-
-        memset(&req, 0, sizeof(req));
-        req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
-        req.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
-        req.nh.nlmsg_type = RTM_SETLINK;
-        req.nh.nlmsg_pid = 0;
-        req.nh.nlmsg_seq = ++seq;
-        req.ifinfo.ifi_family = AF_UNSPEC;
-        req.ifinfo.ifi_index = ifindex;
-
-        /* started nested attribute for XDP */
-        nla = (struct nlattr *)(((char *)&req)
-                                + NLMSG_ALIGN(req.nh.nlmsg_len));
-        nla->nla_type = NLA_F_NESTED | 43/*IFLA_XDP*/;
-        nla->nla_len = NLA_HDRLEN;
-
-        /* add XDP fd */
-        nla_xdp = (struct nlattr *)((char *)nla + nla->nla_len);
-        nla_xdp->nla_type = 1/*IFLA_XDP_FD*/;
-        nla_xdp->nla_len = NLA_HDRLEN + sizeof(int);
-        memcpy((char *)nla_xdp + NLA_HDRLEN, &fd, sizeof(fd));
-        nla->nla_len += nla_xdp->nla_len;
-
-        /* if user passed in any flags, add those too */
-        if (flags) {
-                nla_xdp = (struct nlattr *)((char *)nla + nla->nla_len);
-                nla_xdp->nla_type = 3/*IFLA_XDP_FLAGS*/;
-                nla_xdp->nla_len = NLA_HDRLEN + sizeof(flags);
-                memcpy((char *)nla_xdp + NLA_HDRLEN, &flags, sizeof(flags));
-                nla->nla_len += nla_xdp->nla_len;
-        }
-
-        req.nh.nlmsg_len += NLA_ALIGN(nla->nla_len);
-
-        if (send(sock, &req, req.nh.nlmsg_len, 0) < 0) {
-                printf("send to netlink: %s\n", strerror(errno));
-                goto cleanup;
-        }
-
-        len = recv(sock, buf, sizeof(buf), 0);
-        if (len < 0) {
-                printf("recv from netlink: %s\n", strerror(errno));
-                goto cleanup;
-        }
-
-        for (nh = (struct nlmsghdr *)buf; NLMSG_OK(nh, len);
-             nh = NLMSG_NEXT(nh, len)) {
-                if (nh->nlmsg_pid != getpid()) {
-                        printf("Wrong pid %d, expected %d\n",
-                               nh->nlmsg_pid, getpid());
-                        goto cleanup;
-                }
-                if (nh->nlmsg_seq != seq) {
-                        printf("Wrong seq %d, expected %d\n",
-                               nh->nlmsg_seq, seq);
-                        goto cleanup;
-                }
-                switch (nh->nlmsg_type) {
-                case NLMSG_ERROR:
-                        err = (struct nlmsgerr *)NLMSG_DATA(nh);
-                        if (!err->error)
-                                continue;
-                        printf("nlmsg error %s\n", strerror(-err->error));
-                        goto cleanup;
-                case NLMSG_DONE:
-                        break;
-                }
-        }
-
-        ret = 0;
-
-cleanup:
-        close(sock);
-        return ret;
-}