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

_apply patch failure_

Submitter: Bhagyada Modali <bhagyada.modali@amd.com>
Date: Tuesday, September 06 2022 11:59:15 
Applied on: CommitID:4aee6110bb10b0225fa9562f2e48af233a9058a1
Apply patch set 115980 failed:

Checking patch drivers/net/axgbe/axgbe_rxtx.c...
error: while searching for:
	struct axgbe_rx_queue *rxq = rx_queue;
	volatile union axgbe_rx_desc *desc;

	uint64_t old_dirty = rxq->dirty;
	struct rte_mbuf *first_seg = NULL;
	struct rte_mbuf *mbuf, *tmbuf;
	unsigned int err = 0, etlt;

error: patch failed: drivers/net/axgbe/axgbe_rxtx.c:340
Hunk #2 succeeded at 352 (offset 1 line).
error: while searching for:
						~RTE_MBUF_F_RX_VLAN_STRIPPED;
			} else {
				first_seg->ol_flags &=
					~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED);
				first_seg->vlan_tci = 0;
			}
		}

err_set:
		rxq->cur++;
		rxq->sw_ring[idx++] = tmbuf;
		desc->read.baddr =
			rte_cpu_to_le_64(rte_mbuf_data_iova_default(tmbuf));
		memset((void *)(&desc->read.desc2), 0, 8);
		AXGMAC_SET_BITS_LE(desc->read.desc3, RX_NORMAL_DESC3, OWN, 1);
		rxq->dirty++;

		if (!eop) {
			rte_pktmbuf_free(mbuf);

error: patch failed: drivers/net/axgbe/axgbe_rxtx.c:446
Hunk #4 succeeded at 485 (offset -14 lines).
Applying patch drivers/net/axgbe/axgbe_rxtx.c with 2 rejects...
Rejected hunk #1.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
diff a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c	(rejected hunks)
@@ -340,7 +340,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
 	struct axgbe_rx_queue *rxq = rx_queue;
 	volatile union axgbe_rx_desc *desc;
 
-	uint64_t old_dirty = rxq->dirty;
 	struct rte_mbuf *first_seg = NULL;
 	struct rte_mbuf *mbuf, *tmbuf;
 	unsigned int err = 0, etlt;
@@ -446,19 +444,19 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
 						~RTE_MBUF_F_RX_VLAN_STRIPPED;
 			} else {
 				first_seg->ol_flags &=
-					~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED);
+					~(RTE_MBUF_F_RX_VLAN |
+							RTE_MBUF_F_RX_VLAN_STRIPPED);
 				first_seg->vlan_tci = 0;
 			}
 		}
 
 err_set:
 		rxq->cur++;
-		rxq->sw_ring[idx++] = tmbuf;
+		rxq->sw_ring[idx] = tmbuf;
 		desc->read.baddr =
 			rte_cpu_to_le_64(rte_mbuf_data_iova_default(tmbuf));
 		memset((void *)(&desc->read.desc2), 0, 8);
 		AXGMAC_SET_BITS_LE(desc->read.desc3, RX_NORMAL_DESC3, OWN, 1);
-		rxq->dirty++;
 
 		if (!eop) {
 			rte_pktmbuf_free(mbuf);

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

UNH-IOL DPDK Community Lab