Merge pull request torvalds#189 from liuyuan10/fixt

Add test for tap offloading
laijs · Aug 3, 2016 · 343ec93 · 343ec93
2 parents 47e5676 + ddf318c
commit 343ec93
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/tools/lkl/lib/virtio_net_linux_fdnet.c b/tools/lkl/lib/virtio_net_linux_fdnet.c
@@ -47,7 +47,7 @@ static int linux_fdnet_net_tx(struct lkl_netdev *nd,
 
 	do {
 		ret = writev(nd_fdnet->fd, (struct iovec *)iov, cnt);
-	} while (ret == -1 && errno == EINVAL);
+	} while (ret == -1 && errno == EINTR);
 
 	if (ret < 0 && errno != EAGAIN)
 		perror("write to Linux fd netdev fails");
@@ -63,7 +63,7 @@ static int linux_fdnet_net_rx(struct lkl_netdev *nd,
 
 	do {
 		ret = readv(nd_fdnet->fd, (struct iovec *)iov, cnt);
-	} while (ret == -1 && errno == EINVAL);
+	} while (ret == -1 && errno == EINTR);
 
 	if (ret < 0 && errno != EAGAIN)
 		perror("read from fdnet device fails");

diff --git a/tools/lkl/lib/virtio_net_tap.c b/tools/lkl/lib/virtio_net_tap.c
@@ -66,7 +66,7 @@ struct lkl_netdev *lkl_netdev_tap_create(const char *ifname, int offload)
 		close(fd);
 		return NULL;
 	}
-	if (tap_arg && ioctl(fd, TUNSETOFFLOAD, tap_arg) != 0) {
+	if (ioctl(fd, TUNSETOFFLOAD, tap_arg) != 0) {
 		fprintf(stderr, "tap: failed to TUNSETOFFLOAD to %s: %s\n",
 			ifr.ifr_name, strerror(errno));
 		close(fd);
@@ -75,6 +75,7 @@ struct lkl_netdev *lkl_netdev_tap_create(const char *ifname, int offload)
 	nd = lkl_register_netdev_linux_fdnet(fd);
 	if (!nd) {
 		perror("failed to register to.");
+		close(fd);
 		return NULL;
 	}
 	nd->dev.has_vnet_hdr = (vnet_hdr_sz != 0);

diff --git a/tools/lkl/tests/hijack-test.sh b/tools/lkl/tests/hijack-test.sh
@@ -118,7 +118,14 @@ echo "$ans" | tail -n 15 | grep "192.168.13.1"
 ans=$(${hijack_script} ip -6 route show) || true
 echo "$ans" | tail -n 15 | grep "2001:db8:0:f102::1"
 
-sh ${script_dir}/run_netperf.sh 192.168.13.1 1 0 TCP_STREAM
+# LKL_VIRTIO_NET_F_HOST_TSO4 && LKL_VIRTIO_NET_F_GUEST_TSO4
+# LKL_VIRTIO_NET_F_CSUM && LKL_VIRTIO_NET_F_GUEST_CSUM
+LKL_HIJACK_OFFLOAD=0x883 sh ${script_dir}/run_netperf.sh 192.168.13.1 1 0 TCP_STREAM
+LKL_HIJACK_OFFLOAD=0x883 sh ${script_dir}/run_netperf.sh 192.168.13.1 1 0 TCP_MAERTS
+
+# LKL_VIRTIO_NET_F_HOST_TSO4 && LKL_VIRTIO_NET_F_MRG_RXBUF
+# LKL_VIRTIO_NET_F_CSUM && LKL_VIRTIO_NET_F_GUEST_CSUM
+LKL_HIJACK_OFFLOAD=0x8803 sh ${script_dir}/run_netperf.sh 192.168.13.1 1 0 TCP_MAERTS
 sh ${script_dir}/run_netperf.sh 192.168.13.1 1 0 TCP_RR
 
 echo "== VDE tests =="