Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/148/?format=api
{ "id": 148, "url": "https://patches.dpdk.org/api/patches/148/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1407813127-10991-6-git-send-email-jijiang.liu@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1407813127-10991-6-git-send-email-jijiang.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1407813127-10991-6-git-send-email-jijiang.liu@intel.com", "date": "2014-08-12T03:12:06", "name": "[dpdk-dev,5/6] i40e:VxLAN Tx checksum offload", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0313c11b83e9ba4350a2ccbc2efe53d9c10efd4b", "submitter": { "id": 52, "url": "https://patches.dpdk.org/api/people/52/?format=api", "name": "Jijiang Liu", "email": "jijiang.liu@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1407813127-10991-6-git-send-email-jijiang.liu@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/148/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/148/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<jijiangl@shecgisg004.sh.intel.com>", "Received": [ "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id 6DE38B3AA\n\tfor <dev@dpdk.org>; Tue, 12 Aug 2014 05:09:39 +0200 (CEST)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga101.fm.intel.com with ESMTP; 11 Aug 2014 20:12:32 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga001.fm.intel.com with ESMTP; 11 Aug 2014 20:12:31 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id s7C3CTw9012737;\n\tTue, 12 Aug 2014 11:12:29 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid s7C3CQnN011138; Tue, 12 Aug 2014 11:12:28 +0800", "(from jijiangl@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id s7C3CQ8B011134; \n\tTue, 12 Aug 2014 11:12:26 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.01,846,1400050800\"; d=\"scan'208\";a=\"575329733\"", "From": "Jijiang Liu <jijiang.liu@intel.com>", "To": "dev@dpdk.org", "Date": "Tue, 12 Aug 2014 11:12:06 +0800", "Message-Id": "<1407813127-10991-6-git-send-email-jijiang.liu@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "In-Reply-To": "<1407813127-10991-1-git-send-email-jijiang.liu@intel.com>", "References": "<1407813127-10991-1-git-send-email-jijiang.liu@intel.com>", "Subject": "[dpdk-dev] [PATCH 5/6]i40e:VxLAN Tx checksum offload", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "X-List-Received-Date": "Tue, 12 Aug 2014 03:09:40 -0000" }, "content": "Support VxLAN TX check offload, which include outer and inner L3(IP),\ninner L4(UDP,TCP and SCTP).\n\nSigned-off-by: jijiangl <jijiang.liu@intel.com>\nAcked-by: Helin Zhang <helin.zhang@intel.com>\nAcked-by: Jingjing Wu <jingjing.wu@intel.com>\nAcked-by: Jing Chen <jing.d.chen@intel.com>\n---\n lib/librte_mbuf/rte_mbuf.h | 4 +++\n lib/librte_pmd_i40e/i40e_rxtx.c | 58 +++++++++++++++++++++++++++++++++++++--\n 2 files changed, 59 insertions(+), 3 deletions(-)", "diff": "diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h\nindex 2735f37..212ac3a 100644\n--- a/lib/librte_mbuf/rte_mbuf.h\n+++ b/lib/librte_mbuf/rte_mbuf.h\n@@ -97,6 +97,8 @@ struct rte_ctrlmbuf {\n #define PKT_RX_IEEE1588_PTP 0x0200 /**< RX IEEE1588 L2 Ethernet PT Packet. */\n #define PKT_RX_IEEE1588_TMST 0x0400 /**< RX IEEE1588 L2/L4 timestamped packet.*/\n \n+#define PKT_TX_VXLAN_CKSUM 0x0001 /**< Checksum of TX VxLAN pkt. computed by NIC.. */\n+#define PKT_TX_IVLAN_PKT 0x0002 /**< TX packet is VxLAN packet with an inner VLAN. */\n #define PKT_TX_VLAN_PKT 0x0800 /**< TX packet is a 802.1q VLAN packet. */\n #define PKT_TX_IP_CKSUM 0x1000 /**< IP cksum of TX pkt. computed by NIC. */\n #define PKT_TX_IPV4_CSUM 0x1000 /**< Alias of PKT_TX_IP_CKSUM. */\n@@ -594,6 +596,7 @@ static inline void rte_pktmbuf_reset(struct rte_mbuf *m)\n \tm->pkt.in_port = 0xff;\n \n \tm->ol_flags = 0;\n+\tm->reserved = 0;\n \tbuf_ofs = (RTE_PKTMBUF_HEADROOM <= m->buf_len) ?\n \t\t\tRTE_PKTMBUF_HEADROOM : m->buf_len;\n \tm->pkt.data = (char*) m->buf_addr + buf_ofs;\n@@ -658,6 +661,7 @@ static inline void rte_pktmbuf_attach(struct rte_mbuf *mi, struct rte_mbuf *md)\n \tmi->pkt.pkt_len = mi->pkt.data_len;\n \tmi->pkt.nb_segs = 1;\n \tmi->ol_flags = md->ol_flags;\n+\tmi->reserved = md->reserved;\n \n \t__rte_mbuf_sanity_check(mi, RTE_MBUF_PKT, 1);\n \t__rte_mbuf_sanity_check(md, RTE_MBUF_PKT, 0);\ndiff --git a/lib/librte_pmd_i40e/i40e_rxtx.c b/lib/librte_pmd_i40e/i40e_rxtx.c\nindex 83b9462..17633e9 100644\n--- a/lib/librte_pmd_i40e/i40e_rxtx.c\n+++ b/lib/librte_pmd_i40e/i40e_rxtx.c\n@@ -415,12 +415,16 @@ i40e_rxd_ptype_to_pkt_flags(uint64_t qword)\n \treturn ip_ptype_map[ptype];\n }\n \n+#define L4TUN_LEN (sizeof(struct udp_hdr) + sizeof(struct vxlan_hdr)\\\n+\t\t\t + sizeof(struct ether_hdr))\n static inline void\n i40e_txd_enable_checksum(uint32_t ol_flags,\n \t\t\tuint32_t *td_cmd,\n \t\t\tuint32_t *td_offset,\n \t\t\tuint8_t l2_len,\n-\t\t\tuint8_t l3_len)\n+\t\t\tuint8_t l3_len,\n+\t\t\tuint8_t inner_l3_len,\n+\t\t\tuint32_t *cd_tunneling)\n {\n \tif (!l2_len) {\n \t\tPMD_DRV_LOG(DEBUG, \"L2 length set to 0\\n\");\n@@ -433,6 +437,31 @@ i40e_txd_enable_checksum(uint32_t ol_flags,\n \t\treturn;\n \t}\n \n+\t/* VxLAN packet TX checksum offload */\n+\tif (unlikely(ol_flags & PKT_TX_VXLAN_CKSUM)) {\n+\t\tuint8_t l4tun_len;\n+\n+\t\t/* packet with inner VLAN */\n+\t\tif (ol_flags & PKT_TX_IVLAN_PKT)\n+\t\t\tl4tun_len = L4TUN_LEN + sizeof(struct vlan_hdr);\n+\t\telse\n+\t\t\tl4tun_len = L4TUN_LEN;\n+\n+\t\tif (ol_flags & PKT_TX_IPV4_CSUM)\n+\t\t\t*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;\n+\t\telse if (ol_flags & PKT_TX_IPV6)\n+\t\t\t*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;\n+\n+\t\t/* Now set the ctx descriptor fields */\n+\t\t*cd_tunneling |= (l3_len >> 2) <<\n+\t\t\t\tI40E_TXD_CTX_QW0_EXT_IPLEN_SHIFT |\n+\t\t\t\tI40E_TXD_CTX_UDP_TUNNELING |\n+\t\t\t\t(l4tun_len >> 1) <<\n+\t\t\t\tI40E_TXD_CTX_QW0_NATLEN_SHIFT;\n+\n+\t\tl3_len = inner_l3_len;\n+\t}\n+\n \t/* Enable L3 checksum offloads */\n \tif (ol_flags & PKT_TX_IPV4_CSUM) {\n \t\t*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;\n@@ -614,6 +643,12 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)\n \t\t\t\t\t\tI40E_RXD_QW1_STATUS_SHIFT;\n \t\t\tpkt_len = ((qword1 & I40E_RXD_QW1_LENGTH_PBUF_MASK) >>\n \t\t\t\tI40E_RXD_QW1_LENGTH_PBUF_SHIFT) - rxq->crc_len;\n+\n+\t\t\t/* reserved is used to store packet type for RX side */\n+\t\t\tmb->reserved = (uint8_t)((qword1 & \n+\t\t\t\t\tI40E_RXD_QW1_PTYPE_MASK) >>\n+\t\t\t\t\tI40E_RXD_QW1_PTYPE_SHIFT);\n+\n \t\t\tmb->pkt.data_len = pkt_len;\n \t\t\tmb->pkt.pkt_len = pkt_len;\n \t\t\tmb->pkt.vlan_macip.f.vlan_tci = rx_status &\n@@ -860,6 +895,8 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\tpkt_flags = i40e_rxd_status_to_pkt_flags(qword1);\n \t\tpkt_flags |= i40e_rxd_error_to_pkt_flags(qword1);\n \t\tpkt_flags |= i40e_rxd_ptype_to_pkt_flags(qword1);\n+\t\trxm->reserved = (uint8_t)((qword1 & I40E_RXD_QW1_PTYPE_MASK) >>\n+\t\t\t\tI40E_RXD_QW1_PTYPE_SHIFT);\n \t\trxm->ol_flags = pkt_flags;\n \t\tif (pkt_flags & PKT_RX_RSS_HASH)\n \t\t\trxm->pkt.hash.rss =\n@@ -1013,6 +1050,9 @@ i40e_recv_scattered_pkts(void *rx_queue,\n \t\tpkt_flags = i40e_rxd_status_to_pkt_flags(qword1);\n \t\tpkt_flags |= i40e_rxd_error_to_pkt_flags(qword1);\n \t\tpkt_flags |= i40e_rxd_ptype_to_pkt_flags(qword1);\n+\t\tfirst_seg->reserved = (uint8_t)((qword1 & \n+\t\t\t\t\tI40E_RXD_QW1_PTYPE_MASK) >>\n+\t\t\t\t\tI40E_RXD_QW1_PTYPE_SHIFT);\n \t\tfirst_seg->ol_flags = pkt_flags;\n \t\tif (pkt_flags & PKT_RX_RSS_HASH)\n \t\t\trxm->pkt.hash.rss =\n@@ -1055,6 +1095,9 @@ i40e_calc_context_desc(uint16_t flags)\n {\n \tuint16_t mask = 0;\n \n+\tif (flags | PKT_TX_VXLAN_CKSUM)\n+\t\tmask |= PKT_TX_VXLAN_CKSUM;\n+\n #ifdef RTE_LIBRTE_IEEE1588\n \tmask |= PKT_TX_IEEE1588_TMST;\n #endif\n@@ -1074,6 +1117,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \tvolatile struct i40e_tx_desc *txr;\n \tstruct rte_mbuf *tx_pkt;\n \tstruct rte_mbuf *m_seg;\n+\tuint32_t cd_tunneling_params;\n \tuint16_t tx_id;\n \tuint16_t nb_tx;\n \tuint32_t td_cmd;\n@@ -1083,6 +1127,7 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \tuint16_t ol_flags;\n \tuint8_t l2_len;\n \tuint8_t l3_len;\n+\tuint8_t inner_l3_len;\n \tuint16_t nb_used;\n \tuint16_t nb_ctx;\n \tuint16_t tx_last;\n@@ -1112,6 +1157,12 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\tl2_len = tx_pkt->pkt.vlan_macip.f.l2_len;\n \t\tl3_len = tx_pkt->pkt.vlan_macip.f.l3_len;\n \n+\t\t/**\n+\t\t * the reserved in mbuf is used to store innel L3\n+\t\t * header length.\n+\t\t */\n+\t\tinner_l3_len = tx_pkt->reserved;\n+\n \t\t/* Calculate the number of context descriptors needed. */\n \t\tnb_ctx = i40e_calc_context_desc(ol_flags);\n \n@@ -1158,15 +1209,16 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\ttd_cmd |= I40E_TX_DESC_CMD_ICRC;\n \n \t\t/* Enable checksum offloading */\n+\t\tcd_tunneling_params = 0;\n \t\ti40e_txd_enable_checksum(ol_flags, &td_cmd, &td_offset,\n-\t\t\t\t\t\t\tl2_len, l3_len);\n+\t\t\t\t\t\tl2_len, l3_len, inner_l3_len,\n+\t\t\t\t\t\t&cd_tunneling_params);\n \n \t\tif (unlikely(nb_ctx)) {\n \t\t\t/* Setup TX context descriptor if required */\n \t\t\tvolatile struct i40e_tx_context_desc *ctx_txd =\n \t\t\t\t(volatile struct i40e_tx_context_desc *)\\\n \t\t\t\t\t\t\t&txr[tx_id];\n-\t\t\tuint32_t cd_tunneling_params = 0;\n \t\t\tuint16_t cd_l2tag2 = 0;\n \t\t\tuint64_t cd_type_cmd_tso_mss =\n \t\t\t\tI40E_TX_DESC_DTYPE_CONTEXT;\n", "prefixes": [ "dpdk-dev", "5/6" ] }