Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 5545,
    "url": "http://patches.dpdk.org/api/patches/5545/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1434701661-9943-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": "<1434701661-9943-5-git-send-email-helin.zhang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1434701661-9943-5-git-send-email-helin.zhang@intel.com",
    "date": "2015-06-19T08:14:07",
    "name": "[dpdk-dev,v7,04/18] e1000: replace bit mask based packet type with unified packet type",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "46480e6dcb0919f4491f9c34612757db411c706a",
    "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/1434701661-9943-5-git-send-email-helin.zhang@intel.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/5545/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/5545/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 A943AC6F0;\n\tFri, 19 Jun 2015 10:14:47 +0200 (CEST)",
            "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id CDA3FC6CC\n\tfor <dev@dpdk.org>; Fri, 19 Jun 2015 10:14:40 +0200 (CEST)",
            "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga101.jf.intel.com with ESMTP; 19 Jun 2015 01:14:41 -0700",
            "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga001.fm.intel.com with ESMTP; 19 Jun 2015 01:14:39 -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 t5J8Ea8d012924;\n\tFri, 19 Jun 2015 16:14:36 +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 t5J8EYi6010262; Fri, 19 Jun 2015 16:14:36 +0800",
            "(from hzhan75@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t5J8EYtF010258; \n\tFri, 19 Jun 2015 16:14:34 +0800"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.13,643,1427785200\"; d=\"scan'208\";a=\"730503639\"",
        "From": "Helin Zhang <helin.zhang@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Fri, 19 Jun 2015 16:14:07 +0800",
        "Message-Id": "<1434701661-9943-5-git-send-email-helin.zhang@intel.com>",
        "X-Mailer": "git-send-email 1.7.4.1",
        "In-Reply-To": "<1434701661-9943-1-git-send-email-helin.zhang@intel.com>",
        "References": "<1433144045-30847-1-git-send-email-helin.zhang@intel.com>\n\t<1434701661-9943-1-git-send-email-helin.zhang@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v7 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.\nTo avoid breaking ABI compatibility, all the changes would be\nenabled by RTE_NEXT_ABI, which is disabled by default.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\n---\n drivers/net/e1000/igb_rxtx.c | 102 +++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 102 insertions(+)\n\nv2 changes:\n* Used redefined packet types and enlarged packet_type field in mbuf.\n\nv5 changes:\n* Re-worded the commit logs.\n\nv6 changes:\n* Disabled the code changes for unified packet type by default, to\n  avoid breaking ABI compatibility.\n\nv7 changes:\n* Renamed RTE_UNIFIED_PKT_TYPE to RTE_NEXT_ABI.",
    "diff": "diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex 43d6703..d1c2ef8 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -590,6 +590,99 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n  *  RX functions\n  *\n  **********************************************************************/\n+#ifdef RTE_NEXT_ABI\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 = ((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+\t\t0, 0, 0, PKT_RX_IEEE1588_PTP,\n+\t\t0, 0, 0, 0,\n+\t};\n+\n+\tpkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07];\n+#endif\n+\n+\treturn pkt_flags;\n+}\n+#else /* RTE_NEXT_ABI */\n static inline uint64_t\n rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)\n {\n@@ -617,6 +710,7 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs)\n #endif\n \treturn pkt_flags | (((hl_tp_rs & 0x0F) == 0) ?  0 : PKT_RX_RSS_HASH);\n }\n+#endif /* RTE_NEXT_ABI */\n \n static inline uint64_t\n rx_desc_status_to_pkt_flags(uint32_t rx_status)\n@@ -790,6 +884,10 @@ 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+#ifdef RTE_NEXT_ABI\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+#endif\n \n \t\t/*\n \t\t * Store the mbuf address into the next entry of the array\n@@ -1024,6 +1122,10 @@ 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+#ifdef RTE_NEXT_ABI\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+#endif\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",
        "v7",
        "04/18"
    ]
}