[dpdk-stable] patch 'common/mlx5: fix build with rdma-core 21' has been queued to stable release 19.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue May 19 15:03:59 CEST 2020

Previous message: [dpdk-stable] patch 'net/i40e: fix flow director initialisation' has been queued to stable release 19.11.3
Next message: [dpdk-stable] patch 'net/mlx5: fix crash when releasing meter table' has been queued to stable release 19.11.3
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From a9018074d1ce9bd4474e28fe0cbf06b7e3e8056a Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Thu, 16 Apr 2020 17:59:04 +0200
Subject: [PATCH] common/mlx5: fix build with rdma-core 21

[ upstream commit d53a513aedab1b4d2405ccb1157cd0b9f16f8afb ]

drivers/common/mlx5/mlx5_glue.c: In function 'mlx5_glue_devx_qp_query':
drivers/common/mlx5/mlx5_glue.c:1010:9: error:
implicit declaration of function 'mlx5dv_devx_qp_query'

The function mlx5dv_devx_qp_query() was added in rdma-core 22.
This function is compiled only if HAVE_IBV_DEVX_OBJ,
which is true if the function mlx5dv_devx_obj_create is found.
Unfortunately mlx5dv_devx_obj_create() was introduced in rdma-core 21,
when mlx5dv_devx_qp_query() did not exist yet.

A new flag HAVE_IBV_DEVX_QP is added when mlx5dv_devx_qp_query()
is found.

Fixes: 62d6f70f30f4 ("net/mlx5: add glue for queue query via DevX")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/Makefile    | 5 +++++
 drivers/net/mlx5/meson.build | 2 ++
 drivers/net/mlx5/mlx5_glue.c | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index c5cf4397ac..605975c245 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -193,6 +193,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
 		infiniband/mlx5dv.h \
 		func mlx5dv_devx_obj_query_async \
 		$(AUTOCONF_OUTPUT)
+	$Q sh -- '$<' '$@' \
+		HAVE_IBV_DEVX_QP \
+		infiniband/mlx5dv.h \
+		func mlx5dv_devx_qp_query \
+		$(AUTOCONF_OUTPUT)
 	$Q sh -- '$<' '$@' \
 		HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \
 		infiniband/mlx5dv.h \
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 33c9bc5f53..a5775d18e3 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -143,6 +143,8 @@ if build
 		'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
 		[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
 		'mlx5dv_devx_obj_query_async' ],
+		[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
+		'mlx5dv_devx_qp_query' ],
 		[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
 		'mlx5dv_dr_action_create_dest_devx_tir' ],
 		[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
index c5880dd6f2..c2dd0392d0 100644
--- a/drivers/net/mlx5/mlx5_glue.c
+++ b/drivers/net/mlx5/mlx5_glue.c
@@ -1012,7 +1012,7 @@ mlx5_glue_devx_qp_query(struct ibv_qp *qp,
 			const void *in, size_t inlen,
 			void *out, size_t outlen)
 {
-#ifdef HAVE_IBV_DEVX_OBJ
+#ifdef HAVE_IBV_DEVX_QP
 	return mlx5dv_devx_qp_query(qp, in, inlen, out, outlen);
 #else
 	(void)qp;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:48.689886957 +0100
+++ 0104-common-mlx5-fix-build-with-rdma-core-21.patch	2020-05-19 14:04:44.320650258 +0100
@@ -1,8 +1,10 @@
-From d53a513aedab1b4d2405ccb1157cd0b9f16f8afb Mon Sep 17 00:00:00 2001
+From a9018074d1ce9bd4474e28fe0cbf06b7e3e8056a Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas at monjalon.net>
 Date: Thu, 16 Apr 2020 17:59:04 +0200
 Subject: [PATCH] common/mlx5: fix build with rdma-core 21
 
+[ upstream commit d53a513aedab1b4d2405ccb1157cd0b9f16f8afb ]
+
 drivers/common/mlx5/mlx5_glue.c: In function 'mlx5_glue_devx_qp_query':
 drivers/common/mlx5/mlx5_glue.c:1010:9: error:
 implicit declaration of function 'mlx5dv_devx_qp_query'
@@ -17,21 +19,20 @@
 is found.
 
 Fixes: 62d6f70f30f4 ("net/mlx5: add glue for queue query via DevX")
-Cc: stable at dpdk.org
 
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 ---
- drivers/common/mlx5/Makefile    | 5 +++++
- drivers/common/mlx5/meson.build | 2 ++
- drivers/common/mlx5/mlx5_glue.c | 2 +-
+ drivers/net/mlx5/Makefile    | 5 +++++
+ drivers/net/mlx5/meson.build | 2 ++
+ drivers/net/mlx5/mlx5_glue.c | 2 +-
  3 files changed, 8 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile
-index 0c67755225..8b663ef25f 100644
---- a/drivers/common/mlx5/Makefile
-+++ b/drivers/common/mlx5/Makefile
-@@ -152,6 +152,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
+diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
+index c5cf4397ac..605975c245 100644
+--- a/drivers/net/mlx5/Makefile
++++ b/drivers/net/mlx5/Makefile
+@@ -193,6 +193,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
  		infiniband/mlx5dv.h \
  		func mlx5dv_devx_obj_query_async \
  		$(AUTOCONF_OUTPUT)
@@ -43,24 +44,24 @@
  	$Q sh -- '$<' '$@' \
  		HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \
  		infiniband/mlx5dv.h \
-diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
-index 347d282193..165aa25523 100644
---- a/drivers/common/mlx5/meson.build
-+++ b/drivers/common/mlx5/meson.build
-@@ -120,6 +120,8 @@ has_sym_args = [
- 	'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
- 	[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
- 	'mlx5dv_devx_obj_query_async' ],
-+	[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
-+	'mlx5dv_devx_qp_query' ],
- 	[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
- 	'mlx5dv_dr_action_create_dest_devx_tir' ],
- 	[ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
-diff --git a/drivers/common/mlx5/mlx5_glue.c b/drivers/common/mlx5/mlx5_glue.c
-index 428de0ffd9..f270f677b7 100644
---- a/drivers/common/mlx5/mlx5_glue.c
-+++ b/drivers/common/mlx5/mlx5_glue.c
-@@ -1006,7 +1006,7 @@ mlx5_glue_devx_qp_query(struct ibv_qp *qp,
+diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
+index 33c9bc5f53..a5775d18e3 100644
+--- a/drivers/net/mlx5/meson.build
++++ b/drivers/net/mlx5/meson.build
+@@ -143,6 +143,8 @@ if build
+ 		'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
+ 		[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
+ 		'mlx5dv_devx_obj_query_async' ],
++		[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
++		'mlx5dv_devx_qp_query' ],
+ 		[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
+ 		'mlx5dv_dr_action_create_dest_devx_tir' ],
+ 		[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
+diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
+index c5880dd6f2..c2dd0392d0 100644
+--- a/drivers/net/mlx5/mlx5_glue.c
++++ b/drivers/net/mlx5/mlx5_glue.c
+@@ -1012,7 +1012,7 @@ mlx5_glue_devx_qp_query(struct ibv_qp *qp,
  			const void *in, size_t inlen,
  			void *out, size_t outlen)
  {

Previous message: [dpdk-stable] patch 'net/i40e: fix flow director initialisation' has been queued to stable release 19.11.3
Next message: [dpdk-stable] patch 'net/mlx5: fix crash when releasing meter table' has been queued to stable release 19.11.3
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the stable mailing list