7573bb9b6f
Sync some patches from upstream about bugfix, modifies are as follow: - app/testpmd: fix crash in multi-process forwarding - net/hns3: fix offload flag of IEEE 1588 - net/hns3: fix read Rx timestamp handle - net/hns3: fix double free for Rx/Tx queue - net/hns3: fix variable overflow - net/hns3: enable PFC for all user priorities - ring: add telemetry command for ring info - ring: add telemetry command to list rings - net/hns3: support power monitor - net/hns3: disable SCTP verification tag for RSS hash input - app/testpmd: fix RSS algorithm choice
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 3d7475b7bbb96565726a4e0f387fd35974682022 Mon Sep 17 00:00:00 2001
|
|
From: Dengdui Huang <huangdengdui@huawei.com>
|
|
Date: Wed, 3 Apr 2024 18:16:19 +0800
|
|
Subject: [PATCH 428/431] net/hns3: fix offload flag of IEEE 1588
|
|
|
|
[ upstream commit 5fde4c41f26d2ad607935b76b528e1b64727b5c7 ]
|
|
|
|
Currently, the RTE_MBUF_F_RX_IEEE1588_TMST offload flag will
|
|
not be set when the scatter algorithm is used.
|
|
This patch fixes it.
|
|
|
|
Fixes: 4801f0403b58 ("net/hns3: fix IEEE 1588 PTP for scalar scattered Rx")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
|
|
Signed-off-by: Jie Hai <haijie1@huawei.com>
|
|
Signed-off-by: chenyi <chenyi211@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_rxtx.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
|
|
index 2de31ab9a3..5cf2b3af33 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx.c
|
|
+++ b/drivers/net/hns3/hns3_rxtx.c
|
|
@@ -2680,6 +2680,7 @@ hns3_recv_scattered_pkts(void *rx_queue,
|
|
continue;
|
|
}
|
|
|
|
+ first_seg->ol_flags = 0;
|
|
if (unlikely(bd_base_info & BIT(HNS3_RXD_TS_VLD_B)))
|
|
hns3_rx_ptp_timestamp_handle(rxq, first_seg, timestamp);
|
|
|
|
@@ -2709,7 +2710,7 @@ hns3_recv_scattered_pkts(void *rx_queue,
|
|
|
|
first_seg->port = rxq->port_id;
|
|
first_seg->hash.rss = rte_le_to_cpu_32(rxd.rx.rss_hash);
|
|
- first_seg->ol_flags = RTE_MBUF_F_RX_RSS_HASH;
|
|
+ first_seg->ol_flags |= RTE_MBUF_F_RX_RSS_HASH;
|
|
if (unlikely(bd_base_info & BIT(HNS3_RXD_LUM_B))) {
|
|
first_seg->hash.fdir.hi =
|
|
rte_le_to_cpu_16(rxd.rx.fd_id);
|
|
--
|
|
2.33.0
|
|
|