Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17263/?format=api
{ "id": 17263, "url": "https://patches.dpdk.org/api/patches/17263/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/351d1273612e100f44fc11bf7bcd6e372282bc38.1480096192.git.nelio.laranjeiro@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": "<351d1273612e100f44fc11bf7bcd6e372282bc38.1480096192.git.nelio.laranjeiro@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/351d1273612e100f44fc11bf7bcd6e372282bc38.1480096192.git.nelio.laranjeiro@6wind.com", "date": "2016-11-25T18:14:22", "name": "[dpdk-dev,2/3] net/mlx5: add software support for rte_flow", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "76b1b9c5528eee101dd6c393067f75b18ca27cc8", "submitter": { "id": 243, "url": "https://patches.dpdk.org/api/people/243/?format=api", "name": "Nélio Laranjeiro", "email": "nelio.laranjeiro@6wind.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/351d1273612e100f44fc11bf7bcd6e372282bc38.1480096192.git.nelio.laranjeiro@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/17263/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/17263/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 17B7AFA3F;\n\tFri, 25 Nov 2016 19:15:42 +0100 (CET)", "from mail-wj0-f181.google.com (mail-wj0-f181.google.com\n\t[209.85.210.181]) by dpdk.org (Postfix) with ESMTP id 6E1A4FA32\n\tfor <dev@dpdk.org>; Fri, 25 Nov 2016 19:14:49 +0100 (CET)", "by mail-wj0-f181.google.com with SMTP id qp4so65197433wjc.3\n\tfor <dev@dpdk.org>; Fri, 25 Nov 2016 10:14:49 -0800 (PST)", "from ping.vm.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\t135sm14610323wmh.14.2016.11.25.10.14.48\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 25 Nov 2016 10:14:48 -0800 (PST)" ], "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\t:in-reply-to:references;\n\tbh=pK1IhwRm7NMbgubhF8NvI77I2r/oo9/9a+zcl/yX0hM=;\n\tb=PQdkg0VY4BQijDZrezMbUhZ6F43mam3PvVZm4Qm4iuqoU3Ix1ZGx7zPKiTFdjQVS9T\n\t4kFr4ki0MMZ0o5cIRww2injO+12Joug+KHVRMQk4X01UZMoSQepgGAmupMt4gRct57XR\n\tWvgw6qUjlC75uArkQvahjmR57EBGOLLqT2az6AC7O1bkkDYWhaQFs4h7zWI9XFfC/Hk9\n\tWniA8ljZjNSVIlEtcumWJBKP5hDMFl38zwylCfzUf/in9j+WlvVWWtTKPFK6qwqSkou1\n\ti0aClIncx4x3bNsw4bdP94ktFK46WB3MTmSNywAO0Gc00va1qSqTvJ6YfmwarJQSlwmF\n\trFug==", "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:in-reply-to:references;\n\tbh=pK1IhwRm7NMbgubhF8NvI77I2r/oo9/9a+zcl/yX0hM=;\n\tb=EZxjRqAskO6kDRxMQcm598Hhk2HULiw87YPDTy8g9viWFfr8zN/ld9utxKhNk6tqtm\n\taK+o1dI167e3mYej0t4IdxNGZ2KSex8R/M/42RgUZu4xMN41+L/Bz2bHaqtKN7p0n4jD\n\tBWCSApkQRXPKLXBAkfHZ/XMG9JKiYtx0yZxnSsyblRH6JdVoDsbtcdzIdKyeiwXQl/gO\n\tfdXN65EGOICf6d9I4lWBE9wuBTQUcid+27zGe0gXCtfCGpujoH5ClOmr2To43ODVqISq\n\tm9+mZXpFbIP3Fx+dRPbDIsb3PDnE/3UGlQqO+78Qyo4oarVB2X7hCZz/6gFK0Bt85OsU\n\t59dQ==", "X-Gm-Message-State": "AKaTC03Vapzl9bojsA1/6nwFN2KioIKr3748S5Ex7Lyap+EYakNXACgIB8Ei/SmEBO9cwUXm", "X-Received": "by 10.194.85.107 with SMTP id g11mr8766058wjz.82.1480097689107; \n\tFri, 25 Nov 2016 10:14:49 -0800 (PST)", "From": "Nelio Laranjeiro <nelio.laranjeiro@6wind.com>", "To": "dev@dpdk.org", "Cc": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "Date": "Fri, 25 Nov 2016 19:14:22 +0100", "Message-Id": "<351d1273612e100f44fc11bf7bcd6e372282bc38.1480096192.git.nelio.laranjeiro@6wind.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": [ "<cover.1480096192.git.nelio.laranjeiro@6wind.com>", "<cover.1480096192.git.nelio.laranjeiro@6wind.com>" ], "References": [ "<cover.1480096192.git.nelio.laranjeiro@6wind.com>", "<cover.1480096192.git.nelio.laranjeiro@6wind.com>" ], "Subject": "[dpdk-dev] [PATCH 2/3] net/mlx5: add software support for rte_flow", "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": "Introduce initial software validation for rte_flow rules.\n\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n---\n drivers/net/mlx5/mlx5.h | 1 +\n drivers/net/mlx5/mlx5_flow.c | 196 ++++++++++++++++++++++++++++++++++------\n drivers/net/mlx5/mlx5_trigger.c | 1 +\n 3 files changed, 169 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 04f4eaa..df0e77c 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -136,6 +136,7 @@ struct priv {\n \tunsigned int reta_idx_n; /* RETA index size. */\n \tstruct fdir_filter_list *fdir_filter_list; /* Flow director rules. */\n \tstruct fdir_queue *fdir_drop_queue; /* Flow director drop queue. */\n+\tLIST_HEAD(mlx5_flows, rte_flow) flows; /* RTE Flow rules. */\n \tuint32_t link_speed_capa; /* Link speed capabilities. */\n \trte_spinlock_t lock; /* Lock for control functions. */\n };\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex a514dff..54807ad 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -30,11 +30,125 @@\n * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n */\n \n+#include <sys/queue.h>\n+\n #include <rte_ethdev.h>\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\n+#include <rte_malloc.h>\n+\n #include \"mlx5.h\"\n \n+struct rte_flow {\n+\tLIST_ENTRY(rte_flow) next;\n+};\n+\n+/**\n+ * Validate a flow supported by the NIC.\n+ *\n+ * @param priv\n+ * Pointer to private structure.\n+ * @param[in] attr\n+ * Flow rule attributes.\n+ * @param[in] pattern\n+ * Pattern specification (list terminated by the END pattern item).\n+ * @param[in] actions\n+ * Associated actions (list terminated by the END action).\n+ * @param[out] error\n+ * Perform verbose error reporting if not NULL.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+priv_flow_validate(struct priv *priv,\n+\t\t const struct rte_flow_attr *attr,\n+\t\t const struct rte_flow_item items[],\n+\t\t const struct rte_flow_action actions[],\n+\t\t struct rte_flow_error *error)\n+{\n+\t(void)priv;\n+\tconst struct rte_flow_item *ilast = NULL;\n+\tconst struct rte_flow_action *alast = NULL;\n+\n+\tif (attr->group) {\n+\t\trte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ATTR_GROUP,\n+\t\t\t\t NULL,\n+\t\t\t\t \"groups are not supported\");\n+\t\treturn -rte_errno;\n+\t}\n+\tif (attr->priority) {\n+\t\trte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,\n+\t\t\t\t NULL,\n+\t\t\t\t \"priorities are not supported\");\n+\t\treturn -rte_errno;\n+\t}\n+\tif (attr->egress) {\n+\t\trte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,\n+\t\t\t\t NULL,\n+\t\t\t\t \"egress is not supported\");\n+\t\treturn -rte_errno;\n+\t}\n+\tif (!attr->ingress) {\n+\t\trte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,\n+\t\t\t\t NULL,\n+\t\t\t\t \"only ingress is supported\");\n+\t\treturn -rte_errno;\n+\t}\n+\tfor (; items->type != RTE_FLOW_ITEM_TYPE_END; ++items) {\n+\t\tif (items->type == RTE_FLOW_ITEM_TYPE_VOID) {\n+\t\t\tcontinue;\n+\t\t} else if (items->type == RTE_FLOW_ITEM_TYPE_ETH) {\n+\t\t\tif (ilast)\n+\t\t\t\tgoto exit_item_not_supported;\n+\t\t\tilast = items;\n+\t\t} else if ((items->type == RTE_FLOW_ITEM_TYPE_IPV4) ||\n+\t\t\t (items->type == RTE_FLOW_ITEM_TYPE_IPV6)) {\n+\t\t\tif (!ilast)\n+\t\t\t\tgoto exit_item_not_supported;\n+\t\t\telse if (ilast->type != RTE_FLOW_ITEM_TYPE_ETH)\n+\t\t\t\tgoto exit_item_not_supported;\n+\t\t\tilast = items;\n+\t\t} else if ((items->type == RTE_FLOW_ITEM_TYPE_UDP) ||\n+\t\t\t (items->type == RTE_FLOW_ITEM_TYPE_TCP)) {\n+\t\t\tif (!ilast)\n+\t\t\t\tgoto exit_item_not_supported;\n+\t\t\telse if ((ilast->type != RTE_FLOW_ITEM_TYPE_IPV4) &&\n+\t\t\t\t (ilast->type != RTE_FLOW_ITEM_TYPE_IPV6))\n+\t\t\t\tgoto exit_item_not_supported;\n+\t\t\tilast = items;\n+\t\t} else {\n+\t\t\tgoto exit_item_not_supported;\n+\t\t}\n+\t}\n+\tfor (; actions->type != RTE_FLOW_ACTION_TYPE_END; ++actions) {\n+\t\tif (actions->type == RTE_FLOW_ACTION_TYPE_VOID) {\n+\t\t\tcontinue;\n+\t\t} else if ((actions->type == RTE_FLOW_ACTION_TYPE_QUEUE) ||\n+\t\t\t (actions->type == RTE_FLOW_ACTION_TYPE_DROP)) {\n+\t\t\tif (alast &&\n+\t\t\t alast->type != actions->type)\n+\t\t\t\tgoto exit_action_not_supported;\n+\t\t\talast = actions;\n+\t\t} else {\n+\t\t\tgoto exit_action_not_supported;\n+\t\t}\n+\t}\n+\treturn 0;\n+exit_item_not_supported:\n+\trte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t items, \"item not supported\");\n+\treturn -rte_errno;\n+exit_action_not_supported:\n+\trte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t actions, \"action not supported\");\n+\treturn -rte_errno;\n+}\n+\n /**\n * Validate a flow supported by the NIC.\n *\n@@ -48,15 +162,13 @@ mlx5_flow_validate(struct rte_eth_dev *dev,\n \t\t const struct rte_flow_action actions[],\n \t\t struct rte_flow_error *error)\n {\n-\t(void)dev;\n-\t(void)attr;\n-\t(void)items;\n-\t(void)actions;\n-\t(void)error;\n-\trte_flow_error_set(error, ENOTSUP,\n-\t\t\t RTE_FLOW_ERROR_TYPE_NONE,\n-\t\t\t NULL, \"not implemented yet\");\n-\treturn -rte_errno;\n+\tstruct priv *priv = dev->data->dev_private;\n+\tint ret;\n+\n+\tpriv_lock(priv);\n+\tret = priv_flow_validate(priv, attr, items, actions, error);\n+\tpriv_unlock(priv);\n+\treturn ret;\n }\n \n /**\n@@ -72,15 +184,35 @@ mlx5_flow_create(struct rte_eth_dev *dev,\n \t\t const struct rte_flow_action actions[],\n \t\t struct rte_flow_error *error)\n {\n-\t(void)dev;\n-\t(void)attr;\n-\t(void)items;\n-\t(void)actions;\n-\t(void)error;\n-\trte_flow_error_set(error, ENOTSUP,\n-\t\t\t RTE_FLOW_ERROR_TYPE_NONE,\n-\t\t\t NULL, \"not implemented yet\");\n-\treturn NULL;\n+\tstruct priv *priv = dev->data->dev_private;\n+\tstruct rte_flow *flow;\n+\n+\tpriv_lock(priv);\n+\tif (priv_flow_validate(priv, attr, items, actions, error)) {\n+\t\tpriv_unlock(priv);\n+\t\treturn NULL;\n+\t}\n+\tflow = rte_malloc(__func__, sizeof(struct rte_flow), 0);\n+\tLIST_INSERT_HEAD(&priv->flows, flow, next);\n+\tpriv_unlock(priv);\n+\treturn flow;\n+}\n+\n+/**\n+ * Destroy a flow.\n+ *\n+ * @param priv\n+ * Pointer to private structure.\n+ * @param[in] flow\n+ * Pointer to the flow to destroy.\n+ */\n+static void\n+priv_flow_destroy(struct priv *priv,\n+\t\t struct rte_flow *flow)\n+{\n+\t(void)priv;\n+\tLIST_REMOVE(flow, next);\n+\trte_free(flow);\n }\n \n /**\n@@ -94,13 +226,13 @@ mlx5_flow_destroy(struct rte_eth_dev *dev,\n \t\t struct rte_flow *flow,\n \t\t struct rte_flow_error *error)\n {\n-\t(void)dev;\n-\t(void)flow;\n+\tstruct priv *priv = dev->data->dev_private;\n+\n \t(void)error;\n-\trte_flow_error_set(error, ENOTSUP,\n-\t\t\t RTE_FLOW_ERROR_TYPE_NONE,\n-\t\t\t NULL, \"not implemented yet\");\n-\treturn -rte_errno;\n+\tpriv_lock(priv);\n+\tpriv_flow_destroy(priv, flow);\n+\tpriv_unlock(priv);\n+\treturn 0;\n }\n \n /**\n@@ -113,10 +245,16 @@ int\n mlx5_flow_flush(struct rte_eth_dev *dev,\n \t\tstruct rte_flow_error *error)\n {\n-\t(void)dev;\n+\tstruct priv *priv = dev->data->dev_private;\n+\n \t(void)error;\n-\trte_flow_error_set(error, ENOTSUP,\n-\t\t\t RTE_FLOW_ERROR_TYPE_NONE,\n-\t\t\t NULL, \"not implemented yet\");\n-\treturn -rte_errno;\n+\tpriv_lock(priv);\n+\twhile (!LIST_EMPTY(&priv->flows)) {\n+\t\tstruct rte_flow *flow;\n+\n+\t\tflow = LIST_FIRST(&priv->flows);\n+\t\tpriv_flow_destroy(priv, flow);\n+\t}\n+\tpriv_unlock(priv);\n+\treturn 0;\n }\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex d4dccd8..98a2803 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -90,6 +90,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)\n \tif (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_NONE)\n \t\tpriv_fdir_enable(priv);\n \tpriv_dev_interrupt_handler_install(priv, dev);\n+\tLIST_INIT(&priv->flows);\n \tpriv_unlock(priv);\n \treturn -err;\n }\n", "prefixes": [ "dpdk-dev", "2/3" ] }