|WARNING| pw126467-126468 [PATCH] [v3, 11/11] net/octeon_ep: set secondary process dev ops

|WARNING| pw126467-126468 [PATCH] [v3, 11/11] net/octeon_ep: set secondary process dev ops

[dpdklab]

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

_apply patch failure_

Submitter: Sathesh Edara <sedara@marvell.com>
Date: Monday, April 24 2023 12:55:11 
Applied on: CommitID:70cc4e1fed665712e68f2f45d98dda4abc6accda
Apply patch set 126467-126468 failed:

Checking patch doc/guides/nics/features/octeon_ep.ini...
error: while searching for:
Basic stats          = Y
Link status          = Y
MTU update           = Y
Usage doc            = Y

error: patch failed: doc/guides/nics/features/octeon_ep.ini:11
Checking patch drivers/net/octeon_ep/otx_ep_ethdev.c...
error: while searching for:
static int
otx_ep_dev_close(struct rte_eth_dev *eth_dev)
{
	struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev);
	uint32_t num_queues, q_no;

	otx_ep_mbox_send_dev_exit(eth_dev);
	otx_epvf->fn_list.disable_io_queues(otx_epvf);
	num_queues = otx_epvf->nb_rx_queues;

error: patch failed: drivers/net/octeon_ep/otx_ep_ethdev.c:527
Hunk #2 succeeded at 466 (offset -135 lines).
error: while searching for:
	struct rte_ether_addr vf_mac_addr;

	/* Single process support */
	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
		return 0;

	rte_eth_copy_pci_info(eth_dev, pdev);
	otx_epvf->eth_dev = eth_dev;

error: patch failed: drivers/net/octeon_ep/otx_ep_ethdev.c:642
Applying patch doc/guides/nics/features/octeon_ep.ini with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/octeon_ep/otx_ep_ethdev.c with 2 rejects...
Rejected hunk #1.
Hunk #2 applied cleanly.
Rejected hunk #3.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/doc/guides/nics/features/octeon_ep.ini b/doc/guides/nics/features/octeon_ep.ini	(rejected hunks)
@@ -11,4 +11,5 @@ x86-64               = Y
 Basic stats          = Y
 Link status          = Y
 MTU update           = Y
+Multiprocess aware   = Y
 Usage doc            = Y
diff a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c	(rejected hunks)
@@ -527,9 +527,17 @@ otx_ep_dev_stats_get(struct rte_eth_dev *eth_dev,
 static int
 otx_ep_dev_close(struct rte_eth_dev *eth_dev)
 {
-	struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev);
+	struct otx_ep_device *otx_epvf;
 	uint32_t num_queues, q_no;
 
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+		eth_dev->dev_ops = NULL;
+		eth_dev->rx_pkt_burst = NULL;
+		eth_dev->tx_pkt_burst = NULL;
+		return 0;
+	}
+
+	otx_epvf = OTX_EP_DEV(eth_dev);
 	otx_ep_mbox_send_dev_exit(eth_dev);
 	otx_epvf->fn_list.disable_io_queues(otx_epvf);
 	num_queues = otx_epvf->nb_rx_queues;
@@ -642,8 +654,12 @@ otx_ep_eth_dev_init(struct rte_eth_dev *eth_dev)
 	struct rte_ether_addr vf_mac_addr;
 
 	/* Single process support */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+		eth_dev->dev_ops = &otx_ep_eth_dev_ops;
+		eth_dev->rx_pkt_burst = &otx_ep_recv_pkts;
+		eth_dev->tx_pkt_burst = &otx2_ep_xmit_pkts;
 		return 0;
+	}
 
 	rte_eth_copy_pci_info(eth_dev, pdev);
 	otx_epvf->eth_dev = eth_dev;

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

UNH-IOL DPDK Community Lab