Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/7438/?format=api
{ "id": 7438, "url": "https://patches.dpdk.org/api/patches/7438/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1444067589-29513-12-git-send-email-adrien.mazarguil@6wind.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": "<1444067589-29513-12-git-send-email-adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1444067589-29513-12-git-send-email-adrien.mazarguil@6wind.com", "date": "2015-10-05T17:53:07", "name": "[dpdk-dev,11/13] mlx5: add VLAN filtering", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "abe94da49526a3d32103708887241433a73ef87a", "submitter": { "id": 165, "url": "https://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1444067589-29513-12-git-send-email-adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/7438/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/7438/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 07347937E;\n\tMon, 5 Oct 2015 19:54:03 +0200 (CEST)", "from mail-wi0-f176.google.com (mail-wi0-f176.google.com\n\t[209.85.212.176]) by dpdk.org (Postfix) with ESMTP id DC075935C\n\tfor <dev@dpdk.org>; Mon, 5 Oct 2015 19:54:00 +0200 (CEST)", "by wiclk2 with SMTP id lk2so132419506wic.0\n\tfor <dev@dpdk.org>; Mon, 05 Oct 2015 10:54:00 -0700 (PDT)", "from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by smtp.gmail.com with ESMTPSA id\n\tkr10sm28069186wjc.25.2015.10.05.10.53.59\n\t(version=TLSv1.2 cipher=RC4-SHA bits=128/128);\n\tMon, 05 Oct 2015 10:53:59 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=xXrAeCWt1UwmHKOE2j3i88jfFdxbZmF9dnEC5fFixmk=;\n\tb=clgd0pirUIwzVJPuITWE0Mdui1+a70ZFJ9JLtJ4roMSuVyQ0vGFQkaK5vHsD9Y6ZMO\n\tGXpVJgjATKB5zx2Y3GzvB3en1WdlGxNn3D5cGFdehHBjLBfGYyGS2bgjqdi2oftyfXsb\n\t7sh96J99OeJEaIUm3dZEwpzxt9uGZ3BdXGN029sv6SOcPoMhkyw24TP86xwhMT8TBJ6j\n\tgr62tIFvGkEwAJt7nZCf9ucHLC/WcwNXRZtCoZ6zeg/NDGdu0Ou4viv6LpgB+fooPa6F\n\tLncEwWDTAUX1k9I+4EnMuXAXOPnVpaTGle/YaWmgD3N6L21M9yfBmYyu0xpWAbx03MQI\n\t0z9Q==", "X-Gm-Message-State": "ALoCoQk6CFbBo33vKadzuaRUxOdMIiCj/kOF3y5Y6bzNViyGIVBew3Vbp+ocw3j5qM96yc1Vlj67", "X-Received": "by 10.180.210.162 with SMTP id mv2mr12168212wic.47.1444067640470;\n\tMon, 05 Oct 2015 10:54:00 -0700 (PDT)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Date": "Mon, 5 Oct 2015 19:53:07 +0200", "Message-Id": "<1444067589-29513-12-git-send-email-adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1444067589-29513-1-git-send-email-adrien.mazarguil@6wind.com>", "References": "<1444067589-29513-1-git-send-email-adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH 11/13] mlx5: add VLAN filtering", "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": "All MAC RX flows must be updated with VLAN information when configuring a\nVLAN filter.\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n---\n drivers/net/mlx5/Makefile | 1 +\n drivers/net/mlx5/mlx5.c | 1 +\n drivers/net/mlx5/mlx5.h | 4 ++\n drivers/net/mlx5/mlx5_vlan.c | 166 +++++++++++++++++++++++++++++++++++++++++++\n 4 files changed, 172 insertions(+)\n create mode 100644 drivers/net/mlx5/mlx5_vlan.c", "diff": "diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile\nindex 4d25d9c..8b1e32b 100644\n--- a/drivers/net/mlx5/Makefile\n+++ b/drivers/net/mlx5/Makefile\n@@ -49,6 +49,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_trigger.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_ethdev.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mac.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxmode.c\n+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_vlan.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_stats.c\n \n # Dependencies.\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex b182d0b..47070f8 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -141,6 +141,7 @@ static const struct eth_dev_ops mlx5_dev_ops = {\n \t.stats_get = mlx5_stats_get,\n \t.stats_reset = mlx5_stats_reset,\n \t.dev_infos_get = mlx5_dev_infos_get,\n+\t.vlan_filter_set = mlx5_vlan_filter_set,\n \t.rx_queue_setup = mlx5_rx_queue_setup,\n \t.tx_queue_setup = mlx5_tx_queue_setup,\n \t.rx_queue_release = mlx5_rx_queue_release,\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 1d488fb..459dc3d 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -203,6 +203,10 @@ void mlx5_allmulticast_disable(struct rte_eth_dev *);\n void mlx5_stats_get(struct rte_eth_dev *, struct rte_eth_stats *);\n void mlx5_stats_reset(struct rte_eth_dev *);\n \n+/* mlx5_vlan.c */\n+\n+int mlx5_vlan_filter_set(struct rte_eth_dev *, uint16_t, int);\n+\n /* mlx5_trigger.c */\n \n int mlx5_dev_start(struct rte_eth_dev *);\ndiff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c\nnew file mode 100644\nindex 0000000..60fe06b\n--- /dev/null\n+++ b/drivers/net/mlx5/mlx5_vlan.c\n@@ -0,0 +1,166 @@\n+/*-\n+ * BSD LICENSE\n+ *\n+ * Copyright 2015 6WIND S.A.\n+ * Copyright 2015 Mellanox.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions\n+ * are met:\n+ *\n+ * * Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * * Redistributions in binary form must reproduce the above copyright\n+ * notice, this list of conditions and the following disclaimer in\n+ * the documentation and/or other materials provided with the\n+ * distribution.\n+ * * Neither the name of 6WIND S.A. nor the names of its\n+ * contributors may be used to endorse or promote products derived\n+ * from this software without specific prior written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+ * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ */\n+\n+#include <stddef.h>\n+#include <errno.h>\n+#include <assert.h>\n+#include <stdint.h>\n+\n+/* DPDK headers don't like -pedantic. */\n+#ifdef PEDANTIC\n+#pragma GCC diagnostic ignored \"-pedantic\"\n+#endif\n+#include <rte_ethdev.h>\n+#include <rte_common.h>\n+#ifdef PEDANTIC\n+#pragma GCC diagnostic error \"-pedantic\"\n+#endif\n+\n+#include \"mlx5_utils.h\"\n+#include \"mlx5.h\"\n+\n+/**\n+ * Configure a VLAN filter.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ * @param vlan_id\n+ * VLAN ID to filter.\n+ * @param on\n+ * Toggle filter.\n+ *\n+ * @return\n+ * 0 on success, errno value on failure.\n+ */\n+static int\n+vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tunsigned int i;\n+\tunsigned int j = -1;\n+\n+\tDEBUG(\"%p: %s VLAN filter ID %\" PRIu16,\n+\t (void *)dev, (on ? \"enable\" : \"disable\"), vlan_id);\n+\tfor (i = 0; (i != RTE_DIM(priv->vlan_filter)); ++i) {\n+\t\tif (!priv->vlan_filter[i].enabled) {\n+\t\t\t/* Unused index, remember it. */\n+\t\t\tj = i;\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (priv->vlan_filter[i].id != vlan_id)\n+\t\t\tcontinue;\n+\t\t/* This VLAN ID is already known, use its index. */\n+\t\tj = i;\n+\t\tbreak;\n+\t}\n+\t/* Check if there's room for another VLAN filter. */\n+\tif (j == (unsigned int)-1)\n+\t\treturn ENOMEM;\n+\t/*\n+\t * VLAN filters apply to all configured MAC addresses, flow\n+\t * specifications must be reconfigured accordingly.\n+\t */\n+\tpriv->vlan_filter[j].id = vlan_id;\n+\tif ((on) && (!priv->vlan_filter[j].enabled)) {\n+\t\t/*\n+\t\t * Filter is disabled, enable it.\n+\t\t * Rehashing flows in all RX queues is necessary.\n+\t\t */\n+\t\tif (priv->rss)\n+\t\t\trxq_mac_addrs_del(&priv->rxq_parent);\n+\t\telse\n+\t\t\tfor (i = 0; (i != priv->rxqs_n); ++i)\n+\t\t\t\tif ((*priv->rxqs)[i] != NULL)\n+\t\t\t\t\trxq_mac_addrs_del((*priv->rxqs)[i]);\n+\t\tpriv->vlan_filter[j].enabled = 1;\n+\t\tif (priv->started) {\n+\t\t\tif (priv->rss)\n+\t\t\t\trxq_mac_addrs_add(&priv->rxq_parent);\n+\t\t\telse\n+\t\t\t\tfor (i = 0; (i != priv->rxqs_n); ++i) {\n+\t\t\t\t\tif ((*priv->rxqs)[i] == NULL)\n+\t\t\t\t\t\tcontinue;\n+\t\t\t\t\trxq_mac_addrs_add((*priv->rxqs)[i]);\n+\t\t\t\t}\n+\t\t}\n+\t} else if ((!on) && (priv->vlan_filter[j].enabled)) {\n+\t\t/*\n+\t\t * Filter is enabled, disable it.\n+\t\t * Rehashing flows in all RX queues is necessary.\n+\t\t */\n+\t\tif (priv->rss)\n+\t\t\trxq_mac_addrs_del(&priv->rxq_parent);\n+\t\telse\n+\t\t\tfor (i = 0; (i != priv->rxqs_n); ++i)\n+\t\t\t\tif ((*priv->rxqs)[i] != NULL)\n+\t\t\t\t\trxq_mac_addrs_del((*priv->rxqs)[i]);\n+\t\tpriv->vlan_filter[j].enabled = 0;\n+\t\tif (priv->started) {\n+\t\t\tif (priv->rss)\n+\t\t\t\trxq_mac_addrs_add(&priv->rxq_parent);\n+\t\t\telse\n+\t\t\t\tfor (i = 0; (i != priv->rxqs_n); ++i) {\n+\t\t\t\t\tif ((*priv->rxqs)[i] == NULL)\n+\t\t\t\t\t\tcontinue;\n+\t\t\t\t\trxq_mac_addrs_add((*priv->rxqs)[i]);\n+\t\t\t\t}\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n+/**\n+ * DPDK callback to configure a VLAN filter.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ * @param vlan_id\n+ * VLAN ID to filter.\n+ * @param on\n+ * Toggle filter.\n+ *\n+ * @return\n+ * 0 on success, negative errno value on failure.\n+ */\n+int\n+mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tint ret;\n+\n+\tpriv_lock(priv);\n+\tret = vlan_filter_set(dev, vlan_id, on);\n+\tpriv_unlock(priv);\n+\tassert(ret >= 0);\n+\treturn -ret;\n+}\n", "prefixes": [ "dpdk-dev", "11/13" ] }