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

_apply patch failure_

Submitter: Andrew Boyer <Andrew.Boyer@amd.com>
Date: Tuesday, October 11 2022 00:50:24 
Applied on: CommitID:f13604fad12a81383da7b04821a4befb3d01e2ed
Apply patch set 117855 failed:

Checking patch doc/guides/nics/features/ionic.ini...
error: while searching for:
L4 checksum offload  = Y
Packet type parsing  = Y
Rx descriptor status = Y
Basic stats          = Y
Extended stats       = Y
Stats per queue      = Y

error: patch failed: doc/guides/nics/features/ionic.ini:28
Checking patch drivers/net/ionic/ionic_ethdev.c...
error: while searching for:
	eth_dev->tx_pkt_prepare = &ionic_prep_pkts;

	eth_dev->rx_descriptor_status = ionic_dev_rx_descriptor_status;

	/* Multi-process not supported, primary does initialization anyway */
	if (rte_eal_process_type() != RTE_PROC_PRIMARY)

error: patch failed: drivers/net/ionic/ionic_ethdev.c:985
Checking patch drivers/net/ionic/ionic_rxtx.c...
error: while searching for:

	return RTE_ETH_RX_DESC_AVAIL;
}

error: patch failed: drivers/net/ionic/ionic_rxtx.c:1274
Checking patch drivers/net/ionic/ionic_rxtx.h...
error: while searching for:
	struct rte_eth_txq_info *qinfo);

int ionic_dev_rx_descriptor_status(void *rx_queue, uint16_t offset);

const uint32_t *ionic_dev_supported_ptypes_get(struct rte_eth_dev *dev);


error: patch failed: drivers/net/ionic/ionic_rxtx.h:41
Applying patch doc/guides/nics/features/ionic.ini with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/ionic/ionic_ethdev.c with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/ionic/ionic_rxtx.c with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/ionic/ionic_rxtx.h with 1 reject...
Rejected hunk #1.
diff a/doc/guides/nics/features/ionic.ini b/doc/guides/nics/features/ionic.ini	(rejected hunks)
@@ -28,6 +28,7 @@ L3 checksum offload  = Y
 L4 checksum offload  = Y
 Packet type parsing  = Y
 Rx descriptor status = Y
+Tx descriptor status = Y
 Basic stats          = Y
 Extended stats       = Y
 Stats per queue      = Y
diff a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c	(rejected hunks)
@@ -985,6 +985,7 @@ eth_ionic_dev_init(struct rte_eth_dev *eth_dev, void *init_params)
 	eth_dev->tx_pkt_prepare = &ionic_prep_pkts;
 
 	eth_dev->rx_descriptor_status = ionic_dev_rx_descriptor_status;
+	eth_dev->tx_descriptor_status = ionic_dev_tx_descriptor_status;
 
 	/* Multi-process not supported, primary does initialization anyway */
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
diff a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c	(rejected hunks)
@@ -1274,3 +1274,54 @@ ionic_dev_rx_descriptor_status(void *rx_queue, uint16_t offset)
 
 	return RTE_ETH_RX_DESC_AVAIL;
 }
+
+int
+ionic_dev_tx_descriptor_status(void *tx_queue, uint16_t offset)
+{
+	struct ionic_tx_qcq *txq = tx_queue;
+	struct ionic_qcq *qcq = &txq->qcq;
+	struct ionic_txq_comp *cq_desc;
+	uint16_t mask, head, tail, pos, cq_pos;
+	bool done_color;
+
+	mask = qcq->q.size_mask;
+
+	/* offset must be within the size of the ring */
+	if (offset > mask)
+		return -EINVAL;
+
+	head = qcq->q.head_idx;
+	tail = qcq->q.tail_idx;
+
+	/* offset is beyond what is posted */
+	if (offset >= ((head - tail) & mask))
+		return RTE_ETH_TX_DESC_DONE;
+
+	/* interested in this absolute position in the txq */
+	pos = (tail + offset) & mask;
+
+	/* tx cq position != tx q position, need to walk cq */
+	cq_pos = qcq->cq.tail_idx;
+	cq_desc = qcq->cq.base;
+	cq_desc = &cq_desc[cq_pos];
+
+	/* how far behind is pos from head? */
+	offset = (head - pos) & mask;
+
+	/* walk cq descriptors that match the expected done color */
+	done_color = qcq->cq.done_color;
+	while (color_match(cq_desc->color, done_color)) {
+		/* is comp index no further behind than pos? */
+		tail = rte_cpu_to_le_16(cq_desc->comp_index);
+		if (((head - tail) & mask) <= offset)
+			return RTE_ETH_TX_DESC_DONE;
+
+		cq_pos = (cq_pos + 1) & mask;
+		cq_desc = qcq->cq.base;
+		cq_desc = &cq_desc[cq_pos];
+
+		done_color = done_color != (cq_pos == 0);
+	}
+
+	return RTE_ETH_TX_DESC_FULL;
+}
diff a/drivers/net/ionic/ionic_rxtx.h b/drivers/net/ionic/ionic_rxtx.h	(rejected hunks)
@@ -41,6 +41,7 @@ void ionic_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
 	struct rte_eth_txq_info *qinfo);
 
 int ionic_dev_rx_descriptor_status(void *rx_queue, uint16_t offset);
+int ionic_dev_tx_descriptor_status(void *tx_queue, uint16_t offset);
 
 const uint32_t *ionic_dev_supported_ptypes_get(struct rte_eth_dev *dev);
 

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

UNH-IOL DPDK Community Lab