common/mlx5: introduce common library

[dpdk.git] / drivers / net / mlx5 / mlx5_rxtx_vec_altivec.h

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
index 3be3a6d..1467a42 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
+++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h
@@ -17,13 +17,14 @@
 #include <rte_mempool.h>
 #include <rte_prefetch.h>
 
+#include <mlx5_prm.h>
+
+#include "mlx5_defs.h"
 #include "mlx5.h"
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.h"
 #include "mlx5_rxtx_vec.h"
 #include "mlx5_autoconf.h"
-#include "mlx5_defs.h"
-#include "mlx5_prm.h"
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
@@ -344,9 +345,8 @@ rxq_cq_to_ptype_oflags_v(struct mlx5_rxq_data *rxq,
                PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD |
                PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED};
        const vector unsigned char mbuf_init =
-               (vector unsigned char)(vector unsigned long){
-               *(__attribute__((__aligned__(8))) unsigned long *)
-               &rxq->mbuf_initializer, 0LL};
+               (vector unsigned char)vec_vsx_ld
+                       (0, (vector unsigned char *)&rxq->mbuf_initializer);
        const vector unsigned short rearm_sel_mask =
                (vector unsigned short){0, 0, 0, 0, 0xffff, 0xffff, 0, 0};
        vector unsigned char rearm0, rearm1, rearm2, rearm3;
@@ -416,7 +416,6 @@ rxq_cq_to_ptype_oflags_v(struct mlx5_rxq_data *rxq,
                        vec_cmpeq((vector unsigned int)flow_tag,
                        (vector unsigned int)pinfo_ft_mask)));
        }
-
        /*
         * Merge the two fields to generate the following:
         * bit[1]     = l3_ok
@@ -1011,7 +1010,29 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
                        pkts[pos + 3]->timestamp =
                                rte_be_to_cpu_64(cq[pos + p3].timestamp);
                }
-
+               if (rte_flow_dynf_metadata_avail()) {
+                       uint64_t flag = rte_flow_dynf_metadata_mask;
+                       int offs = rte_flow_dynf_metadata_offs;
+                       uint32_t metadata;
+
+                       /* This code is subject for futher optimization. */
+                       metadata = cq[pos].flow_table_metadata;
+                       *RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
+                                                               metadata;
+                       pkts[pos]->ol_flags |= metadata ? flag : 0ULL;
+                       metadata = cq[pos + 1].flow_table_metadata;
+                       *RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *) =
+                                                               metadata;
+                       pkts[pos + 1]->ol_flags |= metadata ? flag : 0ULL;
+                       metadata = cq[pos + 2].flow_table_metadata;
+                       *RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t *) =
+                                                               metadata;
+                       pkts[pos + 2]->ol_flags |= metadata ? flag : 0ULL;
+                       metadata = cq[pos + 3].flow_table_metadata;
+                       *RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t *) =
+                                                               metadata;
+                       pkts[pos + 3]->ol_flags |= metadata ? flag : 0ULL;
+               }
 #ifdef MLX5_PMD_SOFT_COUNTERS
                /* Add up received bytes count. */
                byte_cnt = vec_perm(op_own, zero, len_shuf_mask);