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

_apply patch failure_

Submitter: Ivan Malov <Ivan.Malov@oktetlabs.ru>
Date: Sunday, September 11 2022 12:24:04 
Applied on: CommitID:4aee6110bb10b0225fa9562f2e48af233a9058a1
Apply patch set 116163 failed:

Checking patch drivers/net/bonding/rte_eth_bond_pmd.c...
error: while searching for:
	return 0;
}

int
bond_ethdev_close(struct rte_eth_dev *dev)
{
	struct bond_dev_private *internals = dev->data->dev_private;
	uint16_t bond_port_id = internals->port_id;
	int skipped = 0;
	struct rte_flow_error ferror;

	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
		return 0;

	RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name);

	/* Flush flows in all back-end devices before removing them */
	bond_flow_ops.flush(dev, &ferror);

error: patch failed: drivers/net/bonding/rte_eth_bond_pmd.c:2143
error: while searching for:
			skipped++;
		}
	}
	bond_ethdev_free_queues(dev);
	rte_bitmap_reset(internals->vlan_filter_bmp);
	rte_bitmap_free(internals->vlan_filter_bmp);

error: patch failed: drivers/net/bonding/rte_eth_bond_pmd.c:2176
Hunk #3 succeeded at 3603 (offset -12 lines).
Applying patch drivers/net/bonding/rte_eth_bond_pmd.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Hunk #3 applied cleanly.
diff a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c	(rejected hunks)
@@ -2143,18 +2143,13 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
 	return 0;
 }
 
-int
-bond_ethdev_close(struct rte_eth_dev *dev)
+static void
+bond_ethdev_cfg_cleanup(struct rte_eth_dev *dev)
 {
 	struct bond_dev_private *internals = dev->data->dev_private;
 	uint16_t bond_port_id = internals->port_id;
-	int skipped = 0;
 	struct rte_flow_error ferror;
-
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
-	RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name);
+	int skipped = 0;
 
 	/* Flush flows in all back-end devices before removing them */
 	bond_flow_ops.flush(dev, &ferror);
@@ -2176,6 +2171,20 @@ bond_ethdev_close(struct rte_eth_dev *dev)
 			skipped++;
 		}
 	}
+}
+
+int
+bond_ethdev_close(struct rte_eth_dev *dev)
+{
+	struct bond_dev_private *internals = dev->data->dev_private;
+
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
+	RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name);
+
+	bond_ethdev_cfg_cleanup(dev);
+
 	bond_ethdev_free_queues(dev);
 	rte_bitmap_reset(internals->vlan_filter_bmp);
 	rte_bitmap_free(internals->vlan_filter_bmp);

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

UNH-IOL DPDK Community Lab