diff mbox series

[v1,2/3] net/mlx5: add devx functions to glue

Message ID 1545748697-3385-3-git-send-email-motih@mellanox.com (mailing list archive)
State Superseded, archived
Delegated to: Shahaf Shuler
Headers
Series support flow counters using devx |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS

Commit Message

Moti Haimovsky Dec. 25, 2018, 2:38 p.m. UTC 
  This patch adds glue functions for operations:
  - dv_open_device.
  - devx object create, destroy, query and modify.
  - devx general command
The new operations depend on HAVE_IBV_DEVX_OBJ.

Signed-off-by: Moti Haimovsky <motih@mellanox.com>
---
 drivers/net/mlx5/Makefile    |  5 +++
 drivers/net/mlx5/meson.build |  2 +
 drivers/net/mlx5/mlx5_glue.c | 99 ++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/mlx5/mlx5_glue.h | 19 +++++++++
 4 files changed, 125 insertions(+)

Comments

Shahaf Shuler Dec. 27, 2018, 8:12 a.m. UTC | #1 
Tuesday, December 25, 2018 4:39 PM, Mordechay Haimovsky:
> Subject: [dpdk-dev] [PATCH v1 2/3] net/mlx5: add devx functions to glue
> 
> This patch adds glue functions for operations:
>   - dv_open_device.
>   - devx object create, destroy, query and modify.
>   - devx general command
> The new operations depend on HAVE_IBV_DEVX_OBJ.
> 
> Signed-off-by: Moti Haimovsky <motih@mellanox.com>

Acked-by: Shahaf Shuler <shahafs@mellanox.com>

Note in general you need also the bump the LIB_GLUE version, but there is a commit which do it already: https://patches.dpdk.org/patch/49277/
Please make sure you rebase on top of it. 

