net/mlx5: fix RSS expansion for patterns with ICMP item

[dpdk.git] / drivers / net / iavf / iavf_rxtx_vec_common.h

diff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h b/drivers/net/iavf/iavf_rxtx_vec_common.h
index 62a333f..a59cb2c 100644 (file)
--- a/drivers/net/iavf/iavf_rxtx_vec_common.h
+++ b/drivers/net/iavf/iavf_rxtx_vec_common.h
@@ -15,7 +15,7 @@
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #endif
 
-static inline uint16_t
+static __rte_always_inline uint16_t
 reassemble_packets(struct iavf_rx_queue *rxq, struct rte_mbuf **rx_bufs,
                   uint16_t nb_bufs, uint8_t *split_flags)
 {
@@ -231,7 +231,13 @@ iavf_rx_vec_queue_default(struct iavf_rx_queue *rxq)
        if (rxq->proto_xtr != IAVF_PROTO_XTR_NONE)
                return -1;
 
-       return 0;
+       if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)
+               return -1;
+
+       if (rxq->offloads & IAVF_RX_VECTOR_OFFLOAD)
+               return IAVF_VECTOR_OFFLOAD_PATH;
+
+       return IAVF_VECTOR_PATH;
 }
 
 static inline int
@@ -258,14 +264,20 @@ iavf_rx_vec_dev_check_default(struct rte_eth_dev *dev)
 {
        int i;
        struct iavf_rx_queue *rxq;
+       int ret;
+       int result = 0;
 
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
                rxq = dev->data->rx_queues[i];
-               if (iavf_rx_vec_queue_default(rxq))
+               ret = iavf_rx_vec_queue_default(rxq);
+
+               if (ret < 0)
                        return -1;
+               if (ret > result)
+                       result = ret;
        }
 
-       return 0;
+       return result;
 }
 
 static inline int
@@ -317,33 +329,33 @@ iavf_txd_enable_offload(__rte_unused struct rte_mbuf *tx_pkt,
                     IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;
 
        /* Enable L3 checksum offloads */
-       if (ol_flags & PKT_TX_IP_CKSUM) {
+       if (ol_flags & RTE_MBUF_F_TX_IP_CKSUM) {
                td_cmd |= IAVF_TX_DESC_CMD_IIPT_IPV4_CSUM;
                td_offset |= (tx_pkt->l3_len >> 2) <<
                             IAVF_TX_DESC_LENGTH_IPLEN_SHIFT;
-       } else if (ol_flags & PKT_TX_IPV4) {
+       } else if (ol_flags & RTE_MBUF_F_TX_IPV4) {
                td_cmd |= IAVF_TX_DESC_CMD_IIPT_IPV4;
                td_offset |= (tx_pkt->l3_len >> 2) <<
                             IAVF_TX_DESC_LENGTH_IPLEN_SHIFT;
-       } else if (ol_flags & PKT_TX_IPV6) {
+       } else if (ol_flags & RTE_MBUF_F_TX_IPV6) {
                td_cmd |= IAVF_TX_DESC_CMD_IIPT_IPV6;
                td_offset |= (tx_pkt->l3_len >> 2) <<
                             IAVF_TX_DESC_LENGTH_IPLEN_SHIFT;
        }
 
        /* Enable L4 checksum offloads */
-       switch (ol_flags & PKT_TX_L4_MASK) {
-       case PKT_TX_TCP_CKSUM:
+       switch (ol_flags & RTE_MBUF_F_TX_L4_MASK) {
+       case RTE_MBUF_F_TX_TCP_CKSUM:
                td_cmd |= IAVF_TX_DESC_CMD_L4T_EOFT_TCP;
                td_offset |= (sizeof(struct rte_tcp_hdr) >> 2) <<
                             IAVF_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
                break;
-       case PKT_TX_SCTP_CKSUM:
+       case RTE_MBUF_F_TX_SCTP_CKSUM:
                td_cmd |= IAVF_TX_DESC_CMD_L4T_EOFT_SCTP;
                td_offset |= (sizeof(struct rte_sctp_hdr) >> 2) <<
                             IAVF_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
                break;
-       case PKT_TX_UDP_CKSUM:
+       case RTE_MBUF_F_TX_UDP_CKSUM:
                td_cmd |= IAVF_TX_DESC_CMD_L4T_EOFT_UDP;
                td_offset |= (sizeof(struct rte_udp_hdr) >> 2) <<
                             IAVF_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
@@ -356,7 +368,7 @@ iavf_txd_enable_offload(__rte_unused struct rte_mbuf *tx_pkt,
 #endif
 
 #ifdef IAVF_TX_VLAN_QINQ_OFFLOAD
-       if (ol_flags & (PKT_TX_VLAN | PKT_TX_QINQ)) {
+       if (ol_flags & (RTE_MBUF_F_TX_VLAN | RTE_MBUF_F_TX_QINQ)) {
                td_cmd |= IAVF_TX_DESC_CMD_IL2TAG1;
                *txd_hi |= ((uint64_t)tx_pkt->vlan_tci <<
                            IAVF_TXD_QW1_L2TAG1_SHIFT);
@@ -561,7 +573,7 @@ iavf_rxq_rearm_common(struct iavf_rx_queue *rxq, __rte_unused bool avx512)
                             (rxq->nb_rx_desc - 1) : (rxq->rxrearm_start - 1));
 
        /* Update the tail pointer on the NIC */
-       IAVF_PCI_REG_WRITE(rxq->qrx_tail, rx_id);
+       IAVF_PCI_REG_WC_WRITE(rxq->qrx_tail, rx_id);
 }
 #endif