Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42810/?format=api
{ "id": 42810, "url": "http://patches.dpdk.org/api/patches/42810/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/c49882f58aa4bd7b87bb2674b17764b8003f0b72.1531293415.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": "<c49882f58aa4bd7b87bb2674b17764b8003f0b72.1531293415.git.nelio.laranjeiro@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/c49882f58aa4bd7b87bb2674b17764b8003f0b72.1531293415.git.nelio.laranjeiro@6wind.com", "date": "2018-07-11T07:22:50", "name": "[v3,17/21] net/mlx5: add flow VXLAN item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f6d72313720c9da432ae0b4b2e7019479a2106fb", "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/c49882f58aa4bd7b87bb2674b17764b8003f0b72.1531293415.git.nelio.laranjeiro@6wind.com/mbox/", "series": [ { "id": 512, "url": "http://patches.dpdk.org/api/series/512/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=512", "date": "2018-07-11T07:22:33", "name": "net/mlx5: flow rework", "version": 3, "mbox": "http://patches.dpdk.org/series/512/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/42810/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/42810/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 52C7B1B579;\n\tWed, 11 Jul 2018 09:24:04 +0200 (CEST)", "from mail-wr1-f67.google.com (mail-wr1-f67.google.com\n\t[209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 5C2E21B476\n\tfor <dev@dpdk.org>; Wed, 11 Jul 2018 09:23:33 +0200 (CEST)", "by mail-wr1-f67.google.com with SMTP id g6-v6so8097416wrp.0\n\tfor <dev@dpdk.org>; Wed, 11 Jul 2018 00:23:33 -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\tt10-v6sm31314212wre.95.2018.07.11.00.23.31\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 11 Jul 2018 00:23:32 -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=rKVgZXY+wLV2a/Ul/p7pYSoVg/kQPYZHpomUcDSr+/A=;\n\tb=NX1XDDHJyr5ftA7Uz0jeAUBTf5ZYdfqrE+4Vkn0qldP83fEkIODqAYFQtQwp/zX4dv\n\tim+4l5mGAiC0jaRzpxZwSkG68C85W7t6g7kIbmIC1ddbz67bursHUCUu2M13dtwdnod9\n\tuyd50vPYml3hoDsMLYiDtq3QeF9PlTNj+FEyuoT5BXLDnrVwkxwYMOLkonMgw9FaTQWC\n\tIrYt3fu9xywerBbtPN5deYmXsOjIRGjFVwG4yq8lW8XITy3OHhO+ICIDn2eS++Nd6zMs\n\tfi6bLt2lKTu0Dj0PYznLo0KomihMk/sQpV/XgmKzcHFNJz84KsJ/YQdl2k22dnzHQAel\n\ttyUA==", "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:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=rKVgZXY+wLV2a/Ul/p7pYSoVg/kQPYZHpomUcDSr+/A=;\n\tb=I837naN9mz8o8tJrsCs/6tFTdfaH9Z2YaInz8T4QOdAUAieQS/WkiQXBqX34MgSCof\n\tWCX5eP+ZbItzPlGKuDjm9U0u1DVE4CYNTb6o5jbvAY1H7k71bikRq6Y4r4bL2FlIIryN\n\tjiDoxbMyD8XHvbJxpWhRASQt2Y+EE45g77sCtvTnN3JTSZ8o8gB/5UVgo8R+DYGwkXM7\n\t/AzbahATv+rL5n9rFaoJBVXWmZPRqXgANKrvbbg8XyIduc5F24/nLdHmoc9TmlVuFgJT\n\t4gw6H/P7DyZislaqFyzIt592WxD3jWp4iCmJ3gt8Ipk0DD78NNNFE6ejESelNxtqgtCL\n\tVf7w==", "X-Gm-Message-State": "APt69E0aRH8hFrj/1ocbvOPgpi4cd1sp20AJAXv/Xqv02a7ryP1pH5Np\n\t/AunMcXebp7BscJpWGGEzHoHSy4Weg==", "X-Google-Smtp-Source": "AAOMgpda8fk01iO1emEw2vwE8cf9I9cc835ZsNVcR90pqtBA7yh7BJdFuoTMuncX1UFOvVrPiwdYLw==", "X-Received": "by 2002:adf:a14a:: with SMTP id\n\tr10-v6mr19336449wrr.104.1531293812448; \n\tWed, 11 Jul 2018 00:23:32 -0700 (PDT)", "From": "Nelio Laranjeiro <nelio.laranjeiro@6wind.com>", "To": "dev@dpdk.org,\n\tYongseok Koh <yskoh@mellanox.com>", "Cc": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "Date": "Wed, 11 Jul 2018 09:22:50 +0200", "Message-Id": "<c49882f58aa4bd7b87bb2674b17764b8003f0b72.1531293415.git.nelio.laranjeiro@6wind.com>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<cover.1531293415.git.nelio.laranjeiro@6wind.com>", "References": "<cover.1530111623.git.nelio.laranjeiro@6wind.com>\n\t<cover.1531293415.git.nelio.laranjeiro@6wind.com>", "Subject": "[dpdk-dev] [PATCH v3 17/21] net/mlx5: add flow VXLAN item", "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": "Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nAcked-by: Yongseok Koh <yskoh@mellanox.com>\n---\n drivers/net/mlx5/mlx5_flow.c | 190 +++++++++++++++++++++++++++++------\n drivers/net/mlx5/mlx5_rxtx.h | 1 +\n 2 files changed, 163 insertions(+), 28 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex edceb17ed..95507059e 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -51,6 +51,9 @@ extern const struct eth_dev_ops mlx5_dev_ops_isolate;\n #define MLX5_FLOW_LAYER_INNER_L4_TCP (1u << 10)\n #define MLX5_FLOW_LAYER_INNER_VLAN (1u << 11)\n \n+/* Pattern tunnel Layer bits. */\n+#define MLX5_FLOW_LAYER_VXLAN (1u << 12)\n+\n /* Outer Masks. */\n #define MLX5_FLOW_LAYER_OUTER_L3 \\\n \t(MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6)\n@@ -61,7 +64,7 @@ extern const struct eth_dev_ops mlx5_dev_ops_isolate;\n \t MLX5_FLOW_LAYER_OUTER_L4)\n \n /* Tunnel Masks. */\n-#define MLX5_FLOW_LAYER_TUNNEL 0\n+#define MLX5_FLOW_LAYER_TUNNEL MLX5_FLOW_LAYER_VXLAN\n \n /* Inner Masks. */\n #define MLX5_FLOW_LAYER_INNER_L3 \\\n@@ -98,6 +101,7 @@ enum mlx5_expansion {\n \tMLX5_EXPANSION_OUTER_IPV6,\n \tMLX5_EXPANSION_OUTER_IPV6_UDP,\n \tMLX5_EXPANSION_OUTER_IPV6_TCP,\n+\tMLX5_EXPANSION_VXLAN,\n \tMLX5_EXPANSION_ETH,\n \tMLX5_EXPANSION_IPV4,\n \tMLX5_EXPANSION_IPV4_UDP,\n@@ -136,6 +140,7 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {\n \t\t\tETH_RSS_NONFRAG_IPV4_OTHER,\n \t},\n \t[MLX5_EXPANSION_OUTER_IPV4_UDP] = {\n+\t\t.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_VXLAN),\n \t\t.type = RTE_FLOW_ITEM_TYPE_UDP,\n \t\t.rss_types = ETH_RSS_NONFRAG_IPV4_UDP,\n \t},\n@@ -152,6 +157,7 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {\n \t\t\tETH_RSS_NONFRAG_IPV6_OTHER,\n \t},\n \t[MLX5_EXPANSION_OUTER_IPV6_UDP] = {\n+\t\t.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_VXLAN),\n \t\t.type = RTE_FLOW_ITEM_TYPE_UDP,\n \t\t.rss_types = ETH_RSS_NONFRAG_IPV6_UDP,\n \t},\n@@ -159,6 +165,10 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {\n \t\t.type = RTE_FLOW_ITEM_TYPE_TCP,\n \t\t.rss_types = ETH_RSS_NONFRAG_IPV6_TCP,\n \t},\n+\t[MLX5_EXPANSION_VXLAN] = {\n+\t\t.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH),\n+\t\t.type = RTE_FLOW_ITEM_TYPE_VXLAN,\n+\t},\n \t[MLX5_EXPANSION_ETH] = {\n \t\t.next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4,\n \t\t\t\t\t\t MLX5_EXPANSION_IPV6),\n@@ -226,6 +236,8 @@ struct rte_flow {\n \tstruct mlx5_flow_verbs *cur_verbs;\n \t/**< Current Verbs flow structure being filled. */\n \tstruct rte_flow_action_rss rss;/**< RSS context. */\n+\tuint32_t tunnel_ptype;\n+\t/**< Store tunnel packet type data to store in Rx queue. */\n \tuint8_t key[MLX5_RSS_HASH_KEY_LEN]; /**< RSS hash key. */\n \tuint16_t (*queue)[]; /**< Destination queues to redirect traffic to. */\n };\n@@ -1158,6 +1170,103 @@ mlx5_flow_item_tcp(const struct rte_flow_item *item, struct rte_flow *flow,\n \treturn size;\n }\n \n+/**\n+ * Convert the @p item into a Verbs specification after ensuring the NIC\n+ * will understand and process it correctly.\n+ * If the necessary size for the conversion is greater than the @p flow_size,\n+ * nothing is written in @p flow, the validation is still performed.\n+ *\n+ * @param[in] item\n+ * Item specification.\n+ * @param[in, out] flow\n+ * Pointer to flow structure.\n+ * @param[in] flow_size\n+ * Size in bytes of the available space in @p flow, if too small, nothing is\n+ * written.\n+ * @param[out] error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * On success the number of bytes consumed/necessary, if the returned value\n+ * is lesser or equal to @p flow_size, the @p item has fully been converted,\n+ * otherwise another call with this returned memory size should be done.\n+ * On error, a negative errno value is returned and rte_errno is set.\n+ */\n+static int\n+mlx5_flow_item_vxlan(const struct rte_flow_item *item, struct rte_flow *flow,\n+\t\t const size_t flow_size, struct rte_flow_error *error)\n+{\n+\tconst struct rte_flow_item_vxlan *spec = item->spec;\n+\tconst struct rte_flow_item_vxlan *mask = item->mask;\n+\tunsigned int size = sizeof(struct ibv_flow_spec_tunnel);\n+\tstruct ibv_flow_spec_tunnel vxlan = {\n+\t\t.type = IBV_FLOW_SPEC_VXLAN_TUNNEL,\n+\t\t.size = size,\n+\t};\n+\tint ret;\n+\tunion vni {\n+\t\tuint32_t vlan_id;\n+\t\tuint8_t vni[4];\n+\t} id = { .vlan_id = 0, };\n+\n+\tif (flow->layers & MLX5_FLOW_LAYER_TUNNEL)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t item,\n+\t\t\t\t\t \"a tunnel is already present\");\n+\t/*\n+\t * Verify only UDPv4 is present as defined in\n+\t * https://tools.ietf.org/html/rfc7348\n+\t */\n+\tif (!(flow->layers & MLX5_FLOW_LAYER_OUTER_L4_UDP))\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t item,\n+\t\t\t\t\t \"no outer UDP layer found\");\n+\tif (!mask)\n+\t\tmask = &rte_flow_item_vxlan_mask;\n+\tret = mlx5_flow_item_acceptable\n+\t\t(item, (const uint8_t *)mask,\n+\t\t (const uint8_t *)&rte_flow_item_vxlan_mask,\n+\t\t sizeof(struct rte_flow_item_vxlan), error);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tif (spec) {\n+\t\tmemcpy(&id.vni[1], spec->vni, 3);\n+\t\tvxlan.val.tunnel_id = id.vlan_id;\n+\t\tmemcpy(&id.vni[1], mask->vni, 3);\n+\t\tvxlan.mask.tunnel_id = id.vlan_id;\n+\t\t/* Remove unwanted bits from values. */\n+\t\tvxlan.val.tunnel_id &= vxlan.mask.tunnel_id;\n+\t}\n+\t/*\n+\t * Tunnel id 0 is equivalent as not adding a VXLAN layer, if\n+\t * only this layer is defined in the Verbs specification it is\n+\t * interpreted as wildcard and all packets will match this\n+\t * rule, if it follows a full stack layer (ex: eth / ipv4 /\n+\t * udp), all packets matching the layers before will also\n+\t * match this rule. To avoid such situation, VNI 0 is\n+\t * currently refused.\n+\t */\n+\tif (!vxlan.val.tunnel_id)\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t item,\n+\t\t\t\t\t \"VXLAN vni cannot be 0\");\n+\tif (!(flow->layers & MLX5_FLOW_LAYER_OUTER))\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t item,\n+\t\t\t\t\t \"VXLAN tunnel must be fully defined\");\n+\tif (size <= flow_size) {\n+\t\tmlx5_flow_spec_verbs_add(flow, &vxlan, size);\n+\t\tflow->cur_verbs->attr->priority = MLX5_PRIORITY_MAP_L2;\n+\t}\n+\tflow->layers |= MLX5_FLOW_LAYER_VXLAN;\n+\tflow->tunnel_ptype = RTE_PTYPE_TUNNEL_VXLAN | RTE_PTYPE_L4_UDP;\n+\treturn size;\n+}\n+\n /**\n * Convert the @p pattern into a Verbs specifications after ensuring the NIC\n * will understand and process it correctly.\n@@ -1215,6 +1324,10 @@ mlx5_flow_items(const struct rte_flow_item pattern[],\n \t\tcase RTE_FLOW_ITEM_TYPE_TCP:\n \t\t\tret = mlx5_flow_item_tcp(pattern, flow, remain, error);\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_VXLAN:\n+\t\t\tret = mlx5_flow_item_vxlan(pattern, 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_ITEM,\n@@ -1822,7 +1935,7 @@ mlx5_flow_merge(struct rte_eth_dev *dev, struct rte_flow *flow,\n }\n \n /**\n- * Mark the Rx queues mark flag if the flow has a mark or flag modifier.\n+ * Set the Rx queue flags (Mark/Flag and Tunnel Ptypes) according to the flow.\n *\n * @param[in] dev\n * Pointer to Ethernet device.\n@@ -1830,28 +1943,34 @@ mlx5_flow_merge(struct rte_eth_dev *dev, struct rte_flow *flow,\n * Pointer to flow structure.\n */\n static void\n-mlx5_flow_rxq_mark_set(struct rte_eth_dev *dev, struct rte_flow *flow)\n+mlx5_flow_rxq_flags_set(struct rte_eth_dev *dev, struct rte_flow *flow)\n {\n \tstruct priv *priv = dev->data->dev_private;\n+\tconst int mark = !!(flow->modifier &\n+\t\t\t (MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK));\n+\tconst int tunnel = !!(flow->layers & MLX5_FLOW_LAYER_TUNNEL);\n+\tunsigned int i;\n \n-\tif (flow->modifier & (MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK)) {\n-\t\tunsigned int i;\n-\n-\t\tfor (i = 0; i != flow->rss.queue_num; ++i) {\n-\t\t\tint idx = (*flow->queue)[i];\n-\t\t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n-\t\t\t\tcontainer_of((*priv->rxqs)[idx],\n-\t\t\t\t\t struct mlx5_rxq_ctrl, rxq);\n+\tfor (i = 0; i != flow->rss.queue_num; ++i) {\n+\t\tint idx = (*flow->queue)[i];\n+\t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n+\t\t\tcontainer_of((*priv->rxqs)[idx],\n+\t\t\t\t struct mlx5_rxq_ctrl, rxq);\n \n+\t\tif (mark) {\n \t\t\trxq_ctrl->rxq.mark = 1;\n \t\t\trxq_ctrl->flow_mark_n++;\n \t\t}\n+\t\tif (tunnel) {\n+\t\t\trxq_ctrl->rxq.tunnel = flow->tunnel_ptype;\n+\t\t\trxq_ctrl->flow_vxlan_n++;\n+\t\t}\n \t}\n }\n \n /**\n- * Clear the Rx queue mark associated with the @p flow if no other flow uses\n- * it with a mark request.\n+ * Clear the Rx queue flags (Mark/Flag and Tunnel Ptype) associated with the\n+ * @p flow if no other flow uses it with the same kind of request.\n *\n * @param dev\n * Pointer to Ethernet device.\n@@ -1859,33 +1978,41 @@ mlx5_flow_rxq_mark_set(struct rte_eth_dev *dev, struct rte_flow *flow)\n * Pointer to the flow.\n */\n static void\n-mlx5_flow_rxq_mark_trim(struct rte_eth_dev *dev, struct rte_flow *flow)\n+mlx5_flow_rxq_flags_trim(struct rte_eth_dev *dev, struct rte_flow *flow)\n {\n \tstruct priv *priv = dev->data->dev_private;\n+\tconst int mark = !!(flow->modifier &\n+\t\t\t (MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK));\n+\tconst int tunnel = !!(flow->layers & MLX5_FLOW_LAYER_TUNNEL);\n+\tunsigned int i;\n \n-\tif (flow->modifier & (MLX5_FLOW_MOD_FLAG | MLX5_FLOW_MOD_MARK)) {\n-\t\tunsigned int i;\n-\n-\t\tfor (i = 0; i != flow->rss.queue_num; ++i) {\n-\t\t\tint idx = (*flow->queue)[i];\n-\t\t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n-\t\t\t\tcontainer_of((*priv->rxqs)[idx],\n-\t\t\t\t\t struct mlx5_rxq_ctrl, rxq);\n+\tassert(dev->data->dev_started);\n+\tfor (i = 0; i != flow->rss.queue_num; ++i) {\n+\t\tint idx = (*flow->queue)[i];\n+\t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n+\t\t\tcontainer_of((*priv->rxqs)[idx],\n+\t\t\t\t struct mlx5_rxq_ctrl, rxq);\n \n+\t\tif (mark) {\n \t\t\trxq_ctrl->flow_mark_n--;\n \t\t\trxq_ctrl->rxq.mark = !!rxq_ctrl->flow_mark_n;\n \t\t}\n+\t\tif (tunnel) {\n+\t\t\trxq_ctrl->flow_vxlan_n++;\n+\t\t\tif (!rxq_ctrl->flow_vxlan_n)\n+\t\t\t\trxq_ctrl->rxq.tunnel = 0;\n+\t\t}\n \t}\n }\n \n /**\n- * Clear the mark bit in all Rx queues.\n+ * Clear the Mark/Flag and Tunnel ptype information in all Rx queues.\n *\n * @param dev\n * Pointer to Ethernet device.\n */\n static void\n-mlx5_flow_rxq_mark_clear(struct rte_eth_dev *dev)\n+mlx5_flow_rxq_flags_clear(struct rte_eth_dev *dev)\n {\n \tstruct priv *priv = dev->data->dev_private;\n \tunsigned int i;\n@@ -1900,6 +2027,8 @@ mlx5_flow_rxq_mark_clear(struct rte_eth_dev *dev)\n \t\t\t\t\tstruct mlx5_rxq_ctrl, rxq);\n \t\trxq_ctrl->flow_mark_n = 0;\n \t\trxq_ctrl->rxq.mark = 0;\n+\t\trxq_ctrl->flow_vxlan_n = 0;\n+\t\trxq_ctrl->rxq.tunnel = 0;\n \t\t++idx;\n \t}\n }\n@@ -2095,7 +2224,7 @@ mlx5_flow_list_create(struct rte_eth_dev *dev,\n \t\t}\n \t}\n \tTAILQ_INSERT_TAIL(list, flow, next);\n-\tmlx5_flow_rxq_mark_set(dev, flow);\n+\tmlx5_flow_rxq_flags_set(dev, flow);\n \treturn flow;\n }\n \n@@ -2133,7 +2262,12 @@ mlx5_flow_list_destroy(struct rte_eth_dev *dev, struct mlx5_flows *list,\n {\n \tmlx5_flow_remove(dev, flow);\n \tTAILQ_REMOVE(list, flow, next);\n-\tmlx5_flow_rxq_mark_trim(dev, flow);\n+\t/*\n+\t * Update RX queue flags only if port is started, otherwise it is\n+\t * already clean.\n+\t */\n+\tif (dev->data->dev_started)\n+\t\tmlx5_flow_rxq_flags_trim(dev, flow);\n \trte_free(flow);\n }\n \n@@ -2171,7 +2305,7 @@ mlx5_flow_stop(struct rte_eth_dev *dev, struct mlx5_flows *list)\n \n \tTAILQ_FOREACH_REVERSE(flow, list, mlx5_flows, next)\n \t\tmlx5_flow_remove(dev, flow);\n-\tmlx5_flow_rxq_mark_clear(dev);\n+\tmlx5_flow_rxq_flags_clear(dev);\n }\n \n /**\n@@ -2196,7 +2330,7 @@ mlx5_flow_start(struct rte_eth_dev *dev, struct mlx5_flows *list)\n \t\tret = mlx5_flow_apply(dev, flow, &error);\n \t\tif (ret < 0)\n \t\t\tgoto error;\n-\t\tmlx5_flow_rxq_mark_set(dev, flow);\n+\t\tmlx5_flow_rxq_flags_set(dev, flow);\n \t}\n \treturn 0;\n error:\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 808118e50..ae9b564dd 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -139,6 +139,7 @@ struct mlx5_rxq_ctrl {\n \tunsigned int irq:1; /* Whether IRQ is enabled. */\n \tuint16_t idx; /* Queue index. */\n \tuint32_t flow_mark_n; /* Number of Mark/Flag flows using this Queue. */\n+\tuint32_t flow_vxlan_n; /* Number of VXLAN flows using this queue. */\n };\n \n /* Indirection table. */\n", "prefixes": [ "v3", "17/21" ] }