> ---
>  drivers/net/mlx5/Makefile    |  5 +++
>  drivers/net/mlx5/meson.build |  2 +
>  drivers/net/mlx5/mlx5_glue.c | 99
> ++++++++++++++++++++++++++++++++++++++++++++
>  drivers/net/mlx5/mlx5_glue.h | 19 +++++++++
>  4 files changed, 125 insertions(+)
> 
> diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index
> 895cdfe..58e2d15 100644
> --- a/drivers/net/mlx5/Makefile
> +++ b/drivers/net/mlx5/Makefile
> @@ -148,6 +148,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-
> config-h.sh
>  		func mlx5dv_create_flow_action_packet_reformat \
>  		$(AUTOCONF_OUTPUT)
>  	$Q sh -- '$<' '$@' \
> +		HAVE_IBV_DEVX_OBJ \
> +		infiniband/mlx5dv.h \
> +		func mlx5dv_devx_obj_create \
> +		$(AUTOCONF_OUTPUT)
> +	$Q sh -- '$<' '$@' \
>  		HAVE_ETHTOOL_LINK_MODE_25G \
>  		/usr/include/linux/ethtool.h \
>  		enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \ diff --
> git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index
> 28938db..e323c3a 100644
> --- a/drivers/net/mlx5/meson.build
> +++ b/drivers/net/mlx5/meson.build
> @@ -104,6 +104,8 @@ if build
>  		'IBV_FLOW_SPEC_MPLS' ],
>  		[ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING',
> 'infiniband/verbs.h',
>  		'IBV_WQ_FLAG_RX_END_PADDING' ],
> +		[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
> +		'mlx5dv_devx_obj_create' ],
>  		[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
>  		'SUPPORTED_40000baseKR4_Full' ],
>  		[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
> diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c index
> dd10ad6..7d3d9d3 100644
> --- a/drivers/net/mlx5/mlx5_glue.c
> +++ b/drivers/net/mlx5/mlx5_glue.c
> @@ -479,6 +479,99 @@
>  #endif
>  }
> 
> +static struct ibv_context *
> +mlx5_glue_dv_open_device(struct ibv_device *device) { #ifdef
> +HAVE_IBV_DEVX_OBJ
> +	return mlx5dv_open_device(device,
> +				  &(struct mlx5dv_context_attr){
> +					.flags =
> MLX5DV_CONTEXT_FLAGS_DEVX,
> +				  });
> +#else
> +	(void)device;
> +	return NULL;
> +#endif
> +}
> +
> +static struct mlx5dv_devx_obj *
> +mlx5_glue_devx_obj_create(struct ibv_context *ctx,
> +			  const void *in, size_t inlen,
> +			  void *out, size_t outlen)
> +{
> +#ifdef HAVE_IBV_DEVX_OBJ
> +	return mlx5dv_devx_obj_create(ctx, in, inlen, out, outlen); #else
> +	(void)ctx;
> +	(void)in;
> +	(void)inlen;
> +	(void)out;
> +	(void)outlen;
> +	return NULL;
> +#endif
> +}
> +
> +static int
> +mlx5_glue_devx_obj_destroy(struct mlx5dv_devx_obj *obj) { #ifdef
> +HAVE_IBV_DEVX_OBJ
> +	return mlx5dv_devx_obj_destroy(obj);
> +#else
> +	(void)obj;
> +	return -ENOTSUP;
> +#endif
> +}
> +
> +static int
> +mlx5_glue_devx_obj_query(struct mlx5dv_devx_obj *obj,
> +			 const void *in, size_t inlen,
> +			 void *out, size_t outlen)
> +{
> +#ifdef HAVE_IBV_DEVX_OBJ
> +	return mlx5dv_devx_obj_query(obj, in, inlen, out, outlen); #else
> +	(void)obj;
> +	(void)in;
> +	(void)inlen;
> +	(void)out;
> +	(void)outlen;
> +	return -ENOTSUP;
> +#endif
> +}
> +
> +static int
> +mlx5_glue_devx_obj_modify(struct mlx5dv_devx_obj *obj,
> +			  const void *in, size_t inlen,
> +			  void *out, size_t outlen)
> +{
> +#ifdef HAVE_IBV_DEVX_OBJ
> +	return mlx5dv_devx_obj_modify(obj, in, inlen, out, outlen); #else
> +	(void)obj;
> +	(void)in;
> +	(void)inlen;
> +	(void)out;
> +	(void)outlen;
> +	return -ENOTSUP;
> +#endif
> +}
> +
> +static int
> +mlx5_glue_devx_general_cmd(struct ibv_context *ctx,
> +			   const void *in, size_t inlen,
> +			   void *out, size_t outlen)
> +{
> +#ifdef HAVE_IBV_DEVX_OBJ
> +	return mlx5dv_devx_general_cmd(ctx, in, inlen, out, outlen); #else
> +	(void)ctx;
> +	(void)in;
> +	(void)inlen;
> +	(void)out;
> +	(void)outlen;
> +	return -ENOTSUP;
> +#endif
> +}
> +
>  alignas(RTE_CACHE_LINE_SIZE)
>  const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
>  	.version = MLX5_GLUE_VERSION,
> @@ -535,4 +628,10 @@
>  	.dv_create_flow = mlx5_glue_dv_create_flow,
>  	.dv_create_flow_action_packet_reformat =
>  			mlx5_glue_dv_create_flow_action_packet_reformat,
> +	.dv_open_device = mlx5_glue_dv_open_device,
> +	.devx_obj_create = mlx5_glue_devx_obj_create,
> +	.devx_obj_destroy = mlx5_glue_devx_obj_destroy,
> +	.devx_obj_query = mlx5_glue_devx_obj_query,
> +	.devx_obj_modify = mlx5_glue_devx_obj_modify,
> +	.devx_general_cmd = mlx5_glue_devx_general_cmd,
>  };
> diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
> index 2d92ba8..a6cd2cd 100644
> --- a/drivers/net/mlx5/mlx5_glue.h
> +++ b/drivers/net/mlx5/mlx5_glue.h
> @@ -55,6 +55,10 @@
>  enum mlx5dv_flow_table_type { flow_table_type = 0, };  #endif
> 
> +#ifndef HAVE_IBV_DEVX_OBJ
> +struct mlx5dv_devx_obj;
> +#endif
> +
>  /* LIB_GLUE_VERSION must be updated every time this structure is modified.
> */  struct mlx5_glue {
>  	const char *version;
> @@ -164,6 +168,21 @@ struct mlx5_glue {
>  		 void *data,
>  		 enum mlx5dv_flow_action_packet_reformat_type
> reformat_type,
>  		 enum mlx5dv_flow_table_type ft_type);
> +	struct ibv_context *(*dv_open_device)(struct ibv_device *device);
> +	struct mlx5dv_devx_obj *(*devx_obj_create)
> +					(struct ibv_context *ctx,
> +					 const void *in, size_t inlen,
> +					 void *out, size_t outlen);
> +	int (*devx_obj_destroy)(struct mlx5dv_devx_obj *obj);
> +	int (*devx_obj_query)(struct mlx5dv_devx_obj *obj,
> +			      const void *in, size_t inlen,
> +			      void *out, size_t outlen);
> +	int (*devx_obj_modify)(struct mlx5dv_devx_obj *obj,
> +			       const void *in, size_t inlen,
> +			       void *out, size_t outlen);
> +	int (*devx_general_cmd)(struct ibv_context *context,
> +				const void *in, size_t inlen,
> +				void *out, size_t outlen);
>  };
> 
>  const struct mlx5_glue *mlx5_glue;
> --
> 1.8.3.1
diff mbox series

