[v1] net/ice: optimize TCP header size calculation
diff mbox series

Message ID 20200730160430.10609-1-haiyue.wang@intel.com
State Superseded, archived
Delegated to: Qi Zhang
Headers show
Series
  • [v1] net/ice: optimize TCP header size calculation
Related show

Checks

Context Check Description
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Wang, Haiyue July 30, 2020, 4:04 p.m. UTC
The rte_pktmbuf_read function can handle the contiguous data buffer
reading, so remove the redundant contiguous memory handling.

Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")
Fixes: 2a0c9ae4f646 ("net/ice: fix TCP checksum offload")
Fixes: 7365a3cee51f ("net/ice: calculate TCP header size for offload")
Cc: stable@dpdk.org

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Patch
diff mbox series

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index bcb67ec25..a35c5546b 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2375,18 +2375,12 @@  ice_calc_pkt_desc(struct rte_mbuf *tx_pkt)
 static inline uint16_t
 ice_calc_pkt_tcp_hdr(struct rte_mbuf *tx_pkt, union ice_tx_offload tx_offload)
 {
-	uint16_t tcpoff = tx_offload.l2_len + tx_offload.l3_len;
 	const struct rte_tcp_hdr *tcp_hdr;
-	struct rte_tcp_hdr _tcp_hdr;
+	struct rte_tcp_hdr tcp_hdr_buf;
 
-	if (tcpoff + sizeof(struct rte_tcp_hdr) < tx_pkt->data_len) {
-		tcp_hdr = rte_pktmbuf_mtod_offset(tx_pkt, struct rte_tcp_hdr *,
-						  tcpoff);
-
-		return (tcp_hdr->data_off & 0xf0) >> 2;
-	}
-
-	tcp_hdr = rte_pktmbuf_read(tx_pkt, tcpoff, sizeof(_tcp_hdr), &_tcp_hdr);
+	tcp_hdr = rte_pktmbuf_read(tx_pkt,
+				   tx_offload.l2_len + tx_offload.l3_len,
+				   sizeof(tcp_hdr_buf), &tcp_hdr_buf);
 	if (tcp_hdr)
 		return (tcp_hdr->data_off & 0xf0) >> 2;
 	else