From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <xuemingl@mellanox.com>
Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])
by dpdk.org (Postfix) with ESMTP id C75645F13
for <dev@dpdk.org>; Mon, 26 Feb 2018 16:10:35 +0100 (CET)
Received: from Internal Mail-Server by MTLPINE1 (envelope-from
xuemingl@mellanox.com)
with ESMTPS (AES256-SHA encrypted); 26 Feb 2018 17:10:52 +0200
Received: from dev-r630-06.mtbc.labs.mlnx (dev-r630-06.mtbc.labs.mlnx
[10.12.205.180])
by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w1QFAWle021452;
Mon, 26 Feb 2018 17:10:33 +0200
Received: from dev-r630-06.mtbc.labs.mlnx (localhost [127.0.0.1])
by dev-r630-06.mtbc.labs.mlnx (8.14.7/8.14.7) with ESMTP id w1QFAWRK107288;
Mon, 26 Feb 2018 23:10:32 +0800
Received: (from xuemingl@localhost)
by dev-r630-06.mtbc.labs.mlnx (8.14.7/8.14.7/Submit) id w1QFAWWp107287;
Mon, 26 Feb 2018 23:10:32 +0800
From: Xueming Li <xuemingl@mellanox.com>
To: Wenzhuo Lu <wenzhuo.lu@intel.com>, Jingjing Wu <jingjing.wu@intel.com>,
Thomas Monjalon <thomas@monjalon.net>,
Nelio Laranjeiro <nelio.laranjeiro@6wind.com>,
Adrien Mazarguil <adrien.mazarguil@6wind.com>,
Shahaf Shuler <shahafs@mellanox.com>
Cc: Xueming Li <xuemingl@mellanox.com>, dev@dpdk.org
Date: Mon, 26 Feb 2018 23:09:42 +0800
Message-Id: <20180226150947.107179-14-xuemingl@mellanox.com>
X-Mailer: git-send-email 2.13.3
In-Reply-To: <20180226150947.107179-1-xuemingl@mellanox.com>
References: <20180226150947.107179-1-xuemingl@mellanox.com>
Subject: [dpdk-dev] [PATCH 13/18] net/mlx5: support 16 hardware priorities
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://dpdk.org/ml/options/dev>,
<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: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Feb 2018 15:10:36 -0000
Since OFED 4.3-0.1.3.0, new driver support 16 Verbs priorities, adjust
RTE FLOW priority mapping to:
0-3: RTE FLOW tunnel rule
4-7: RTE FLOW non-tunnel rule
8-15: PMD default control flow
Signed-off-by: Xueming Li <xuemingl@mellanox.com>
---
drivers/net/mlx5/mlx5_flow.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 1e9e3d6..f01c90f 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -28,7 +28,16 @@
#include "mlx5_glue.h"
/* Define minimal priority for control plane flows. */
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+/* 16 verb priorities since OFED 4.3, control flow start from 8. */
+#define MLX5_CTRL_FLOW_PRIORITY 8
+#else
+/* 8 Verb priorities before OFED4.3, control flow start from 4. */
#define MLX5_CTRL_FLOW_PRIORITY 4
+#endif
+
+/* Define verb priority span for each flow. */
+#define MLX5_FLOW_PRIORITY_SPAN 4
/* Internet Protocol versions. */
#define MLX5_IPV4 4
@@ -1216,6 +1225,7 @@ struct ibv_spec_header {
struct mlx5_flow_parse *parser)
{
const struct mlx5_flow_items *cur_item = mlx5_flow_items;
+ unsigned int priority_shift = attr->priority;
unsigned int i;
int ret;
@@ -1235,13 +1245,20 @@ struct ibv_spec_header {
if (ret)
return ret;
priv_flow_convert_finalise(priv, parser);
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+ /*
+ * 16 priorities since OFED4.3, tunnel rules use highest priority 0-3,
+ * other user-flows use 4-7, control flows use lowest start from 8.
+ */
+ if (!parser->tunnel)
+ priority_shift += MLX5_FLOW_PRIORITY_SPAN;
+#endif
/*
* Second step.
* Allocate the memory space to store verbs specifications.
*/
if (parser->drop) {
- unsigned int priority =
- attr->priority +
+ unsigned int priority = priority_shift +
hash_rxq_init[HASH_RXQ_ETH].flow_priority;
unsigned int offset = parser->queue[HASH_RXQ_ETH].offset;
@@ -1254,8 +1271,7 @@ struct ibv_spec_header {
sizeof(struct ibv_flow_attr);
} else {
for (i = 0; i != hash_rxq_init_n; ++i) {
- unsigned int priority =
- attr->priority +
+ unsigned int priority = priority_shift +
hash_rxq_init[i].flow_priority;
unsigned int offset;
@@ -1299,7 +1315,7 @@ struct ibv_spec_header {
priv_flow_convert_finalise(priv, parser);
} else {
parser->queue[HASH_RXQ_ETH].ibv_attr->priority =
- attr->priority +
+ priority_shift +
hash_rxq_init[parser->layer].flow_priority;
}
if (parser->mark)
--
1.8.3.1