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

_apply patch failure_

Submitter: Huisong Li <lihuisong@huawei.com>
Date: Tuesday, November 08 2022 08:40:38 
Applied on: CommitID:a39f5e14560df310e7af3c135a11bb6f51eb92e6
Apply patch set 119545-119546 failed:

Checking patch app/test-pmd/testpmd.c...
error: while searching for:
{
#ifdef RTE_NET_BOND
	struct rte_port *port = &ports[bond_pid];
	uint16_t i;
	int ret;


error: patch failed: app/test-pmd/testpmd.c:2812
error: while searching for:
	if (port->dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
		port->dev_conf.txmode.offloads |=
				RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
	/* Apply Tx offloads configuration */
	for (i = 0; i < port->dev_info.max_tx_queues; i++)
		port->txq[i].conf.offloads = port->dev_conf.txmode.offloads;

error: patch failed: app/test-pmd/testpmd.c:2825
Applying patch app/test-pmd/testpmd.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
diff a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c	(rejected hunks)
@@ -2812,6 +2812,7 @@ update_bonding_port_dev_conf(portid_t bond_pid)
 {
 #ifdef RTE_NET_BOND
 	struct rte_port *port = &ports[bond_pid];
+	uint8_t bonding_mode;
 	uint16_t i;
 	int ret;
 
@@ -2825,6 +2826,13 @@ update_bonding_port_dev_conf(portid_t bond_pid)
 	if (port->dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
 		port->dev_conf.txmode.offloads |=
 				RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
+	/* Bond mode broadcast & 8023AD don't support MBUF_FAST_FREE offload */
+	bonding_mode = rte_eth_bond_mode_get(bond_pid);
+	if (bonding_mode == BONDING_MODE_8023AD ||
+	    bonding_mode == BONDING_MODE_BROADCAST)
+		port->dev_conf.txmode.offloads &=
+				~RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
+
 	/* Apply Tx offloads configuration */
 	for (i = 0; i < port->dev_info.max_tx_queues; i++)
 		port->txq[i].conf.offloads = port->dev_conf.txmode.offloads;

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

UNH-IOL DPDK Community Lab