Merge branch 'master' into gh

Author: vmaffione

sys/dev/netmap/if_em_netmap.h

@@ -277,9 +277,9 @@ em_netmap_rxsync(struct netmap_kring *kring, int flags)
 			if (addr == NETMAP_BUF_BASE(na)) /* bad buf */
 				goto ring_reset;
 
+			curr->read.buffer_addr = htole64(paddr);
 			if (slot->flags & NS_BUF_CHANGED) {
 				/* buffer has changed, reload map */
-				curr->read.buffer_addr = htole64(paddr);
 				netmap_reload_map(na, rxr->rxtag, rxbuf->map, addr);
 				slot->flags &= ~NS_BUF_CHANGED;
 			}

sys/dev/netmap/netmap.c

@@ -1046,20 +1046,20 @@ netmap_dtor(void *data)
  * These are associated to a network interface and are just another
  * ring pair managed by userspace.
  *
- * Netmap also supports transparent forwarding (NS_FOWARD and NR_FOWARD
+ * Netmap also supports transparent forwarding (NS_FORWARD and NR_FORWARD
  * flags):
  *
  * - Before releasing buffers on hw RX rings, the application can mark
- *   them with the NS_FOWARD flag. During the next RXSYNC or poll(), they
+ *   them with the NS_FORWARD flag. During the next RXSYNC or poll(), they
  *   will be forwarded to the host stack, similarly to what happened if
  *   the application moved them to the host TX ring.
  *
  * - Before releasing buffers on the host RX ring, the application can
- *   mark them with the NS_FOWARD flag. During the next RXSYNC or poll(),
+ *   mark them with the NS_FORWARD flag. During the next RXSYNC or poll(),
  *   they will be forwarded to the hw TX rings, saving the application
  *   from doing the same task in user-space.
  *
- * Transparent fowarding can be enabled per-ring, by setting the NR_FOWARD
+ * Transparent fowarding can be enabled per-ring, by setting the NR_FORWARD
  * flag, or globally with the netmap_fwd sysctl.
  *
  * The transfer NIC --> host is relatively easy, just encapsulate
@@ -2145,6 +2145,16 @@ nm_sync_finalize(struct netmap_kring *kring)
 		kring->rhead, kring->rcur, kring->rtail);
 }
 
+/* set ring timestamp */
+static inline void
+ring_timestamp_set(struct netmap_ring *ring)
+{
+	if (netmap_no_timestamp == 0 || ring->flags & NR_TIMESTAMP) {
+		microtime(&ring->ts);
+	}
+}
+
+
 /*
  * ioctl(2) support for the "netmap" device.
  *
@@ -2160,6 +2170,7 @@ nm_sync_finalize(struct netmap_kring *kring)
 int
 netmap_ioctl(struct netmap_priv_d *priv, u_long cmd, caddr_t data, struct thread *td)
 {
+	struct mbq q;	/* packets from RX hw queues to host stack */
 	struct nmreq *nmr = (struct nmreq *) data;
 	struct netmap_adapter *na = NULL;
 	struct netmap_mem_d *nmd = NULL;
@@ -2373,6 +2384,7 @@ netmap_ioctl(struct netmap_priv_d *priv, u_long cmd, caddr_t data, struct thread
 			break;
 		}
 
+		mbq_init(&q);
 		t = (cmd == NIOCTXSYNC ? NR_TX : NR_RX);
 		krings = NMR(na, t);
 		qfirst = priv->np_qfirst[t];
@@ -2404,14 +2416,23 @@ netmap_ioctl(struct netmap_priv_d *priv, u_long cmd, caddr_t data, struct thread
 			} else {
 				if (nm_rxsync_prologue(kring, ring) >= kring->nkr_num_slots) {
 					netmap_ring_reinit(kring);
-				} else if (kring->nm_sync(kring, NAF_FORCE_READ) == 0) {
+				}
+				if (nm_may_forward_up(kring)) {
+					/* transparent forwarding, see netmap_poll() */
+					netmap_grab_packets(kring, &q, netmap_fwd);
+				}
+				if (kring->nm_sync(kring, NAF_FORCE_READ) == 0) {
 					nm_sync_finalize(kring);
 				}
-				microtime(&ring->ts);
+				ring_timestamp_set(ring);
 			}
 			nm_kr_put(kring);
 		}
 
