Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/4833/?format=api
{ "id": 4833, "url": "http://patches.dpdk.org/api/patches/4833/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1432284264-17376-5-git-send-email-helin.zhang@intel.com/", "project": { "id": 1, "url": "http://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": "<1432284264-17376-5-git-send-email-helin.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1432284264-17376-5-git-send-email-helin.zhang@intel.com", "date": "2015-05-22T08:44:10", "name": "[dpdk-dev,v5,04/18] e1000: replace bit mask based packet type with unified packet type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e4a7ddc47f0f742a9cf1f640fe7ba60860065b66", "submitter": { "id": 14, "url": "http://patches.dpdk.org/api/people/14/?format=api", "name": "Zhang, Helin", "email": "helin.zhang@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1432284264-17376-5-git-send-email-helin.zhang@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/4833/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/4833/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 46CECC350;\n\tFri, 22 May 2015 10:44:45 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 31263C34A\n\tfor <dev@dpdk.org>; Fri, 22 May 2015 10:44:43 +0200 (CEST)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga103.jf.intel.com with ESMTP; 22 May 2015 01:44:42 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga002.jf.intel.com with ESMTP; 22 May 2015 01:44:41 -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 t4M8icZu024905;\n\tFri, 22 May 2015 16:44:38 +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 t4M8iZFS017438; Fri, 22 May 2015 16:44:37 +0800", "(from hzhan75@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t4M8iZ4Z017434; \n\tFri, 22 May 2015 16:44:35 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,474,1427785200\"; d=\"scan'208\";a=\"733604719\"", "From": "Helin Zhang <helin.zhang@intel.com>", "To": "dev@dpdk.org", "Date": "Fri, 22 May 2015 16:44:10 +0800", "Message-Id": "<1432284264-17376-5-git-send-email-helin.zhang@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1432284264-17376-1-git-send-email-helin.zhang@intel.com>", "References": "<1425042696-23162-1-git-send-email-helin.zhang@intel.com>\n\t<1432284264-17376-1-git-send-email-helin.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH v5 04/18] e1000: replace bit mask based packet\n\ttype with 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\n'ol_flags' are replaced by unified packet type.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\n---\n lib/librte_pmd_e1000/igb_rxtx.c | 98 ++++++++++++++++++++++++++++++++++-------\n 1 file changed, 83 insertions(+), 15 deletions(-)\n\nv2 changes:\n* Used redefined packet types and enlarged packet_type field in mbuf.\n\nv5 changes:\n* Re-worded the commit logs.", "diff": "diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c\nindex 80d05c0..6174fa7 100644\n--- a/lib/librte_pmd_e1000/igb_rxtx.c\n+++ b/lib/librte_pmd_e1000/igb_rxtx.c\n@@ -590,17 +590,85 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n * RX functions\n *\n **********************************************************************/\n+#define IGB_PACKET_TYPE_IPV4 0X01\n+#define IGB_PACKET_TYPE_IPV4_TCP 0X11\n+#define IGB_PACKET_TYPE_IPV4_UDP 0X21\n+#define IGB_PACKET_TYPE_IPV4_SCTP 0X41\n+#define IGB_PACKET_TYPE_IPV4_EXT 0X03\n+#define IGB_PACKET_TYPE_IPV4_EXT_SCTP 0X43\n+#define IGB_PACKET_TYPE_IPV6 0X04\n+#define IGB_PACKET_TYPE_IPV6_TCP 0X14\n+#define IGB_PACKET_TYPE_IPV6_UDP 0X24\n+#define IGB_PACKET_TYPE_IPV6_EXT 0X0C\n+#define IGB_PACKET_TYPE_IPV6_EXT_TCP 0X1C\n+#define IGB_PACKET_TYPE_IPV6_EXT_UDP 0X2C\n+#define IGB_PACKET_TYPE_IPV4_IPV6 0X05\n+#define IGB_PACKET_TYPE_IPV4_IPV6_TCP 0X15\n+#define IGB_PACKET_TYPE_IPV4_IPV6_UDP 0X25\n+#define IGB_PACKET_TYPE_IPV4_IPV6_EXT 0X0D\n+#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP 0X1D\n+#define IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP 0X2D\n+#define IGB_PACKET_TYPE_MAX 0X80\n+#define IGB_PACKET_TYPE_MASK 0X7F\n+#define IGB_PACKET_TYPE_SHIFT 0X04\n+static inline uint32_t\n+igb_rxd_pkt_info_to_pkt_type(uint16_t pkt_info)\n+{\n+\tstatic const uint32_t\n+\t\tptype_table[IGB_PACKET_TYPE_MAX] __rte_cache_aligned = {\n+\t\t[IGB_PACKET_TYPE_IPV4] = RTE_PTYPE_L2_MAC | RTE_PTYPE_L3_IPV4,\n+\t\t[IGB_PACKET_TYPE_IPV4_EXT] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4_EXT,\n+\t\t[IGB_PACKET_TYPE_IPV6] = RTE_PTYPE_L2_MAC | RTE_PTYPE_L3_IPV6,\n+\t\t[IGB_PACKET_TYPE_IPV4_IPV6] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6,\n+\t\t[IGB_PACKET_TYPE_IPV6_EXT] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV6_EXT,\n+\t\t[IGB_PACKET_TYPE_IPV4_IPV6_EXT] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6_EXT,\n+\t\t[IGB_PACKET_TYPE_IPV4_TCP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_TCP,\n+\t\t[IGB_PACKET_TYPE_IPV6_TCP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP,\n+\t\t[IGB_PACKET_TYPE_IPV4_IPV6_TCP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6 | RTE_PTYPE_INNER_L4_TCP,\n+\t\t[IGB_PACKET_TYPE_IPV6_EXT_TCP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_L4_TCP,\n+\t\t[IGB_PACKET_TYPE_IPV4_IPV6_EXT_TCP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6_EXT | RTE_PTYPE_INNER_L4_TCP,\n+\t\t[IGB_PACKET_TYPE_IPV4_UDP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_UDP,\n+\t\t[IGB_PACKET_TYPE_IPV6_UDP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_UDP,\n+\t\t[IGB_PACKET_TYPE_IPV4_IPV6_UDP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6 | RTE_PTYPE_INNER_L4_UDP,\n+\t\t[IGB_PACKET_TYPE_IPV6_EXT_UDP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_L4_UDP,\n+\t\t[IGB_PACKET_TYPE_IPV4_IPV6_EXT_UDP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_IP |\n+\t\t\tRTE_PTYPE_INNER_L3_IPV6_EXT | RTE_PTYPE_INNER_L4_UDP,\n+\t\t[IGB_PACKET_TYPE_IPV4_SCTP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_SCTP,\n+\t\t[IGB_PACKET_TYPE_IPV4_EXT_SCTP] = RTE_PTYPE_L2_MAC |\n+\t\t\tRTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_L4_SCTP,\n+\t};\n+\tif (unlikely(pkt_info & E1000_RXDADV_PKTTYPE_ETQF))\n+\t\treturn RTE_PTYPE_UNKNOWN;\n+\n+\tpkt_info = (pkt_info >> IGB_PACKET_TYPE_SHIFT) & IGB_PACKET_TYPE_MASK;\n+\n+\treturn ptype_table[pkt_info];\n+}\n+\n static inline uint64_t\n rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)\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-\t};\n+\tuint64_t pkt_flags = ((hl_tp_rs & 0x0F) == 0) ? 0 : PKT_RX_RSS_HASH;\n \n #if defined(RTE_LIBRTE_IEEE1588)\n \tstatic uint32_t ip_pkt_etqf_map[8] = {\n@@ -608,14 +676,10 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)\n \t\t0, 0, 0, 0,\n \t};\n \n-\tpkt_flags = (hl_tp_rs & E1000_RXDADV_PKTTYPE_ETQF) ?\n-\t\t\t\tip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07] :\n-\t\t\t\tip_pkt_types_map[(hl_tp_rs >> 4) & 0x0F];\n-#else\n-\tpkt_flags = (hl_tp_rs & E1000_RXDADV_PKTTYPE_ETQF) ? 0 :\n-\t\t\t\tip_pkt_types_map[(hl_tp_rs >> 4) & 0x0F];\n+\tpkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07];\n #endif\n-\treturn pkt_flags | (((hl_tp_rs & 0x0F) == 0) ? 0 : PKT_RX_RSS_HASH);\n+\n+\treturn pkt_flags;\n }\n \n static inline uint64_t\n@@ -790,6 +854,8 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tpkt_flags = pkt_flags | rx_desc_status_to_pkt_flags(staterr);\n \t\tpkt_flags = pkt_flags | rx_desc_error_to_pkt_flags(staterr);\n \t\trxm->ol_flags = pkt_flags;\n+\t\trxm->packet_type = igb_rxd_pkt_info_to_pkt_type(rxd.wb.lower.\n+\t\t\t\t\t\tlo_dword.hs_rss.pkt_info);\n \n \t\t/*\n \t\t * Store the mbuf address into the next entry of the array\n@@ -1024,6 +1090,8 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tpkt_flags = pkt_flags | rx_desc_status_to_pkt_flags(staterr);\n \t\tpkt_flags = pkt_flags | rx_desc_error_to_pkt_flags(staterr);\n \t\tfirst_seg->ol_flags = pkt_flags;\n+\t\tfirst_seg->packet_type = igb_rxd_pkt_info_to_pkt_type(rxd.wb.\n+\t\t\t\t\tlower.lo_dword.hs_rss.pkt_info);\n \n \t\t/* Prefetch data of first segment, if configured to do so. */\n \t\trte_packet_prefetch((char *)first_seg->buf_addr +\n", "prefixes": [ "dpdk-dev", "v5", "04/18" ] }