selftests: ncdevmem: Move ncdevmem under drivers/net/hw

This is where all the tests that depend on the HW functionality live in
and this is where the automated test is gonna be added in the next
patch.

Reviewed-by: Mina Almasry <almasrymina@google.com>
Signed-off-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20241107181211.3934153-12-sdf@fomichev.me
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

3 files changed, 0 insertions, 798 deletions

diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore
index 217d8b7a7365..a78debbd1fe7 100644
--- a/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@ -18,7 +18,6 @@ ipv6_flowlabel_mgr
 log.txt
 msg_oob
 msg_zerocopy
-ncdevmem
 nettest
 psock_fanout
 psock_snd
diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile
index 61cce028f105..9322b904ad00 100644
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@ -98,10 +98,6 @@ TEST_PROGS += vlan_hw_filter.sh
 TEST_PROGS += bpf_offload.py
 TEST_PROGS += ipv6_route_update_soft_lockup.sh
 
-# YNL files, must be before "include ..lib.mk"
-YNL_GEN_FILES := ncdevmem
-TEST_GEN_FILES += $(YNL_GEN_FILES)
-
 TEST_FILES := settings
 TEST_FILES += in_netns.sh lib.sh net_helper.sh setup_loopback.sh setup_veth.sh
 
@@ -111,10 +107,6 @@ TEST_INCLUDES := forwarding/lib.sh
 
 include ../lib.mk
 
-# YNL build
-YNL_GENS := ethtool netdev
-include ynl.mk
-
 $(OUTPUT)/epoll_busy_poll: LDLIBS += -lcap
 $(OUTPUT)/reuseport_bpf_numa: LDLIBS += -lnuma
 $(OUTPUT)/tcp_mmap: LDLIBS += -lpthread -lcrypto
