From: Hamdan Igbaria <hamd...@nvidia.com>
Add support for creation of packet reformat object,
via the ALLOC_PACKET_REFORMAT_CONTEXT command.
Signed-off-by: Hamdan Igbaria <hamd...@nvidia.com>
Acked-by: Alex Vesker <va...@nvidia.com>
---
drivers/common/mlx5/mlx5_prm.h | 39 +++++++++++++++++
drivers/net/mlx5/hws/mlx5dr_cmd.c | 60 ++++++++++++++++++++++++++
drivers/net/mlx5/hws/mlx5dr_cmd.h | 11 +++++
drivers/net/mlx5/hws/mlx5dr_internal.h | 5 +++
drivers/net/mlx5/hws/mlx5dr_send.c | 5 ---
5 files changed, 115 insertions(+), 5 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 51f426c614..6749f2c037 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -1213,6 +1213,8 @@ enum {
MLX5_CMD_OP_CREATE_FLOW_GROUP = 0x933,
MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY = 0x936,
MLX5_CMD_OP_MODIFY_FLOW_TABLE = 0x93c,
+ MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT = 0x93d,
+ MLX5_CMD_OP_DEALLOC_PACKET_REFORMAT_CONTEXT = 0x93e,
MLX5_CMD_OP_ALLOC_FLOW_COUNTER = 0x939,
MLX5_CMD_OP_QUERY_FLOW_COUNTER = 0x93b,
MLX5_CMD_OP_CREATE_GENERAL_OBJECT = 0xa00,
@@ -5180,6 +5182,43 @@ struct mlx5_ifc_modify_flow_table_out_bits {
u8 reserved_at_40[0x60];
};
+struct mlx5_ifc_packet_reformat_context_in_bits {
+ u8 reformat_type[0x8];
+ u8 reserved_at_8[0x4];
+ u8 reformat_param_0[0x4];
+ u8 reserved_at_16[0x6];
+ u8 reformat_data_size[0xa];
+
+ u8 reformat_param_1[0x8];
+ u8 reserved_at_40[0x8];
+ u8 reformat_data[6][0x8];
+
+ u8 more_reformat_data[][0x8];
+};
+
+struct mlx5_ifc_alloc_packet_reformat_context_in_bits {
+ u8 opcode[0x10];
+ u8 uid[0x10];
+
+ u8 reserved_at_20[0x10];
+ u8 op_mod[0x10];
+
+ u8 reserved_at_40[0xa0];
+
+ u8 packet_reformat_context[];
+};
+
+struct mlx5_ifc_alloc_packet_reformat_out_bits {
+ u8 status[0x8];
+ u8 reserved_at_8[0x18];
+
+ u8 syndrome[0x20];
+
+ u8 packet_reformat_id[0x20];
+
+ u8 reserved_at_60[0x20];
+};
+
/* CQE format mask. */
#define MLX5E_CQE_FORMAT_MASK 0xc
diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c
b/drivers/net/mlx5/hws/mlx5dr_cmd.c
index 7771aeb8cf..d20ec7f0c4 100644
--- a/drivers/net/mlx5/hws/mlx5dr_cmd.c
+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c
@@ -779,6 +779,66 @@ mlx5dr_cmd_sq_create(struct ibv_context *ctx,
return devx_obj;
}
+struct mlx5dr_devx_obj *
+mlx5dr_cmd_packet_reformat_create(struct ibv_context *ctx,
+ struct mlx5dr_cmd_packet_reformat_create_attr
*attr)
+{
+ uint32_t out[DEVX_ST_SZ_DW(alloc_packet_reformat_out)] = {0};
+ size_t insz, cmd_data_sz, cmd_total_sz;
+ struct mlx5dr_devx_obj *devx_obj;
+ void *prctx;
+ void *pdata;
+ void *in;
+
+ cmd_total_sz = DEVX_ST_SZ_BYTES(alloc_packet_reformat_context_in);
+ cmd_total_sz += DEVX_ST_SZ_BYTES(packet_reformat_context_in);
+ cmd_data_sz = DEVX_FLD_SZ_BYTES(packet_reformat_context_in,
reformat_data);
+ insz = align(cmd_total_sz + attr->data_sz - cmd_data_sz, DW_SIZE);
+ in = simple_calloc(1, insz);
+ if (!in) {
+ rte_errno = ENOMEM;
+ return NULL;
+ }
+
+ MLX5_SET(alloc_packet_reformat_context_in, in, opcode,
+ MLX5_CMD_OP_ALLOC_PACKET_REFORMAT_CONTEXT);
+
+ prctx = DEVX_ADDR_OF(alloc_packet_reformat_context_in, in,
+ packet_reformat_context);
+ pdata = DEVX_ADDR_OF(packet_reformat_context_in, prctx, reformat_data);
+
+ MLX5_SET(packet_reformat_context_in, prctx, reformat_type, attr->type);
+ MLX5_SET(packet_reformat_context_in, prctx, reformat_param_0,
attr->reformat_param_0);
+ MLX5_SET(packet_reformat_context_in, prctx, reformat_data_size,
attr->data_sz);
+ memcpy(pdata, attr->data, attr->data_sz);
+
+ devx_obj = simple_malloc(sizeof(*devx_obj));
+ if (!devx_obj) {
+ DR_LOG(ERR, "Failed to allocate memory for packet reformat
object");
+ rte_errno = ENOMEM;
+ goto out_free_in;
+ }
+
+ devx_obj->obj = mlx5_glue->devx_obj_create(ctx, in, insz, out,
sizeof(out));
+ if (!devx_obj->obj) {
+ DR_LOG(ERR, "Failed to create packet reformat");
+ rte_errno = errno;
+ goto out_free_devx;
+ }
+
+ devx_obj->id = MLX5_GET(alloc_packet_reformat_out, out,
packet_reformat_id);
+
+ simple_free(in);
+
+ return devx_obj;
+
+out_free_devx:
+ simple_free(devx_obj);
+out_free_in:
+ simple_free(in);
+ return NULL;
+}
+
int mlx5dr_cmd_sq_modify_rdy(struct mlx5dr_devx_obj *devx_obj)
{
uint32_t out[MLX5_ST_SZ_DW(modify_sq_out)] = {0};
diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.h
b/drivers/net/mlx5/hws/mlx5dr_cmd.h
index e57013c309..ee427c1829 100644
--- a/drivers/net/mlx5/hws/mlx5dr_cmd.h
+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.h
@@ -155,6 +155,13 @@ struct mlx5dr_cmd_allow_other_vhca_access_attr {
uint8_t access_key[ACCESS_KEY_LEN];
};
+struct mlx5dr_cmd_packet_reformat_create_attr {
+ uint8_t type;
+ size_t data_sz;
+ void *data;
+ uint8_t reformat_param_0;
+};
+
struct mlx5dr_cmd_query_ft_caps {
uint8_t max_level;
uint8_t reparse;
@@ -270,6 +277,10 @@ mlx5dr_cmd_header_modify_pattern_create(struct ibv_context
*ctx,
uint32_t pattern_length,
uint8_t *actions);
+struct mlx5dr_devx_obj *
+mlx5dr_cmd_packet_reformat_create(struct ibv_context *ctx,
+ struct mlx5dr_cmd_packet_reformat_create_attr
*attr);
+
struct mlx5dr_devx_obj *
mlx5dr_cmd_set_fte(struct ibv_context *ctx,
uint32_t table_type,
diff --git a/drivers/net/mlx5/hws/mlx5dr_internal.h
b/drivers/net/mlx5/hws/mlx5dr_internal.h
index c3c077667d..3770d28e62 100644
--- a/drivers/net/mlx5/hws/mlx5dr_internal.h
+++ b/drivers/net/mlx5/hws/mlx5dr_internal.h
@@ -91,4 +91,9 @@ static inline uint64_t roundup_pow_of_two(uint64_t n)
return n == 1 ? 1 : 1ULL << log2above(n);
}
+static inline unsigned long align(unsigned long val, unsigned long align)
+{
+ return (val + align - 1) & ~(align - 1);
+}
+
#endif /* MLX5DR_INTERNAL_H_ */
diff --git a/drivers/net/mlx5/hws/mlx5dr_send.c
b/drivers/net/mlx5/hws/mlx5dr_send.c
index e58fdeb117..622d574bfa 100644
--- a/drivers/net/mlx5/hws/mlx5dr_send.c
+++ b/drivers/net/mlx5/hws/mlx5dr_send.c
@@ -668,11 +668,6 @@ static int mlx5dr_send_ring_create_sq_obj(struct
mlx5dr_context *ctx,
return err;
}
-static inline unsigned long align(unsigned long val, unsigned long align)
-{
- return (val + align - 1) & ~(align - 1);
-}
-
static int mlx5dr_send_ring_open_sq(struct mlx5dr_context *ctx,
struct mlx5dr_send_engine *queue,
struct mlx5dr_send_ring_sq *sq,
--
2.20.0