Patch

diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 895cdfe..58e2d15 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -148,6 +148,11 @@  mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
 		func mlx5dv_create_flow_action_packet_reformat \
 		$(AUTOCONF_OUTPUT)
 	$Q sh -- '$<' '$@' \
+		HAVE_IBV_DEVX_OBJ \
+		infiniband/mlx5dv.h \
+		func mlx5dv_devx_obj_create \
+		$(AUTOCONF_OUTPUT)
+	$Q sh -- '$<' '$@' \
 		HAVE_ETHTOOL_LINK_MODE_25G \
 		/usr/include/linux/ethtool.h \
 		enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 28938db..e323c3a 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -104,6 +104,8 @@  if build
 		'IBV_FLOW_SPEC_MPLS' ],
 		[ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
 		'IBV_WQ_FLAG_RX_END_PADDING' ],
+		[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
+		'mlx5dv_devx_obj_create' ],
 		[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
 		'SUPPORTED_40000baseKR4_Full' ],
 		[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
index dd10ad6..7d3d9d3 100644
--- a/drivers/net/mlx5/mlx5_glue.c
+++ b/drivers/net/mlx5/mlx5_glue.c
@@ -479,6 +479,99 @@ 
 #endif
 }
 
+static struct ibv_context *
+mlx5_glue_dv_open_device(struct ibv_device *device)
+{
+#ifdef HAVE_IBV_DEVX_OBJ
+	return mlx5dv_open_device(device,
+				  &(struct mlx5dv_context_attr){
+					.flags = MLX5DV_CONTEXT_FLAGS_DEVX,
+				  });
+#else
+	(void)device;
+	return NULL;
+#endif
+}
+
+static struct mlx5dv_devx_obj *
+mlx5_glue_devx_obj_create(struct ibv_context *ctx,
+			  const void *in, size_t inlen,
+			  void *out, size_t outlen)
+{
+#ifdef HAVE_IBV_DEVX_OBJ
+	return mlx5dv_devx_obj_create(ctx, in, inlen, out, outlen);
+#else
+	(void)ctx;
+	(void)in;
+	(void)inlen;
+	(void)out;
+	(void)outlen;
+	return NULL;
+#endif
+}
+
+static int
+mlx5_glue_devx_obj_destroy(struct mlx5dv_devx_obj *obj)
+{
+#ifdef HAVE_IBV_DEVX_OBJ
+	return mlx5dv_devx_obj_destroy(obj);
+#else
+	(void)obj;
+	return -ENOTSUP;
+#endif
+}
+
+static int
+mlx5_glue_devx_obj_query(struct mlx5dv_devx_obj *obj,
+			 const void *in, size_t inlen,
+			 void *out, size_t outlen)
+{
+#ifdef HAVE_IBV_DEVX_OBJ
+	return mlx5dv_devx_obj_query(obj, in, inlen, out, outlen);
+#else
+	(void)obj;
+	(void)in;
+	(void)inlen;
+	(void)out;
+	(void)outlen;
+	return -ENOTSUP;
+#endif
+}
+
+static int
+mlx5_glue_devx_obj_modify(struct mlx5dv_devx_obj *obj,
+			  const void *in, size_t inlen,
+			  void *out, size_t outlen)
+{
+#ifdef HAVE_IBV_DEVX_OBJ
+	return mlx5dv_devx_obj_modify(obj, in, inlen, out, outlen);
+#else
+	(void)obj;
+	(void)in;
+	(void)inlen;
+	(void)out;
+	(void)outlen;
+	return -ENOTSUP;
+#endif
+}
+
+static int
+mlx5_glue_devx_general_cmd(struct ibv_context *ctx,
+			   const void *in, size_t inlen,
+			   void *out, size_t outlen)
+{
+#ifdef HAVE_IBV_DEVX_OBJ
+	return mlx5dv_devx_general_cmd(ctx, in, inlen, out, outlen);
+#else
+	(void)ctx;
+	(void)in;
+	(void)inlen;
+	(void)out;
+	(void)outlen;
+	return -ENOTSUP;
+#endif
+}
+
 alignas(RTE_CACHE_LINE_SIZE)
 const struct mlx5_glue *mlx5_glue = &(const struct mlx5_glue){
 	.version = MLX5_GLUE_VERSION,
@@ -535,4 +628,10 @@ 
 	.dv_create_flow = mlx5_glue_dv_create_flow,
 	.dv_create_flow_action_packet_reformat =
 			mlx5_glue_dv_create_flow_action_packet_reformat,
+	.dv_open_device = mlx5_glue_dv_open_device,
+	.devx_obj_create = mlx5_glue_devx_obj_create,
+	.devx_obj_destroy = mlx5_glue_devx_obj_destroy,
+	.devx_obj_query = mlx5_glue_devx_obj_query,
+	.devx_obj_modify = mlx5_glue_devx_obj_modify,
+	.devx_general_cmd = mlx5_glue_devx_general_cmd,
 };
diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
index 2d92ba8..a6cd2cd 100644
--- a/drivers/net/mlx5/mlx5_glue.h
+++ b/drivers/net/mlx5/mlx5_glue.h
@@ -55,6 +55,10 @@ 
 enum mlx5dv_flow_table_type { flow_table_type = 0, };
 #endif
 
+#ifndef HAVE_IBV_DEVX_OBJ
+struct mlx5dv_devx_obj;
+#endif
+
 /* LIB_GLUE_VERSION must be updated every time this structure is modified. */
 struct mlx5_glue {
 	const char *version;
@@ -164,6 +168,21 @@  struct mlx5_glue {
 		 void *data,
 		 enum mlx5dv_flow_action_packet_reformat_type reformat_type,
 		 enum mlx5dv_flow_table_type ft_type);
+	struct ibv_context *(*dv_open_device)(struct ibv_device *device);
+	struct mlx5dv_devx_obj *(*devx_obj_create)
+					(struct ibv_context *ctx,
+					 const void *in, size_t inlen,
+					 void *out, size_t outlen);
+	int (*devx_obj_destroy)(struct mlx5dv_devx_obj *obj);
+	int (*devx_obj_query)(struct mlx5dv_devx_obj *obj,
+			      const void *in, size_t inlen,
+			      void *out, size_t outlen);
+	int (*devx_obj_modify)(struct mlx5dv_devx_obj *obj,
+			       const void *in, size_t inlen,
+			       void *out, size_t outlen);
+	int (*devx_general_cmd)(struct ibv_context *context,
+				const void *in, size_t inlen,
+				void *out, size_t outlen);
 };
 
 const struct mlx5_glue *mlx5_glue;