<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
From patchwork Fri Aug 12 16:52:23 2022</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof">
<div>Content-Type: text/plain; charset="utf-8"</div>
<div>MIME-Version: 1.0</div>
<div>Content-Transfer-Encoding: 7bit</div>
<div>X-Patchwork-Submitter: "Zhang, Peng1X" <peng1x.zhang@intel.com></div>
<div>X-Patchwork-Id: 114859</div>
<div>X-Patchwork-Delegate: qi.z.zhang@intel.com</div>
<div>Return-Path: <dev-bounces@dpdk.org></div>
<div>X-Original-To: patchwork@inbox.dpdk.org</div>
<div>Delivered-To: patchwork@inbox.dpdk.org</div>
<div>Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])</div>
<div> by inbox.dpdk.org (Postfix) with ESMTP id C9074A0543;</div>
<div> Fri, 12 Aug 2022 11:02:29 +0200 (CEST)</div>
<div>Received: from [217.70.189.124] (localhost [127.0.0.1])</div>
<div> by mails.dpdk.org (Postfix) with ESMTP id BC9E3427F2;</div>
<div> Fri, 12 Aug 2022 11:02:29 +0200 (CEST)</div>
<div>Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])</div>
<div> by mails.dpdk.org (Postfix) with ESMTP id EB424410FC</div>
<div> for <dev@dpdk.org>; Fri, 12 Aug 2022 11:02:27 +0200 (CEST)</div>
<div>DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;</div>
<div> d=intel.com; i=@intel.com; q=dns/txt; s=Intel;</div>
<div> t=1660294948; x=1691830948;</div>
<div> h=from:to:cc:subject:date:message-id:in-reply-to:</div>
<div> references:mime-version:content-transfer-encoding;</div>
<div> bh=IpO6pCd5TXQDILuXUPoUuCViBMkYfHWoRV2RV4bEyOs=;</div>
<div> b=czOHY8+0z/9icpoaY8UM3Up/T5Td5o6VKtvi/l/Jrw+/Mg8y7vat0loH</div>
<div> M3ZWRKgO+ljh9CyDK4pcXjCZYvBRdw8Yo2PH1ZoDzVcRQmcBnqa2NnLNI</div>
<div> 0NjKAjinoFZJogZEYYRgeoGx3gQTSIZDSYG+RhYWijBXB9VkIawArGScp</div>
<div> Onw4UrYkIHSiZFN48jBbeoflcOpMvj72KQk5jLfyxLetJ/EUjHiSj6tYa</div>
<div> 6ZGILyL/hmSH2pQMwmIH+Hw03qjp/fPjuxB6PdGBGg5aMQ3y8NmlFWGxZ</div>
<div> aTzhpllEuWfAiH3F5JPR+PZ2w9YVXd6QLrF+Q+4lFf2g1EiUQOOH7dTkf Q==;</div>
<div>X-IronPort-AV: E=McAfee;i="6400,9594,10436"; a="355562201"</div>
<div>X-IronPort-AV: E=Sophos;i="5.93,231,1654585200"; d="scan'208";a="355562201"</div>
<div>Received: from fmsmga008.fm.intel.com ([10.253.24.58])</div>
<div> by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;</div>
<div> 12 Aug 2022 02:02:26 -0700</div>
<div>X-IronPort-AV: E=Sophos;i="5.93,231,1654585200"; d="scan'208";a="665750867"</div>
<div>Received: from unknown (HELO localhost.localdomain) ([10.239.252.253])</div>
<div> by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;</div>
<div> 12 Aug 2022 02:02:24 -0700</div>
<div>From: peng1x.zhang@intel.com</div>
<div>To: dev@dpdk.org</div>
<div>Cc: beilei.xing@intel.com, jingjing.wu@intel.com,</div>
<div> Peng Zhang <peng1x.zhang@intel.com></div>
<div>Subject: [PATCH 2/2] net/iavf: support inner and outer checksum offload</div>
<div>Date: Sat, 13 Aug 2022 00:52:23 +0800</div>
<div>Message-Id: <20220812165223.470777-2-peng1x.zhang@intel.com></div>
<div>X-Mailer: git-send-email 2.25.1</div>
<div>In-Reply-To: <20220812165223.470777-1-peng1x.zhang@intel.com></div>
<div>References: <20220812165223.470777-1-peng1x.zhang@intel.com></div>
<div>MIME-Version: 1.0</div>
<div>X-BeenThere: dev@dpdk.org</div>
<div>X-Mailman-Version: 2.1.29</div>
<div>Precedence: list</div>
<div>List-Id: DPDK patches and discussions <dev.dpdk.org></div>
<div>List-Unsubscribe: <https://mails.dpdk.org/options/dev>,</div>
<div> <mailto:dev-request@dpdk.org?subject=unsubscribe></div>
<div>List-Archive: <http://mails.dpdk.org/archives/dev/></div>
<div>List-Post: <mailto:dev@dpdk.org></div>
<div>List-Help: <mailto:dev-request@dpdk.org?subject=help></div>
<div>List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,</div>
<div> <mailto:dev-request@dpdk.org?subject=subscribe></div>
<div>Errors-To: dev-bounces@dpdk.org</div>
<div><br>
</div>
<div>From: Peng Zhang <peng1x.zhang@intel.com></div>
<div><br>
</div>
<div>Add the support of inner and outer Tx checksum offload for tunneling</div>
<div>packets by configuring tunneling parameters in Tx descriptors,</div>
<div>including outer L3/L4 checksum offload.</div>
<div><br>
</div>
<div>Signed-off-by: Peng Zhang <peng1x.zhang@intel.com></div>
<div>---</div>
<div>Tested-by: Daniel M Buckley <daniel.m.buckley@intel.con></div>
<div>---</div>
<div> drivers/net/iavf/iavf_ethdev.c | 3 +-</div>
<div> drivers/net/iavf/iavf_rxtx.c | 51 +++++++++++++++++++++++++++++++---</div>
<div> drivers/net/iavf/iavf_rxtx.h | 8 +++++-</div>
<div> 3 files changed, 56 insertions(+), 6 deletions(-)</div>
<div><br>
</div>
<div>diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c</div>
<div>index 506fcff6e3..59238ecceb 100644</div>
<div>--- a/drivers/net/iavf/iavf_ethdev.c</div>
<div>+++ b/drivers/net/iavf/iavf_ethdev.c</div>
<div>@@ -1140,7 +1140,8 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)</div>
<div> RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |</div>
<div> RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |</div>
<div> RTE_ETH_TX_OFFLOAD_MULTI_SEGS |</div>
<div>- RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;</div>
<div>+ RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE |</div>
<div>+ RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM;</div>
<div> </div>
<div> if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_CRC)</div>
<div> dev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_KEEP_CRC;</div>
<div>diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c</div>
<div>index adec58e90a..7cbebafc09 100644</div>
<div>--- a/drivers/net/iavf/iavf_rxtx.c</div>
<div>+++ b/drivers/net/iavf/iavf_rxtx.c</div>
<div>@@ -2334,7 +2334,7 @@ static inline uint16_t</div>
<div> iavf_calc_context_desc(uint64_t flags, uint8_t vlan_flag)</div>
<div> {</div>
<div> if (flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG |</div>
<div>- RTE_MBUF_F_TX_TUNNEL_MASK))</div>
<div>+ RTE_MBUF_F_TX_TUNNEL_MASK | RTE_MBUF_F_TX_OUTER_IP_CKSUM))</div>
<div> return 1;</div>
<div> if (flags & RTE_MBUF_F_TX_VLAN &&</div>
<div> vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2)</div>
<div>@@ -2399,6 +2399,44 @@ iavf_fill_ctx_desc_tunnelling_field(volatile uint64_t *qw0,</div>
<div> break;</div>
<div> }</div>
<div> </div>
<div>+ /* L4TUNT: L4 Tunneling Type */</div>
<div>+ switch (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) {</div>
<div>+ case RTE_MBUF_F_TX_TUNNEL_IPIP:</div>
<div>+ /* for non UDP / GRE tunneling, set to 00b */</div>
<div>+ break;</div>
<div>+ case RTE_MBUF_F_TX_TUNNEL_VXLAN:</div>
<div>+ case RTE_MBUF_F_TX_TUNNEL_GTP:</div>
<div>+ case RTE_MBUF_F_TX_TUNNEL_GENEVE:</div>
<div>+ eip_typ |= IAVF_TXD_CTX_UDP_TUNNELING;</div>
<div>+ break;</div>
<div>+ case RTE_MBUF_F_TX_TUNNEL_GRE:</div>
<div>+ eip_typ |= IAVF_TXD_CTX_GRE_TUNNELING;</div>
<div>+ break;</div>
<div>+ default:</div>
<div>+ PMD_TX_LOG(ERR, "Tunnel type not supported");</div>
<div>+ return;</div>
<div>+ }</div>
<div>+</div>
<div>+ /* L4TUNLEN: L4 Tunneling Length, in Words</div>
<div>+ *</div>
<div>+ * We depend on app to set rte_mbuf.l2_len correctly.</div>
<div>+ * For IP in GRE it should be set to the length of the GRE</div>
<div>+ * header;</div>
<div>+ * For MAC in GRE or MAC in UDP it should be set to the length</div>
<div>+ * of the GRE or UDP headers plus the inner MAC up to including</div>
<div>+ * its last Ethertype.</div>
<div>+ * If MPLS labels exists, it should include them as well.</div>
<div>+ */</div>
<div>+ eip_typ |= (m->l2_len >> 1) << IAVF_TXD_CTX_QW0_NATLEN_SHIFT;</div>
<div>+</div>
<div>+ /**</div>
<div>+ * Calculate the tunneling UDP checksum.</div>
<div>+ * Shall be set only if L4TUNT = 01b and EIPT is not zero</div>
<div>+ */</div>
<div>+ if (!(eip_typ & IAVF_TX_CTX_EXT_IP_NONE) &&</div>
<div>+ (eip_typ & IAVF_TXD_CTX_UDP_TUNNELING))</div>
<div>+ eip_typ |= IAVF_TXD_CTX_QW0_L4T_CS_MASK;</div>
<div>+</div>
<div> *qw0 = eip_typ << IAVF_TXD_CTX_QW0_TUN_PARAMS_EIPT_SHIFT |</div>
<div> eip_len << IAVF_TXD_CTX_QW0_TUN_PARAMS_EIPLEN_SHIFT |</div>
<div> eip_noinc << IAVF_TXD_CTX_QW0_TUN_PARAMS_EIP_NOINC_SHIFT;</div>
<div>@@ -2417,7 +2455,7 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,</div>
<div> total_length = m->pkt_len - (m->l2_len + m->l3_len + m->l4_len);</div>
<div> </div>
<div> if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)</div>
<div>- total_length -= m->outer_l3_len;</div>
<div>+ total_length -= m->outer_l3_len + m->outer_l2_len;</div>
<div> }</div>
<div> </div>
<div> #ifdef RTE_LIBRTE_IAVF_DEBUG_TX</div>
<div>@@ -2535,8 +2573,13 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,</div>
<div> }</div>
<div> </div>
<div> /* Set MACLEN */</div>
<div>- offset |= (m->l2_len >> 1) << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;</div>
<div>-</div>
<div>+ if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)</div>
<div>+ offset |= (m->outer_l2_len >> 1)</div>
<div>+ << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;</div>
<div>+ else</div>
<div>+ offset |= (m->l2_len >> 1)</div>
<div>+ << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;</div>
<div>+</div>
<div> /* Enable L3 checksum offloading inner */</div>
<div> if (m->ol_flags & RTE_MBUF_F_TX_IP_CKSUM) {</div>
<div> if (m->ol_flags & RTE_MBUF_F_TX_IPV4) {</div>
<div>diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h</div>
<div>index 1695e43cd5..4b40ad3615 100644</div>
<div>--- a/drivers/net/iavf/iavf_rxtx.h</div>
<div>+++ b/drivers/net/iavf/iavf_rxtx.h</div>
<div>@@ -26,6 +26,8 @@</div>
<div> #define IAVF_TX_NO_VECTOR_FLAGS ( \</div>
<div> RTE_ETH_TX_OFFLOAD_MULTI_SEGS | \</div>
<div> RTE_ETH_TX_OFFLOAD_TCP_TSO | \</div>
<div>+ RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM | \</div>
<div>+ RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM | \</div>
<div> RTE_ETH_TX_OFFLOAD_SECURITY)</div>
<div> </div>
<div> #define IAVF_TX_VECTOR_OFFLOAD ( \</div>
<div>@@ -56,7 +58,8 @@</div>
<div> #define IAVF_TX_CKSUM_OFFLOAD_MASK ( \</div>
<div> RTE_MBUF_F_TX_IP_CKSUM | \</div>
<div> RTE_MBUF_F_TX_L4_MASK | \</div>
<div>- RTE_MBUF_F_TX_TCP_SEG)</div>
<div>+ RTE_MBUF_F_TX_TCP_SEG | \</div>
<div>+ RTE_MBUF_F_TX_OUTER_IP_CKSUM)</div>
<div> </div>
<div> #define IAVF_TX_OFFLOAD_MASK ( \</div>
<div> RTE_MBUF_F_TX_OUTER_IPV6 | \</div>
<div>@@ -67,6 +70,9 @@</div>
<div> RTE_MBUF_F_TX_IP_CKSUM | \</div>
<div> RTE_MBUF_F_TX_L4_MASK | \</div>
<div> RTE_MBUF_F_TX_TCP_SEG | \</div>
<div>+ RTE_MBUF_F_TX_TUNNEL_MASK | \</div>
<div>+ RTE_MBUF_F_TX_OUTER_IP_CKSUM | \</div>
<div>+ RTE_MBUF_F_TX_OUTER_UDP_CKSUM | \</div>
<div> RTE_ETH_TX_OFFLOAD_SECURITY)</div>
<div> </div>
<div> #define IAVF_TX_OFFLOAD_NOTSUP_MASK \</div>
<br>
</div>
<p>--------------------------------------------------------------<br>
Intel Research and Development Ireland Limited<br>
Registered in Ireland<br>
Registered Office: Collinstown Industrial Park, Leixlip, County Kildare<br>
Registered Number: 308263</p>
<p>This e-mail and any attachments may contain confidential material for the
sole use of the intended recipient(s). Any review or distribution by others is
strictly prohibited. If you are not the intended recipient, please contact the
sender and delete all copies.</p>
<p></p>
</body>
</html>