common/mlx5: fix PCI driver name

[dpdk.git] / drivers / net / octeontx2 / otx2_rx.h

diff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h
index d8648b6..926f614 100644 (file)
--- a/drivers/net/octeontx2/otx2_rx.h
+++ b/drivers/net/octeontx2/otx2_rx.h
@@ -9,6 +9,7 @@
 
 #include "otx2_common.h"
 #include "otx2_ethdev_sec.h"
+#include "otx2_ipsec_anti_replay.h"
 #include "otx2_ipsec_fp.h"
 
 /* Default mark value used when none is provided. */
@@ -48,6 +49,8 @@ struct otx2_timesync_info {
        uint64_t        rx_tstamp;
        rte_iova_t      tx_tstamp_iova;
        uint64_t        *tx_tstamp;
+       uint64_t        rx_tstamp_dynflag;
+       int             tstamp_dynfield_offset;
        uint8_t         tx_ready;
        uint8_t         rx_ready;
 } __rte_cache_aligned;
@@ -62,6 +65,14 @@ union mbuf_initializer {
        uint64_t value;
 };
 
+static inline rte_mbuf_timestamp_t *
+otx2_timestamp_dynfield(struct rte_mbuf *mbuf,
+               struct otx2_timesync_info *info)
+{
+       return RTE_MBUF_DYNFIELD(mbuf,
+               info->tstamp_dynfield_offset, rte_mbuf_timestamp_t *);
+}
+
 static __rte_always_inline void
 otx2_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,
                        struct otx2_timesync_info *tstamp, const uint16_t flag,
@@ -76,15 +87,18 @@ otx2_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,
                /* Reading the rx timestamp inserted by CGX, viz at
                 * starting of the packet data.
                 */
-               mbuf->timestamp = rte_be_to_cpu_64(*tstamp_ptr);
+               *otx2_timestamp_dynfield(mbuf, tstamp) =
+                               rte_be_to_cpu_64(*tstamp_ptr);
                /* PKT_RX_IEEE1588_TMST flag needs to be set only in case
                 * PTP packets are received.
                 */
                if (mbuf->packet_type == RTE_PTYPE_L2_ETHER_TIMESYNC) {
-                       tstamp->rx_tstamp = mbuf->timestamp;
+                       tstamp->rx_tstamp =
+                                       *otx2_timestamp_dynfield(mbuf, tstamp);
                        tstamp->rx_ready = 1;
                        mbuf->ol_flags |= PKT_RX_IEEE1588_PTP |
-                               PKT_RX_IEEE1588_TMST | PKT_RX_TIMESTAMP;
+                               PKT_RX_IEEE1588_TMST |
+                               tstamp->rx_tstamp_dynflag;
                }
        }
 }
@@ -240,9 +254,15 @@ nix_rx_sec_mbuf_update(const struct nix_cqe_hdr_s *cq, struct rte_mbuf *m,
        spi = cq->tag & 0xFFFFF;
 
        sa = nix_rx_sec_sa_get(lookup_mem, spi, m->port);
-       m->udata64 = (uint64_t)sa->userdata;
+       *rte_security_dynfield(m) = sa->udata64;
 
        data = rte_pktmbuf_mtod(m, char *);
+
+       if (sa->replay_win_sz) {
+               if (cpt_ipsec_antireplay_check(sa, data) < 0)
+                       return PKT_RX_SEC_OFFLOAD | PKT_RX_SEC_OFFLOAD_FAILED;
+       }
+
        memcpy(data + INLINE_INB_RPTR_HDR, data, RTE_ETHER_HDR_LEN);
 
        m->data_off += INLINE_INB_RPTR_HDR;