packages/dpdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!326 [sync] PR-322: hinic: free tx mbuf use rte_pktmbuf_free_seg

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12
This commit is contained in:
openeuler-ci-bot 2023-04-01 13:59:44 +00:00 committed by Gitee
commit b1edac04f7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 113 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dpdk.spec
View File

@ -1,6 +1,6 @@
Name: dpdk
Version: 19.11
Release: 26
Release: 27
Packager: packaging@6wind.com
URL: http://dpdk.org
%global source_version 19.11
@ -60,6 +60,8 @@ Patch6011: backport-0003-net-hinic-check-memory-allocations-in-flow-creation.pat
Patch6012: backport-0004-net-hinic-fix-filters-on-memory-allocation-failure.patch
Patch6013: backport-0005-net-hinic-fix-TCAM-filter-set.patch
Patch9000: hinic-free-mbuf-use-rte_pktmbuf_free_seg.patch
Summary: Data Plane Development Kit core
Group: System Environment/Libraries
License: BSD and LGPLv2 and GPLv2
@ -228,6 +230,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko
/usr/sbin/depmod
%changelog
* Fri Mar 24 2023 jiangheng <jiangheng14@huawei.com> - 19.11-27
- hinic: free tx mbuf use rte_pktmbuf_free_seg
* Thu Mar 09 2023 jiangheng <jiangheng14@huawei.com> - 19.11-26
- sync patches to enable hinic flow director

107
hinic-free-mbuf-use-rte_pktmbuf_free_seg.patch Normal file
View File

@ -0,0 +1,107 @@
From 5600cdc0dcdc7e70a44fb6c8c9e7594cce62f119 Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Fri, 24 Mar 2023 16:58:43 +0800
Subject: [PATCH] hinic: free mbuf use rte_pktmbuf_free_seg
---
drivers/net/hinic/hinic_pmd_tx.c | 27 ++++++++++++++++++---------
drivers/net/hinic/hinic_pmd_tx.h | 9 +++++++++
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c
index 985540a..670247b 100644
--- a/drivers/net/hinic/hinic_pmd_tx.c
+++ b/drivers/net/hinic/hinic_pmd_tx.c
@@ -30,13 +30,6 @@
#define TX_MSS_DEFAULT 0x3E00
#define TX_MSS_MIN 0x50
-#define HINIC_NONTSO_PKT_MAX_SGE 17 /* non-tso max sge 17 */
-#define HINIC_NONTSO_SEG_NUM_INVALID(num) \
- ((num) > HINIC_NONTSO_PKT_MAX_SGE)
-
-#define HINIC_TSO_PKT_MAX_SGE 127 /* tso max sge 127 */
-#define HINIC_TSO_SEG_NUM_INVALID(num) ((num) > HINIC_TSO_PKT_MAX_SGE)
-
#define HINIC_TX_OUTER_CHECKSUM_FLAG_SET 1
#define HINIC_TX_OUTER_CHECKSUM_FLAG_NO_SET 0
@@ -608,6 +601,7 @@ static inline void hinic_xmit_mbuf_cleanup(struct hinic_txq *txq)
if (likely(mbuf->nb_segs == 1)) {
m = rte_pktmbuf_prefree_seg(mbuf);
tx_info->mbuf = NULL;
+ tx_info->nb_segs = 0;
if (unlikely(m == NULL))
continue;
@@ -621,8 +615,11 @@ static inline void hinic_xmit_mbuf_cleanup(struct hinic_txq *txq)
mbuf_free[nb_free++] = m;
}
} else {
- rte_pktmbuf_free(mbuf);
+ for (int j = 0; j < tx_info->nb_segs; j++) {
+ rte_pktmbuf_free_seg(tx_info->mbufs[j]);
+ }
tx_info->mbuf = NULL;
+ tx_info->nb_segs = 0;
}
}
@@ -1129,6 +1126,13 @@ u16 hinic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, u16 nb_pkts)
tx_info->mbuf = mbuf_pkt;
tx_info->wqebb_cnt = wqe_wqebb_cnt;
+ tx_info->nb_segs = mbuf_pkt->nb_segs;
+ struct rte_mbuf *tmp = mbuf_pkt;
+ for (int j = 0; j < mbuf_pkt->nb_segs; j++) {
+ tx_info->mbufs[j] = tmp;
+ tmp = tmp->next;
+ }
+
/* 7. fill sq wqe header section */
hinic_fill_sq_wqe_header(&sq_wqe->ctrl, queue_info,
sqe_info.sge_cnt, sqe_info.owner);
@@ -1169,7 +1173,12 @@ void hinic_free_all_tx_mbufs(struct hinic_txq *txq)
tx_info->cpy_mbuf = NULL;
}
- rte_pktmbuf_free(tx_info->mbuf);
+ for (int j = 0; j < tx_info->nb_segs; j++) {
+ rte_pktmbuf_free_seg(tx_info->mbufs[j]);
+ tx_info->mbufs[j] = NULL;
+ }
+ tx_info->nb_segs = 0;
+
hinic_update_sq_local_ci(nic_dev->hwdev, txq->q_id,
tx_info->wqebb_cnt);
diff --git a/drivers/net/hinic/hinic_pmd_tx.h b/drivers/net/hinic/hinic_pmd_tx.h
index a1ca580..dd2baff 100644
--- a/drivers/net/hinic/hinic_pmd_tx.h
+++ b/drivers/net/hinic/hinic_pmd_tx.h
@@ -21,6 +21,13 @@
PKT_TX_OUTER_IP_CKSUM | \
PKT_TX_TCP_SEG)
+#define HINIC_NONTSO_PKT_MAX_SGE 17 /* non-tso max sge 17 */
+#define HINIC_NONTSO_SEG_NUM_INVALID(num) \
+ ((num) > HINIC_NONTSO_PKT_MAX_SGE)
+
+#define HINIC_TSO_PKT_MAX_SGE 127 /* tso max sge 127 */
+#define HINIC_TSO_SEG_NUM_INVALID(num) ((num) > HINIC_TSO_PKT_MAX_SGE)
+
enum sq_wqe_type {
SQ_NORMAL_WQE = 0,
};
@@ -97,6 +104,8 @@ struct hinic_txq_stats {
struct hinic_tx_info {
struct rte_mbuf *mbuf;
+ struct rte_mbuf *mbufs[HINIC_TSO_PKT_MAX_SGE];
+ int nb_segs;
int wqebb_cnt;
struct rte_mbuf *cpy_mbuf;
};
--
2.23.0