X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fdevices%2Fdpdk%2Fdevice.c;h=cd22d8a4689755b293d5c1dced2b8649b01b67e0;hb=c631f2de6dd06b4cbb92bf8398839b882344fd25;hp=3649178f3886949c0ea1591be075786db244a80d;hpb=b58598b73107eb314b1f6dde7c86a7b75e3497df;p=vpp.git

diff --git a/vnet/vnet/devices/dpdk/device.c b/vnet/vnet/devices/dpdk/device.c
index 3649178f388..cd22d8a4689 100644
--- a/vnet/vnet/devices/dpdk/device.c
+++ b/vnet/vnet/devices/dpdk/device.c
@@ -332,7 +332,48 @@ static_always_inline
 	    queue_id = (queue_id + 1) % xd->tx_q_used;
 	}
 
-      if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD))
+      if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_HQOS))	/* HQoS ON */
+	{
+	  if (PREDICT_TRUE (tx_head > tx_tail))
+	    {
+	      /* no wrap, transmit in one burst */
+	      dpdk_device_hqos_per_worker_thread_t *hqos =
+		&xd->hqos_wt[vm->cpu_index];
+
+	      dpdk_hqos_metadata_set (hqos,
+				      &tx_vector[tx_tail], tx_head - tx_tail);
+	      rv = rte_ring_sp_enqueue_burst (hqos->swq,
+					      (void **) &tx_vector[tx_tail],
+					      (uint16_t) (tx_head - tx_tail));
+	    }
+	  else
+	    {
+	      /*
+	       * This can only happen if there is a flowcontrol callback.
+	       * We need to split the transmit into two calls: one for
+	       * the packets up to the wrap point, and one to continue
+	       * at the start of the ring.
+	       * Transmit pkts up to the wrap point.
+	       */
+	      dpdk_device_hqos_per_worker_thread_t *hqos =
+		&xd->hqos_wt[vm->cpu_index];
+
+	      dpdk_hqos_metadata_set (hqos,
+				      &tx_vector[tx_tail],
+				      xd->nb_tx_desc - tx_tail);
+	      rv = rte_ring_sp_enqueue_burst (hqos->swq,
+					      (void **) &tx_vector[tx_tail],
+					      (uint16_t) (xd->nb_tx_desc -
+							  tx_tail));
+	      /*
+	       * If we transmitted everything we wanted, then allow 1 retry
+	       * so we can try to transmit the rest. If we didn't transmit
+	       * everything, stop now.
+	       */
+	      n_retry = (rv == xd->nb_tx_desc - tx_tail) ? 1 : 0;
+	    }
+	}
+      else if (PREDICT_TRUE (xd->flags & DPDK_DEVICE_FLAG_PMD))
 	{
 	  if (PREDICT_TRUE (tx_head > tx_tail))
 	    {
@@ -1234,6 +1275,7 @@ VNET_DEVICE_CLASS (dpdk_device_class) = {
   .rx_redirect_to_node = dpdk_set_interface_next_node,
   .no_flatten_output_chains = 1,
   .name_renumber = dpdk_device_renumber,
+  .mac_addr_change_function = dpdk_set_mac_address,
 };
 
 VLIB_DEVICE_TX_FUNCTION_MULTIARCH (dpdk_device_class, dpdk_interface_tx)