|WARNING| pw106071 [PATCH] net/cnxk: resolve mbuf data length update issue

|WARNING| pw106071 [PATCH] net/cnxk: resolve mbuf data length update issue

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 3011 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/106071

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali@marvell.com>
Date: Wednesday, January 19 2022 10:52:03 
Applied on: CommitID:cadb255e25d690d719d6f159e0a63f8be60650a5
Apply patch set 106071 failed:

Checking patch drivers/event/cnxk/cn10k_worker.h...
Hunk #1 succeeded at 169 (offset -5 lines).
Hunk #2 succeeded at 260 (offset -5 lines).
Checking patch drivers/event/cnxk/cn9k_worker.h...
error: while searching for:
			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;
		}

error: patch failed: drivers/event/cnxk/cn9k_worker.h:208
Hunk #2 succeeded at 288 (offset 4 lines).
Checking patch drivers/net/cnxk/cn10k_rx.h...
Hunk #1 succeeded at 363 (offset -1 lines).
Hunk #2 succeeded at 457 (offset -1 lines).
Checking patch drivers/net/cnxk/cn9k_rx.h...
error: while searching for:
	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->next = NULL;
	}
}

static inline uint16_t

error: patch failed: drivers/net/cnxk/cn9k_rx.h:345
Hunk #2 succeeded at 413 (offset -6 lines).
Checking patch drivers/net/cnxk/cnxk_ethdev.h...
Applied patch drivers/event/cnxk/cn10k_worker.h cleanly.
Applying patch drivers/event/cnxk/cn9k_worker.h with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch drivers/net/cnxk/cn10k_rx.h cleanly.
Applying patch drivers/net/cnxk/cn9k_rx.h with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch drivers/net/cnxk/cnxk_ethdev.h cleanly.
diff a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h	(rejected hunks)
@@ -208,7 +208,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;
 		}
diff a/drivers/net/cnxk/cn9k_rx.h b/drivers/net/cnxk/cn9k_rx.h	(rejected hunks)
@@ -345,13 +345,18 @@ cn9k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
 	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

https://lab.dpdk.org/results/dashboard/patchsets/20722/

UNH-IOL DPDK Community Lab