net/cnxk: fix mbuf data length

If multi-segment is enabled and single segment/packet
is received, then mbuf data_len is not updated in
cn9k_nix_cqe_to_mbuf() function.
Also, in case of timestamp is enabled, mbuf data_len
and pkt_len will be updated for all packets including
multi segmented packets.

Fixes: 7c6bee34064f ("net/cnxk: enable PTP processing in vector Rx")
Cc: stable@dpdk.org
Signed-off-by: Rahul Bhansali <rbhansali@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h
index bb32ef75ef37e6d3afdcab4fcd9cd43aae25f5ce..56e84bd5998fee9a0447c97676a260d1d2106a5e 100644 (file)
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -174,7 +174,6 @@ cn10k_process_vwqe(uintptr_t vwqe, uint16_t port_id, const uint32_t flags,
                                           CNXK_SSO_WQE_SG_PTR);
                cnxk_nix_mbuf_to_tstamp((struct rte_mbuf *)mbuf, tstamp,
                                        flags & NIX_RX_OFFLOAD_TSTAMP_F,
-                                       flags & NIX_RX_MULTI_SEG_F,
                                        (uint64_t *)tstamp_ptr);
                wqe[0] = (uint64_t *)mbuf;
                non_vec--;
@@ -266,7 +265,6 @@ cn10k_sso_hws_get_work(struct cn10k_sso_hws *ws, struct rte_event *ev,
                        cnxk_nix_mbuf_to_tstamp((struct rte_mbuf *)mbuf,
                                                ws->tstamp,
                                                flags & NIX_RX_OFFLOAD_TSTAMP_F,
-                                               flags & NIX_RX_MULTI_SEG_F,
                                                (uint64_t *)tstamp_ptr);
                        gw.u64[1] = mbuf;
                } else if (CNXK_EVENT_TYPE_FROM_TAG(gw.u64[0]) ==

diff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h
index 79b2b3809fe33b394bd3fcad39274aa4a316bc9b..385cc656cb46b5c4cd027355e3b4a0744c1c5b0f 100644 (file)
--- a/drivers/event/cnxk/cn9k_worker.h
+++ b/drivers/event/cnxk/cn9k_worker.h
@@ -231,7 +231,6 @@ cn9k_sso_hws_dual_get_work(uint64_t base, uint64_t pair_base,
                        cnxk_nix_mbuf_to_tstamp((struct rte_mbuf *)mbuf,
                                                dws->tstamp,
                                                flags & NIX_RX_OFFLOAD_TSTAMP_F,
-                                               flags & NIX_RX_MULTI_SEG_F,
                                                (uint64_t *)tstamp_ptr);
                        gw.u64[1] = mbuf;
                }
@@ -308,7 +307,6 @@ cn9k_sso_hws_get_work(struct cn9k_sso_hws *ws, struct rte_event *ev,
                        cnxk_nix_mbuf_to_tstamp((struct rte_mbuf *)mbuf,
                                                ws->tstamp,
                                                flags & NIX_RX_OFFLOAD_TSTAMP_F,
-                                               flags & NIX_RX_MULTI_SEG_F,
                                                (uint64_t *)tstamp_ptr);
                        gw.u64[1] = mbuf;
                }

diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
index 564e50f0afc7f43713fc0ceb3f821a00fc07f9ba..0c9fe4af6dfcd8221bb6c63d21d7fe22be326ba7 100644 (file)
--- a/drivers/net/cnxk/cn10k_rx.h
+++ b/drivers/net/cnxk/cn10k_rx.h
@@ -364,7 +364,13 @@ cn10k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
        *(uint64_t *)(&mbuf->rearm_data) = val;
 
        if (flag & NIX_RX_MULTI_SEG_F)
-               nix_cqe_xtract_mseg(rx, mbuf, val, flag);
+               /*
+                * For multi segment packets, mbuf length correction according
+                * to Rx timestamp length will be handled later during
+                * timestamp data process.
+                * Hence, flag argument is not required.
+                */
+               nix_cqe_xtract_mseg(rx, mbuf, val, 0);
        else
                mbuf->next = NULL;
 }
@@ -452,7 +458,6 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
                                      flags);
                cnxk_nix_mbuf_to_tstamp(mbuf, rxq->tstamp,
                                        (flags & NIX_RX_OFFLOAD_TSTAMP_F),
-                                       (flags & NIX_RX_MULTI_SEG_F),
                                        (uint64_t *)((uint8_t *)mbuf
                                                                + data_off));
                rx_pkts[packets++] = mbuf;

diff --git a/drivers/net/cnxk/cn9k_rx.h b/drivers/net/cnxk/cn9k_rx.h
index d36f292c953e8addab34d9cdbfaddd8c1c51b0fc..6b6c5bfbc2e9dec2bf9aa5fed3d16a1aca6c5a5c 100644 (file)
--- a/drivers/net/cnxk/cn9k_rx.h
+++ b/drivers/net/cnxk/cn9k_rx.h
@@ -391,13 +391,18 @@ skip_parse:
        mbuf->ol_flags = ol_flags;
        *(uint64_t *)(&mbuf->rearm_data) = val;
        mbuf->pkt_len = len;
-
-       if (flag & NIX_RX_MULTI_SEG_F) {
-               nix_cqe_xtract_mseg(rx, mbuf, val, flag);
-       } else {
-               mbuf->data_len = len;
+       mbuf->data_len = len;
+
+       if (flag & NIX_RX_MULTI_SEG_F)
+               /*
+                * For multi segment packets, mbuf length correction according
+                * to Rx timestamp length will be handled later during
+                * timestamp data process.
+                * Hence, flag argument is not required.
+                */
+               nix_cqe_xtract_mseg(rx, mbuf, val, 0);
+       else
                mbuf->next = NULL;
-       }
 }
 
 static inline uint16_t
@@ -460,7 +465,6 @@ cn9k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
                                     flags);
                cnxk_nix_mbuf_to_tstamp(mbuf, rxq->tstamp,
                                        (flags & NIX_RX_OFFLOAD_TSTAMP_F),
-                                       (flags & NIX_RX_MULTI_SEG_F),
                                        (uint64_t *)((uint8_t *)mbuf
                                                                + data_off));
                rx_pkts[packets++] = mbuf;

diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
index fadc8aaf455fd6265294db861c4f8f3535746f3a..ad568c9fcda50293060f3ff05b03af3bd5241071 100644 (file)
--- a/drivers/net/cnxk/cnxk_ethdev.h
+++ b/drivers/net/cnxk/cnxk_ethdev.h
@@ -696,14 +696,11 @@ cnxk_nix_timestamp_dynfield(struct rte_mbuf *mbuf,
 static __rte_always_inline void
 cnxk_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,
                        struct cnxk_timesync_info *tstamp,
-                       const uint8_t ts_enable, const uint8_t mseg_enable,
-                       uint64_t *tstamp_ptr)
+                       const uint8_t ts_enable, uint64_t *tstamp_ptr)
 {
        if (ts_enable) {
-               if (!mseg_enable) {
-                       mbuf->pkt_len -= CNXK_NIX_TIMESYNC_RX_OFFSET;
-                       mbuf->data_len -= CNXK_NIX_TIMESYNC_RX_OFFSET;
-               }
+               mbuf->pkt_len -= CNXK_NIX_TIMESYNC_RX_OFFSET;
+               mbuf->data_len -= CNXK_NIX_TIMESYNC_RX_OFFSET;
 
                /* Reading the rx timestamp inserted by CGX, viz at
                 * starting of the packet data.