+		if (mbq_peek(&q)) {
+			netmap_send_up(na->ifp, &q);
+		}
+
 		break;
 
 #ifdef WITH_VALE
@@ -2482,7 +2503,7 @@ netmap_poll(struct netmap_priv_d *priv, int events, NM_SELRECORD_T *sr)
 	u_int i, check_all_tx, check_all_rx, want[NR_TXRX], revents = 0;
 #define want_tx want[NR_TX]
 #define want_rx want[NR_RX]
-	struct mbq q;		/* packets from hw queues to host stack */
+	struct mbq q;	/* packets from RX hw queues to host stack */
 	enum txrx t;
 
 	/*
@@ -2665,8 +2686,6 @@ netmap_poll(struct netmap_priv_d *priv, int events, NM_SELRECORD_T *sr)
 			 * hw rxring(s) that have been released by the user
 			 */
 			if (nm_may_forward_up(kring)) {
-				ND(2, "forwarding some buffers up %d to %d",
-				       kring->nr_hwcur, ring->cur);
 				netmap_grab_packets(kring, &q, netmap_fwd);
 			}
 
@@ -2679,10 +2698,7 @@ netmap_poll(struct netmap_priv_d *priv, int events, NM_SELRECORD_T *sr)
 			else
 				nm_sync_finalize(kring);
 			send_down |= (kring->nr_kflags & NR_FORWARD);
