New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / net / mlx5 / mlx5_rxtx_vec.c

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c
index 0a4aed8..1453f4f 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx_vec.c
+++ b/drivers/net/mlx5/mlx5_rxtx_vec.c
@@ -40,7 +40,8 @@
 #endif
 
 /**
- * Count the number of packets having same ol_flags and calculate cs_flags.
+ * Count the number of packets having same ol_flags and same metadata (if
+ * PKT_TX_METADATA is set in ol_flags), and calculate cs_flags.
  *
  * @param pkts
  *   Pointer to array of packets.
@@ -48,26 +49,45 @@
  *   Number of packets.
  * @param cs_flags
  *   Pointer of flags to be returned.
+ * @param metadata
+ *   Pointer of metadata to be returned.
+ * @param txq_offloads
+ *   Offloads enabled on Tx queue
  *
  * @return
- *   Number of packets having same ol_flags.
+ *   Number of packets having same ol_flags and metadata, if relevant.
  */
 static inline unsigned int
-txq_calc_offload(struct rte_mbuf **pkts, uint16_t pkts_n, uint8_t *cs_flags)
+txq_calc_offload(struct rte_mbuf **pkts, uint16_t pkts_n, uint8_t *cs_flags,
+                rte_be32_t *metadata, const uint64_t txq_offloads)
 {
        unsigned int pos;
-       const uint64_t ol_mask =
+       const uint64_t cksum_ol_mask =
                PKT_TX_IP_CKSUM | PKT_TX_TCP_CKSUM |
                PKT_TX_UDP_CKSUM | PKT_TX_TUNNEL_GRE |
                PKT_TX_TUNNEL_VXLAN | PKT_TX_OUTER_IP_CKSUM;
+       rte_be32_t p0_metadata, pn_metadata;
 
        if (!pkts_n)
                return 0;
-       /* Count the number of packets having same ol_flags. */
-       for (pos = 1; pos < pkts_n; ++pos)
-               if ((pkts[pos]->ol_flags ^ pkts[0]->ol_flags) & ol_mask)
+       p0_metadata = pkts[0]->ol_flags & PKT_TX_METADATA ?
+                       pkts[0]->tx_metadata : 0;
+       /* Count the number of packets having same offload parameters. */
+       for (pos = 1; pos < pkts_n; ++pos) {
+               /* Check if packet has same checksum flags. */
+               if ((txq_offloads & MLX5_VEC_TX_CKSUM_OFFLOAD_CAP) &&
+                   ((pkts[pos]->ol_flags ^ pkts[0]->ol_flags) & cksum_ol_mask))
                        break;
+               /* Check if packet has same metadata. */
+               if (txq_offloads & DEV_TX_OFFLOAD_MATCH_METADATA) {
+                       pn_metadata = pkts[pos]->ol_flags & PKT_TX_METADATA ?
+                                       pkts[pos]->tx_metadata : 0;
+                       if (pn_metadata != p0_metadata)
+                               break;
+               }
+       }
        *cs_flags = txq_ol_cksum_to_cs(pkts[0]);
+       *metadata = p0_metadata;
        return pos;
 }
 
@@ -96,7 +116,7 @@ mlx5_tx_burst_raw_vec(void *dpdk_txq, struct rte_mbuf **pkts,
                uint16_t ret;
 
                n = RTE_MIN((uint16_t)(pkts_n - nb_tx), MLX5_VPMD_TX_MAX_BURST);
-               ret = txq_burst_v(txq, &pkts[nb_tx], n, 0);
+               ret = txq_burst_v(txq, &pkts[nb_tx], n, 0, 0);
                nb_tx += ret;
                if (!ret)
                        break;
@@ -127,6 +147,7 @@ mlx5_tx_burst_vec(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                uint8_t cs_flags = 0;
                uint16_t n;
                uint16_t ret;
+               rte_be32_t metadata = 0;
 
                /* Transmit multi-seg packets in the head of pkts list. */
                if ((txq->offloads & DEV_TX_OFFLOAD_MULTI_SEGS) &&
@@ -137,9 +158,12 @@ mlx5_tx_burst_vec(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                n = RTE_MIN((uint16_t)(pkts_n - nb_tx), MLX5_VPMD_TX_MAX_BURST);
                if (txq->offloads & DEV_TX_OFFLOAD_MULTI_SEGS)
                        n = txq_count_contig_single_seg(&pkts[nb_tx], n);
-               if (txq->offloads & MLX5_VEC_TX_CKSUM_OFFLOAD_CAP)
-                       n = txq_calc_offload(&pkts[nb_tx], n, &cs_flags);
-               ret = txq_burst_v(txq, &pkts[nb_tx], n, cs_flags);
+               if (txq->offloads & (MLX5_VEC_TX_CKSUM_OFFLOAD_CAP |
+                                    DEV_TX_OFFLOAD_MATCH_METADATA))
+                       n = txq_calc_offload(&pkts[nb_tx], n,
+                                            &cs_flags, &metadata,
+                                            txq->offloads);
+               ret = txq_burst_v(txq, &pkts[nb_tx], n, cs_flags, metadata);
                nb_tx += ret;
                if (!ret)
                        break;