Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8459/?format=api
{ "id": 8459, "url": "https://patches.dpdk.org/api/patches/8459/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1446231162-8075-9-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": "<1446231162-8075-9-git-send-email-adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446231162-8075-9-git-send-email-adrien.mazarguil@6wind.com", "date": "2015-10-30T18:52:37", "name": "[dpdk-dev,v2,08/13] mlx5: add promiscuous and allmulticast RX modes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "19d40bdbc91a013d80afb1a0ff2fc2c23cff2cec", "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/1446231162-8075-9-git-send-email-adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/8459/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/8459/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 782E591E9;\n\tFri, 30 Oct 2015 19:53:53 +0100 (CET)", "from mail-wm0-f50.google.com (mail-wm0-f50.google.com\n\t[74.125.82.50]) by dpdk.org (Postfix) with ESMTP id 07A2B9216\n\tfor <dev@dpdk.org>; Fri, 30 Oct 2015 19:53:31 +0100 (CET)", "by wmff134 with SMTP id f134so18469812wmf.1\n\tfor <dev@dpdk.org>; Fri, 30 Oct 2015 11:53:31 -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\tbh5sm8352182wjb.42.2015.10.30.11.53.30\n\t(version=TLSv1.2 cipher=RC4-SHA bits=128/128);\n\tFri, 30 Oct 2015 11:53:31 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind_com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=xrvZiGPNQ9syhKNdHCZ5JlcxChUFc/J7zTzbriHfIDA=;\n\tb=ZyfbnHT83FBRuiwW6Nk39pbUvqMUZLlvE42h9hhDvQdxyHJ4MuqjHW9SEZiFBe4Hjw\n\t0UzBTONAaDZmq7f22A+8c0Xl78zKf+wChKIdq7XuIxdCZNjYCTkHeOD9P7obxehGCrnd\n\tH6I/nP2oxz6V9rm90I9mARo24dUYMGVjDupE6xqSYtsy5VH7Kl2WWVJHs1+PLARsnY0U\n\t4k/q/1YFB5Gr52099zofH7Lkd8US0CSW6a7PcZKMYmQC5mYJNbnBWr+KDu0XuQBn7z54\n\tBBDLbfbfQbjVthIqSPQs3NN5u2L7BDbyM+3XGS3VyTv2mz5rmgXllIZdoPaHx4AVJ/wb\n\tWwtQ==", "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=xrvZiGPNQ9syhKNdHCZ5JlcxChUFc/J7zTzbriHfIDA=;\n\tb=PuqAn/xljMuwjOroo7siVszbJ6A2BfLo89toJKEkDW2dFi47pztA+WvJ8UsyeXsj9t\n\tjmA4wbwZuFgq9XcEfzjzw3/Ky856gmJpmiGNwroAA/ANt96TZQzIG/O6etwM5u9wZ0US\n\tTti6C3e6/ILyISNZTMPwcI6nkCtsb+zFtovVqgejtHlPPf+DfcCW33F7DgiA+hpqDIes\n\tIcqirbPyNafFJLeg02xETBewBgRNBMZkDBGOKa/BCggkQthqgW0M04S45vzbecMNi8lG\n\tQb23GQG5NdrwTIFbOTr0O/KWpS7JHw3r0cBA4v7lcgB5xdg+kodM8J1L5yx0olv6L9gS\n\twDpw==", "X-Gm-Message-State": "ALoCoQl8YOlh3E3UR64ZFASs77kEx6Z/g6MMd7OpO7VvhN2dVUm1ZU021s0R2D3feHlTofX2Vxt8", "X-Received": "by 10.28.24.144 with SMTP id 138mr4919195wmy.43.1446231211760;\n\tFri, 30 Oct 2015 11:53:31 -0700 (PDT)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Date": "Fri, 30 Oct 2015 19:52:37 +0100", "Message-Id": "<1446231162-8075-9-git-send-email-adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1446231162-8075-1-git-send-email-adrien.mazarguil@6wind.com>", "References": "<1444067589-29513-1-git-send-email-adrien.mazarguil@6wind.com>\n\t<1446231162-8075-1-git-send-email-adrien.mazarguil@6wind.com>", "Cc": "Yaacov Hazan <yaacovh@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v2 08/13] mlx5: add promiscuous and allmulticast\n\tRX modes", "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": "These modes require special non-MAC flows.\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nSigned-off-by: Yaacov Hazan <yaacovh@mellanox.com>\n---\n drivers/net/mlx5/Makefile | 1 +\n drivers/net/mlx5/mlx5.c | 4 +\n drivers/net/mlx5/mlx5.h | 13 ++\n drivers/net/mlx5/mlx5_ethdev.c | 4 +\n drivers/net/mlx5/mlx5_rxmode.c | 311 ++++++++++++++++++++++++++++++++++++++++\n drivers/net/mlx5/mlx5_rxq.c | 12 ++\n drivers/net/mlx5/mlx5_rxtx.h | 2 +\n drivers/net/mlx5/mlx5_trigger.c | 8 ++\n 8 files changed, 355 insertions(+)\n create mode 100644 drivers/net/mlx5/mlx5_rxmode.c", "diff": "diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile\nindex 88b361c..4d25d9c 100644\n--- a/drivers/net/mlx5/Makefile\n+++ b/drivers/net/mlx5/Makefile\n@@ -48,6 +48,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx.c\n 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_stats.c\n \n # Dependencies.\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 38f5199..ee63bdf 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -133,6 +133,10 @@ static const struct eth_dev_ops mlx5_dev_ops = {\n \t.dev_start = mlx5_dev_start,\n \t.dev_stop = mlx5_dev_stop,\n \t.dev_close = mlx5_dev_close,\n+\t.promiscuous_enable = mlx5_promiscuous_enable,\n+\t.promiscuous_disable = mlx5_promiscuous_disable,\n+\t.allmulticast_enable = mlx5_allmulticast_enable,\n+\t.allmulticast_disable = mlx5_allmulticast_disable,\n \t.stats_get = mlx5_stats_get,\n \t.stats_reset = mlx5_stats_reset,\n \t.dev_infos_get = mlx5_dev_infos_get,\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 79559bc..56da43c 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -94,6 +94,8 @@ struct priv {\n \tuint16_t mtu; /* Configured MTU. */\n \tuint8_t port; /* Physical port number. */\n \tunsigned int started:1; /* Device started, flows enabled. */\n+\tunsigned int promisc_req:1; /* Promiscuous mode requested. */\n+\tunsigned int allmulti_req:1; /* All multicast mode requested. */\n \tunsigned int hw_qpg:1; /* QP groups are supported. */\n \tunsigned int hw_tss:1; /* TSS is supported. */\n \tunsigned int hw_rss:1; /* RSS is supported. */\n@@ -177,6 +179,17 @@ int priv_mac_addr_add(struct priv *, unsigned int,\n void mlx5_mac_addr_add(struct rte_eth_dev *, struct ether_addr *, uint32_t,\n \t\t uint32_t);\n \n+/* mlx5_rxmode.c */\n+\n+int rxq_promiscuous_enable(struct rxq *);\n+void mlx5_promiscuous_enable(struct rte_eth_dev *);\n+void rxq_promiscuous_disable(struct rxq *);\n+void mlx5_promiscuous_disable(struct rte_eth_dev *);\n+int rxq_allmulticast_enable(struct rxq *);\n+void mlx5_allmulticast_enable(struct rte_eth_dev *);\n+void rxq_allmulticast_disable(struct rxq *);\n+void mlx5_allmulticast_disable(struct rte_eth_dev *);\n+\n /* mlx5_stats.c */\n \n void mlx5_stats_get(struct rte_eth_dev *, struct rte_eth_stats *);\ndiff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c\nindex 0afc1bb..26b6d73 100644\n--- a/drivers/net/mlx5/mlx5_ethdev.c\n+++ b/drivers/net/mlx5/mlx5_ethdev.c\n@@ -605,6 +605,10 @@ mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)\n \t\tif (!priv->rss) {\n \t\t\tif (priv->started)\n \t\t\t\trxq_mac_addrs_add(rxq);\n+\t\t\tif (priv->started && priv->promisc_req)\n+\t\t\t\trxq_promiscuous_enable(rxq);\n+\t\t\tif (priv->started && priv->allmulti_req)\n+\t\t\t\trxq_allmulticast_enable(rxq);\n \t\t}\n \t\t/* Scattered burst function takes priority. */\n \t\tif (rxq->sp)\ndiff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c\nnew file mode 100644\nindex 0000000..7efa21b\n--- /dev/null\n+++ b/drivers/net/mlx5/mlx5_rxmode.c\n@@ -0,0 +1,311 @@\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 <string.h>\n+\n+/* Verbs header. */\n+/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */\n+#ifdef PEDANTIC\n+#pragma GCC diagnostic ignored \"-pedantic\"\n+#endif\n+#include <infiniband/verbs.h>\n+#ifdef PEDANTIC\n+#pragma GCC diagnostic error \"-pedantic\"\n+#endif\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+#ifdef PEDANTIC\n+#pragma GCC diagnostic error \"-pedantic\"\n+#endif\n+\n+#include \"mlx5.h\"\n+#include \"mlx5_rxtx.h\"\n+#include \"mlx5_utils.h\"\n+\n+/**\n+ * Enable promiscuous mode in a RX queue.\n+ *\n+ * @param rxq\n+ * Pointer to RX queue structure.\n+ *\n+ * @return\n+ * 0 on success, errno value on failure.\n+ */\n+int\n+rxq_promiscuous_enable(struct rxq *rxq)\n+{\n+\tstruct ibv_flow *flow;\n+\tstruct ibv_flow_attr attr = {\n+\t\t.type = IBV_FLOW_ATTR_ALL_DEFAULT,\n+\t\t.num_of_specs = 0,\n+\t\t.port = rxq->priv->port,\n+\t\t.flags = 0\n+\t};\n+\n+\tif (rxq->priv->vf)\n+\t\treturn 0;\n+\tif (rxq->promisc_flow != NULL)\n+\t\treturn 0;\n+\tDEBUG(\"%p: enabling promiscuous mode\", (void *)rxq);\n+\terrno = 0;\n+\tflow = ibv_create_flow(rxq->qp, &attr);\n+\tif (flow == NULL) {\n+\t\t/* It's not clear whether errno is always set in this case. */\n+\t\tERROR(\"%p: flow configuration failed, errno=%d: %s\",\n+\t\t (void *)rxq, errno,\n+\t\t (errno ? strerror(errno) : \"Unknown error\"));\n+\t\tif (errno)\n+\t\t\treturn errno;\n+\t\treturn EINVAL;\n+\t}\n+\trxq->promisc_flow = flow;\n+\tDEBUG(\"%p: promiscuous mode enabled\", (void *)rxq);\n+\treturn 0;\n+}\n+\n+/**\n+ * DPDK callback to enable promiscuous mode.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ */\n+void\n+mlx5_promiscuous_enable(struct rte_eth_dev *dev)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tunsigned int i;\n+\tint ret;\n+\n+\tpriv_lock(priv);\n+\tpriv->promisc_req = 1;\n+\t/* If device isn't started, this is all we need to do. */\n+\tif (!priv->started)\n+\t\tgoto end;\n+\tif (priv->rss) {\n+\t\tret = rxq_promiscuous_enable(&priv->rxq_parent);\n+\t\tif (ret) {\n+\t\t\tpriv_unlock(priv);\n+\t\t\treturn;\n+\t\t}\n+\t\tgoto end;\n+\t}\n+\tfor (i = 0; (i != priv->rxqs_n); ++i) {\n+\t\tif ((*priv->rxqs)[i] == NULL)\n+\t\t\tcontinue;\n+\t\tret = rxq_promiscuous_enable((*priv->rxqs)[i]);\n+\t\tif (!ret)\n+\t\t\tcontinue;\n+\t\t/* Failure, rollback. */\n+\t\twhile (i != 0)\n+\t\t\tif ((*priv->rxqs)[--i] != NULL)\n+\t\t\t\trxq_promiscuous_disable((*priv->rxqs)[i]);\n+\t\tpriv_unlock(priv);\n+\t\treturn;\n+\t}\n+end:\n+\tpriv_unlock(priv);\n+}\n+\n+/**\n+ * Disable promiscuous mode in a RX queue.\n+ *\n+ * @param rxq\n+ * Pointer to RX queue structure.\n+ */\n+void\n+rxq_promiscuous_disable(struct rxq *rxq)\n+{\n+\tif (rxq->priv->vf)\n+\t\treturn;\n+\tif (rxq->promisc_flow == NULL)\n+\t\treturn;\n+\tDEBUG(\"%p: disabling promiscuous mode\", (void *)rxq);\n+\tclaim_zero(ibv_destroy_flow(rxq->promisc_flow));\n+\trxq->promisc_flow = NULL;\n+\tDEBUG(\"%p: promiscuous mode disabled\", (void *)rxq);\n+}\n+\n+/**\n+ * DPDK callback to disable promiscuous mode.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ */\n+void\n+mlx5_promiscuous_disable(struct rte_eth_dev *dev)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tunsigned int i;\n+\n+\tpriv_lock(priv);\n+\tpriv->promisc_req = 0;\n+\tif (priv->rss) {\n+\t\trxq_promiscuous_disable(&priv->rxq_parent);\n+\t\tgoto end;\n+\t}\n+\tfor (i = 0; (i != priv->rxqs_n); ++i)\n+\t\tif ((*priv->rxqs)[i] != NULL)\n+\t\t\trxq_promiscuous_disable((*priv->rxqs)[i]);\n+end:\n+\tpriv_unlock(priv);\n+}\n+\n+/**\n+ * Enable allmulti mode in a RX queue.\n+ *\n+ * @param rxq\n+ * Pointer to RX queue structure.\n+ *\n+ * @return\n+ * 0 on success, errno value on failure.\n+ */\n+int\n+rxq_allmulticast_enable(struct rxq *rxq)\n+{\n+\tstruct ibv_flow *flow;\n+\tstruct ibv_flow_attr attr = {\n+\t\t.type = IBV_FLOW_ATTR_MC_DEFAULT,\n+\t\t.num_of_specs = 0,\n+\t\t.port = rxq->priv->port,\n+\t\t.flags = 0\n+\t};\n+\n+\tif (rxq->allmulti_flow != NULL)\n+\t\treturn 0;\n+\tDEBUG(\"%p: enabling allmulticast mode\", (void *)rxq);\n+\terrno = 0;\n+\tflow = ibv_create_flow(rxq->qp, &attr);\n+\tif (flow == NULL) {\n+\t\t/* It's not clear whether errno is always set in this case. */\n+\t\tERROR(\"%p: flow configuration failed, errno=%d: %s\",\n+\t\t (void *)rxq, errno,\n+\t\t (errno ? strerror(errno) : \"Unknown error\"));\n+\t\tif (errno)\n+\t\t\treturn errno;\n+\t\treturn EINVAL;\n+\t}\n+\trxq->allmulti_flow = flow;\n+\tDEBUG(\"%p: allmulticast mode enabled\", (void *)rxq);\n+\treturn 0;\n+}\n+\n+/**\n+ * DPDK callback to enable allmulti mode.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ */\n+void\n+mlx5_allmulticast_enable(struct rte_eth_dev *dev)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tunsigned int i;\n+\tint ret;\n+\n+\tpriv_lock(priv);\n+\tpriv->allmulti_req = 1;\n+\t/* If device isn't started, this is all we need to do. */\n+\tif (!priv->started)\n+\t\tgoto end;\n+\tif (priv->rss) {\n+\t\tret = rxq_allmulticast_enable(&priv->rxq_parent);\n+\t\tif (ret) {\n+\t\t\tpriv_unlock(priv);\n+\t\t\treturn;\n+\t\t}\n+\t\tgoto end;\n+\t}\n+\tfor (i = 0; (i != priv->rxqs_n); ++i) {\n+\t\tif ((*priv->rxqs)[i] == NULL)\n+\t\t\tcontinue;\n+\t\tret = rxq_allmulticast_enable((*priv->rxqs)[i]);\n+\t\tif (!ret)\n+\t\t\tcontinue;\n+\t\t/* Failure, rollback. */\n+\t\twhile (i != 0)\n+\t\t\tif ((*priv->rxqs)[--i] != NULL)\n+\t\t\t\trxq_allmulticast_disable((*priv->rxqs)[i]);\n+\t\tpriv_unlock(priv);\n+\t\treturn;\n+\t}\n+end:\n+\tpriv_unlock(priv);\n+}\n+\n+/**\n+ * Disable allmulti mode in a RX queue.\n+ *\n+ * @param rxq\n+ * Pointer to RX queue structure.\n+ */\n+void\n+rxq_allmulticast_disable(struct rxq *rxq)\n+{\n+\tif (rxq->allmulti_flow == NULL)\n+\t\treturn;\n+\tDEBUG(\"%p: disabling allmulticast mode\", (void *)rxq);\n+\tclaim_zero(ibv_destroy_flow(rxq->allmulti_flow));\n+\trxq->allmulti_flow = NULL;\n+\tDEBUG(\"%p: allmulticast mode disabled\", (void *)rxq);\n+}\n+\n+/**\n+ * DPDK callback to disable allmulti mode.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ */\n+void\n+mlx5_allmulticast_disable(struct rte_eth_dev *dev)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tunsigned int i;\n+\n+\tpriv_lock(priv);\n+\tpriv->allmulti_req = 0;\n+\tif (priv->rss) {\n+\t\trxq_allmulticast_disable(&priv->rxq_parent);\n+\t\tgoto end;\n+\t}\n+\tfor (i = 0; (i != priv->rxqs_n); ++i)\n+\t\tif ((*priv->rxqs)[i] != NULL)\n+\t\t\trxq_allmulticast_disable((*priv->rxqs)[i]);\n+end:\n+\tpriv_unlock(priv);\n+}\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 620ec70..1cd28c2 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -398,6 +398,8 @@ rxq_cleanup(struct rxq *rxq)\n \t\t\t\t\t\t¶ms));\n \t}\n \tif (rxq->qp != NULL) {\n+\t\trxq_promiscuous_disable(rxq);\n+\t\trxq_allmulticast_disable(rxq);\n \t\trxq_mac_addrs_del(rxq);\n \t\tclaim_zero(ibv_destroy_qp(rxq->qp));\n \t}\n@@ -580,8 +582,12 @@ rxq_rehash(struct rte_eth_dev *dev, struct rxq *rxq)\n \t}\n \t/* Remove attached flows if RSS is disabled (no parent queue). */\n \tif (!priv->rss) {\n+\t\trxq_allmulticast_disable(&tmpl);\n+\t\trxq_promiscuous_disable(&tmpl);\n \t\trxq_mac_addrs_del(&tmpl);\n \t\t/* Update original queue in case of failure. */\n+\t\trxq->allmulti_flow = tmpl.allmulti_flow;\n+\t\trxq->promisc_flow = tmpl.promisc_flow;\n \t\tmemcpy(rxq->mac_flow, tmpl.mac_flow, sizeof(rxq->mac_flow));\n \t}\n \t/* From now on, any failure will render the queue unusable.\n@@ -621,7 +627,13 @@ rxq_rehash(struct rte_eth_dev *dev, struct rxq *rxq)\n \tif (!priv->rss) {\n \t\tif (priv->started)\n \t\t\trxq_mac_addrs_add(&tmpl);\n+\t\tif (priv->started && priv->promisc_req)\n+\t\t\trxq_promiscuous_enable(&tmpl);\n+\t\tif (priv->started && priv->allmulti_req)\n+\t\t\trxq_allmulticast_enable(&tmpl);\n \t\t/* Update original queue in case of failure. */\n+\t\trxq->allmulti_flow = tmpl.allmulti_flow;\n+\t\trxq->promisc_flow = tmpl.promisc_flow;\n \t\tmemcpy(rxq->mac_flow, tmpl.mac_flow, sizeof(rxq->mac_flow));\n \t}\n \t/* Allocate pool. */\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 4183820..020acf0 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -106,6 +106,8 @@ struct rxq {\n \tstruct ibv_exp_cq_family *if_cq; /* CQ interface. */\n \t/* MAC flow steering rules. */\n \tstruct ibv_flow *mac_flow[MLX5_MAX_MAC_ADDRESSES];\n+\tstruct ibv_flow *promisc_flow; /* Promiscuous flow. */\n+\tstruct ibv_flow *allmulti_flow; /* Multicast flow. */\n \tunsigned int port_id; /* Port ID for incoming packets. */\n \tunsigned int elts_n; /* (*elts)[] length. */\n \tunsigned int elts_head; /* Current index in (*elts)[]. */\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex f5d965f..dced025 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -86,6 +86,10 @@ mlx5_dev_start(struct rte_eth_dev *dev)\n \t\tif (rxq == NULL)\n \t\t\tcontinue;\n \t\tret = rxq_mac_addrs_add(rxq);\n+\t\tif (!ret && priv->promisc_req)\n+\t\t\tret = rxq_promiscuous_enable(rxq);\n+\t\tif (!ret && priv->allmulti_req)\n+\t\t\tret = rxq_allmulticast_enable(rxq);\n \t\tif (!ret)\n \t\t\tcontinue;\n \t\tWARN(\"%p: QP flow attachment failed: %s\",\n@@ -94,6 +98,8 @@ mlx5_dev_start(struct rte_eth_dev *dev)\n \t\twhile (i != 0) {\n \t\t\trxq = (*priv->rxqs)[--i];\n \t\t\tif (rxq != NULL) {\n+\t\t\t\trxq_allmulticast_disable(rxq);\n+\t\t\t\trxq_promiscuous_disable(rxq);\n \t\t\t\trxq_mac_addrs_del(rxq);\n \t\t\t}\n \t\t}\n@@ -140,6 +146,8 @@ mlx5_dev_stop(struct rte_eth_dev *dev)\n \t\t/* Ignore nonexistent RX queues. */\n \t\tif (rxq == NULL)\n \t\t\tcontinue;\n+\t\trxq_allmulticast_disable(rxq);\n+\t\trxq_promiscuous_disable(rxq);\n \t\trxq_mac_addrs_del(rxq);\n \t} while ((--r) && ((rxq = (*priv->rxqs)[++i]), i));\n \tpriv_unlock(priv);\n", "prefixes": [ "dpdk-dev", "v2", "08/13" ] }