Merge branch 'master' into gh

Author: vmaffione

LINUX/veth_netmap.h

@@ -114,7 +114,7 @@ veth_netmap_reg(struct netmap_adapter *na, int onoff)
 	/* Enable or disable flags and callbacks in na and ifp. */
 	if (onoff) {
 		for_rx_tx(t) {
-			for (i = 0; i < nma_get_nrings(na, t) + 1; i++) {
+			for (i = 0; i < nma_get_nrings(na, t); i++) {
 				struct netmap_kring *kring = &NMR(na, t)[i];
 
 				if (nm_kring_pending_on(kring)) {
@@ -154,10 +154,15 @@ veth_netmap_reg(struct netmap_adapter *na, int onoff)
 
 				if (nm_kring_pending_off(kring)) {
 					kring->nr_mode = NKR_NETMAP_OFF;
-					/* mark the peer ring as no longer needed by us
-					 * (it may still be kept if sombody else is using it)
+					/* If hw kring, mark the peer kring
+					 * as no longer needed by us (it may
+					 * still be kept if sombody else is
+					 * using it).
 					 */
-					kring->pipe->nr_kflags &= ~NKR_NEEDRING;
+					if (kring->pipe) {
+						kring->pipe->nr_kflags &=
+								~NKR_NEEDRING;
+					}
 				}
 			}
 		}
@@ -212,7 +217,7 @@ veth_netmap_krings_create(struct netmap_adapter *na)
 	if (error)
 		goto del_krings1;
 
-	/* cross link the krings */
+	/* cross link the krings (only the hw ones, not the host krings) */
 	for_rx_tx(t) {
 		enum txrx r = nm_txrx_swap(t); /* swap NR_TX <-> NR_RX */
 		int i;

sys/dev/netmap/netmap.c

@@ -1242,11 +1242,9 @@ netmap_txsync_to_host(struct netmap_kring *kring, int flags)
  * They have been put in kring->rx_queue by netmap_transmit().
  * We protect access to the kring using kring->rx_queue.lock
  *
- * This routine also does the selrecord if called from the poll handler
- * (we know because sr != NULL).
- *
- * returns the number of packets delivered to tx queues in
- * transparent mode, or a negative value if error
+ * also moves to the nic hw rings any packet the user has marked
+ * for transparent-mode forwarding, then sets the NR_FORWARD
+ * flag in the kring to let the caller push them out
  */
 static int
 netmap_rxsync_from_host(struct netmap_kring *kring, int flags)

sys/dev/netmap/netmap_pipe.c

@@ -390,7 +390,7 @@ netmap_pipe_reg(struct netmap_adapter *na, int onoff)
 	ND("%p: onoff %d", na, onoff);
 	if (onoff) {
 		for_rx_tx(t) {
-			for (i = 0; i < nma_get_nrings(na, t) + 1; i++) {
+			for (i = 0; i < nma_get_nrings(na, t); i++) {
 				struct netmap_kring *kring = &NMR(na, t)[i];
 
 				if (nm_kring_pending_on(kring)) {
@@ -429,7 +429,9 @@ netmap_pipe_reg(struct netmap_adapter *na, int onoff)
 					/* mark the peer ring as no longer needed by us
 					 * (it may still be kept if sombody else is using it)
 					 */
-					kring->pipe->nr_kflags &= ~NKR_NEEDRING;
+					if (kring->pipe) {
+						kring->pipe->nr_kflags &= ~NKR_NEEDRING;
+					}
 				}
 			}
 		}

utils/switch-modules/ovs-2.4.0/0001-datapath-netmap-VALE-support.patch

@@ -1,9 +1,9 @@
 diff --git a/INSTALL.NETMAP b/INSTALL.NETMAP
 new file mode 100644
-index 000000000..f70466798
+index 000000000..664078ed3
 --- /dev/null
 +++ b/INSTALL.NETMAP
-@@ -0,0 +1,95 @@
+@@ -0,0 +1,99 @@
 +                   Using Open vSwitch with netmap (VALE)
 +                   ============================
 +
@@ -38,6 +38,10 @@ index 000000000..f70466798
 +netmap kernel module (LINUX/Module.symvers).
 +
 +Before being able to build OVS, therefore, you need to build netmap.
++When building netmap, run ./configure and make in the root directory of
++the netmap repository; don't run those in the LINUX/ subdir or into
++another build directory, otherwise the openvswitch module will not be
++built with the correct dependencies in place.
 +
 +To quickly build and run, ovs-dev.py script can also be used:
 +

utils/switch-modules/ovs-2.6.1/0001-datapath-netmap-VALE-support.patch

@@ -1,9 +1,9 @@
 diff --git a/INSTALL.NETMAP b/INSTALL.NETMAP
 new file mode 100644
-index 000000000..12ee16307
+index 000000000..7cf02e45e
 --- /dev/null
 +++ b/INSTALL.NETMAP
-@@ -0,0 +1,95 @@
+@@ -0,0 +1,99 @@
 +                   Using Open vSwitch with netmap (VALE)
 +                   ============================
 +
@@ -38,6 +38,10 @@ index 000000000..12ee16307
 +netmap kernel module (LINUX/Module.symvers).
 +
 +Before being able to build OVS, therefore, you need to build netmap.
++When building netmap, run ./configure and make in the root directory of
++the netmap repository; don't run those in the LINUX/ subdir or into
++another build directory, otherwise the openvswitch module will not be
++built with the correct dependencies in place.
 +
 +To quickly build and run, ovs-dev.py script can also be used:
 +