Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/48268/?format=api
{ "id": 48268, "url": "https://patches.dpdk.org/api/patches/48268/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20181122172632.6229-2-qi.z.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": "<20181122172632.6229-2-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181122172632.6229-2-qi.z.zhang@intel.com", "date": "2018-11-22T17:26:30", "name": "[1/3] app/testpmd: code refactory for macswap", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f3434c84bd6b083c7377c9f124fb1a44e634be10", "submitter": { "id": 504, "url": "https://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20181122172632.6229-2-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 2542, "url": "https://patches.dpdk.org/api/series/2542/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=2542", "date": "2018-11-22T17:26:29", "name": "improve MAC swap performance.", "version": 1, "mbox": "https://patches.dpdk.org/series/2542/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/48268/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/48268/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6D4111B4D8;\n\tThu, 22 Nov 2018 18:25:24 +0100 (CET)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id DAB391B494\n\tfor <dev@dpdk.org>; Thu, 22 Nov 2018 18:25:21 +0100 (CET)", "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t22 Nov 2018 09:25:21 -0800", "from dpdk51.sh.intel.com ([10.67.110.190])\n\tby orsmga007.jf.intel.com with ESMTP; 22 Nov 2018 09:25:19 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.56,266,1539673200\"; d=\"scan'208\";a=\"91376878\"", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "bruce.richardson@intel.com, keith.wiles@intel.com,\n\tkonstantin.ananyev@intel.com", "Cc": "dev@dpdk.org, wenzhuo.lu@intel.com, bernard.iremonger@intel.com,\n\tQi Zhang <qi.z.zhang@intel.com>", "Date": "Fri, 23 Nov 2018 01:26:30 +0800", "Message-Id": "<20181122172632.6229-2-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20181122172632.6229-1-qi.z.zhang@intel.com>", "References": "<20181122172632.6229-1-qi.z.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH 1/3] app/testpmd: code refactory for macswap", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Move macswap workload to dedicate function, so we can further enable\nplatform specific optimized version.\n\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\n---\n app/test-pmd/l2fwd.h | 40 ++++++++++++++++++++++++++++++++++++++++\n app/test-pmd/l2fwd_common.h | 36 ++++++++++++++++++++++++++++++++++++\n app/test-pmd/macswap.c | 32 ++------------------------------\n app/test-pmd/macswap.h | 40 ++++++++++++++++++++++++++++++++++++++++\n app/test-pmd/macswap_common.h | 36 ++++++++++++++++++++++++++++++++++++\n 5 files changed, 154 insertions(+), 30 deletions(-)\n create mode 100644 app/test-pmd/l2fwd.h\n create mode 100644 app/test-pmd/l2fwd_common.h\n create mode 100644 app/test-pmd/macswap.h\n create mode 100644 app/test-pmd/macswap_common.h", "diff": "diff --git a/app/test-pmd/l2fwd.h b/app/test-pmd/l2fwd.h\nnew file mode 100644\nindex 000000000..6fcad4d75\n--- /dev/null\n+++ b/app/test-pmd/l2fwd.h\n@@ -0,0 +1,40 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018 Intel Corporation\n+ */\n+\n+#ifndef _L2FWD_H_\n+#define _L2FWD_H_\n+\n+#include \"l2fwd_common.h\"\n+\n+static inline void\n+do_macswap(struct rte_mbuf *pkts[], uint16_t nb,\n+\t\tstruct rte_port *txp)\n+{\n+\tstruct ether_hdr *eth_hdr;\n+\tstruct rte_mbuf *mb;\n+\tstruct ether_addr addr;\n+\tuint64_t ol_flags;\n+\tint i;\n+\n+\tol_flags = ol_flags_init(txp->dev_conf.txmode.offloads);\n+\n+\tfor (i = 0; i < nb; i++) {\n+\t\tif (likely(i < nb - 1))\n+\t\t\trte_prefetch0(rte_pktmbuf_mtod(pkts[i+1], void *));\n+\t\tmb = pkts[i];\n+\n+\t\teth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);\n+\n+\t\t/* Swap dest and src mac addresses. */\n+\t\tether_addr_copy(ð_hdr->d_addr, &addr);\n+\t\tether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr);\n+\t\tether_addr_copy(&addr, ð_hdr->s_addr);\n+\n+\t\tmbuf_field_set(mb, ol_flags, txp->tx_vlan_id,\n+\t\t\t\ttxp->tx_vlan_id_outer);\n+\t}\n+}\n+\n+#endif /* _BPF_CMD_H_ */\n+\ndiff --git a/app/test-pmd/l2fwd_common.h b/app/test-pmd/l2fwd_common.h\nnew file mode 100644\nindex 000000000..2c01cbc8f\n--- /dev/null\n+++ b/app/test-pmd/l2fwd_common.h\n@@ -0,0 +1,36 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018 Intel Corporation\n+ */\n+\n+#ifndef _L2FWD_COMMON_H_\n+#define _L2FWD_COMMON_H_\n+\n+static inline uint64_t\n+ol_flags_init(uint64_t tx_offload)\n+{\n+\tuint64_t ol_flags = 0;\n+\n+\tol_flags |= (tx_offload & DEV_TX_OFFLOAD_VLAN_INSERT) ?\n+\t\t\tPKT_TX_VLAN_PKT : 0;\n+\tol_flags |= (tx_offload & DEV_TX_OFFLOAD_QINQ_INSERT) ?\n+\t\t\tPKT_TX_QINQ_PKT : 0;\n+\tol_flags |= (tx_offload & DEV_TX_OFFLOAD_MACSEC_INSERT) ?\n+\t\t\tPKT_TX_MACSEC : 0;\n+\n+\treturn ol_flags;\n+}\n+\n+static inline void\n+mbuf_field_set(struct rte_mbuf *mb, uint64_t ol_flags,\n+\t\tuint16_t vlan, uint16_t vlan_outer)\n+{\n+\tmb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF;\n+\tmb->ol_flags |= ol_flags;\n+\tmb->l2_len = sizeof(struct ether_hdr);\n+\tmb->l3_len = sizeof(struct ipv4_hdr);\n+\tmb->vlan_tci = vlan;\n+\tmb->vlan_tci_outer = vlan_outer;\n+}\n+\n+#endif /* _BPF_CMD_H_ */\n+\ndiff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c\nindex a8384d5b8..849194fe2 100644\n--- a/app/test-pmd/macswap.c\n+++ b/app/test-pmd/macswap.c\n@@ -66,6 +66,7 @@\n #include <rte_flow.h>\n \n #include \"testpmd.h\"\n+#include \"macswap.h\"\n \n /*\n * MAC swap forwarding mode: Swap the source and the destination Ethernet\n@@ -76,15 +77,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)\n {\n \tstruct rte_mbuf *pkts_burst[MAX_PKT_BURST];\n \tstruct rte_port *txp;\n-\tstruct rte_mbuf *mb;\n-\tstruct ether_hdr *eth_hdr;\n-\tstruct ether_addr addr;\n \tuint16_t nb_rx;\n \tuint16_t nb_tx;\n-\tuint16_t i;\n \tuint32_t retry;\n-\tuint64_t ol_flags = 0;\n-\tuint64_t tx_offloads;\n #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES\n \tuint64_t start_tsc;\n \tuint64_t end_tsc;\n@@ -108,32 +103,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)\n #endif\n \tfs->rx_packets += nb_rx;\n \ttxp = &ports[fs->tx_port];\n-\ttx_offloads = txp->dev_conf.txmode.offloads;\n-\tif (tx_offloads\t& DEV_TX_OFFLOAD_VLAN_INSERT)\n-\t\tol_flags = PKT_TX_VLAN_PKT;\n-\tif (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT)\n-\t\tol_flags |= PKT_TX_QINQ_PKT;\n-\tif (tx_offloads & DEV_TX_OFFLOAD_MACSEC_INSERT)\n-\t\tol_flags |= PKT_TX_MACSEC;\n-\tfor (i = 0; i < nb_rx; i++) {\n-\t\tif (likely(i < nb_rx - 1))\n-\t\t\trte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],\n-\t\t\t\t\t\t void *));\n-\t\tmb = pkts_burst[i];\n-\t\teth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);\n \n-\t\t/* Swap dest and src mac addresses. */\n-\t\tether_addr_copy(ð_hdr->d_addr, &addr);\n-\t\tether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr);\n-\t\tether_addr_copy(&addr, ð_hdr->s_addr);\n+\tdo_macswap(pkts_burst, nb_rx, txp);\n \n-\t\tmb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF;\n-\t\tmb->ol_flags |= ol_flags;\n-\t\tmb->l2_len = sizeof(struct ether_hdr);\n-\t\tmb->l3_len = sizeof(struct ipv4_hdr);\n-\t\tmb->vlan_tci = txp->tx_vlan_id;\n-\t\tmb->vlan_tci_outer = txp->tx_vlan_id_outer;\n-\t}\n \tnb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_rx);\n \t/*\n \t * Retry if necessary\ndiff --git a/app/test-pmd/macswap.h b/app/test-pmd/macswap.h\nnew file mode 100644\nindex 000000000..bc8a95626\n--- /dev/null\n+++ b/app/test-pmd/macswap.h\n@@ -0,0 +1,40 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018 Intel Corporation\n+ */\n+\n+#ifndef _L2FWD_H_\n+#define _L2FWD_H_\n+\n+#include \"macswap_common.h\"\n+\n+static inline void\n+do_macswap(struct rte_mbuf *pkts[], uint16_t nb,\n+\t\tstruct rte_port *txp)\n+{\n+\tstruct ether_hdr *eth_hdr;\n+\tstruct rte_mbuf *mb;\n+\tstruct ether_addr addr;\n+\tuint64_t ol_flags;\n+\tint i;\n+\n+\tol_flags = ol_flags_init(txp->dev_conf.txmode.offloads);\n+\n+\tfor (i = 0; i < nb; i++) {\n+\t\tif (likely(i < nb - 1))\n+\t\t\trte_prefetch0(rte_pktmbuf_mtod(pkts[i+1], void *));\n+\t\tmb = pkts[i];\n+\n+\t\teth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);\n+\n+\t\t/* Swap dest and src mac addresses. */\n+\t\tether_addr_copy(ð_hdr->d_addr, &addr);\n+\t\tether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr);\n+\t\tether_addr_copy(&addr, ð_hdr->s_addr);\n+\n+\t\tmbuf_field_set(mb, ol_flags, txp->tx_vlan_id,\n+\t\t\t\ttxp->tx_vlan_id_outer);\n+\t}\n+}\n+\n+#endif /* _BPF_CMD_H_ */\n+\ndiff --git a/app/test-pmd/macswap_common.h b/app/test-pmd/macswap_common.h\nnew file mode 100644\nindex 000000000..2c01cbc8f\n--- /dev/null\n+++ b/app/test-pmd/macswap_common.h\n@@ -0,0 +1,36 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018 Intel Corporation\n+ */\n+\n+#ifndef _L2FWD_COMMON_H_\n+#define _L2FWD_COMMON_H_\n+\n+static inline uint64_t\n+ol_flags_init(uint64_t tx_offload)\n+{\n+\tuint64_t ol_flags = 0;\n+\n+\tol_flags |= (tx_offload & DEV_TX_OFFLOAD_VLAN_INSERT) ?\n+\t\t\tPKT_TX_VLAN_PKT : 0;\n+\tol_flags |= (tx_offload & DEV_TX_OFFLOAD_QINQ_INSERT) ?\n+\t\t\tPKT_TX_QINQ_PKT : 0;\n+\tol_flags |= (tx_offload & DEV_TX_OFFLOAD_MACSEC_INSERT) ?\n+\t\t\tPKT_TX_MACSEC : 0;\n+\n+\treturn ol_flags;\n+}\n+\n+static inline void\n+mbuf_field_set(struct rte_mbuf *mb, uint64_t ol_flags,\n+\t\tuint16_t vlan, uint16_t vlan_outer)\n+{\n+\tmb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF;\n+\tmb->ol_flags |= ol_flags;\n+\tmb->l2_len = sizeof(struct ether_hdr);\n+\tmb->l3_len = sizeof(struct ipv4_hdr);\n+\tmb->vlan_tci = vlan;\n+\tmb->vlan_tci_outer = vlan_outer;\n+}\n+\n+#endif /* _BPF_CMD_H_ */\n+\n", "prefixes": [ "1/3" ] }