From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0AADAA00C4; Sun, 9 Oct 2022 05:42:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B42A400D5; Sun, 9 Oct 2022 05:42:22 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id B3B6840042 for ; Sun, 9 Oct 2022 05:42:20 +0200 (CEST) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MlSTC0G3GzpVYS; Sun, 9 Oct 2022 11:39:11 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sun, 9 Oct 2022 11:42:18 +0800 From: Chengwen Feng To: , CC: , , , , , <3chas3@gmail.com> Subject: [PATCH v4] net/bonding: call Tx prepare before Tx burst Date: Sun, 9 Oct 2022 03:36:39 +0000 Message-ID: <20221009033639.38232-1-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <1619171202-28486-2-git-send-email-tangchengchang@huawei.com> References: <1619171202-28486-2-git-send-email-tangchengchang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Normally, to use the HW offloads capability (e.g. checksum and TSO) in the Tx direction, the application needs to call rte_eth_tx_prepare() to do some adjustment with the packets before sending them. But the tx_prepare callback of the bonding driver is not implemented. Therefore, the sent packets may have errors (e.g. checksum errors). However, it is difficult to design the tx_prepare callback for bonding driver. Because when a bonded device sends packets, the bonded device allocates the packets to different slave devices based on the real-time link status and bonding mode. That is, it is very difficult for the bonded device to determine which slave device's prepare function should be invoked. So in this patch, the tx_prepare callback of bonding driver is not implemented. Instead, the rte_eth_tx_prepare() will be called before rte_eth_tx_burst(). In this way, all tx_offloads can be processed correctly for all NIC devices. Note: because it is rara that bond different PMDs together, so just call tx-prepare once in broadcast bonding mode. Also the following description was added to the rte_eth_tx_burst() function: "@note This function must not modify mbufs (including packets data) unless the refcnt is 1. The exception is the bonding PMD, which does not have tx-prepare function, in this case, mbufs maybe modified." Signed-off-by: Chengchang Tang Signed-off-by: Chengwen Feng Reviewed-by: Min Hu (Connor) --- v4: address Chas and Konstantin's comments. v3: support tx-prepare when Tx internal generate mbufs. v2: support tx-prepare enable flag and fail stats. --- drivers/net/bonding/rte_eth_bond_8023ad.c | 10 ++++- drivers/net/bonding/rte_eth_bond_pmd.c | 45 ++++++++++++++++++----- lib/ethdev/rte_ethdev.h | 4 ++ 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index b3cddd8a20..29a71ae0bf 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -636,9 +636,12 @@ tx_machine(struct bond_dev_private *internals, uint16_t slave_id) return; } } else { - uint16_t pkts_sent = rte_eth_tx_burst(slave_id, + uint16_t pkts_sent = rte_eth_tx_prepare(slave_id, internals->mode4.dedicated_queues.tx_qid, &lacp_pkt, 1); + pkts_sent = rte_eth_tx_burst(slave_id, + internals->mode4.dedicated_queues.tx_qid, + &lacp_pkt, pkts_sent); if (pkts_sent != 1) { rte_pktmbuf_free(lacp_pkt); set_warning_flags(port, WRN_TX_QUEUE_FULL); @@ -1371,9 +1374,12 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private *internals, } } else { /* Send packet directly to the slow queue */ - uint16_t tx_count = rte_eth_tx_burst(slave_id, + uint16_t tx_count = rte_eth_tx_prepare(slave_id, internals->mode4.dedicated_queues.tx_qid, &pkt, 1); + tx_count = rte_eth_tx_burst(slave_id, + internals->mode4.dedicated_queues.tx_qid, + &pkt, tx_count); if (tx_count != 1) { /* reset timer */ port->rx_marker_timer = 0; diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index fd2d95a751..fdc004ba46 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -602,8 +602,11 @@ bond_ethdev_tx_burst_round_robin(void *queue, struct rte_mbuf **bufs, /* Send packet burst on each slave device */ for (i = 0; i < num_of_slaves; i++) { if (slave_nb_pkts[i] > 0) { + num_tx_slave = rte_eth_tx_prepare(slaves[i], + bd_tx_q->queue_id, slave_bufs[i], + slave_nb_pkts[i]); num_tx_slave = rte_eth_tx_burst(slaves[i], bd_tx_q->queue_id, - slave_bufs[i], slave_nb_pkts[i]); + slave_bufs[i], num_tx_slave); /* if tx burst fails move packets to end of bufs */ if (unlikely(num_tx_slave < slave_nb_pkts[i])) { @@ -628,6 +631,7 @@ bond_ethdev_tx_burst_active_backup(void *queue, { struct bond_dev_private *internals; struct bond_tx_queue *bd_tx_q; + uint16_t nb_prep_pkts; bd_tx_q = (struct bond_tx_queue *)queue; internals = bd_tx_q->dev_private; @@ -635,8 +639,11 @@ bond_ethdev_tx_burst_active_backup(void *queue, if (internals->active_slave_count < 1) return 0; + nb_prep_pkts = rte_eth_tx_prepare(internals->current_primary_port, + bd_tx_q->queue_id, bufs, nb_pkts); + return rte_eth_tx_burst(internals->current_primary_port, bd_tx_q->queue_id, - bufs, nb_pkts); + bufs, nb_prep_pkts); } static inline uint16_t @@ -910,7 +917,7 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) struct rte_eth_dev *primary_port = &rte_eth_devices[internals->primary_port]; - uint16_t num_tx_total = 0; + uint16_t num_tx_total = 0, num_tx_prep; uint16_t i, j; uint16_t num_of_slaves = internals->active_slave_count; @@ -951,8 +958,10 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) #endif } - num_tx_total += rte_eth_tx_burst(slaves[i], bd_tx_q->queue_id, + num_tx_prep = rte_eth_tx_prepare(slaves[i], bd_tx_q->queue_id, bufs + num_tx_total, nb_pkts - num_tx_total); + num_tx_total += rte_eth_tx_burst(slaves[i], bd_tx_q->queue_id, + bufs + num_tx_total, num_tx_prep); if (num_tx_total == nb_pkts) break; @@ -1064,8 +1073,10 @@ bond_ethdev_tx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) /* Send ARP packets on proper slaves */ for (i = 0; i < RTE_MAX_ETHPORTS; i++) { if (slave_bufs_pkts[i] > 0) { - num_send = rte_eth_tx_burst(i, bd_tx_q->queue_id, + num_send = rte_eth_tx_prepare(i, bd_tx_q->queue_id, slave_bufs[i], slave_bufs_pkts[i]); + num_send = rte_eth_tx_burst(i, bd_tx_q->queue_id, + slave_bufs[i], num_send); for (j = 0; j < slave_bufs_pkts[i] - num_send; j++) { bufs[nb_pkts - 1 - num_not_send - j] = slave_bufs[i][nb_pkts - 1 - j]; @@ -1088,8 +1099,10 @@ bond_ethdev_tx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) /* Send update packets on proper slaves */ for (i = 0; i < RTE_MAX_ETHPORTS; i++) { if (update_bufs_pkts[i] > 0) { + num_send = rte_eth_tx_prepare(i, bd_tx_q->queue_id, + update_bufs[i], update_bufs_pkts[i]); num_send = rte_eth_tx_burst(i, bd_tx_q->queue_id, update_bufs[i], - update_bufs_pkts[i]); + num_send); for (j = num_send; j < update_bufs_pkts[i]; j++) { rte_pktmbuf_free(update_bufs[i][j]); } @@ -1158,9 +1171,12 @@ tx_burst_balance(void *queue, struct rte_mbuf **bufs, uint16_t nb_bufs, if (slave_nb_bufs[i] == 0) continue; - slave_tx_count = rte_eth_tx_burst(slave_port_ids[i], + slave_tx_count = rte_eth_tx_prepare(slave_port_ids[i], bd_tx_q->queue_id, slave_bufs[i], slave_nb_bufs[i]); + slave_tx_count = rte_eth_tx_burst(slave_port_ids[i], + bd_tx_q->queue_id, slave_bufs[i], + slave_tx_count); total_tx_count += slave_tx_count; @@ -1243,8 +1259,10 @@ tx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_bufs, if (rte_ring_dequeue(port->tx_ring, (void **)&ctrl_pkt) != -ENOENT) { - slave_tx_count = rte_eth_tx_burst(slave_port_ids[i], + slave_tx_count = rte_eth_tx_prepare(slave_port_ids[i], bd_tx_q->queue_id, &ctrl_pkt, 1); + slave_tx_count = rte_eth_tx_burst(slave_port_ids[i], + bd_tx_q->queue_id, &ctrl_pkt, slave_tx_count); /* * re-enqueue LAG control plane packets to buffering * ring if transmission fails so the packet isn't lost. @@ -1298,6 +1316,7 @@ bond_ethdev_tx_burst_broadcast(void *queue, struct rte_mbuf **bufs, uint16_t slaves[RTE_MAX_ETHPORTS]; uint8_t tx_failed_flag = 0; uint16_t num_of_slaves; + uint16_t num_tx_prep; uint16_t max_nb_of_tx_pkts = 0; @@ -1320,12 +1339,18 @@ bond_ethdev_tx_burst_broadcast(void *queue, struct rte_mbuf **bufs, for (i = 0; i < nb_pkts; i++) rte_pktmbuf_refcnt_update(bufs[i], num_of_slaves - 1); + /* It is rare that bond different PMDs together, so just call tx-prepare once */ + num_tx_prep = rte_eth_tx_prepare(slaves[0], bd_tx_q->queue_id, + bufs, nb_pkts); + if (unlikely(num_tx_prep < nb_pkts)) + tx_failed_flag = 1; + /* Transmit burst on each active slave */ for (i = 0; i < num_of_slaves; i++) { slave_tx_total[i] = rte_eth_tx_burst(slaves[i], bd_tx_q->queue_id, - bufs, nb_pkts); + bufs, num_tx_prep); - if (unlikely(slave_tx_total[i] < nb_pkts)) + if (unlikely(slave_tx_total[i] < num_tx_prep)) tx_failed_flag = 1; /* record the value and slave index for the slave which transmits the diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index e8d1e1c658..b0396bb86e 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -6031,6 +6031,10 @@ uint16_t rte_eth_call_tx_callbacks(uint16_t port_id, uint16_t queue_id, * @see rte_eth_tx_prepare to perform some prior checks or adjustments * for offloads. * + * @note This function must not modify mbufs (including packets data) unless + * the refcnt is 1. The exception is the bonding PMD, which does not have + * tx-prepare function, in this case, mbufs maybe modified. + * * @param port_id * The port identifier of the Ethernet device. * @param queue_id -- 2.17.1