Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/21624/?format=api
{ "id": 21624, "url": "http://patches.dpdk.org/api/patches/21624/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d2f4027920a1a9c2672fcda1fea9288160ba7dbb.1488985489.git.gaetan.rivet@6wind.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": "<d2f4027920a1a9c2672fcda1fea9288160ba7dbb.1488985489.git.gaetan.rivet@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d2f4027920a1a9c2672fcda1fea9288160ba7dbb.1488985489.git.gaetan.rivet@6wind.com", "date": "2017-03-08T15:15:44", "name": "[dpdk-dev,v2,11/13] net/failsafe: add fast burst functions", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "5950096959c59788bc95fb5d71eaf8c057e7012d", "submitter": { "id": 269, "url": "http://patches.dpdk.org/api/people/269/?format=api", "name": "Gaëtan Rivet", "email": "gaetan.rivet@6wind.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/d2f4027920a1a9c2672fcda1fea9288160ba7dbb.1488985489.git.gaetan.rivet@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/21624/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/21624/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 43132F955;\n\tWed, 8 Mar 2017 16:16:54 +0100 (CET)", "from mail-wm0-f52.google.com (mail-wm0-f52.google.com\n\t[74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 446683DC\n\tfor <dev@dpdk.org>; Wed, 8 Mar 2017 16:16:12 +0100 (CET)", "by mail-wm0-f52.google.com with SMTP id v186so117346645wmd.0\n\tfor <dev@dpdk.org>; Wed, 08 Mar 2017 07:16:12 -0800 (PST)", "from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com.\n\t[62.23.145.78]) by smtp.gmail.com with ESMTPSA id\n\tt103sm4553592wrc.43.2017.03.08.07.16.11 for <dev@dpdk.org>\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 08 Mar 2017 07:16:11 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:subject:date:message-id:in-reply-to:references:in-reply-to\n\t:references; bh=2+CzKdrLQSKGRDZWDtEqgutUzQSzdt25hdL1A9ZUzzw=;\n\tb=f9GFQ84Z7hqphfi7f4oOzf6JWBxKCVS9nMvKTub5vxuS9M6x//82EUyF8PBJ99K7yd\n\tTdQcy4mZec59FNrl5UWekZjeWziv23O8meHS71dagP/JL082dEqk9vqylxpSWCGxf6a4\n\t3LGEaePBtRDP4C5uGJcmnA+UNeY2m2BqxnjDZICRuqsnpwKhqNVTF+pDkqMupXhqsuPf\n\th2ZdWWry1tXEv5fHdrjAzohCy/XxTsAdv6AS1ULt6cMwDxubBYDuFNAJjIwyW2G0kE6y\n\t33DgExvKtoyGQWW4ZUeKxAtSG/smnw1tofuw5QzHAJS5LIOdmOAGSUkOZ6udypu0xnEw\n\tHdkw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references:in-reply-to:references;\n\tbh=2+CzKdrLQSKGRDZWDtEqgutUzQSzdt25hdL1A9ZUzzw=;\n\tb=KIHj0HtgmsVQL5fy+v5oiRK3Sa0UR/zBN52PHpijBX9UY1jqlWJOHEUOmRcavse5Fn\n\tZTR4wVi07PNjegxiuKAMZAuNp+hhOWbxSxaCa1+X5FiDTK45MCo6SK2QuoPR6Vnb47z3\n\th5fl0mgWofMAs0guAxSBt71cuVLbDA0OoKxbH5yDl1F70juuchFYmGjJuzzc0GSKnWLL\n\tHgc133rgDqkuAmUwmwYeQQsrbIzRGlNWEvzpxXHUxmQ6Zjm+3NTY5atZcLEZ92C2WiuR\n\tF12zC+I4q3PGZxnwGWpM2F1MWZ9nia2cv4Vo/S9jFx/+WM9mvrVlUZqlFgwENDyCdk8I\n\t731A==", "X-Gm-Message-State": "AMke39livwD1ctPVTraaqKlRBVU7Iib8+iBMHj4wVTFJHnqJznxDGMnfBwHrFvCz5KCmC7nM", "X-Received": "by 10.28.147.147 with SMTP id\n\tv141mr25734840wmd.110.1488986171731; \n\tWed, 08 Mar 2017 07:16:11 -0800 (PST)", "From": "Gaetan Rivet <gaetan.rivet@6wind.com>", "To": "dev@dpdk.org", "Date": "Wed, 8 Mar 2017 16:15:44 +0100", "Message-Id": "<d2f4027920a1a9c2672fcda1fea9288160ba7dbb.1488985489.git.gaetan.rivet@6wind.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": [ "<cover.1488550982.git.gaetan.rivet@6wind.com>", "<cover.1488985489.git.gaetan.rivet@6wind.com>" ], "References": [ "<cover.1488550982.git.gaetan.rivet@6wind.com>", "<cover.1488985489.git.gaetan.rivet@6wind.com>" ], "Subject": "[dpdk-dev] [PATCH v2 11/13] net/failsafe: add fast burst functions", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <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": "Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>\nAcked-by: Olga Shern <olgas@mellanox.com>\n---\n drivers/net/failsafe/failsafe_private.h | 8 +++\n drivers/net/failsafe/failsafe_rxtx.c | 117 ++++++++++++++++++++++++++------\n 2 files changed, 105 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h\nindex c636199..faf0e71 100644\n--- a/drivers/net/failsafe/failsafe_private.h\n+++ b/drivers/net/failsafe/failsafe_private.h\n@@ -148,11 +148,18 @@ int failsafe_plugin_alarm_cancel(struct rte_eth_dev *dev);\n \n /* RX / TX */\n \n+void set_burst_fn(struct rte_eth_dev *dev);\n+\n uint16_t failsafe_rx_burst(void *rxq,\n \t\tstruct rte_mbuf **rx_pkts, uint16_t nb_pkts);\n uint16_t failsafe_tx_burst(void *txq,\n \t\tstruct rte_mbuf **tx_pkts, uint16_t nb_pkts);\n \n+uint16_t failsafe_rx_burst_fast(void *rxq,\n+\t\tstruct rte_mbuf **rx_pkts, uint16_t nb_pkts);\n+uint16_t failsafe_tx_burst_fast(void *txq,\n+\t\tstruct rte_mbuf **tx_pkts, uint16_t nb_pkts);\n+\n /* ARGS */\n \n int failsafe_args_parse(struct rte_eth_dev *dev, const char *params);\n@@ -306,6 +313,7 @@ fs_switch_dev(struct rte_eth_dev *dev)\n \t} else {\n \t\treturn;\n \t}\n+\tset_burst_fn(dev);\n }\n \n #endif /* _RTE_ETH_FAILSAFE_PRIVATE_H_ */\ndiff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/failsafe_rxtx.c\nindex a45b4e5..796a9ad 100644\n--- a/drivers/net/failsafe/failsafe_rxtx.c\n+++ b/drivers/net/failsafe/failsafe_rxtx.c\n@@ -36,11 +36,53 @@\n \n #include \"failsafe_private.h\"\n \n-/*\n- * TODO: write fast version,\n- * without additional checks, to be activated once\n- * everything has been verified to comply.\n- */\n+static inline int\n+sdev_rx_unsafe(struct sub_device *sdev)\n+{\n+\treturn (ETH(sdev) == NULL) ||\n+\t\t(ETH(sdev)->rx_pkt_burst == NULL) ||\n+\t\t(sdev->state != DEV_STARTED);\n+}\n+\n+static inline int\n+sdev_tx_unsafe(struct sub_device *sdev)\n+{\n+\treturn (sdev == NULL) ||\n+\t\t(ETH(sdev) == NULL) ||\n+\t\t(ETH(sdev)->tx_pkt_burst == NULL) ||\n+\t\t(sdev->state != DEV_STARTED);\n+}\n+\n+void\n+set_burst_fn(struct rte_eth_dev *dev)\n+{\n+\tstruct sub_device *sdev;\n+\tuint8_t i;\n+\tint need_safe;\n+\tint safe_set;\n+\n+\tneed_safe = 0;\n+\tFOREACH_SUBDEV(sdev, i, dev)\n+\t\tneed_safe |= sdev_rx_unsafe(sdev);\n+\tsafe_set = (dev->rx_pkt_burst == &failsafe_rx_burst);\n+\tif (need_safe && !safe_set) {\n+\t\tDEBUG(\"Using safe RX bursts\");\n+\t\tdev->rx_pkt_burst = &failsafe_rx_burst;\n+\t} else if (!need_safe && safe_set) {\n+\t\tDEBUG(\"Using fast RX bursts\");\n+\t\tdev->rx_pkt_burst = &failsafe_rx_burst_fast;\n+\t}\n+\tneed_safe = sdev_tx_unsafe(TX_SUBDEV(dev));\n+\tsafe_set = (dev->tx_pkt_burst == &failsafe_tx_burst);\n+\tif (need_safe && !safe_set) {\n+\t\tDEBUG(\"Using safe TX bursts\");\n+\t\tdev->tx_pkt_burst = &failsafe_tx_burst;\n+\t} else if (!need_safe && safe_set) {\n+\t\tDEBUG(\"Using fast TX bursts\");\n+\t\tdev->tx_pkt_burst = &failsafe_tx_burst_fast;\n+\t}\n+}\n+\n uint16_t\n failsafe_rx_burst(void *queue,\n \t\t struct rte_mbuf **rx_pkts,\n@@ -63,11 +105,7 @@ failsafe_rx_burst(void *queue,\n \t\tif (i == priv->subs_tail)\n \t\t\ti = priv->subs_head;\n \t\tsdev = &priv->subs[i];\n-\t\tif (unlikely(ETH(sdev) == NULL))\n-\t\t\tcontinue;\n-\t\tif (unlikely(ETH(sdev)->rx_pkt_burst == NULL))\n-\t\t\tcontinue;\n-\t\tif (unlikely(sdev->state != DEV_STARTED))\n+\t\tif (unlikely(sdev_rx_unsafe(sdev)))\n \t\t\tcontinue;\n \t\tsub_rxq = ETH(sdev)->data->rx_queues[rxq->qid];\n \t\tnb_rx = ETH(sdev)->\n@@ -80,11 +118,39 @@ failsafe_rx_burst(void *queue,\n \treturn 0;\n }\n \n-/*\n- * TODO: write fast version,\n- * without additional checks, to be activated once\n- * everything has been verified to comply.\n- */\n+uint16_t\n+failsafe_rx_burst_fast(void *queue,\n+\t\t\t struct rte_mbuf **rx_pkts,\n+\t\t\t uint16_t nb_pkts)\n+{\n+\tstruct fs_priv *priv;\n+\tstruct sub_device *sdev;\n+\tstruct rxq *rxq;\n+\tvoid *sub_rxq;\n+\tuint16_t nb_rx;\n+\tuint8_t nb_polled, nb_subs;\n+\tuint8_t i;\n+\n+\trxq = queue;\n+\tpriv = rxq->priv;\n+\tnb_subs = priv->subs_tail - priv->subs_head;\n+\tnb_polled = 0;\n+\tfor (i = rxq->last_polled; nb_polled < nb_subs; nb_polled++) {\n+\t\ti++;\n+\t\tif (i == priv->subs_tail)\n+\t\t\ti = priv->subs_head;\n+\t\tsdev = &priv->subs[i];\n+\t\tsub_rxq = ETH(sdev)->data->rx_queues[rxq->qid];\n+\t\tnb_rx = ETH(sdev)->\n+\t\t\trx_pkt_burst(sub_rxq, rx_pkts, nb_pkts);\n+\t\tif (nb_rx) {\n+\t\t\trxq->last_polled = i;\n+\t\t\treturn nb_rx;\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n uint16_t\n failsafe_tx_burst(void *queue,\n \t\t struct rte_mbuf **tx_pkts,\n@@ -96,12 +162,23 @@ failsafe_tx_burst(void *queue,\n \n \ttxq = queue;\n \tsdev = TX_SUBDEV(txq->priv->dev);\n-\tif (unlikely(sdev == NULL))\n-\t\treturn 0;\n-\tif (unlikely(ETH(sdev) == NULL))\n-\t\treturn 0;\n-\tif (unlikely(ETH(sdev)->tx_pkt_burst == NULL))\n+\tif (unlikely(sdev_tx_unsafe(sdev)))\n \t\treturn 0;\n \tsub_txq = ETH(sdev)->data->tx_queues[txq->qid];\n \treturn ETH(sdev)->tx_pkt_burst(sub_txq, tx_pkts, nb_pkts);\n }\n+\n+uint16_t\n+failsafe_tx_burst_fast(void *queue,\n+\t\t\t struct rte_mbuf **tx_pkts,\n+\t\t\t uint16_t nb_pkts)\n+{\n+\tstruct sub_device *sdev;\n+\tstruct txq *txq;\n+\tvoid *sub_txq;\n+\n+\ttxq = queue;\n+\tsdev = TX_SUBDEV(txq->priv->dev);\n+\tsub_txq = ETH(sdev)->data->tx_queues[txq->qid];\n+\treturn ETH(sdev)->tx_pkt_burst(sub_txq, tx_pkts, nb_pkts);\n+}\n", "prefixes": [ "dpdk-dev", "v2", "11/13" ] }