Add a new structure "mlx5_devx_geneve_tlv_option_attr" to use in GENEVE
TLV option creation.
Later this structure will be used by GENEVE TLV option query operation
as well.
Signed-off-by: Michael Baum <michae...@nvidia.com>
Acked-by: Suanming Mou <suanmi...@nvidia.com>
---
drivers/common/mlx5/mlx5_devx_cmds.c | 28 +++++++++++++---------------
drivers/common/mlx5/mlx5_devx_cmds.h | 11 ++++++++++-
drivers/net/mlx5/mlx5_flow_dv.c | 10 +++++++---
3 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
b/drivers/common/mlx5/mlx5_devx_cmds.c
index d3ecdfece7..c783fc0e10 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -2858,19 +2858,15 @@ mlx5_devx_cmd_create_conn_track_offload_obj(void *ctx,
uint32_t pd,
*
* @param[in] ctx
* Context returned from mlx5 open_device() glue function.
- * @param [in] class
- * TLV option variable value of class
- * @param [in] type
- * TLV option variable value of type
- * @param [in] len
- * TLV option variable value of len
+ * @param[in] attr
+ * Pointer to GENEVE TLV option attributes structure.
*
* @return
* The DevX object created, NULL otherwise and rte_errno is set.
*/
struct mlx5_devx_obj *
mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
- uint16_t class, uint8_t type, uint8_t len)
+ struct mlx5_devx_geneve_tlv_option_attr *attr)
{
uint32_t in[MLX5_ST_SZ_DW(create_geneve_tlv_option_in)] = {0};
uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
@@ -2879,25 +2875,27 @@ mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
0, SOCKET_ID_ANY);
if (!geneve_tlv_opt_obj) {
- DRV_LOG(ERR, "Failed to allocate geneve tlv option object.");
+ DRV_LOG(ERR, "Failed to allocate GENEVE TLV option object.");
rte_errno = ENOMEM;
return NULL;
}
void *hdr = MLX5_ADDR_OF(create_geneve_tlv_option_in, in, hdr);
void *opt = MLX5_ADDR_OF(create_geneve_tlv_option_in, in,
- geneve_tlv_opt);
+ geneve_tlv_opt);
MLX5_SET(general_obj_in_cmd_hdr, hdr, opcode,
- MLX5_CMD_OP_CREATE_GENERAL_OBJECT);
+ MLX5_CMD_OP_CREATE_GENERAL_OBJECT);
MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_type,
MLX5_GENERAL_OBJ_TYPE_GENEVE_TLV_OPT);
MLX5_SET(geneve_tlv_option, opt, option_class,
- rte_be_to_cpu_16(class));
- MLX5_SET(geneve_tlv_option, opt, option_type, type);
- MLX5_SET(geneve_tlv_option, opt, option_data_length, len);
+ rte_be_to_cpu_16(attr->option_class));
+ MLX5_SET(geneve_tlv_option, opt, option_type, attr->option_type);
+ MLX5_SET(geneve_tlv_option, opt, option_data_length,
+ attr->option_data_len);
geneve_tlv_opt_obj->obj = mlx5_glue->devx_obj_create(ctx, in,
- sizeof(in), out, sizeof(out));
+ sizeof(in), out,
+ sizeof(out));
if (!geneve_tlv_opt_obj->obj) {
- DEVX_DRV_LOG(ERR, out, "create GENEVE TLV", NULL, 0);
+ DEVX_DRV_LOG(ERR, out, "create GENEVE TLV option", NULL, 0);
mlx5_free(geneve_tlv_opt_obj);
return NULL;
}
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h
b/drivers/common/mlx5/mlx5_devx_cmds.h
index dfb1148b84..d11f1d650f 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -668,6 +668,15 @@ struct mlx5_devx_crypto_login_attr {
uint8_t credential[MLX5_CRYPTO_CREDENTIAL_SIZE];
};
+/*
+ * GENEVE TLV option attributes structure, used by GENEVE TLV option create.
+ */
+struct mlx5_devx_geneve_tlv_option_attr {
+ uint32_t option_class:16;
+ uint32_t option_type:8;
+ uint32_t option_data_len:5;
+};
+
/* mlx5_devx_cmds.c */
__rte_internal
@@ -778,7 +787,7 @@ int mlx5_devx_cmd_register_write(void *ctx, uint16_t reg_id,
__rte_internal
struct mlx5_devx_obj *
mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
- uint16_t class, uint8_t type, uint8_t len);
+ struct mlx5_devx_geneve_tlv_option_attr *attr);
/**
* Create virtio queue counters object DevX API.
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index cc5549f9ce..ae10981165 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -10046,11 +10046,15 @@ flow_dev_geneve_tlv_option_resource_register(struct
rte_eth_dev *dev,
goto exit;
}
} else {
+ struct mlx5_devx_geneve_tlv_option_attr attr = {
+ .option_class = geneve_opt_v->option_class,
+ .option_type = geneve_opt_v->option_type,
+ .option_data_len = geneve_opt_v->option_len,
+ };
+
/* Create a GENEVE TLV object and resource. */
obj = mlx5_devx_cmd_create_geneve_tlv_option(sh->cdev->ctx,
- geneve_opt_v->option_class,
- geneve_opt_v->option_type,
- geneve_opt_v->option_len);
+ &attr);
if (!obj) {
ret = rte_flow_error_set(error, ENODATA,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
--
2.25.1
