7d8194517a
Sync some patches for hns3 PMD, telemetry and testpmd. And main modifications are as follows: - backport some bugfixes for hns3 - revert Tx performance optimization for hns3 - add Rx/Tx descriptor dump feature for hns3 - refactor some RSS commands for testpmd - add ethdev telemetry private dump - add dmadev telemetry - sync telemetry lib Signed-off-by: Huisong Li <lihuisong@huawei.com> (cherry picked from commit 4f06d27eff9aa99c2e2073ac74328893990ed8ed)
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From eaab0561c2effa2f60f27c10d27c099d819fdd1f Mon Sep 17 00:00:00 2001
|
|
From: Chengwen Feng <fengchengwen@huawei.com>
|
|
Date: Fri, 21 Oct 2022 15:36:12 +0800
|
|
Subject: [PATCH 136/189] net/hns3: fix crash in SVE Tx
|
|
|
|
Currently, the number of Tx send bytes is obtained by accumulating the
|
|
length of the batch 'mbuf' packets of the current loop cycle.
|
|
Unfortunately, it uses svcntd (which means all lane, regardless of
|
|
whether the corresponding lane is valid) which may lead to overflow,
|
|
and thus refers to an invalid mbuf.
|
|
|
|
Because the SVE xmit algorithm applies only to a single mbuf, the
|
|
mbuf's data_len is equal pkt_len, so this patch fixes it by using
|
|
svaddv_u64(svbool_t pg, svuint64_t data_len) which only adds valid
|
|
lanes.
|
|
|
|
Fixes: fdcd6a3e0246 ("net/hns3: add bytes stats")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
|
|
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_rxtx_vec_sve.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
index be1fdbcdf0..b0dfb052bb 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c
|
|
@@ -435,9 +435,8 @@ hns3_tx_fill_hw_ring_sve(struct hns3_tx_queue *txq,
|
|
offsets, svdup_n_u64(valid_bit));
|
|
|
|
/* Increment bytes counter */
|
|
- uint32_t idx;
|
|
- for (idx = 0; idx < svcntd(); idx++)
|
|
- txq->basic_stats.bytes += pkts[idx]->pkt_len;
|
|
+ txq->basic_stats.bytes +=
|
|
+ (svaddv_u64(pg, data_len) >> HNS3_UINT16_BIT);
|
|
|
|
/* update index for next loop */
|
|
i += svcntd();
|
|
--
|
|
2.23.0
|
|
|