Merge branch 'master' into github-master

Author: giuseppelettieri

apps/pkt-gen/pkt-gen.c

@@ -1649,6 +1649,14 @@ receiver_body(void *data)
 		i = poll(&pfd, 1, 1000);
 		if (i > 0 && !(pfd.revents & POLLERR))
 			break;
+		if (i < 0) {
+			D("poll() error: %s", strerror(errno));
+			goto quit;
+		}
+		if (pfd.revents & POLLERR) {
+			D("fd error");
+			goto quit;
+		}
 		RD(1, "waiting for initial packets, poll returns %d %d",
 			i, pfd.revents);
 	}

sys/dev/netmap/netmap_vale.c

@@ -553,6 +553,7 @@ static int
 nm_vi_destroy(const char *name)
 {
 	struct ifnet *ifp;
+	struct netmap_vp_adapter *vpna;
 	int error;
 
 	ifp = ifunit_ref(name);
@@ -565,18 +566,29 @@ nm_vi_destroy(const char *name)
 		goto err;
 	}
 
-	if (NA(ifp)->na_refcount > 1) {
+	vpna = (struct netmap_vp_adapter *)NA(ifp);
+
+	/* we can only destroy ports that were created via NETMAP_BDG_NEWIF */
+	if (vpna->autodelete) {
+		error = EINVAL;
+		goto err;
+	}
+
+	/* also make sure that nobody is using the inferface */
+	if (NETMAP_OWNED_BY_ANY(&vpna->up) ||
+	    vpna->up.na_refcount > 1 /* any ref besides the one in nm_vi_create()? */) {
 		error = EBUSY;
 		goto err;
 	}
+
 	NMG_UNLOCK();
 
 	D("destroying a persistent vale interface %s", ifp->if_xname);
 	/* Linux requires all the references are released
 	 * before unregister
 	 */
-	if_rele(ifp);
 	netmap_detach(ifp);
+	if_rele(ifp);
 	nm_os_vi_detach(ifp);
 	return 0;
 

utils/testmmap.c

@@ -802,7 +802,8 @@ nmr_arg_extra()
 	printf("arg1:      %d [%sextra rings]\n", curr_nmr.nr_arg1,
 		(curr_nmr.nr_arg1 ? "" : "no "));
 	printf("arg2:      %d [%s memory allocator]\n", curr_nmr.nr_arg2,
-		(curr_nmr.nr_arg2 == 0 ? "global" : "private"));
+		(curr_nmr.nr_arg2 == 0 ? "default" :
+		 curr_nmr.nr_arg2 == 1 ? "global"  : "private"));
 	printf("arg3:      %d [%sextra buffers]\n", curr_nmr.nr_arg3,
 		(curr_nmr.nr_arg3 ? "" : "no "));
 }