Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2357/?format=api
{ "id": 2357, "url": "https://patches.dpdk.org/api/patches/2357/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1421637803-17034-17-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-17-git-send-email-helin.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1421637803-17034-17-git-send-email-helin.zhang@intel.com", "date": "2015-01-19T03:23:22", "name": "[dpdk-dev,RFC,16/17] examples/l3fwd: support of unified packet type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "d0a283faf18e2983ce0622deb8b71b5c86ea90ed", "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-17-git-send-email-helin.zhang@intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/2357/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/2357/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 6D1F95ACE;\n\tMon, 19 Jan 2015 04:24:30 +0100 (CET)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id CCE1D5A8F\n\tfor <dev@dpdk.org>; Mon, 19 Jan 2015 04:24:06 +0100 (CET)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga102.jf.intel.com with ESMTP; 18 Jan 2015 19:21:12 -0800", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby FMSMGA003.fm.intel.com with ESMTP; 18 Jan 2015 19:10:54 -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 t0J3O2KV009523;\n\tMon, 19 Jan 2015 11:24:02 +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 t0J3O0Hj017180; Mon, 19 Jan 2015 11:24:02 +0800", "(from hzhan75@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t0J3O002017176; \n\tMon, 19 Jan 2015 11:24:00 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"4.97,862,1389772800\"; d=\"scan'208\";a=\"442109315\"", "From": "Helin Zhang <helin.zhang@intel.com>", "To": "dev@dpdk.org", "Date": "Mon, 19 Jan 2015 11:23:22 +0800", "Message-Id": "<1421637803-17034-17-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 16/17] examples/l3fwd: support of unified packet\n\ttype", "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 and relevant macros\nof packet type for ol_flags are replaced by unified packet type and\nrelevant macros.\n\nSigned-off-by: Helin Zhang <helin.zhang@intel.com>\n---\n examples/l3fwd/main.c | 64 +++++++++++++++++++++++++++++----------------------\n 1 file changed, 37 insertions(+), 27 deletions(-)", "diff": "diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c\nindex 918f2cb..74a6185 100644\n--- a/examples/l3fwd/main.c\n+++ b/examples/l3fwd/main.c\n@@ -958,7 +958,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon\n \n \teth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);\n \n-\tif (m->ol_flags & PKT_RX_IPV4_HDR) {\n+\tif (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {\n \t\t/* Handle IPv4 headers.*/\n \t\tipv4_hdr = (struct ipv4_hdr *)(rte_pktmbuf_mtod(m, unsigned char *) +\n \t\t\t\tsizeof(struct ether_hdr));\n@@ -993,7 +993,7 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon\n \n \t\tsend_single_packet(m, dst_port);\n \n-\t} else {\n+\t} else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {\n \t\t/* Handle IPv6 headers.*/\n \t\tstruct ipv6_hdr *ipv6_hdr;\n \n@@ -1039,11 +1039,11 @@ l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid, struct lcore_conf *qcon\n * to BAD_PORT value.\n */\n static inline __attribute__((always_inline)) void\n-rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint32_t flags)\n+rfc1812_process(struct ipv4_hdr *ipv4_hdr, uint16_t *dp, uint16_t ptype)\n {\n \tuint8_t ihl;\n \n-\tif ((flags & PKT_RX_IPV4_HDR) != 0) {\n+\tif (RTE_ETH_IS_IPV4_HDR(ptype)) {\n \n \t\tihl = ipv4_hdr->version_ihl - IPV4_MIN_VER_IHL;\n \n@@ -1074,11 +1074,11 @@ get_dst_port(const struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \tstruct ipv6_hdr *ipv6_hdr;\n \tstruct ether_hdr *eth_hdr;\n \n-\tif (pkt->ol_flags & PKT_RX_IPV4_HDR) {\n+\tif (RTE_ETH_IS_IPV4_HDR(pkt->packet_type)) {\n \t\tif (rte_lpm_lookup(qconf->ipv4_lookup_struct, dst_ipv4,\n \t\t\t\t&next_hop) != 0)\n \t\t\tnext_hop = portid;\n-\t} else if (pkt->ol_flags & PKT_RX_IPV6_HDR) {\n+\t} else if (RTE_ETH_IS_IPV6_HDR(pkt->packet_type)) {\n \t\teth_hdr = rte_pktmbuf_mtod(pkt, struct ether_hdr *);\n \t\tipv6_hdr = (struct ipv6_hdr *)(eth_hdr + 1);\n \t\tif (rte_lpm6_lookup(qconf->ipv6_lookup_struct,\n@@ -1112,7 +1112,7 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt,\n \tve = val_eth[dp];\n \n \tdst_port[0] = dp;\n-\trfc1812_process(ipv4_hdr, dst_port, pkt->ol_flags);\n+\trfc1812_process(ipv4_hdr, dst_port, pkt->packet_type);\n \n \tte = _mm_blend_epi16(te, ve, MASK_ETH);\n \t_mm_store_si128((__m128i *)eth_hdr, te);\n@@ -1122,7 +1122,7 @@ process_packet(struct lcore_conf *qconf, struct rte_mbuf *pkt,\n * Read ol_flags and destination IPV4 addresses from 4 mbufs.\n */\n static inline void\n-processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag)\n+processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, int *ipv4_flag)\n {\n \tstruct ipv4_hdr *ipv4_hdr;\n \tstruct ether_hdr *eth_hdr;\n@@ -1131,22 +1131,22 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag)\n \teth_hdr = rte_pktmbuf_mtod(pkt[0], struct ether_hdr *);\n \tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n \tx0 = ipv4_hdr->dst_addr;\n-\tflag[0] = pkt[0]->ol_flags & PKT_RX_IPV4_HDR;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[1], struct ether_hdr *);\n \tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n \tx1 = ipv4_hdr->dst_addr;\n-\tflag[0] &= pkt[1]->ol_flags;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[2], struct ether_hdr *);\n \tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n \tx2 = ipv4_hdr->dst_addr;\n-\tflag[0] &= pkt[2]->ol_flags;\n \n \teth_hdr = rte_pktmbuf_mtod(pkt[3], struct ether_hdr *);\n \tipv4_hdr = (struct ipv4_hdr *)(eth_hdr + 1);\n \tx3 = ipv4_hdr->dst_addr;\n-\tflag[0] &= pkt[3]->ol_flags;\n+\t*ipv4_flag = RTE_ETH_IS_IPV4_HDR(pkt[0]->packet_type) &&\n+\t\t\tRTE_ETH_IS_IPV4_HDR(pkt[1]->packet_type) &&\n+\t\t\tRTE_ETH_IS_IPV4_HDR(pkt[2]->packet_type) &&\n+\t\t\tRTE_ETH_IS_IPV4_HDR(pkt[3]->packet_type);\n \n \tdip[0] = _mm_set_epi32(x3, x2, x1, x0);\n }\n@@ -1156,7 +1156,7 @@ processx4_step1(struct rte_mbuf *pkt[FWDSTEP], __m128i *dip, uint32_t *flag)\n * If lookup fails, use incoming port (portid) as destination port.\n */\n static inline void\n-processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag,\n+processx4_step2(const struct lcore_conf *qconf, __m128i dip, int ipv4_flag,\n \tuint8_t portid, struct rte_mbuf *pkt[FWDSTEP], uint16_t dprt[FWDSTEP])\n {\n \trte_xmm_t dst;\n@@ -1167,7 +1167,7 @@ processx4_step2(const struct lcore_conf *qconf, __m128i dip, uint32_t flag,\n \tdip = _mm_shuffle_epi8(dip, bswap_mask);\n \n \t/* if all 4 packets are IPV4. */\n-\tif (likely(flag != 0)) {\n+\tif (likely(ipv4_flag)) {\n \t\trte_lpm_lookupx4(qconf->ipv4_lookup_struct, dip, dprt, portid);\n \t} else {\n \t\tdst.m = dip;\n@@ -1218,13 +1218,13 @@ processx4_step3(struct rte_mbuf *pkt[FWDSTEP], uint16_t dst_port[FWDSTEP])\n \t_mm_store_si128(p[3], te[3]);\n \n \trfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[0] + 1),\n-\t\t&dst_port[0], pkt[0]->ol_flags);\n+\t\t&dst_port[0], pkt[0]->packet_type);\n \trfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[1] + 1),\n-\t\t&dst_port[1], pkt[1]->ol_flags);\n+\t\t&dst_port[1], pkt[1]->packet_type);\n \trfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[2] + 1),\n-\t\t&dst_port[2], pkt[2]->ol_flags);\n+\t\t&dst_port[2], pkt[2]->packet_type);\n \trfc1812_process((struct ipv4_hdr *)((struct ether_hdr *)p[3] + 1),\n-\t\t&dst_port[3], pkt[3]->ol_flags);\n+\t\t&dst_port[3], pkt[3]->packet_type);\n }\n \n /*\n@@ -1411,7 +1411,7 @@ main_loop(__attribute__((unused)) void *dummy)\n \tuint16_t *lp;\n \tuint16_t dst_port[MAX_PKT_BURST];\n \t__m128i dip[MAX_PKT_BURST / FWDSTEP];\n-\tuint32_t flag[MAX_PKT_BURST / FWDSTEP];\n+\tint ipv4_flag[MAX_PKT_BURST / FWDSTEP];\n \tuint16_t pnum[MAX_PKT_BURST + 1];\n #endif\n \n@@ -1481,14 +1481,24 @@ main_loop(__attribute__((unused)) void *dummy)\n \t\t\t\t */\n \t\t\t\tint32_t n = RTE_ALIGN_FLOOR(nb_rx, 4);\n \t\t\t\tfor (j = 0; j < n ; j+=4) {\n-\t\t\t\t\tuint32_t ol_flag = pkts_burst[j]->ol_flags\n-\t\t\t\t\t\t\t& pkts_burst[j+1]->ol_flags\n-\t\t\t\t\t\t\t& pkts_burst[j+2]->ol_flags\n-\t\t\t\t\t\t\t& pkts_burst[j+3]->ol_flags;\n-\t\t\t\t\tif (ol_flag & PKT_RX_IPV4_HDR ) {\n+\t\t\t\t\tif (RTE_ETH_IS_IPV4_HDR(\n+\t\t\t\t\tpkts_burst[j]->packet_type) &&\n+\t\t\t\t\tRTE_ETH_IS_IPV4_HDR(\n+\t\t\t\t\tpkts_burst[j+1]->packet_type) &&\n+\t\t\t\t\tRTE_ETH_IS_IPV4_HDR(\n+\t\t\t\t\tpkts_burst[j+2]->packet_type) &&\n+\t\t\t\t\tRTE_ETH_IS_IPV4_HDR(\n+\t\t\t\t\tpkts_burst[j+3]->packet_type)) {\n \t\t\t\t\t\tsimple_ipv4_fwd_4pkts(&pkts_burst[j],\n \t\t\t\t\t\t\t\t\tportid, qconf);\n-\t\t\t\t\t} else if (ol_flag & PKT_RX_IPV6_HDR) {\n+\t\t\t\t\t} else if (RTE_ETH_IS_IPV6_HDR(\n+\t\t\t\t\tpkts_burst[j]->packet_type) &&\n+\t\t\t\t\tRTE_ETH_IS_IPV6_HDR(\n+\t\t\t\t\tpkts_burst[j+1]->packet_type) &&\n+\t\t\t\t\tRTE_ETH_IS_IPV6_HDR(\n+\t\t\t\t\tpkts_burst[j+2]->packet_type) &&\n+\t\t\t\t\tRTE_ETH_IS_IPV6_HDR(\n+\t\t\t\t\tpkts_burst[j+3]->packet_type)) {\n \t\t\t\t\t\tsimple_ipv6_fwd_4pkts(&pkts_burst[j],\n \t\t\t\t\t\t\t\t\tportid, qconf);\n \t\t\t\t\t} else {\n@@ -1513,13 +1523,13 @@ main_loop(__attribute__((unused)) void *dummy)\n \t\t\tfor (j = 0; j != k; j += FWDSTEP) {\n \t\t\t\tprocessx4_step1(&pkts_burst[j],\n \t\t\t\t\t&dip[j / FWDSTEP],\n-\t\t\t\t\t&flag[j / FWDSTEP]);\n+\t\t\t\t\t&ipv4_flag[j / FWDSTEP]);\n \t\t\t}\n \n \t\t\tk = RTE_ALIGN_FLOOR(nb_rx, FWDSTEP);\n \t\t\tfor (j = 0; j != k; j += FWDSTEP) {\n \t\t\t\tprocessx4_step2(qconf, dip[j / FWDSTEP],\n-\t\t\t\t\tflag[j / FWDSTEP], portid,\n+\t\t\t\t\tipv4_flag[j / FWDSTEP], portid,\n \t\t\t\t\t&pkts_burst[j], &dst_port[j]);\n \t\t\t}\n \n", "prefixes": [ "dpdk-dev", "RFC", "16/17" ] }