Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/8476/?format=api
{ "id": 8476, "url": "http://patches.dpdk.org/api/patches/8476/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1446231319-8185-13-git-send-email-adrien.mazarguil@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": "<1446231319-8185-13-git-send-email-adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1446231319-8185-13-git-send-email-adrien.mazarguil@6wind.com", "date": "2015-10-30T18:55:15", "name": "[dpdk-dev,v2,12/16] mlx5: disable useless flows in promiscuous mode", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e2da7d907270e0e1bc7591c60af7e4a9d4db9da3", "submitter": { "id": 165, "url": "http://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1446231319-8185-13-git-send-email-adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/8476/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/8476/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 C499E9388;\n\tFri, 30 Oct 2015 19:56:47 +0100 (CET)", "from mail-wm0-f43.google.com (mail-wm0-f43.google.com\n\t[74.125.82.43]) by dpdk.org (Postfix) with ESMTP id C353A926B\n\tfor <dev@dpdk.org>; Fri, 30 Oct 2015 19:56:16 +0100 (CET)", "by wmec75 with SMTP id c75so19176293wme.1\n\tfor <dev@dpdk.org>; Fri, 30 Oct 2015 11:56:16 -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\tb12sm4227328wma.6.2015.10.30.11.56.15\n\t(version=TLSv1.2 cipher=RC4-SHA bits=128/128);\n\tFri, 30 Oct 2015 11:56:16 -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=GjUn00skyISRXltTmxp5IIYaNCC+HNBALdNOvpHb+ZA=;\n\tb=tNkdjnoVaufhjwSLta9+x8SOImy0m2LK0mvZp3TZMnJVgZgj7OsxgntmLoz3Dutfd9\n\tdhXZWrLvp4d6FONXpZ/iXrZVxVXKkclCpedAIE8TJUKfCIXJ/ydRwmrUZIsIBpf2iogP\n\txL0tzkIGtVmKcJP8kdJo2bJFOW1A05bED6W9hoKLG+npogFbbHRP0l/Mhy3k6AQhuvzM\n\t/pvs2Nxz27WIH5Jr7AeYY9Vb1sQ/TfczDTwltJg+a010LQ+haHbuRhj/XE+ufwSFz2F2\n\trsKedOVdZmQC8K14saNrdsoM7f14vaukoYieK+qb4wB4TBTMFnboos5qNOQztZtqpjll\n\teogw==", "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=GjUn00skyISRXltTmxp5IIYaNCC+HNBALdNOvpHb+ZA=;\n\tb=i6fRR0TOOhWZ700faadKJnUlGcgHY+e1ItgZGdM+IR2gwA1Dktp2TecrMy6ecEl6io\n\tS7llfA+07ekpC1F+8PYamIn51nVwWJYhK49uPkhB5B4t17+rHvS58f9BffkQV5abUkKT\n\tsXn9P3PMb7Cw4sU16X2c0Wqs2w0jqLhqgP4fVxwKNsaud6WJc/CSTfadoQ1m8LTvVuuf\n\tMBMBASlUgg0BSFrATTwGxVyRVPtW+qpngRneN18GwS9fJeAaosMGSWrn4dVh6+iK8GYN\n\tLpOp+GV9ouly5osyDlv4TCyyj+kMGV12MVLbjotFEmat3C0YqaPt4YQjx2fybIKRmtfP\n\tKTGg==", "X-Gm-Message-State": "ALoCoQm7U3HkpIN6/FyWN069Jfkp8l/axIhZE89jsm2g65JHHa2l7sIQXlFg3ORyp6vw+d3B8i7w", "X-Received": "by 10.28.87.67 with SMTP id l64mr4911542wmb.72.1446231376643;\n\tFri, 30 Oct 2015 11:56:16 -0700 (PDT)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Date": "Fri, 30 Oct 2015 19:55:15 +0100", "Message-Id": "<1446231319-8185-13-git-send-email-adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1446231319-8185-1-git-send-email-adrien.mazarguil@6wind.com>", "References": "<1444067692-29645-1-git-send-email-adrien.mazarguil@6wind.com>\n\t<1446231319-8185-1-git-send-email-adrien.mazarguil@6wind.com>", "Cc": "Yaacov Hazan <yaacovh@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v2 12/16] mlx5: disable useless flows in\n\tpromiscuous mode", "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": "From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n\nOnly a single flow per hash RX queue is needed in promiscuous mode.\nDisable others to free up hardware resources.\n\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\nSigned-off-by: Yaacov Hazan <yaacovh@mellanox.com>\n---\n drivers/net/mlx5/mlx5_mac.c | 5 +++++\n drivers/net/mlx5/mlx5_rxmode.c | 10 ++++++++++\n drivers/net/mlx5/mlx5_rxq.c | 29 +++++++++++++++++++++++++++++\n drivers/net/mlx5/mlx5_rxtx.h | 7 +++++++\n drivers/net/mlx5/mlx5_trigger.c | 6 +++---\n 5 files changed, 54 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c\nindex d3ab5b9..c7927c1 100644\n--- a/drivers/net/mlx5/mlx5_mac.c\n+++ b/drivers/net/mlx5/mlx5_mac.c\n@@ -410,6 +410,8 @@ priv_mac_addr_add(struct priv *priv, unsigned int mac_index,\n \t\t\t(*mac)[3], (*mac)[4], (*mac)[5]\n \t\t}\n \t};\n+\tif (!priv_allow_flow_type(priv, HASH_RXQ_FLOW_TYPE_MAC))\n+\t\tgoto end;\n \tfor (i = 0; (i != priv->hash_rxqs_n); ++i) {\n \t\tret = hash_rxq_mac_addr_add(&(*priv->hash_rxqs)[i], mac_index);\n \t\tif (!ret)\n@@ -420,6 +422,7 @@ priv_mac_addr_add(struct priv *priv, unsigned int mac_index,\n \t\t\t\t\t mac_index);\n \t\treturn ret;\n \t}\n+end:\n \tBITFIELD_SET(priv->mac_configured, mac_index);\n \treturn 0;\n }\n@@ -439,6 +442,8 @@ priv_mac_addrs_enable(struct priv *priv)\n \tunsigned int i;\n \tint ret;\n \n+\tif (!priv_allow_flow_type(priv, HASH_RXQ_FLOW_TYPE_MAC))\n+\t\treturn 0;\n \tfor (i = 0; (i != priv->hash_rxqs_n); ++i) {\n \t\tret = hash_rxq_mac_addrs_add(&(*priv->hash_rxqs)[i]);\n \t\tif (!ret)\ndiff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c\nindex 7794608..f7de1b8 100644\n--- a/drivers/net/mlx5/mlx5_rxmode.c\n+++ b/drivers/net/mlx5/mlx5_rxmode.c\n@@ -113,6 +113,8 @@ priv_promiscuous_enable(struct priv *priv)\n {\n \tunsigned int i;\n \n+\tif (!priv_allow_flow_type(priv, HASH_RXQ_FLOW_TYPE_PROMISC))\n+\t\treturn 0;\n \tfor (i = 0; (i != priv->hash_rxqs_n); ++i) {\n \t\tstruct hash_rxq *hash_rxq = &(*priv->hash_rxqs)[i];\n \t\tint ret;\n@@ -147,6 +149,10 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev)\n \tret = priv_promiscuous_enable(priv);\n \tif (ret)\n \t\tERROR(\"cannot enable promiscuous mode: %s\", strerror(ret));\n+\telse {\n+\t\tpriv_mac_addrs_disable(priv);\n+\t\tpriv_allmulticast_disable(priv);\n+\t}\n \tpriv_unlock(priv);\n }\n \n@@ -196,6 +202,8 @@ mlx5_promiscuous_disable(struct rte_eth_dev *dev)\n \tpriv_lock(priv);\n \tpriv->promisc_req = 0;\n \tpriv_promiscuous_disable(priv);\n+\tpriv_mac_addrs_enable(priv);\n+\tpriv_allmulticast_enable(priv);\n \tpriv_unlock(priv);\n }\n \n@@ -266,6 +274,8 @@ priv_allmulticast_enable(struct priv *priv)\n {\n \tunsigned int i;\n \n+\tif (!priv_allow_flow_type(priv, HASH_RXQ_FLOW_TYPE_ALLMULTI))\n+\t\treturn 0;\n \tfor (i = 0; (i != priv->hash_rxqs_n); ++i) {\n \t\tstruct hash_rxq *hash_rxq = &(*priv->hash_rxqs)[i];\n \t\tint ret;\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex d46fc13..bdd5429 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -539,6 +539,35 @@ priv_destroy_hash_rxqs(struct priv *priv)\n }\n \n /**\n+ * Check whether a given flow type is allowed.\n+ *\n+ * @param priv\n+ * Pointer to private structure.\n+ * @param type\n+ * Flow type to check.\n+ *\n+ * @return\n+ * Nonzero if the given flow type is allowed.\n+ */\n+int\n+priv_allow_flow_type(struct priv *priv, enum hash_rxq_flow_type type)\n+{\n+\t/* Only FLOW_TYPE_PROMISC is allowed when promiscuous mode\n+\t * has been requested. */\n+\tif (priv->promisc_req)\n+\t\treturn (type == HASH_RXQ_FLOW_TYPE_PROMISC);\n+\tswitch (type) {\n+\tcase HASH_RXQ_FLOW_TYPE_PROMISC:\n+\t\treturn !!priv->promisc_req;\n+\tcase HASH_RXQ_FLOW_TYPE_ALLMULTI:\n+\t\treturn !!priv->allmulti_req;\n+\tcase HASH_RXQ_FLOW_TYPE_MAC:\n+\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n+/**\n * Allocate RX queue elements with scattered packets support.\n *\n * @param rxq\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 651eb95..dc23f4f 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -159,6 +159,12 @@ struct ind_table_init {\n \tunsigned int hash_types_n;\n };\n \n+enum hash_rxq_flow_type {\n+\tHASH_RXQ_FLOW_TYPE_MAC,\n+\tHASH_RXQ_FLOW_TYPE_PROMISC,\n+\tHASH_RXQ_FLOW_TYPE_ALLMULTI,\n+};\n+\n struct hash_rxq {\n \tstruct priv *priv; /* Back pointer to private data. */\n \tstruct ibv_qp *qp; /* Hash RX QP. */\n@@ -223,6 +229,7 @@ size_t hash_rxq_flow_attr(const struct hash_rxq *, struct ibv_flow_attr *,\n \t\t\t size_t);\n int priv_create_hash_rxqs(struct priv *);\n void priv_destroy_hash_rxqs(struct priv *);\n+int priv_allow_flow_type(struct priv *, enum hash_rxq_flow_type);\n void rxq_cleanup(struct rxq *);\n int rxq_rehash(struct rte_eth_dev *, struct rxq *);\n int rxq_setup(struct rte_eth_dev *, struct rxq *, uint16_t, unsigned int,\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex 233c0d8..68e00a0 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -70,10 +70,10 @@ mlx5_dev_start(struct rte_eth_dev *dev)\n \tDEBUG(\"%p: allocating and configuring hash RX queues\", (void *)dev);\n \terr = priv_create_hash_rxqs(priv);\n \tif (!err)\n-\t\terr = priv_mac_addrs_enable(priv);\n-\tif (!err && priv->promisc_req)\n \t\terr = priv_promiscuous_enable(priv);\n-\tif (!err && priv->allmulti_req)\n+\tif (!err)\n+\t\terr = priv_mac_addrs_enable(priv);\n+\tif (!err)\n \t\terr = priv_allmulticast_enable(priv);\n \tif (!err)\n \t\tpriv->started = 1;\n", "prefixes": [ "dpdk-dev", "v2", "12/16" ] }