Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/80184/?format=api
{ "id": 80184, "url": "https://patches.dpdk.org/api/patches/80184/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1602251436-269694-4-git-send-email-jiaweiw@nvidia.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": "<1602251436-269694-4-git-send-email-jiaweiw@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1602251436-269694-4-git-send-email-jiaweiw@nvidia.com", "date": "2020-10-09T13:50:29", "name": "[03/10] net/mlx5: add the validate sample action", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "866d9cddd48ae095fb9a0a0687cb7ea9165733f8", "submitter": { "id": 1939, "url": "https://patches.dpdk.org/api/people/1939/?format=api", "name": "Jiawei Wang", "email": "jiaweiw@nvidia.com" }, "delegate": { "id": 3268, "url": "https://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1602251436-269694-4-git-send-email-jiaweiw@nvidia.com/mbox/", "series": [ { "id": 12829, "url": "https://patches.dpdk.org/api/series/12829/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=12829", "date": "2020-10-09T13:50:28", "name": "Add sampling and mirroring support in MLX5 PMD", "version": 1, "mbox": "https://patches.dpdk.org/series/12829/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/80184/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/80184/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id CE5DCA04BC;\n\tFri, 9 Oct 2020 15:54:10 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id DF5AA1D6AF;\n\tFri, 9 Oct 2020 15:51:02 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id 8621C1D67F\n for <dev@dpdk.org>; Fri, 9 Oct 2020 15:50:43 +0200 (CEST)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n jiaweiw@nvidia.com) with SMTP; 9 Oct 2020 16:50:36 +0300", "from nvidia.com (gen-l-vrt-280.mtl.labs.mlnx [10.237.45.1])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 099Doade013303;\n Fri, 9 Oct 2020 16:50:36 +0300" ], "From": "Jiawei Wang <jiaweiw@nvidia.com>", "To": "orika@nvidia.com, viacheslavo@nvidia.com, matan@nvidia.com,\n thomas@monjalon.net", "Cc": "dev@dpdk.org, rasland@nvidia.com, asafp@nvidia.com", "Date": "Fri, 9 Oct 2020 16:50:29 +0300", "Message-Id": "<1602251436-269694-4-git-send-email-jiaweiw@nvidia.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1602251436-269694-1-git-send-email-jiaweiw@nvidia.com>", "References": "<1601187539-112694-1-git-send-email-jiaweiw@nvidia.com>\n <1602251436-269694-1-git-send-email-jiaweiw@nvidia.com>", "Subject": "[dpdk-dev] [PATCH 03/10] net/mlx5: add the validate sample 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 <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add sample action validate function.\n\nSample Flow is supported in NIC-RX and FDB domains. For the NIC-RX\nthe Sample Flow action list must include the destination queue action.\n\nOnly NIC-RX domain supports the optional actions list. FDB doesn't\nsupport any optional actions, the sampled packets is always forwarded\nto the E-Switch manager port.\n\nSigned-off-by: Jiawei Wang <jiaweiw@nvidia.com>\nAcked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>\n---\n drivers/net/mlx5/linux/mlx5_os.c | 14 ++++\n drivers/net/mlx5/mlx5.h | 1 +\n drivers/net/mlx5/mlx5_flow.h | 1 +\n drivers/net/mlx5/mlx5_flow_dv.c | 137 +++++++++++++++++++++++++++++++++++++++\n 4 files changed, 153 insertions(+)", "diff": "diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 487714f..09d0944 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -1099,6 +1099,20 @@\n \t\t\t}\n \t\t}\n #endif\n+#if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE)\n+\t\tif (config->hca_attr.log_max_ft_sampler_num > 0 &&\n+\t\t config->dv_flow_en) {\n+\t\t\tpriv->sampler_en = 1;\n+\t\t\tDRV_LOG(DEBUG, \"The Sampler enabled!\\n\");\n+\t\t} else {\n+\t\t\tpriv->sampler_en = 0;\n+\t\t\tif (!config->hca_attr.log_max_ft_sampler_num)\n+\t\t\t\tDRV_LOG(WARNING, \"No available register for\"\n+\t\t\t\t\t\t\" Sampler.\");\n+\t\t\telse\n+\t\t\t\tDRV_LOG(DEBUG, \"DV flow is not supported!\\n\");\n+\t\t}\n+#endif\n \t}\n \tif (config->tx_pp) {\n \t\tDRV_LOG(DEBUG, \"Timestamp counter frequency %u kHz\",\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 87d3c15..375c86e 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -813,6 +813,7 @@ struct mlx5_priv {\n \tunsigned int counter_fallback:1; /* Use counter fallback management. */\n \tunsigned int mtr_en:1; /* Whether support meter. */\n \tunsigned int mtr_reg_share:1; /* Whether support meter REG_C share. */\n+\tunsigned int sampler_en:1; /* Whether support sampler. */\n \tuint16_t domain_id; /* Switch domain identifier. */\n \tuint16_t vport_id; /* Associated VF vport index (if any). */\n \tuint32_t vport_meta_tag; /* Used for vport index match ove VF LAG. */\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 279daf2..f47170d 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -196,6 +196,7 @@ enum mlx5_feature_name {\n #define MLX5_FLOW_ACTION_SET_IPV6_DSCP (1ull << 33)\n #define MLX5_FLOW_ACTION_AGE (1ull << 34)\n #define MLX5_FLOW_ACTION_DEFAULT_MISS (1ull << 35)\n+#define MLX5_FLOW_ACTION_SAMPLE (1ull << 36)\n \n #define MLX5_FLOW_FATE_ACTIONS \\\n \t(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \\\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 79fdf34..ec586c3 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -4042,6 +4042,134 @@ struct field_modify_info modify_tcp[] = {\n }\n \n /**\n+ * Validate the sample action.\n+ *\n+ * @param[in] action_flags\n+ * Holds the actions detected until now.\n+ * @param[in] action\n+ * Pointer to the sample action.\n+ * @param[in] dev\n+ * Pointer to the Ethernet device structure.\n+ * @param[in] attr\n+ * Attributes of flow that includes this action.\n+ * @param[out] error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+flow_dv_validate_action_sample(uint64_t action_flags,\n+\t\t\t const struct rte_flow_action *action,\n+\t\t\t struct rte_eth_dev *dev,\n+\t\t\t const struct rte_flow_attr *attr,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_dev_config *dev_conf = &priv->config;\n+\tconst struct rte_flow_action_sample *sample = action->conf;\n+\tconst struct rte_flow_action *act;\n+\tuint64_t sub_action_flags = 0;\n+\tint actions_n = 0;\n+\tint ret;\n+\n+\tif (!sample)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, action,\n+\t\t\t\t\t \"configuration cannot be NULL\");\n+\tif (sample->ratio == 0)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, action,\n+\t\t\t\t\t \"ratio value starts from 1\");\n+\tif (!priv->config.devx || (sample->ratio > 0 && !priv->sampler_en))\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\t NULL,\n+\t\t\t\t\t \"sample action not supported\");\n+\tif (action_flags & MLX5_FLOW_ACTION_SAMPLE)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"Multiple sample actions not \"\n+\t\t\t\t\t \"supported\");\n+\tif (action_flags & MLX5_FLOW_ACTION_METER)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, action,\n+\t\t\t\t\t \"wrong action order, meter should \"\n+\t\t\t\t\t \"be after sample action\");\n+\tif (action_flags & MLX5_FLOW_ACTION_JUMP)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, action,\n+\t\t\t\t\t \"wrong action order, jump should \"\n+\t\t\t\t\t \"be after sample action\");\n+\tact = sample->actions;\n+\tfor (; act->type != RTE_FLOW_ACTION_TYPE_END; act++) {\n+\t\tif (actions_n == MLX5_DV_MAX_NUMBER_OF_ACTIONS)\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 act, \"too many actions\");\n+\t\tswitch (act->type) {\n+\t\tcase RTE_FLOW_ACTION_TYPE_QUEUE:\n+\t\t\tret = mlx5_flow_validate_action_queue(act,\n+\t\t\t\t\t\t\t sub_action_flags,\n+\t\t\t\t\t\t\t dev,\n+\t\t\t\t\t\t\t attr, error);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\t\t\tsub_action_flags |= MLX5_FLOW_ACTION_QUEUE;\n+\t\t\t++actions_n;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_MARK:\n+\t\t\tret = flow_dv_validate_action_mark(dev, act,\n+\t\t\t\t\t\t\t sub_action_flags,\n+\t\t\t\t\t\t\t attr, error);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\t\t\tif (dev_conf->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY)\n+\t\t\t\tsub_action_flags |= MLX5_FLOW_ACTION_MARK |\n+\t\t\t\t\t\tMLX5_FLOW_ACTION_MARK_EXT;\n+\t\t\telse\n+\t\t\t\tsub_action_flags |= MLX5_FLOW_ACTION_MARK;\n+\t\t\t++actions_n;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n+\t\t\tret = flow_dv_validate_action_count(dev, error);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\t\t\tsub_action_flags |= MLX5_FLOW_ACTION_COUNT;\n+\t\t\t++actions_n;\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 NULL,\n+\t\t\t\t\t\t \"Doesn't support optional \"\n+\t\t\t\t\t\t \"action\");\n+\t\t}\n+\t}\n+\tif (attr->ingress && !attr->transfer) {\n+\t\tif (!(sub_action_flags & MLX5_FLOW_ACTION_QUEUE))\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t\t NULL,\n+\t\t\t\t\t\t \"Ingress must has a dest \"\n+\t\t\t\t\t\t \"QUEUE for Sample\");\n+\t} else if (attr->egress && !attr->transfer) {\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 NULL,\n+\t\t\t\t\t \"Sample Only support Ingress \"\n+\t\t\t\t\t \"or E-Switch\");\n+\t} else if (sample->actions->type != RTE_FLOW_ACTION_TYPE_END) {\n+\t\tMLX5_ASSERT(attr->transfer);\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t\t \"E-Switch doesn't support any \"\n+\t\t\t\t\t \"optional action for sampling\");\n+\t}\n+\treturn 0;\n+}\n+\n+/**\n * Find existing modify-header resource or create and register a new one.\n *\n * @param dev[in, out]\n@@ -5803,6 +5931,15 @@ struct field_modify_info modify_tcp[] = {\n \t\t\taction_flags |= MLX5_FLOW_ACTION_SET_IPV6_DSCP;\n \t\t\trw_act_num += MLX5_ACT_NUM_SET_DSCP;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_SAMPLE:\n+\t\t\tret = flow_dv_validate_action_sample(action_flags,\n+\t\t\t\t\t\t\t actions, dev,\n+\t\t\t\t\t\t\t attr, error);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\t\t\taction_flags |= MLX5_FLOW_ACTION_SAMPLE;\n+\t\t\t++actions_n;\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", "prefixes": [ "03/10" ] }