Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2344/?format=api
https://patches.dpdk.org/api/patches/2344/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1421637803-17034-4-git-send-email-helin.zhang@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": "<1421637803-17034-4-git-send-email-helin.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1421637803-17034-4-git-send-email-helin.zhang@intel.com", "date": "2015-01-19T03:23:09", "name": "[dpdk-dev,RFC,03/17] ixgbe: support of unified packet type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c81559c04b9919d9d2ba6166f79d1504a2e625ee", "submitter": { "id": 14, "url": "https://patches.dpdk.org/api/people/14/?format=api", "name": "Zhang, Helin", "email": "helin.zhang@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1421637803-17034-4-git-send-email-helin.zhang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/2344/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/2344/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id B5ACD5937;\n\tMon, 19 Jan 2015 04:24:05 +0100 (CET)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id CFE8F5A80\n\tfor <dev@dpdk.org>; Mon, 19 Jan 2015 04:23:36 +0100 (CET)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga102.fm.intel.com with ESMTP; 18 Jan 2015 19:23:36 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby FMSMGA003.fm.intel.com with ESMTP; 18 Jan 2015 19:10:25 -0800", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t0J3NXm2008469;\n\tMon, 19 Jan 2015 11:23:33 +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 t0J3NVQC017089; Mon, 19 Jan 2015 11:23:33 +0800", "(from hzhan75@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t0J3NVKc017085; \n\tMon, 19 Jan 2015 11:23:31 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"4.97,862,1389772800\"; d=\"scan'208\";a=\"442109249\"", "From": "Helin Zhang <helin.zhang@intel.com>", "To": "dev@dpdk.org", "Date": "Mon, 19 Jan 2015 11:23:09 +0800", "Message-Id": "<1421637803-17034-4-git-send-email-helin.zhang@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1421637803-17034-1-git-send-email-helin.zhang@intel.com>", "References": "<1421637803-17034-1-git-send-email-helin.zhang@intel.com>", "Subject": "[dpdk-dev] [RFC 03/17] ixgbe: support of unified packet type", "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>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "To unify packet types among all PMDs, bit masks of packet type for\nol_flags are replaced by unified packet type.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\n---\n lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 141 +++++++++++++++++++++++++++++---------\n 1 file changed, 107 insertions(+), 34 deletions(-)", "diff": "diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\nindex 840bc07..fd6a8e2 100644\n--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c\n@@ -866,40 +866,102 @@ end_of_tx:\n * RX functions\n *\n **********************************************************************/\n-static inline uint64_t\n-rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)\n+#define IXGBE_PACKET_TYPE_IPV4 0X01\n+#define IXGBE_PACKET_TYPE_IPV4_TCP 0X11\n+#define IXGBE_PACKET_TYPE_IPV4_UDP 0X21\n+#define IXGBE_PACKET_TYPE_IPV4_SCTP 0X41\n+#define IXGBE_PACKET_TYPE_IPV4_EXT 0X03\n+#define IXGBE_PACKET_TYPE_IPV4_EXT_SCTP 0X43\n+#define IXGBE_PACKET_TYPE_IPV6 0X04\n+#define IXGBE_PACKET_TYPE_IPV6_TCP 0X14\n+#define IXGBE_PACKET_TYPE_IPV6_UDP 0X24\n+#define IXGBE_PACKET_TYPE_IPV6_EXT 0X0C\n+#define IXGBE_PACKET_TYPE_IPV6_EXT_TCP 0X1C\n+#define IXGBE_PACKET_TYPE_IPV6_EXT_UDP 0X2C\n+#define IXGBE_PACKET_TYPE_IPV4_IPV6 0X05\n+#define IXGBE_PACKET_TYPE_IPV4_IPV6_TCP 0X15\n+#define IXGBE_PACKET_TYPE_IPV4_IPV6_UDP 0X25\n+#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT 0X0D\n+#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D\n+#define IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D\n+#define IXGBE_PACKET_TYPE_MAX 0X80\n+#define IXGBE_PACKET_TYPE_MASK 0X7F\n+#define IXGBE_PACKET_TYPE_SHIFT 0X04\n+static inline uint16_t\n+ixgbe_rxd_pkt_info_to_pkt_type(uint16_t pkt_info)\n {\n-\tuint64_t pkt_flags;\n-\n-\tstatic uint64_t ip_pkt_types_map[16] = {\n-\t\t0, PKT_RX_IPV4_HDR, PKT_RX_IPV4_HDR_EXT, PKT_RX_IPV4_HDR_EXT,\n-\t\tPKT_RX_IPV6_HDR, 0, 0, 0,\n-\t\tPKT_RX_IPV6_HDR_EXT, 0, 0, 0,\n-\t\tPKT_RX_IPV6_HDR_EXT, 0, 0, 0,\n+\tstatic const uint16_t\n+\t\tptype_table[IXGBE_PACKET_TYPE_MAX] __rte_cache_aligned = {\n+\t\t[IXGBE_PACKET_TYPE_IPV4] = RTE_PTYPE_L3_IPV4,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_EXT] = RTE_PTYPE_L3_IPV4_EXT,\n+\t\t[IXGBE_PACKET_TYPE_IPV6] = RTE_PTYPE_L3_IPV6,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_IPV6] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_TUNNEL_IP | RTE_PTYPE_INNER_L3_IPV6,\n+\t\t[IXGBE_PACKET_TYPE_IPV6_EXT] = RTE_PTYPE_L3_IPV6_EXT,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_IPV6_EXT] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6_EXT,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_TCP] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_L4_TCP,\n+\t\t[IXGBE_PACKET_TYPE_IPV6_TCP] = RTE_PTYPE_L3_IPV6 |\n+\t\t\tRTE_PTYPE_L4_TCP,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_IPV6_TCP] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_TUNNEL_IP | RTE_PTYPE_INNER_L3_IPV6 |\n+\t\t\tRTE_PTYPE_L4_TCP,\n+\t\t[IXGBE_PACKET_TYPE_IPV6_EXT_TCP] = RTE_PTYPE_L3_IPV6_EXT |\n+\t\t\tRTE_PTYPE_L4_TCP,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_TCP] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6_EXT | RTE_PTYPE_L4_TCP,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_UDP] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_L4_UDP,\n+\t\t[IXGBE_PACKET_TYPE_IPV6_UDP] = RTE_PTYPE_L3_IPV6 |\n+\t\t\tRTE_PTYPE_L4_UDP,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_IPV6_UDP] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_TUNNEL_IP | RTE_PTYPE_INNER_L3_IPV6 |\n+\t\t\tRTE_PTYPE_L4_UDP,\n+\t\t[IXGBE_PACKET_TYPE_IPV6_EXT_UDP] = RTE_PTYPE_L3_IPV6_EXT |\n+\t\t\tRTE_PTYPE_L4_UDP,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_IPV6_EXT_UDP] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6_EXT | RTE_PTYPE_L4_UDP,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_SCTP] = RTE_PTYPE_L3_IPV4 |\n+\t\t\tRTE_PTYPE_L4_SCTP,\n+\t\t[IXGBE_PACKET_TYPE_IPV4_EXT_SCTP] = RTE_PTYPE_L3_IPV4_EXT |\n+\t\t\tRTE_PTYPE_L4_SCTP,\n \t};\n+\tif (unlikely(pkt_info & IXGBE_RXDADV_PKTTYPE_ETQF))\n+\t\treturn RTE_PTYPE_UNKNOWN;\n \n-\tstatic uint64_t ip_rss_types_map[16] = {\n+\tpkt_info = (pkt_info >> IXGBE_PACKET_TYPE_SHIFT) &\n+\t\t\t\tIXGBE_PACKET_TYPE_MASK;\n+\n+\treturn ptype_table[pkt_info];\n+}\n+\n+static inline uint64_t\n+ixgbe_rxd_pkt_info_to_pkt_flags(uint16_t pkt_info)\n+{\n+\tstatic uint64_t ip_rss_types_map[16] __rte_cache_aligned = {\n \t\t0, PKT_RX_RSS_HASH, PKT_RX_RSS_HASH, PKT_RX_RSS_HASH,\n \t\t0, PKT_RX_RSS_HASH, 0, PKT_RX_RSS_HASH,\n \t\tPKT_RX_RSS_HASH, 0, 0, 0,\n \t\t0, 0, 0, PKT_RX_FDIR,\n \t};\n-\n #ifdef RTE_LIBRTE_IEEE1588\n \tstatic uint64_t ip_pkt_etqf_map[8] = {\n \t\t0, 0, 0, PKT_RX_IEEE1588_PTP,\n \t\t0, 0, 0, 0,\n \t};\n \n-\tpkt_flags = (hl_tp_rs & IXGBE_RXDADV_PKTTYPE_ETQF) ?\n-\t\t\tip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07] :\n-\t\t\tip_pkt_types_map[(hl_tp_rs >> 4) & 0x0F];\n+\tif (likely(pkt_info & IXGBE_RXDADV_PKTTYPE_ETQF))\n+\t\treturn ip_pkt_etqf_map[(pkt_info >> 4) & 0X07] |\n+\t\t\t\tip_rss_types_map[pkt_info & 0xF];\n+\telse\n+\t\treturn ip_rss_types_map[pkt_info & 0xF];\n #else\n-\tpkt_flags = (hl_tp_rs & IXGBE_RXDADV_PKTTYPE_ETQF) ? 0 :\n-\t\t\tip_pkt_types_map[(hl_tp_rs >> 4) & 0x0F];\n-\n+\treturn ip_rss_types_map[pkt_info & 0xF];\n #endif\n-\treturn pkt_flags | ip_rss_types_map[hl_tp_rs & 0xF];\n }\n \n static inline uint64_t\n@@ -956,7 +1018,9 @@ ixgbe_rx_scan_hw_ring(struct igb_rx_queue *rxq)\n \tstruct rte_mbuf *mb;\n \tuint16_t pkt_len;\n \tuint64_t pkt_flags;\n-\tint s[LOOK_AHEAD], nb_dd;\n+\tint nb_dd;\n+\tuint32_t s[LOOK_AHEAD];\n+\tuint16_t pkt_info[LOOK_AHEAD];\n \tint i, j, nb_rx = 0;\n \n \n@@ -979,6 +1043,9 @@ ixgbe_rx_scan_hw_ring(struct igb_rx_queue *rxq)\n \t\tfor (j = LOOK_AHEAD-1; j >= 0; --j)\n \t\t\ts[j] = rxdp[j].wb.upper.status_error;\n \n+\t\tfor (j = LOOK_AHEAD-1; j >= 0; --j)\n+\t\t\tpkt_info[j] = rxdp[j].wb.lower.lo_dword.hs_rss.pkt_info;\n+\n \t\t/* Compute how many status bits were set */\n \t\tnb_dd = 0;\n \t\tfor (j = 0; j < LOOK_AHEAD; ++j)\n@@ -996,12 +1063,13 @@ ixgbe_rx_scan_hw_ring(struct igb_rx_queue *rxq)\n \t\t\tmb->vlan_tci = rte_le_to_cpu_16(rxdp[j].wb.upper.vlan);\n \n \t\t\t/* convert descriptor fields to rte mbuf flags */\n-\t\t\tpkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(\n-\t\t\t\t\trxdp[j].wb.lower.lo_dword.data);\n-\t\t\t/* reuse status field from scan list */\n-\t\t\tpkt_flags |= rx_desc_status_to_pkt_flags(s[j]);\n+\t\t\tpkt_flags = rx_desc_status_to_pkt_flags(s[j]);\n \t\t\tpkt_flags |= rx_desc_error_to_pkt_flags(s[j]);\n+\t\t\tpkt_flags |=\n+\t\t\t\tixgbe_rxd_pkt_info_to_pkt_flags(pkt_info[j]);\n \t\t\tmb->ol_flags = pkt_flags;\n+\t\t\tmb->packet_type =\n+\t\t\t\tixgbe_rxd_pkt_info_to_pkt_type(pkt_info[j]);\n \n \t\t\tif (likely(pkt_flags & PKT_RX_RSS_HASH))\n \t\t\t\tmb->hash.rss = rxdp[j].wb.lower.hi_dword.rss;\n@@ -1198,7 +1266,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tunion ixgbe_adv_rx_desc rxd;\n \tuint64_t dma_addr;\n \tuint32_t staterr;\n-\tuint32_t hlen_type_rss;\n+\tuint32_t pkt_info;\n \tuint16_t pkt_len;\n \tuint16_t rx_id;\n \tuint16_t nb_rx;\n@@ -1316,14 +1384,17 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\trxm->data_len = pkt_len;\n \t\trxm->port = rxq->port_id;\n \n-\t\thlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data);\n+\t\tpkt_info = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.hs_rss.\n+\t\t\t\t\t\t\t\tpkt_info);\n \t\t/* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */\n \t\trxm->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan);\n \n-\t\tpkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss);\n-\t\tpkt_flags = pkt_flags | rx_desc_status_to_pkt_flags(staterr);\n+\t\tpkt_flags = rx_desc_status_to_pkt_flags(staterr);\n \t\tpkt_flags = pkt_flags | rx_desc_error_to_pkt_flags(staterr);\n+\t\tpkt_flags = pkt_flags |\n+\t\t\tixgbe_rxd_pkt_info_to_pkt_flags(pkt_info);\n \t\trxm->ol_flags = pkt_flags;\n+\t\trxm->packet_type = ixgbe_rxd_pkt_info_to_pkt_type(pkt_info);\n \n \t\tif (likely(pkt_flags & PKT_RX_RSS_HASH))\n \t\t\trxm->hash.rss = rxd.wb.lower.hi_dword.rss;\n@@ -1382,7 +1453,7 @@ ixgbe_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \tunion ixgbe_adv_rx_desc rxd;\n \tuint64_t dma; /* Physical address of mbuf data buffer */\n \tuint32_t staterr;\n-\tuint32_t hlen_type_rss;\n+\tuint16_t pkt_info;\n \tuint16_t rx_id;\n \tuint16_t nb_rx;\n \tuint16_t nb_hold;\n@@ -1561,13 +1632,15 @@ ixgbe_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t * set in the pkt_flags field.\n \t\t */\n \t\tfirst_seg->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan);\n-\t\thlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data);\n-\t\tpkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss);\n-\t\tpkt_flags = (pkt_flags |\n-\t\t\t\trx_desc_status_to_pkt_flags(staterr));\n-\t\tpkt_flags = (pkt_flags |\n-\t\t\t\trx_desc_error_to_pkt_flags(staterr));\n+\t\tpkt_info = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.hs_rss.\n+\t\t\t\t\t\t\t\tpkt_info);\n+\t\tpkt_flags = rx_desc_status_to_pkt_flags(staterr);\n+\t\tpkt_flags = pkt_flags | rx_desc_error_to_pkt_flags(staterr);\n+\t\tpkt_flags = pkt_flags |\n+\t\t\tixgbe_rxd_pkt_info_to_pkt_flags(pkt_info);\n \t\tfirst_seg->ol_flags = pkt_flags;\n+\t\tfirst_seg->packet_type =\n+\t\t\tixgbe_rxd_pkt_info_to_pkt_type(pkt_info);\n \n \t\tif (likely(pkt_flags & PKT_RX_RSS_HASH))\n \t\t\tfirst_seg->hash.rss = rxd.wb.lower.hi_dword.rss;\n", "prefixes": [ "dpdk-dev", "RFC", "03/17" ] }{ "id": 2344, "url": "