diff --git a/tools/testing/selftests/net/ncdevmem.c b/tools/testing/selftests/net/ncdevmem.c
deleted file mode 100644
index 8e502a1f8f9b..000000000000
--- a/tools/testing/selftests/net/ncdevmem.c
+++ /dev/null
@@ -1,789 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * tcpdevmem netcat. Works similarly to netcat but does device memory TCP
- * instead of regular TCP. Uses udmabuf to mock a dmabuf provider.
- *
- * Usage:
- *
- *     On server:
- *     ncdevmem -s <server IP> [-c <client IP>] -f eth1 -l -p 5201
- *
- *     On client:
- *     echo -n "hello\nworld" | nc -s <server IP> 5201 -p 5201
- *
- * Test data validation:
- *
- *     On server:
- *     ncdevmem -s <server IP> [-c <client IP>] -f eth1 -l -p 5201 -v 7
- *
- *     On client:
- *     yes $(echo -e \\x01\\x02\\x03\\x04\\x05\\x06) | \
- *             tr \\n \\0 | \
- *             head -c 5G | \
- *             nc <server IP> 5201 -p 5201
- *
- *
- * Note this is compatible with regular netcat. i.e. the sender or receiver can
- * be replaced with regular netcat to test the RX or TX path in isolation.
- */
-#define _GNU_SOURCE
-#define __EXPORTED_HEADERS__
-
-#include <linux/uio.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <string.h>
-#include <errno.h>
-#define __iovec_defined
-#include <fcntl.h>
-#include <malloc.h>
-#include <error.h>
-
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include <sys/syscall.h>
-
-#include <linux/memfd.h>
-#include <linux/dma-buf.h>
-#include <linux/udmabuf.h>
-#include <libmnl/libmnl.h>
-#include <linux/types.h>
-#include <linux/netlink.h>
-#include <linux/genetlink.h>
-#include <linux/netdev.h>
-#include <linux/ethtool_netlink.h>
-#include <time.h>
-#include <net/if.h>
-
-#include "netdev-user.h"
-#include "ethtool-user.h"
-#include <ynl.h>
-
-#define PAGE_SHIFT 12
-#define TEST_PREFIX "ncdevmem"
-#define NUM_PAGES 16000
-
-#ifndef MSG_SOCK_DEVMEM
-#define MSG_SOCK_DEVMEM 0x2000000
-#endif
-
-static char *server_ip;
-static char *client_ip;
-static char *port;
-static size_t do_validation;
-static int start_queue = -1;
-static int num_queues = -1;
-static char *ifname;
-static unsigned int ifindex;
-static unsigned int dmabuf_id;
-
-struct memory_buffer {
-	int fd;
-	size_t size;
-
-	int devfd;
-	int memfd;
-	char *buf_mem;
-};
-
-struct memory_provider {
-	struct memory_buffer *(*alloc)(size_t size);
-	void (*free)(struct memory_buffer *ctx);
-	void (*memcpy_from_device)(void *dst, struct memory_buffer *src,
-				   size_t off, int n);
-};
-
-static struct memory_buffer *udmabuf_alloc(size_t size)
-{
-	struct udmabuf_create create;
-	struct memory_buffer *ctx;
-	int ret;
-
-	ctx = malloc(sizeof(*ctx));
-	if (!ctx)
-		error(1, ENOMEM, "malloc failed");
-
-	ctx->size = size;
-
-	ctx->devfd = open("/dev/udmabuf", O_RDWR);
-	if (ctx->devfd < 0)
-		error(1, errno,
-		      "%s: [skip,no-udmabuf: Unable to access DMA buffer device file]\n",
-		      TEST_PREFIX);
-
-	ctx->memfd = memfd_create("udmabuf-test", MFD_ALLOW_SEALING);
-	if (ctx->memfd < 0)
-		error(1, errno, "%s: [skip,no-memfd]\n", TEST_PREFIX);
-
-	ret = fcntl(ctx->memfd, F_ADD_SEALS, F_SEAL_SHRINK);
-	if (ret < 0)
-		error(1, errno, "%s: [skip,fcntl-add-seals]\n", TEST_PREFIX);
-
-	ret = ftruncate(ctx->memfd, size);
-	if (ret == -1)
-		error(1, errno, "%s: [FAIL,memfd-truncate]\n", TEST_PREFIX);
-
-	memset(&create, 0, sizeof(create));
-
-	create.memfd = ctx->memfd;
-	create.offset = 0;
-	create.size = size;
-	ctx->fd = ioctl(ctx->devfd, UDMABUF_CREATE, &create);
-	if (ctx->fd < 0)
-		error(1, errno, "%s: [FAIL, create udmabuf]\n", TEST_PREFIX);
-
-	ctx->buf_mem = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-			    ctx->fd, 0);
-	if (ctx->buf_mem == MAP_FAILED)
-		error(1, errno, "%s: [FAIL, map udmabuf]\n", TEST_PREFIX);
-
-	return ctx;
-}
-
-static void udmabuf_free(struct memory_buffer *ctx)
-{
-	munmap(ctx->buf_mem, ctx->size);
-	close(ctx->fd);
-	close(ctx->memfd);
-	close(ctx->devfd);
-	free(ctx);
-}
-
-static void udmabuf_memcpy_from_device(void *dst, struct memory_buffer *src,
-				       size_t off, int n)
-{
-	struct dma_buf_sync sync = {};
-
-	sync.flags = DMA_BUF_SYNC_START;
-	ioctl(src->fd, DMA_BUF_IOCTL_SYNC, &sync);
-
-	memcpy(dst, src->buf_mem + off, n);
-
-	sync.flags = DMA_BUF_SYNC_END;
-	ioctl(src->fd, DMA_BUF_IOCTL_SYNC, &sync);
-}
-
-static struct memory_provider udmabuf_memory_provider = {
-	.alloc = udmabuf_alloc,
-	.free = udmabuf_free,
-	.memcpy_from_device = udmabuf_memcpy_from_device,
-};
-
-static struct memory_provider *provider = &udmabuf_memory_provider;
-
-static void print_nonzero_bytes(void *ptr, size_t size)
-{
-	unsigned char *p = ptr;
-	unsigned int i;
-
-	for (i = 0; i < size; i++)
-		putchar(p[i]);
-}
-
-void validate_buffer(void *line, size_t size)
-{
-	static unsigned char seed = 1;
-	unsigned char *ptr = line;
-	int errors = 0;
-	size_t i;
-
-	for (i = 0; i < size; i++) {
-		if (ptr[i] != seed) {
-			fprintf(stderr,
-				"Failed validation: expected=%u, actual=%u, index=%lu\n",
-				seed, ptr[i], i);
-			errors++;
-			if (errors > 20)
-				error(1, 0, "validation failed.");
-		}
-		seed++;
-		if (seed == do_validation)
-			seed = 0;
-	}
-
-	fprintf(stdout, "Validated buffer\n");
-}
-
-static int rxq_num(int ifindex)
-{
-	struct ethtool_channels_get_req *req;
-	struct ethtool_channels_get_rsp *rsp;
-	struct ynl_error yerr;
-	struct ynl_sock *ys;
-	int num = -1;
-
-	ys = ynl_sock_create(&ynl_ethtool_family, &yerr);
-	if (!ys) {
-		fprintf(stderr, "YNL: %s\n", yerr.msg);
-		return -1;
-	}
-
-	req = ethtool_channels_get_req_alloc();
-	ethtool_channels_get_req_set_header_dev_index(req, ifindex);
-	rsp = ethtool_channels_get(ys, req);
-	if (rsp)
-		num = rsp->rx_count + rsp->combined_count;
-	ethtool_channels_get_req_free(req);
-	ethtool_channels_get_rsp_free(rsp);
-
-	ynl_sock_destroy(ys);
-
-	return num;
-}
-
-#define run_command(cmd, ...)                                           \
-	({                                                              \
-		char command[256];                                      \
-		memset(command, 0, sizeof(command));                    \
-		snprintf(command, sizeof(command), cmd, ##__VA_ARGS__); \
-		fprintf(stderr, "Running: %s\n", command);                       \
-		system(command);                                        \
-	})
-
-static int reset_flow_steering(void)
-{
-	/* Depending on the NIC, toggling ntuple off and on might not
-	 * be allowed. Additionally, attempting to delete existing filters
-	 * will fail if no filters are present. Therefore, do not enforce
-	 * the exit status.
-	 */
-
-	run_command("sudo ethtool -K %s ntuple off >&2", ifname);
-	run_command("sudo ethtool -K %s ntuple on >&2", ifname);
-	run_command(
-		"sudo ethtool -n %s | grep 'Filter:' | awk '{print $2}' | xargs -n1 ethtool -N %s delete >&2",
-		ifname, ifname);
-	return 0;
-}
-
-static const char *tcp_data_split_str(int val)
-{
-	switch (val) {
-	case 0:
-		return "off";
-	case 1:
-		return "auto";
-	case 2:
-		return "on";
-	default:
-		return "?";
-	}
-}
-
-static int configure_headersplit(bool on)
-{
-	struct ethtool_rings_get_req *get_req;
-	struct ethtool_rings_get_rsp *get_rsp;
-	struct ethtool_rings_set_req *req;
-	struct ynl_error yerr;
-	struct ynl_sock *ys;
-	int ret;
-
-	ys = ynl_sock_create(&ynl_ethtool_family, &yerr);
-	if (!ys) {
-		fprintf(stderr, "YNL: %s\n", yerr.msg);
-		return -1;
-	}
-
-	req = ethtool_rings_set_req_alloc();
-	ethtool_rings_set_req_set_header_dev_index(req, ifindex);
-	/* 0 - off, 1 - auto, 2 - on */
-	ethtool_rings_set_req_set_tcp_data_split(req, on ? 2 : 0);
-	ret = ethtool_rings_set(ys, req);
-	if (ret < 0)
-		fprintf(stderr, "YNL failed: %s\n", ys->err.msg);
-	ethtool_rings_set_req_free(req);
-
-	if (ret == 0) {
-		get_req = ethtool_rings_get_req_alloc();
-		ethtool_rings_get_req_set_header_dev_index(get_req, ifindex);
-		get_rsp = ethtool_rings_get(ys, get_req);
-		ethtool_rings_get_req_free(get_req);
-		if (get_rsp)
-			fprintf(stderr, "TCP header split: %s\n",
-				tcp_data_split_str(get_rsp->tcp_data_split));
-		ethtool_rings_get_rsp_free(get_rsp);
-	}
-
-	ynl_sock_destroy(ys);
-
-	return ret;
-}
-
-static int configure_rss(void)
-{
-	return run_command("sudo ethtool -X %s equal %d >&2", ifname, start_queue);
-}
-
-static int configure_channels(unsigned int rx, unsigned int tx)
-{
-	return run_command("sudo ethtool -L %s rx %u tx %u", ifname, rx, tx);
-}
-
-static int configure_flow_steering(struct sockaddr_in6 *server_sin)
-{
-	const char *type = "tcp6";
-	const char *server_addr;
-	char buf[40];
-
-	inet_ntop(AF_INET6, &server_sin->sin6_addr, buf, sizeof(buf));
-	server_addr = buf;
-
-	if (IN6_IS_ADDR_V4MAPPED(&server_sin->sin6_addr)) {
-		type = "tcp4";
-		server_addr = strrchr(server_addr, ':') + 1;
-	}
-
-	return run_command("sudo ethtool -N %s flow-type %s %s %s dst-ip %s %s %s dst-port %s queue %d >&2",
-			   ifname,
-			   type,
-			   client_ip ? "src-ip" : "",
-			   client_ip ?: "",
-			   server_addr,
-			   client_ip ? "src-port" : "",
-			   client_ip ? port : "",
-			   port, start_queue);
-}
-
-static int bind_rx_queue(unsigned int ifindex, unsigned int dmabuf_fd,
-			 struct netdev_queue_id *queues,
-			 unsigned int n_queue_index, struct ynl_sock **ys)
-{
-	struct netdev_bind_rx_req *req = NULL;
-	struct netdev_bind_rx_rsp *rsp = NULL;
-	struct ynl_error yerr;
-
-	*ys = ynl_sock_create(&ynl_netdev_family, &yerr);
-	if (!*ys) {
-		fprintf(stderr, "YNL: %s\n", yerr.msg);
-		return -1;
-	}
-
-	req = netdev_bind_rx_req_alloc();
-	netdev_bind_rx_req_set_ifindex(req, ifindex);
-	netdev_bind_rx_req_set_fd(req, dmabuf_fd);
-	__netdev_bind_rx_req_set_queues(req, queues, n_queue_index);
-
-	rsp = netdev_bind_rx(*ys, req);
-	if (!rsp) {
-		perror("netdev_bind_rx");
-		goto err_close;
-	}
-
-	if (!rsp->_present.id) {
-		perror("id not present");
-		goto err_close;
-	}
-
-	fprintf(stderr, "got dmabuf id=%d\n", rsp->id);
-	dmabuf_id = rsp->id;
-
-	netdev_bind_rx_req_free(req);
-	netdev_bind_rx_rsp_free(rsp);
-
-	return 0;
-
-err_close:
-	fprintf(stderr, "YNL failed: %s\n", (*ys)->err.msg);
-	netdev_bind_rx_req_free(req);
-	ynl_sock_destroy(*ys);
-	return -1;
-}
-
-static void enable_reuseaddr(int fd)
-{
-	int opt = 1;
-	int ret;
-
-	ret = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt));
-	if (ret)
-		error(1, errno, "%s: [FAIL, SO_REUSEPORT]\n", TEST_PREFIX);
-
-	ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
-	if (ret)
-		error(1, errno, "%s: [FAIL, SO_REUSEADDR]\n", TEST_PREFIX);
-}
-
-static int parse_address(const char *str, int port, struct sockaddr_in6 *sin6)
-{
-	int ret;
-
-	sin6->sin6_family = AF_INET6;
-	sin6->sin6_port = htons(port);
-
-	ret = inet_pton(sin6->sin6_family, str, &sin6->sin6_addr);
-	if (ret != 1) {
-		/* fallback to plain IPv4 */
-		ret = inet_pton(AF_INET, str, &sin6->sin6_addr.s6_addr32[3]);
-		if (ret != 1)
-			return -1;
-
-		/* add ::ffff prefix */
-		sin6->sin6_addr.s6_addr32[0] = 0;
-		sin6->sin6_addr.s6_addr32[1] = 0;
-		sin6->sin6_addr.s6_addr16[4] = 0;
-		sin6->sin6_addr.s6_addr16[5] = 0xffff;
-	}
-
-	return 0;
-}
-
-int do_server(struct memory_buffer *mem)
-{
-	char ctrl_data[sizeof(int) * 20000];
-	struct netdev_queue_id *queues;
-	size_t non_page_aligned_frags = 0;
-	struct sockaddr_in6 client_addr;
-	struct sockaddr_in6 server_sin;
-	size_t page_aligned_frags = 0;
-	size_t total_received = 0;
-	socklen_t client_addr_len;
-	bool is_devmem = false;
-	char *tmp_mem = NULL;
-	struct ynl_sock *ys;
-	char iobuf[819200];
-	char buffer[256];
-	int socket_fd;
-	int client_fd;
-	size_t i = 0;
-	int ret;
-
-	ret = parse_address(server_ip, atoi(port), &server_sin);
-	if (ret < 0)
-		error(1, 0, "parse server address");
-
-	if (reset_flow_steering())
-		error(1, 0, "Failed to reset flow steering\n");
-
-	if (configure_headersplit(1))
-		error(1, 0, "Failed to enable TCP header split\n");
-
-	/* Configure RSS to divert all traffic from our devmem queues */
-	if (configure_rss())
-		error(1, 0, "Failed to configure rss\n");
-
-	/* Flow steer our devmem flows to start_queue */
-	if (configure_flow_steering(&server_sin))
-		error(1, 0, "Failed to configure flow steering\n");
-
-	sleep(1);
-
-	queues = malloc(sizeof(*queues) * num_queues);
-
-	for (i = 0; i < num_queues; i++) {
-		queues[i]._present.type = 1;
-		queues[i]._present.id = 1;
-		queues[i].type = NETDEV_QUEUE_TYPE_RX;
-		queues[i].id = start_queue + i;
-	}
-
-	if (bind_rx_queue(ifindex, mem->fd, queues, num_queues, &ys))
-		error(1, 0, "Failed to bind\n");
-
-	tmp_mem = malloc(mem->size);
-	if (!tmp_mem)
-		error(1, ENOMEM, "malloc failed");
-
-	socket_fd = socket(AF_INET6, SOCK_STREAM, 0);
-	if (socket_fd < 0)
-		error(1, errno, "%s: [FAIL, create socket]\n", TEST_PREFIX);
-
-	enable_reuseaddr(socket_fd);
-
-	fprintf(stderr, "binding to address %s:%d\n", server_ip,
-		ntohs(server_sin.sin6_port));
-
-	ret = bind(socket_fd, &server_sin, sizeof(server_sin));
-	if (ret)
-		error(1, errno, "%s: [FAIL, bind]\n", TEST_PREFIX);
-
-	ret = listen(socket_fd, 1);
-	if (ret)
-		error(1, errno, "%s: [FAIL, listen]\n", TEST_PREFIX);
-
-	client_addr_len = sizeof(client_addr);
-
-	inet_ntop(AF_INET6, &server_sin.sin6_addr, buffer,
-		  sizeof(buffer));
-	fprintf(stderr, "Waiting or connection on %s:%d\n", buffer,
-		ntohs(server_sin.sin6_port));
-	client_fd = accept(socket_fd, &client_addr, &client_addr_len);
-
-	inet_ntop(AF_INET6, &client_addr.sin6_addr, buffer,
-		  sizeof(buffer));
-	fprintf(stderr, "Got connection from %s:%d\n", buffer,
-		ntohs(client_addr.sin6_port));
-
-	while (1) {
-		struct iovec iov = { .iov_base = iobuf,
-				     .iov_len = sizeof(iobuf) };
-		struct dmabuf_cmsg *dmabuf_cmsg = NULL;
-		struct cmsghdr *cm = NULL;
-		struct msghdr msg = { 0 };
-		struct dmabuf_token token;
-		ssize_t ret;
-
-		is_devmem = false;
-
-		msg.msg_iov = &iov;
-		msg.msg_iovlen = 1;
-		msg.msg_control = ctrl_data;
-		msg.msg_controllen = sizeof(ctrl_data);
-		ret = recvmsg(client_fd, &msg, MSG_SOCK_DEVMEM);
-		fprintf(stderr, "recvmsg ret=%ld\n", ret);
-		if (ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))
-			continue;
-		if (ret < 0) {
-			perror("recvmsg");
-			continue;
-		}
-		if (ret == 0) {
-			fprintf(stderr, "client exited\n");
-			goto cleanup;
-		}
-
-		i++;
-		for (cm = CMSG_FIRSTHDR(&msg); cm; cm = CMSG_NXTHDR(&msg, cm)) {
-			if (cm->cmsg_level != SOL_SOCKET ||
-			    (cm->cmsg_type != SCM_DEVMEM_DMABUF &&
-			     cm->cmsg_type != SCM_DEVMEM_LINEAR)) {
-				fprintf(stderr, "skipping non-devmem cmsg\n");
-				continue;
-			}
-
-			dmabuf_cmsg = (struct dmabuf_cmsg *)CMSG_DATA(cm);
-			is_devmem = true;
-
-			if (cm->cmsg_type == SCM_DEVMEM_LINEAR) {
-				/* TODO: process data copied from skb's linear
-				 * buffer.
-				 */
-				fprintf(stderr,
-					"SCM_DEVMEM_LINEAR. dmabuf_cmsg->frag_size=%u\n",
-					dmabuf_cmsg->frag_size);
-
-				continue;
-			}
-
-			token.token_start = dmabuf_cmsg->frag_token;
-			token.token_count = 1;
-
-			total_received += dmabuf_cmsg->frag_size;
-			fprintf(stderr,
-				"received frag_page=%llu, in_page_offset=%llu, frag_offset=%llu, frag_size=%u, token=%u, total_received=%lu, dmabuf_id=%u\n",
-				dmabuf_cmsg->frag_offset >> PAGE_SHIFT,
-				dmabuf_cmsg->frag_offset % getpagesize(),
-				dmabuf_cmsg->frag_offset,
-				dmabuf_cmsg->frag_size, dmabuf_cmsg->frag_token,
-				total_received, dmabuf_cmsg->dmabuf_id);
-
-			if (dmabuf_cmsg->dmabuf_id != dmabuf_id)
-				error(1, 0,
-				      "received on wrong dmabuf_id: flow steering error\n");
-
-			if (dmabuf_cmsg->frag_size % getpagesize())
-				non_page_aligned_frags++;
-			else
-				page_aligned_frags++;
-
-			provider->memcpy_from_device(tmp_mem, mem,
-						     dmabuf_cmsg->frag_offset,
-						     dmabuf_cmsg->frag_size);
-
-			if (do_validation)
-				validate_buffer(tmp_mem,
-						dmabuf_cmsg->frag_size);
-			else
-				print_nonzero_bytes(tmp_mem,
-						    dmabuf_cmsg->frag_size);
-
-			ret = setsockopt(client_fd, SOL_SOCKET,
-					 SO_DEVMEM_DONTNEED, &token,
-					 sizeof(token));
-			if (ret != 1)
-				error(1, 0,
-				      "SO_DEVMEM_DONTNEED not enough tokens");
-		}
-		if (!is_devmem)
-			error(1, 0, "flow steering error\n");
-
-		fprintf(stderr, "total_received=%lu\n", total_received);
-	}
-
-	fprintf(stderr, "%s: ok\n", TEST_PREFIX);
-
-	fprintf(stderr, "page_aligned_frags=%lu, non_page_aligned_frags=%lu\n",
-		page_aligned_frags, non_page_aligned_frags);
-
-	fprintf(stderr, "page_aligned_frags=%lu, non_page_aligned_frags=%lu\n",
-		page_aligned_frags, non_page_aligned_frags);
-
-cleanup:
-
-	free(tmp_mem);
-	close(client_fd);
-	close(socket_fd);
-	ynl_sock_destroy(ys);
-
-	return 0;
-}
-
-void run_devmem_tests(void)
-{
-	struct netdev_queue_id *queues;
-	struct memory_buffer *mem;
-	struct ynl_sock *ys;
-	size_t i = 0;
-
-	mem = provider->alloc(getpagesize() * NUM_PAGES);
-
-	/* Configure RSS to divert all traffic from our devmem queues */
-	if (configure_rss())
-		error(1, 0, "rss error\n");
-
-	queues = calloc(num_queues, sizeof(*queues));
-
-	if (configure_headersplit(1))
-		error(1, 0, "Failed to configure header split\n");
-
-	if (!bind_rx_queue(ifindex, mem->fd, queues, num_queues, &ys))
-		error(1, 0, "Binding empty queues array should have failed\n");
-
-	for (i = 0; i < num_queues; i++) {
-		queues[i]._present.type = 1;
-		queues[i]._present.id = 1;
-		queues[i].type = NETDEV_QUEUE_TYPE_RX;
-		queues[i].id = start_queue + i;
-	}
-
-	if (configure_headersplit(0))
-		error(1, 0, "Failed to configure header split\n");
-
-	if (!bind_rx_queue(ifindex, mem->fd, queues, num_queues, &ys))
-		error(1, 0, "Configure dmabuf with header split off should have failed\n");
-
-	if (configure_headersplit(1))
-		error(1, 0, "Failed to configure header split\n");
-
-	for (i = 0; i < num_queues; i++) {
-		queues[i]._present.type = 1;
-		queues[i]._present.id = 1;
-		queues[i].type = NETDEV_QUEUE_TYPE_RX;
-		queues[i].id = start_queue + i;
-	}
-
-	if (bind_rx_queue(ifindex, mem->fd, queues, num_queues, &ys))
-		error(1, 0, "Failed to bind\n");
-
-	/* Deactivating a bound queue should not be legal */
-	if (!configure_channels(num_queues, num_queues - 1))
-		error(1, 0, "Deactivating a bound queue should be illegal.\n");
-
-	/* Closing the netlink socket does an implicit unbind */
-	ynl_sock_destroy(ys);
-
-	provider->free(mem);
-}
-
-int main(int argc, char *argv[])
-{
-	struct memory_buffer *mem;
-	int is_server = 0, opt;
-	int ret;
-
-	while ((opt = getopt(argc, argv, "ls:c:p:v:q:t:f:")) != -1) {
-		switch (opt) {
-		case 'l':
-			is_server = 1;
-			break;
-		case 's':
-			server_ip = optarg;
-			break;
-		case 'c':
-			client_ip = optarg;
-			break;
-		case 'p':
-			port = optarg;
-			break;
-		case 'v':
-			do_validation = atoll(optarg);
-			break;
-		case 'q':
-			num_queues = atoi(optarg);
-			break;
-		case 't':
-			start_queue = atoi(optarg);
-			break;
-		case 'f':
-			ifname = optarg;
-			break;
-		case '?':
-			fprintf(stderr, "unknown option: %c\n", optopt);
-			break;
-		}
-	}
-
-	if (!ifname)
-		error(1, 0, "Missing -f argument\n");
-
-	ifindex = if_nametoindex(ifname);
-
-	if (!server_ip && !client_ip) {
-		if (start_queue < 0 && num_queues < 0) {
-			num_queues = rxq_num(ifindex);
-			if (num_queues < 0)
-				error(1, 0, "couldn't detect number of queues\n");
-			if (num_queues < 2)
-				error(1, 0,
-				      "number of device queues is too low\n");
-			/* make sure can bind to multiple queues */
-			start_queue = num_queues / 2;
-			num_queues /= 2;
-		}
-
-		if (start_queue < 0 || num_queues < 0)
-			error(1, 0, "Both -t and -q are required\n");
-
-		run_devmem_tests();
-		return 0;
-	}
-
-	if (start_queue < 0 && num_queues < 0) {
-		num_queues = rxq_num(ifindex);
-		if (num_queues < 2)
-			error(1, 0, "number of device queues is too low\n");
-
-		num_queues = 1;
-		start_queue = rxq_num(ifindex) - num_queues;
-
-		if (start_queue < 0)
-			error(1, 0, "couldn't detect number of queues\n");
-
-		fprintf(stderr, "using queues %d..%d\n", start_queue, start_queue + num_queues);
-	}
-
-	for (; optind < argc; optind++)
-		fprintf(stderr, "extra arguments: %s\n", argv[optind]);
-
-	if (start_queue < 0)
-		error(1, 0, "Missing -t argument\n");
-
-	if (num_queues < 0)
-		error(1, 0, "Missing -q argument\n");
-
-	if (!server_ip)
-		error(1, 0, "Missing -s argument\n");
-
-	if (!port)
-		error(1, 0, "Missing -p argument\n");
-
-	mem = provider->alloc(getpagesize() * NUM_PAGES);
-	ret = is_server ? do_server(mem) : 1;
-	provider->free(mem);
-
-	return ret;
-}