-			if (netmap_no_timestamp == 0 ||
-					ring->flags & NR_TIMESTAMP) {
-				microtime(&ring->ts);
-			}
+			ring_timestamp_set(ring);
 			found = kring->rcur != kring->rtail;
 			nm_kr_put(kring);
 			if (found) {

sys/dev/netmap/netmap_freebsd.c

@@ -403,17 +403,17 @@ netmap_getna(if_t ifp)
 int
 nm_os_generic_find_num_desc(struct ifnet *ifp, unsigned int *tx, unsigned int *rx)
 {
-	D("called, in tx %d rx %d", *tx, *rx);
 	return 0;
 }
 
 
 void
 nm_os_generic_find_num_queues(struct ifnet *ifp, u_int *txq, u_int *rxq)
 {
-	D("called, in txq %d rxq %d", *txq, *rxq);
-	*txq = netmap_generic_rings;
-	*rxq = netmap_generic_rings;
+	unsigned num_rings = netmap_generic_rings ? netmap_generic_rings : 1;
+
+	*txq = num_rings;
+	*rxq = num_rings;
 }
 
 void

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

@@ -1,6 +1,6 @@
 diff --git a/INSTALL.NETMAP b/INSTALL.NETMAP
 new file mode 100644
-index 000000000..57d796715
+index 000000000..f70466798
 --- /dev/null
 +++ b/INSTALL.NETMAP
 @@ -0,0 +1,95 @@
@@ -61,7 +61,7 @@ index 000000000..57d796715
 +
 +(3) Create an OVS bridge:
 +
-+# ovs-vsctl add-br vale0
++# ovs-vsctl add-br br0
 +
 +(4) Create two persistent VALE ports:
 +
@@ -70,20 +70,20 @@ index 000000000..57d796715
 +
 +(5) Attach the two ports to the bridge:
 +
-+# ovs-vsctl add-port vale0 vi0
-+# ovs-vsctl add-port vale0 vi1
++# ovs-vsctl add-port br0 vi0
++# ovs-vsctl add-port br0 vi1
 +
 +(6) Add some OpenFlow rules, to forward traffic betweeen vi0 and vi1
 +(assuming the port identifiers are 1 and 2):
 +
-+# ovs-ofctl add-flow vale0 in_port=1,actions=output:2
-+# ovs-ofctl add-flow vale0 in_port=2,actions=output:1
++# ovs-ofctl add-flow br0 in_port=1,actions=output:2
++# ovs-ofctl add-flow br0 in_port=2,actions=output:1
 +
 +(7) Bring the various interfaces up:
 +
 +# ip link set vi0 up
 +# ip link set vi1 up
-+# ip link set vale0 up
++# ip link set br0 up
 +
 +(8) Run pkt-gen in receive mode on vi0:
 +
@@ -98,7 +98,7 @@ index 000000000..57d796715
 +they have netmap support (e.g. Intel NIC veth interfaces,
 +etc.):
 +
-+# ovs-vsctl add-port vale0 eth2
++# ovs-vsctl add-port br0 eth2
 diff --git a/Makefile.am b/Makefile.am
 index 59a14667d..1f59e74fa 100644
 --- a/Makefile.am
@@ -185,10 +185,10 @@ index 3c97b86df..c0307dd22 100644
  	if (err)
 diff --git a/datapath/dp-vale.c b/datapath/dp-vale.c
 new file mode 100644
-index 000000000..41cb43337
+index 000000000..9b38f4431
 --- /dev/null
 +++ b/datapath/dp-vale.c
-@@ -0,0 +1,193 @@
+@@ -0,0 +1,195 @@
 +/*
 + * Copyright (c) 2014 NEC Europe Ltd.
 + *
@@ -286,7 +286,9 @@ index 000000000..41cb43337
 +	return dst.port;
 +}
 +
-+#define OVS_VALE_PREFIX "vale0:"
++/* Name of the VALE switch that will be actually used to
++ * implement the OVS datapath (for all the OVS bridges). */
++#define OVS_VALE_PREFIX "valeOVS:"
 +
 +static struct netmap_bdg_ops ovs_vale_ops = {
 +	.lookup = ovs_vale_lookup,

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

@@ -1,6 +1,6 @@
 diff --git a/INSTALL.NETMAP b/INSTALL.NETMAP
 new file mode 100644
-index 000000000..088a5d842
+index 000000000..12ee16307
 --- /dev/null
 +++ b/INSTALL.NETMAP
 @@ -0,0 +1,95 @@
@@ -61,7 +61,7 @@ index 000000000..088a5d842
 +
 +(3) Create an OVS bridge:
 +
-+# ovs-vsctl add-br vale0
++# ovs-vsctl add-br br0
 +
 +(4) Create two persistent VALE ports:
 +
@@ -70,20 +70,20 @@ index 000000000..088a5d842
 +
 +(5) Attach the two ports to the bridge:
 +
-+# ovs-vsctl add-port vale0 vi0
-+# ovs-vsctl add-port vale0 vi1
++# ovs-vsctl add-port br0 vi0
++# ovs-vsctl add-port br0 vi1
 +
 +(6) Add some OpenFlow rules, to forward traffic betweeen vi0 and vi1
 +(assuming the port identifiers are 1 and 2):
 +
-+# ovs-ofctl add-flow vale0 in_port=1,actions=output:2
-+# ovs-ofctl add-flow vale0 in_port=2,actions=output:1
++# ovs-ofctl add-flow br0 in_port=1,actions=output:2
++# ovs-ofctl add-flow br0 in_port=2,actions=output:1
 +
 +(7) Bring the various interfaces up:
 +
 +# ip link set vi0 up
 +# ip link set vi1 up
-+# ip link set vale0 up
++# ip link set br0 up
 +
 +(8) Run pkt-gen in receive mode on vi0:
 +
@@ -98,7 +98,7 @@ index 000000000..088a5d842
 +they have netmap support (e.g. Intel NIC veth interfaces,
 +etc.):
 +
-+# ovs-vsctl add-port vale0 eth2
++# ovs-vsctl add-port br0 eth2
 diff --git a/Makefile.am b/Makefile.am
 index 49010b3b5..56f4f62ef 100644
 --- a/Makefile.am
@@ -196,10 +196,10 @@ index db8a18a13..0352e3d83 100644
  	if (err)
 diff --git a/datapath/dp-vale.c b/datapath/dp-vale.c
 new file mode 100644
-index 000000000..514bf9197
+index 000000000..fb1ac5f6c
 --- /dev/null
 +++ b/datapath/dp-vale.c
-@@ -0,0 +1,195 @@
+@@ -0,0 +1,197 @@
 +/*
 + * Copyright (c) 2014 NEC Europe Ltd.
 + *
@@ -297,7 +297,9 @@ index 000000000..514bf9197
 +	return dst.port;
 +}
 +
-+#define OVS_VALE_PREFIX "vale0:"
++/* Name of the VALE switch that will be actually used to
++ * implement the OVS datapath (for all the OVS bridges). */
++#define OVS_VALE_PREFIX "valeOVS:"
 +
 +static struct netmap_bdg_ops ovs_vale_ops = {
 +	.lookup = ovs_vale_lookup,