samples/bpf: use bpf_set_link_xdp_fd (b259c2ff) · Commits · e / devices / android_kernel_fairphone_FP4

samples/bpf/bpf_load.c

+0 −102

Original line number	Diff line number	Diff line
		@@ -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;
		}

samples/bpf/bpf_load.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,5 +61,5 @@ struct ksym {

		int load_kallsyms(void);
		struct ksym *ksym_search(long key);
		int set_link_xdp_fd(int ifindex, int fd, __u32 flags);
		int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags);
		#endif

samples/bpf/xdp1_user.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ static __u32 xdp_flags;

		static void int_exit(int sig)
		{
		set_link_xdp_fd(ifindex, -1, xdp_flags);
		bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
		exit(0);
		}

		@@ -116,7 +116,7 @@ int main(int argc, char **argv)
		signal(SIGINT, int_exit);
		signal(SIGTERM, int_exit);

		if (set_link_xdp_fd(ifindex, prog_fd[0], xdp_flags) < 0) {
		if (bpf_set_link_xdp_fd(ifindex, prog_fd[0], xdp_flags) < 0) {
		printf("link set xdp fd failed\n");
		return 1;
		}

samples/bpf/xdp_redirect_cpu_user.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ static const char *__doc__ =

		/* Wanted to get rid of bpf_load.h and fake-"libbpf.h" (and instead
		* use bpf/libbpf.h), but cannot as (currently) needed for XDP
		* attaching to a device via set_link_xdp_fd()
		* attaching to a device via bpf_set_link_xdp_fd()
		*/
		#include "libbpf.h"
		#include "bpf_load.h"
		@@ -67,7 +67,7 @@ static void int_exit(int sig)
		"Interrupted: Removing XDP program on ifindex:%d device:%s\n",
		ifindex, ifname);
		if (ifindex > -1)
		set_link_xdp_fd(ifindex, -1, xdp_flags);
		bpf_set_link_xdp_fd(ifindex, -1, xdp_flags);
		exit(EXIT_OK);
		}

		@@ -682,7 +682,7 @@ int main(int argc, char **argv)
		/* Remove XDP program when program is interrupted */
		signal(SIGINT, int_exit);

		if (set_link_xdp_fd(ifindex, prog_fd[prog_num], xdp_flags) < 0) {
		if (bpf_set_link_xdp_fd(ifindex, prog_fd[prog_num], xdp_flags) < 0) {
		fprintf(stderr, "link set xdp fd failed\n");
		return EXIT_FAIL_XDP;
		}

samples/bpf/xdp_redirect_map_user.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@ static __u32 xdp_flags;

		static void int_exit(int sig)
		{
		set_link_xdp_fd(ifindex_in, -1, xdp_flags);
		bpf_set_link_xdp_fd(ifindex_in, -1, xdp_flags);
		if (ifindex_out_xdp_dummy_attached)
		set_link_xdp_fd(ifindex_out, -1, xdp_flags);
		bpf_set_link_xdp_fd(ifindex_out, -1, xdp_flags);
		exit(0);
		}

		@@ -120,13 +120,13 @@ int main(int argc, char **argv)
		return 1;
		}

		if (set_link_xdp_fd(ifindex_in, prog_fd[0], xdp_flags) < 0) {
		if (bpf_set_link_xdp_fd(ifindex_in, prog_fd[0], xdp_flags) < 0) {
		printf("ERROR: link set xdp fd failed on %d\n", ifindex_in);
		return 1;
		}

		/* Loading dummy XDP prog on out-device */
		if (set_link_xdp_fd(ifindex_out, prog_fd[1],
		if (bpf_set_link_xdp_fd(ifindex_out, prog_fd[1],
		(xdp_flags \| XDP_FLAGS_UPDATE_IF_NOEXIST)) < 0) {
		printf("WARN: link set xdp fd failed on %d\n", ifindex_out);
		ifindex_out_xdp_dummy_attached = false;