Sync some patchs from upstreaming and modifies are as follow: - maintainers: update for hns3 driver - app/testpmd: add command to flush multicast MAC addresses - app/testpmd: fix help string - app/testpmd: fix multicast address pool leak - net/hns3: optimize SVE Rx performance - net/hns3: optimize rearm mbuf for SVE Rx - net/hns3: optimize free mbuf for SVE Tx - net/hns3: fix order in NEON Rx - net/hns3: fix traffic management dump text alignment - net/hns3: fix traffic management thread safety - net/hns3: fix flushing multicast MAC address - net/hns3: fix error code for multicast resource - net/hns3: fix VF default MAC modified when set failed - net/hns3: fix index to look up table in NEON Rx - net/hns3: fix non-zero weight for disabled TC - config/arm: add HiSilicon HIP10 Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
90 lines
3.1 KiB
Diff
90 lines
3.1 KiB
Diff
From d967db92088afcb06e7b245109ff35288c8cd3fe Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Tue, 11 Jul 2023 18:24:46 +0800
|
|
Subject: [PATCH 360/366] net/hns3: optimize free mbuf for SVE Tx
|
|
|
|
[ upstream commit 01a295b741603b9366366a665402a2667a29fcc3 ]
|
|
|
|
Currently, hns3 SVE Tx checks the valid bits of all descriptors
|
|
in a batch and then determines whether to release the corresponding
|
|
mbufs. Actually, once the valid bit of any descriptor in a batch
|
|
isn't cleared, driver does not need to scan the rest of descriptors.
|
|
|
|
If we optimize SVE codes algorithm about this function, the performance
|
|
of a single queue for 64B packet is improved by ~2% on txonly forwarding
|
|
mode. And if use C code to scan all descriptors, the performance is
|
|
improved by ~8%.
|
|
|
|
So this patch selects C code to optimize this code to improve the SVE
|
|
Tx performance.
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_rxtx_vec_sve.c | 42 +---------------------------
|
|
1 file changed, 1 insertion(+), 41 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
index 6f23ba6..51d4bf3 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
@@ -337,46 +337,6 @@ hns3_recv_pkts_vec_sve(void *__restrict rx_queue,
|
|
return nb_rx;
|
|
}
|
|
|
|
-static inline void
|
|
-hns3_tx_free_buffers_sve(struct hns3_tx_queue *txq)
|
|
-{
|
|
-#define HNS3_SVE_CHECK_DESCS_PER_LOOP 8
|
|
-#define TX_VLD_U8_ZIP_INDEX svindex_u8(0, 4)
|
|
- svbool_t pg32 = svwhilelt_b32(0, HNS3_SVE_CHECK_DESCS_PER_LOOP);
|
|
- svuint32_t vld, vld2;
|
|
- svuint8_t vld_u8;
|
|
- uint64_t vld_all;
|
|
- struct hns3_desc *tx_desc;
|
|
- int i;
|
|
-
|
|
- /*
|
|
- * All mbufs can be released only when the VLD bits of all
|
|
- * descriptors in a batch are cleared.
|
|
- */
|
|
- /* do logical OR operation for all desc's valid field */
|
|
- vld = svdup_n_u32(0);
|
|
- tx_desc = &txq->tx_ring[txq->next_to_clean];
|
|
- for (i = 0; i < txq->tx_rs_thresh; i += HNS3_SVE_CHECK_DESCS_PER_LOOP,
|
|
- tx_desc += HNS3_SVE_CHECK_DESCS_PER_LOOP) {
|
|
- vld2 = svld1_gather_u32offset_u32(pg32, (uint32_t *)tx_desc,
|
|
- svindex_u32(BD_FIELD_VALID_OFFSET, BD_SIZE));
|
|
- vld = svorr_u32_z(pg32, vld, vld2);
|
|
- }
|
|
- /* shift left and then right to get all valid bit */
|
|
- vld = svlsl_n_u32_z(pg32, vld,
|
|
- HNS3_UINT32_BIT - 1 - HNS3_TXD_VLD_B);
|
|
- vld = svreinterpret_u32_s32(svasr_n_s32_z(pg32,
|
|
- svreinterpret_s32_u32(vld), HNS3_UINT32_BIT - 1));
|
|
- /* use tbl to compress 32bit-lane to 8bit-lane */
|
|
- vld_u8 = svtbl_u8(svreinterpret_u8_u32(vld), TX_VLD_U8_ZIP_INDEX);
|
|
- /* dump compressed 64bit to variable */
|
|
- svst1_u64(PG64_64BIT, &vld_all, svreinterpret_u64_u8(vld_u8));
|
|
- if (vld_all > 0)
|
|
- return;
|
|
-
|
|
- hns3_tx_bulk_free_buffers(txq);
|
|
-}
|
|
-
|
|
static inline void
|
|
hns3_tx_fill_hw_ring_sve(struct hns3_tx_queue *txq,
|
|
struct rte_mbuf **pkts,
|
|
@@ -457,7 +417,7 @@ hns3_xmit_fixed_burst_vec_sve(void *__restrict tx_queue,
|
|
uint16_t nb_tx = 0;
|
|
|
|
if (txq->tx_bd_ready < txq->tx_free_thresh)
|
|
- hns3_tx_free_buffers_sve(txq);
|
|
+ hns3_tx_free_buffers(txq);
|
|
|
|
nb_pkts = RTE_MIN(txq->tx_bd_ready, nb_pkts);
|
|
if (unlikely(nb_pkts == 0)) {
|
|
--
|
|
2.41.0.windows.2
|
|
|