Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41694/?format=api
{ "id": 41694, "url": "http://patches.dpdk.org/api/patches/41694/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d210afa2cad14ff0d2d2d3c2169bf8e8f4c08bd9.1530111623.git.nelio.laranjeiro@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": "<d210afa2cad14ff0d2d2d3c2169bf8e8f4c08bd9.1530111623.git.nelio.laranjeiro@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d210afa2cad14ff0d2d2d3c2169bf8e8f4c08bd9.1530111623.git.nelio.laranjeiro@6wind.com", "date": "2018-06-27T15:07:52", "name": "[v2,20/20] net/mlx5: add count flow action", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c3d7ccf907205ccf4bcf72696d8fd12374d2feeb", "submitter": { "id": 243, "url": "http://patches.dpdk.org/api/people/243/?format=api", "name": "Nélio Laranjeiro", "email": "nelio.laranjeiro@6wind.com" }, "delegate": { "id": 6624, "url": "http://patches.dpdk.org/api/users/6624/?format=api", "username": "shahafs", "first_name": "Shahaf", "last_name": "Shuler", "email": "shahafs@mellanox.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/d210afa2cad14ff0d2d2d3c2169bf8e8f4c08bd9.1530111623.git.nelio.laranjeiro@6wind.com/mbox/", "series": [ { "id": 268, "url": "http://patches.dpdk.org/api/series/268/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=268", "date": "2018-06-27T15:07:32", "name": "net/mlx5: flow rework", "version": 2, "mbox": "http://patches.dpdk.org/series/268/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/41694/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/41694/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 940761C02D;\n\tWed, 27 Jun 2018 17:08:15 +0200 (CEST)", "from mail-wr0-f171.google.com (mail-wr0-f171.google.com\n\t[209.85.128.171]) by dpdk.org (Postfix) with ESMTP id 8936F1BFB3\n\tfor <dev@dpdk.org>; Wed, 27 Jun 2018 17:07:52 +0200 (CEST)", "by mail-wr0-f171.google.com with SMTP id h10-v6so2402099wrq.8\n\tfor <dev@dpdk.org>; Wed, 27 Jun 2018 08:07:52 -0700 (PDT)", "from laranjeiro-vm.dev.6wind.com\n\t(host.78.145.23.62.rev.coltfrance.com. [62.23.145.78])\n\tby smtp.gmail.com with ESMTPSA id\n\tk17-v6sm4872513wrp.19.2018.06.27.08.07.50\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 27 Jun 2018 08:07:51 -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:subject:date:message-id:in-reply-to:references;\n\tbh=i+7dXZTu+kAwCGAzc5tAnD6uziD6l5YID1kqtZ1r89s=;\n\tb=cR+rV83T2efHvxu7joBazNoouPQYf8O9LjRoJqYUIfFS0y4WFKQS4PCOfOP64IMf8N\n\t2ZBiNNkLlthojuuACFUsArz/6S4sPTG33fsKQWuqpGG4pJm1OrIKFrRi5uyMOBr0vvSw\n\tORSD1TMlyq0cmaEjdAJepgOz8pB5wyft2ljTgMpkGYw1PbNAzB7lEgn7WEo9EgEYlOEE\n\ttLhD1xMCgF1JGifg4dkRki8YRZ7fRQ5qiQq20VtY4kKvSlt1Oolg7ly03fA/pSFSJfsk\n\tgSrlCuRN+A3naO59QVC9njES566hFswHAiIdVktOTehjB0QSucDQYJscRcJgeczA0TCX\n\tlOTw==", "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;\n\tbh=i+7dXZTu+kAwCGAzc5tAnD6uziD6l5YID1kqtZ1r89s=;\n\tb=RpGwqB4GbuTbBZUplShtMjjkO06tpveLHLz0g6AdrQOb68PRa7Wztq6NeDY3ORP/jd\n\t1FgPGOuHlQMPSUGRrcg4BpoLrZrZNZB+nQlmAdDLuQfWiPOHr8MDBpTQ3Ypcia6gDHp1\n\toYr4aOX/yjEqvIx+JgmfS0d2uWy1ae24vATWhBCXAZcFgAdNZyzEu1UfROIa5gxmYTb7\n\tDUmcK6Uc0OdA3xqe/rCeaa/gxmkuLT83VGlPsSaH+kqjTDRHWswHrl/ESOe+ydryr4pX\n\tcNjjyOirxIpCdCmYY5J34VM3XMksg+aQNhVIl8s3fv7GOmNVcbGYOgL3bCqPuytKL+Fk\n\tz56g==", "X-Gm-Message-State": "APt69E2Sok4Wg3wAV8sU3AyWpM3KYYWEiQtXnOg/heaS+3Mhd3eeqtp/\n\th6Jsg/naBUfhYzYM9cuk7WEh32KOmw==", "X-Google-Smtp-Source": "AAOMgpfqCB4z9bAwlaRPHa/CUOqE7TZxRMcKZYXRtdsZggF9FRqjL73CsKWtx+23LplwDFNIsVzqQg==", "X-Received": "by 2002:a5d:4c4c:: with SMTP id\n\tn12-v6mr5405724wrt.71.1530112071985; \n\tWed, 27 Jun 2018 08:07:51 -0700 (PDT)", "From": "Nelio Laranjeiro <nelio.laranjeiro@6wind.com>", "To": "dev@dpdk.org, Adrien Mazarguil <adrien.mazarguil@6wind.com>,\n\tYongseok Koh <yskoh@mellanox.com>", "Date": "Wed, 27 Jun 2018 17:07:52 +0200", "Message-Id": "<d210afa2cad14ff0d2d2d3c2169bf8e8f4c08bd9.1530111623.git.nelio.laranjeiro@6wind.com>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<cover.1530111623.git.nelio.laranjeiro@6wind.com>", "References": "<cover.1527506071.git.nelio.laranjeiro@6wind.com>\n\t<cover.1530111623.git.nelio.laranjeiro@6wind.com>", "Subject": "[dpdk-dev] [PATCH v2 20/20] net/mlx5: add count flow action", "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": "This is only supported by Mellanox OFED.\n\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n---\n drivers/net/mlx5/mlx5.h | 2 +\n drivers/net/mlx5/mlx5_flow.c | 238 +++++++++++++++++++++++++++++++++++\n 2 files changed, 240 insertions(+)", "diff": "diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex ed8c1c9a2..1d8e156c8 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -181,6 +181,8 @@ struct priv {\n \tstruct mlx5_drop drop; /* Flow drop queues. */\n \tstruct mlx5_flows flows; /* RTE Flow rules. */\n \tstruct mlx5_flows ctrl_flows; /* Control flow rules. */\n+\tLIST_HEAD(counters, mlx5_flow_counter) flow_counters;\n+\t/* Flow counters. */\n \tstruct {\n \t\tuint32_t dev_gen; /* Generation number to flush local caches. */\n \t\trte_rwlock_t rwlock; /* MR Lock. */\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 7aa4e6ed5..9241855be 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -88,6 +88,7 @@ extern const struct eth_dev_ops mlx5_dev_ops_isolate;\n /* Modify a packet. */\n #define MLX5_FLOW_MOD_FLAG (1u << 0)\n #define MLX5_FLOW_MOD_MARK (1u << 1)\n+#define MLX5_FLOW_MOD_COUNT (1u << 2)\n \n /* Priority reserved for default flows. */\n #define MLX5_FLOW_PRIO_RSVD ((uint32_t)-1)\n@@ -239,6 +240,17 @@ struct mlx5_flow_verbs {\n \tuint64_t hash_fields; /**< Verbs hash Rx queue hash fields. */\n };\n \n+/* Counters information. */\n+struct mlx5_flow_counter {\n+\tLIST_ENTRY(mlx5_flow_counter) next; /**< Pointer to the next counter. */\n+\tuint32_t shared:1; /**< Share counter ID with other flow rules. */\n+\tuint32_t ref_cnt:31; /**< Reference counter. */\n+\tuint32_t id; /**< Counter ID. */\n+\tstruct ibv_counter_set *cs; /**< Holds the counters for the rule. */\n+\tuint64_t hits; /**< Number of packets matched by the rule. */\n+\tuint64_t bytes; /**< Number of bytes matched by the rule. */\n+};\n+\n /* Flow structure. */\n struct rte_flow {\n \tTAILQ_ENTRY(rte_flow) next; /**< Pointer to the next flow structure. */\n@@ -253,6 +265,7 @@ struct rte_flow {\n \tLIST_HEAD(verbs, mlx5_flow_verbs) verbs; /**< Verbs flows list. */\n \tstruct mlx5_flow_verbs *cur_verbs;\n \t/**< Current Verbs flow structure being filled. */\n+\tstruct mlx5_flow_counter *counter; /**< Holds Verbs flow counter. */\n \tstruct rte_flow_action_rss rss;/**< RSS context. */\n \tuint32_t ptype;\n \t/**< Store tunnel packet type data to store in Rx queue. */\n@@ -266,6 +279,7 @@ static const struct rte_flow_ops mlx5_flow_ops = {\n \t.destroy = mlx5_flow_destroy,\n \t.flush = mlx5_flow_flush,\n \t.isolate = mlx5_flow_isolate,\n+\t.query = mlx5_flow_query,\n };\n \n /* Convert FDIR request to Generic flow. */\n@@ -407,6 +421,81 @@ mlx5_flow_priority(struct rte_eth_dev *dev, uint32_t priority,\n \treturn priority;\n }\n \n+/**\n+ * Get a flow counter.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ * @param id\n+ * Counter identifier.\n+ *\n+ * @return\n+ * A pointer to the counter, NULL otherwise and rte_errno is set.\n+ */\n+static struct mlx5_flow_counter *\n+mlx5_flow_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tstruct mlx5_flow_counter *cnt;\n+\n+\tLIST_FOREACH(cnt, &priv->flow_counters, next) {\n+\t\tif (cnt->shared != shared)\n+\t\t\tcontinue;\n+\t\tif (cnt->id != id)\n+\t\t\tcontinue;\n+\t\tcnt->ref_cnt++;\n+\t\treturn cnt;\n+\t}\n+#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT\n+\n+\tstruct mlx5_flow_counter tmpl = {\n+\t\t.shared = shared,\n+\t\t.id = id,\n+\t\t.cs = mlx5_glue->create_counter_set\n+\t\t\t(priv->ctx,\n+\t\t\t &(struct ibv_counter_set_init_attr){\n+\t\t\t\t .counter_set_id = id,\n+\t\t\t }),\n+\t\t.hits = 0,\n+\t\t.bytes = 0,\n+\t};\n+\n+\tif (!tmpl.cs) {\n+\t\trte_errno = errno;\n+\t\treturn NULL;\n+\t}\n+\tcnt = rte_calloc(__func__, 1, sizeof(*cnt), 0);\n+\tif (!cnt) {\n+\t\trte_errno = ENOMEM;\n+\t\treturn NULL;\n+\t}\n+\t*cnt = tmpl;\n+\tLIST_INSERT_HEAD(&priv->flow_counters, cnt, next);\n+\treturn cnt;\n+#endif\n+\trte_errno = ENOTSUP;\n+\treturn NULL;\n+}\n+\n+/**\n+ * Release a flow counter.\n+ *\n+ * @param id\n+ * Counter identifier.\n+ *\n+ * @return\n+ * A pointer to the counter, NULL otherwise and rte_errno is set.\n+ */\n+static void\n+mlx5_flow_counter_release(struct mlx5_flow_counter *counter)\n+{\n+\tif (--counter->ref_cnt == 0) {\n+\t\tclaim_zero(mlx5_glue->destroy_counter_set(counter->cs));\n+\t\tLIST_REMOVE(counter, next);\n+\t\trte_free(counter);\n+\t}\n+}\n+\n /**\n * Flow debug purpose function only available when\n * CONFIG_RTE_LIBRTE_MLX5_DEBUG=y\n@@ -2169,6 +2258,65 @@ mlx5_flow_action_mark(const struct rte_flow_action *actions,\n \treturn size;\n }\n \n+/**\n+ * Validate action count provided by the user.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ * @param actions\n+ * Pointer to flow actions array.\n+ * @param flow\n+ * Pointer to the rte_flow structure.\n+ * @param flow_size[in]\n+ * Size in bytes of the available space for to store the flow information.\n+ * @param error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * size in bytes necessary for the conversion, a negative errno value\n+ * otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_flow_action_count(struct rte_eth_dev *dev,\n+\t\t const struct rte_flow_action *actions,\n+\t\t struct rte_flow *flow,\n+\t\t const size_t flow_size __rte_unused,\n+\t\t struct rte_flow_error *error)\n+{\n+\tconst struct rte_flow_action_count *count = actions->conf;\n+#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT\n+\tunsigned int size = sizeof(struct ibv_flow_spec_counter_action);\n+\tstruct ibv_flow_spec_counter_action counter = {\n+\t\t.type = IBV_FLOW_SPEC_ACTION_COUNT,\n+\t\t.size = size,\n+\t};\n+#endif\n+\n+\tif (!flow->counter) {\n+\t\tflow->counter = mlx5_flow_counter_new(dev, count->shared,\n+\t\t\t\t\t\t count->id);\n+\t\tif (!flow->counter)\n+\t\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t\t actions,\n+\t\t\t\t\t\t \"cannot get counter\"\n+\t\t\t\t\t\t \" context.\");\n+\t}\n+\tif (!((struct priv *)dev->data->dev_private)->config.flow_counter_en)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t actions,\n+\t\t\t\t\t \"flow counters are not supported.\");\n+\tflow->modifier |= MLX5_FLOW_MOD_COUNT;\n+#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT\n+\tcounter.counter_set_handle = flow->counter->cs->handle;\n+\tif (size <= flow_size)\n+\t\tmlx5_flow_spec_verbs_add(flow, &counter, size);\n+\treturn size;\n+#endif\n+\treturn 0;\n+}\n+\n /**\n * Validate actions provided by the user.\n *\n@@ -2228,6 +2376,10 @@ mlx5_flow_actions(struct rte_eth_dev *dev,\n \t\tcase RTE_FLOW_ACTION_TYPE_RSS:\n \t\t\tret = mlx5_flow_action_rss(dev, actions, flow, error);\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n+\t\t\tret = mlx5_flow_action_count(dev, actions, flow, remain,\n+\t\t\t\t\t\t error);\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n@@ -2417,6 +2569,10 @@ mlx5_flow_fate_remove(struct rte_eth_dev *dev, struct rte_flow *flow)\n \t\t\tverbs->hrxq = NULL;\n \t\t}\n \t}\n+\tif (flow->counter) {\n+\t\tmlx5_flow_counter_release(flow->counter);\n+\t\tflow->counter = NULL;\n+\t}\n }\n \n /**\n@@ -2974,6 +3130,88 @@ mlx5_flow_isolate(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n+/**\n+ * Query flow counter.\n+ *\n+ * @param flow\n+ * Pointer to the flow.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_flow_query_count(struct rte_flow *flow __rte_unused,\n+\t\t void *data __rte_unused,\n+\t\t struct rte_flow_error *error)\n+{\n+#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT\n+\tstruct rte_flow_query_count *qc = data;\n+\tuint64_t counters[2] = {0, 0};\n+\tstruct ibv_query_counter_set_attr query_cs_attr = {\n+\t\t.cs = flow->counter->cs,\n+\t\t.query_flags = IBV_COUNTER_SET_FORCE_UPDATE,\n+\t};\n+\tstruct ibv_counter_set_data query_out = {\n+\t\t.out = counters,\n+\t\t.outlen = 2 * sizeof(uint64_t),\n+\t};\n+\tint err = mlx5_glue->query_counter_set(&query_cs_attr, &query_out);\n+\n+\tif (err)\n+\t\treturn rte_flow_error_set(error, err,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t NULL,\n+\t\t\t\t\t \"cannot read counter\");\n+\tqc->hits_set = 1;\n+\tqc->bytes_set = 1;\n+\tqc->hits = counters[0] - flow->counter->hits;\n+\tqc->bytes = counters[1] - flow->counter->bytes;\n+\tif (qc->reset) {\n+\t\tflow->counter->hits = counters[0];\n+\t\tflow->counter->bytes = counters[1];\n+\t}\n+\treturn 0;\n+#endif\n+\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t NULL,\n+\t\t\t\t \"counters are not available\");\n+}\n+\n+/**\n+ * Query a flows.\n+ *\n+ * @see rte_flow_query()\n+ * @see rte_flow_ops\n+ */\n+int\n+mlx5_flow_query(struct rte_eth_dev *dev __rte_unused,\n+\t\tstruct rte_flow *flow,\n+\t\tconst struct rte_flow_action *actions,\n+\t\tvoid *data,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tint ret = 0;\n+\n+\tfor (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {\n+\t\tswitch (actions->type) {\n+\t\tcase RTE_FLOW_ACTION_TYPE_VOID:\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n+\t\t\tret = mlx5_flow_query_count(flow, data, error);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t\t actions,\n+\t\t\t\t\t\t \"action not supported\");\n+\t\t}\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\t}\n+\treturn 0;\n+}\n+\n /**\n * Convert a flow director filter to a generic flow.\n *\n", "prefixes": [ "v2", "20/20" ] }