From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 990D7A052B; Wed, 29 Jul 2020 10:00:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C2A9837B7; Wed, 29 Jul 2020 10:00:02 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 7C4B01023; Wed, 29 Jul 2020 10:00:01 +0200 (CEST) IronPort-SDR: lgtTS0BR0Gtu+4hye0/KWnDVo4Nxra1ZJreUCkOl9p04CjOOk0NVWHCFOLkCCbv7ji8HcdPKpf FnR1eIPxx4Yw== X-IronPort-AV: E=McAfee;i="6000,8403,9696"; a="236240409" X-IronPort-AV: E=Sophos;i="5.75,409,1589266800"; d="scan'208";a="236240409" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jul 2020 01:00:00 -0700 IronPort-SDR: QAxU93yAHD8intF6d5PbNw4im8uVvq8eRS98HCEzs6NKITvqW6uzRiAbsqkAPw8J5bPYGiFVGU fa9a8CTbNPQA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,409,1589266800"; d="scan'208";a="312940609" Received: from npg-dpdk-haiyue-3.sh.intel.com ([10.67.118.157]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2020 00:59:56 -0700 From: Haiyue Wang To: dev@dpdk.org, qiming.yang@intel.com, qi.z.zhang@intel.com Cc: yinan.wang@intel.com, ting.xu@intel.com, Haiyue Wang , stable@dpdk.org Date: Wed, 29 Jul 2020 15:50:39 +0800 Message-Id: <20200729075039.336729-1-haiyue.wang@intel.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v1] net/ice: calculate TCP header size for offload X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The ice needs the exact TCP header size including options for TCP checksum offload, but according to PKT_TX_TCP_CKSUM note, l4_len is not required to be set, so it needs to calculate the TCP header size if not set. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") Cc: stable@dpdk.org Signed-off-by: Haiyue Wang --- drivers/net/ice/ice_rxtx.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index ddf6a93fb2..bcb67ec251 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2371,6 +2371,28 @@ ice_calc_pkt_desc(struct rte_mbuf *tx_pkt) return count; } +/* Calculate TCP header length for PKT_TX_TCP_CKSUM if not provided */ +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; + + 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); + if (tcp_hdr) + return (tcp_hdr->data_off & 0xf0) >> 2; + else + return 0; +} + uint16_t ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { @@ -2468,6 +2490,11 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) /* Enable checksum offloading */ if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK) { + if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM && + !tx_offload.l4_len) + tx_offload.l4_len = + ice_calc_pkt_tcp_hdr(tx_pkt, tx_offload); + ice_txd_enable_checksum(ol_flags, &td_cmd, &td_offset, tx_offload); } -- 2.28.0