[PATCH v1 03/23] net/mlx5/hws: fix tunnel protocol checks

[Michael Baum]

From: Alex Vesker 

Align GRE, GTPU and VXLAN tunnel protocols to fail
in case the packet is already tunneled. Also use local
defines for protocol UDP ports for better layering of
mlx5dr API.

Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer")
Fixes: 5bf14a4beb1a ("net/mlx5/hws: support matching on MPLSoUDP")
Cc: va...@nvidia.com
Cc: ere...@nvidia.com
Cc: sta...@dpdk.org

Signed-off-by: Alex Vesker 
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 39 +--
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c 
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 0b60479406..bab1869369 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -8,8 +8,9 @@
 #define BAD_PORT   0xBAD
 #define ETH_TYPE_IPV4_VXLAN0x0800
 #define ETH_TYPE_IPV6_VXLAN0x86DD
-#define ETH_VXLAN_DEFAULT_PORT 4789
-#define IP_UDP_PORT_MPLS   6635
+#define UDP_GTPU_PORT  2152
+#define UDP_VXLAN_PORT 4789
+#define UDP_PORT_MPLS  6635
 #define UDP_ROCEV2_PORT4791
 #define DR_FLOW_LAYER_TUNNEL_NO_MPLS (MLX5_FLOW_LAYER_TUNNEL & 
~MLX5_FLOW_LAYER_MPLS)
 
@@ -158,7 +159,7 @@ struct mlx5dr_definer_conv_data {
X(SET,  tcp_protocol,   STE_TCP,
rte_flow_item_tcp) \
X(SET_BE16, tcp_src_port,   v->hdr.src_port,
rte_flow_item_tcp) \
X(SET_BE16, tcp_dst_port,   v->hdr.dst_port,
rte_flow_item_tcp) \
-   X(SET,  gtp_udp_port,   RTE_GTPU_UDP_PORT,  
rte_flow_item_gtp) \
+   X(SET,  gtp_udp_port,   UDP_GTPU_PORT,  
rte_flow_item_gtp) \
X(SET_BE32, gtp_teid,   v->hdr.teid,
rte_flow_item_gtp) \
X(SET,  gtp_msg_type,   v->hdr.msg_type,
rte_flow_item_gtp) \
X(SET,  gtp_ext_flag,   !!v->hdr.gtp_hdr_info,  
rte_flow_item_gtp) \
@@ -166,8 +167,8 @@ struct mlx5dr_definer_conv_data {
X(SET,  gtp_ext_hdr_pdu,v->hdr.type,
rte_flow_item_gtp_psc) \
X(SET,  gtp_ext_hdr_qfi,v->hdr.qfi, 
rte_flow_item_gtp_psc) \
X(SET,  vxlan_flags,v->flags,   
rte_flow_item_vxlan) \
-   X(SET,  vxlan_udp_port, ETH_VXLAN_DEFAULT_PORT, 
rte_flow_item_vxlan) \
-   X(SET,  mpls_udp_port,  IP_UDP_PORT_MPLS,   
rte_flow_item_mpls) \
+   X(SET,  vxlan_udp_port, UDP_VXLAN_PORT, 
rte_flow_item_vxlan) \
+   X(SET,  mpls_udp_port,  UDP_PORT_MPLS,  
rte_flow_item_mpls) \
X(SET,  source_qp,  v->queue,   
mlx5_rte_flow_item_sq) \
X(SET,  tag,v->data,
rte_flow_item_tag) \
X(SET,  metadata,   v->data,
rte_flow_item_meta) \
@@ -1170,6 +1171,12 @@ mlx5dr_definer_conv_item_gtp(struct 
mlx5dr_definer_conv_data *cd,
const struct rte_flow_item_gtp *m = item->mask;
struct mlx5dr_definer_fc *fc;
 
+   if (cd->tunnel) {
+   DR_LOG(ERR, "Inner GTPU item not supported");
+   rte_errno = ENOTSUP;
+   return rte_errno;
+   }
+
/* Overwrite GTPU dest port if not present */
fc = &cd->fc[DR_CALC_FNAME(L4_DPORT, false)];
if (!fc->tag_set && !cd->relaxed) {
@@ -1344,9 +1351,13 @@ mlx5dr_definer_conv_item_vxlan(struct 
mlx5dr_definer_conv_data *cd,
struct mlx5dr_definer_fc *fc;
bool inner = cd->tunnel;
 
-   /* In order to match on VXLAN we must match on ether_type, ip_protocol
-* and l4_dport.
-*/
+   if (inner) {
+   DR_LOG(ERR, "Inner VXLAN item not supported");
+   rte_errno = ENOTSUP;
+   return rte_errno;
+   }
+
+   /* In order to match on VXLAN we must match on ip_protocol and l4_dport 
*/
if (!cd->relaxed) {
fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, inner)];
if (!fc->tag_set) {
@@ -1369,12 +1380,6 @@ mlx5dr_definer_conv_item_vxlan(struct 
mlx5dr_definer_conv_data *cd,
return 0;
 
if (m->flags) {
-   if (inner) {
-   DR_LOG(ERR, "Inner VXLAN flags item not supported");
-   rte_errno = ENOTSUP;
-   return rte_errno;
-   }
-
fc = &cd->fc[MLX5DR_DEFINER_FNAME_VXLAN_FLAGS];
fc->item_idx = item_idx;
fc->tag_set = &mlx5dr_definer_vxlan_flags_set;
@@ -1384,12 +1389,6 @@ mlx5dr_definer_conv_item_vxlan(struct 
mlx5dr_definer_conv_data *cd,
}
 
if (!is_mem_zero(m->vni, 3)) {
-   if (inner) {
-   DR_LOG(ERR, "Inner VXLAN vni item not supported");
-   rte_errno = ENOTSUP;
-   ret

[PATCH v1 00/23] net/mlx5: support Geneve and options for HWS

[Michael Baum]

Add HWS support for both GENEVE and GENEVE TLV option headers.
This patchset supports:

 - Add HW support for "RTE_FLOW_ITEM_TYPE_GENEVE" flow item.
 - Add HW support for "RTE_FLOW_ITEM_TYPE_GENEVE_OPT" flow item.
 - Add HW support for "RTE_FLOW_FIELD_GENEVE_VNI" for modify field flow
   action.
 - Add HW support for "RTE_FLOW_FIELD_GENEVE_OPT_TYPE" for modify field
   flow action.
 - Add HW support for "RTE_FLOW_FIELD_GENEVE_OPT_CLASS" for modify field
   flow action.
 - Add HW support for "RTE_FLOW_FIELD_GENEVE_OPT_DATA" for modify field
   flow action.

The GENEVE TLV options support using flex parser.
The profile should be specified to either 8 for multiple option or 0 for
single option.
A new API is added to create the GENEVE option parser before using it in
templates API.

Alex Vesker (4):
  net/mlx5/hws: fix tunnel protocol checks
  net/mlx5/hws: increase hl size for future compatibility
  net/mlx5/hws: support GENEVE matching
  net/mlx5/hws: support GENEVE options header

Michael Baum (19):
  common/mlx5: fix duplicate read of general capabilities
  common/mlx5: fix query sample info capability
  net/mlx5: remove GENEVE options length limitation
  net/mlx5: fix GENEVE option item translation
  common/mlx5: add system image GUID attribute
  common/mlx5: add GENEVE TLV option attribute structure
  common/mlx5: add PRM attribute for TLV sample
  common/mlx5: add sample info query syndrome into error log
  common/mlx5: query GENEVE option sample ID from HCA attr
  common/mlx5: add function to query GENEVE TLV option
  net/mlx5: add physical device handle
  net/mlx5: add GENEVE TLV options parser API
  net/mlx5: add API to expose GENEVE option FW information
  net/mlx5: add testpmd support for GENEVE TLV parser
  net/mlx5: add support for GENEVE and option item in HWS
  net/mlx5: add GENEVE option support for profile 0
  net/mlx5: add GENEVE option support for group 0
  net/mlx5: add support for GENEVE VNI modify field
  net/mlx5: add support for modify GENEVE option header

 doc/guides/nics/mlx5.rst   |  251 +-
 doc/guides/platform/mlx5.rst   |2 +
 doc/guides/rel_notes/release_24_03.rst |9 +
 drivers/common/mlx5/mlx5_devx_cmds.c   |  139 +++-
 drivers/common/mlx5/mlx5_devx_cmds.h   |   29 +-
 drivers/common/mlx5/mlx5_prm.h |   20 +-
 drivers/common/mlx5/version.map|1 +
 drivers/net/mlx5/hws/mlx5dr_definer.c  |  277 ++-
 drivers/net/mlx5/hws/mlx5dr_definer.h  |   49 +-
 drivers/net/mlx5/meson.build   |1 +
 drivers/net/mlx5/mlx5.c|  115 ++-
 drivers/net/mlx5/mlx5.h|   21 +
 drivers/net/mlx5/mlx5_flow.c   |   30 +
 drivers/net/mlx5/mlx5_flow.h   |   92 ++-
 drivers/net/mlx5/mlx5_flow_dv.c|  158 ++--
 drivers/net/mlx5/mlx5_flow_geneve.c| 1011 
 drivers/net/mlx5/mlx5_flow_hw.c|  127 ++-
 drivers/net/mlx5/mlx5_testpmd.c|  556 -
 drivers/net/mlx5/rte_pmd_mlx5.h|  102 +++
 drivers/net/mlx5/version.map   |3 +
 20 files changed, 2809 insertions(+), 184 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_flow_geneve.c

-- 
2.25.1

[PATCH v1 01/23] common/mlx5: fix duplicate read of general capabilities

[Michael Baum]

General object types support is indicated in bitmap general_obj_types,
which is part of HCA capabilities list.
This bitmap was read multiple times, and each time a different bit was
extracted.

Previous patch optimized the code, reading the bitmap once into a local
variable, and then extracting the required bits.
However, it missed few of them which still read the bitmap for
themselves. In addition, for other readings, it moved them to use local
variable without removing the old reading, and they are read twice.

This patch moves them all to use the local variable and removes all
duplications.

Fixes: 876d4702b141 ("common/mlx5: optimize read of general capabilities")
Cc: dek...@nvidia.com
Cc: sta...@dpdk.org

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 18 --
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 4d8818924a..41f6e0a727 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -966,18 +966,6 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
attr->max_geneve_tlv_option_data_len = MLX5_GET(cmd_hca_cap, hcattr,
max_geneve_tlv_option_data_len);
attr->qos.sup = MLX5_GET(cmd_hca_cap, hcattr, qos);
-   attr->qos.flow_meter_aso_sup = !!(MLX5_GET64(cmd_hca_cap, hcattr,
-general_obj_types) &
- MLX5_GENERAL_OBJ_TYPES_CAP_FLOW_METER_ASO);
-   attr->vdpa.valid = !!(MLX5_GET64(cmd_hca_cap, hcattr,
-general_obj_types) &
- MLX5_GENERAL_OBJ_TYPES_CAP_VIRTQ_NET_Q);
-   attr->vdpa.queue_counters_valid = !!(MLX5_GET64(cmd_hca_cap, hcattr,
-   general_obj_types) &
- MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_Q_COUNTERS);
-   attr->parse_graph_flex_node = !!(MLX5_GET64(cmd_hca_cap, hcattr,
-general_obj_types) &
- MLX5_GENERAL_OBJ_TYPES_CAP_PARSE_GRAPH_FLEX_NODE);
attr->wqe_index_ignore = MLX5_GET(cmd_hca_cap, hcattr,
  wqe_index_ignore_cap);
attr->cross_channel = MLX5_GET(cmd_hca_cap, hcattr, cd);
@@ -1001,6 +989,9 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
/* Read the general_obj_types bitmap and extract the relevant bits. */
general_obj_types_supported = MLX5_GET64(cmd_hca_cap, hcattr,
 general_obj_types);
+   attr->qos.flow_meter_aso_sup =
+   !!(general_obj_types_supported &
+  MLX5_GENERAL_OBJ_TYPES_CAP_FLOW_METER_ASO);
attr->vdpa.valid = !!(general_obj_types_supported &
  MLX5_GENERAL_OBJ_TYPES_CAP_VIRTQ_NET_Q);
attr->vdpa.queue_counters_valid =
@@ -1074,8 +1065,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
MLX5_GET(cmd_hca_cap, hcattr, umr_modify_entity_size_disabled);
attr->wait_on_time = MLX5_GET(cmd_hca_cap, hcattr, wait_on_time);
attr->crypto = MLX5_GET(cmd_hca_cap, hcattr, crypto);
-   attr->ct_offload = !!(MLX5_GET64(cmd_hca_cap, hcattr,
-general_obj_types) &
+   attr->ct_offload = !!(general_obj_types_supported &
  MLX5_GENERAL_OBJ_TYPES_CAP_CONN_TRACK_OFFLOAD);
attr->rq_delay_drop = MLX5_GET(cmd_hca_cap, hcattr, rq_delay_drop);
attr->nic_flow_table = MLX5_GET(cmd_hca_cap, hcattr, nic_flow_table);
-- 
2.25.1

[PATCH v1 04/23] net/mlx5: remove GENEVE options length limitation

[Michael Baum]

GENEVE header has field named "opt_len" describing the total length of
all GENEVE options in 4-byte granularity.

In SW sreering implementation, only single option with single DW data is
supported. When matching on GENEVE option data is requested, matching on
"opt_len" field is added according to given option length.

This behaveior assumes that only packets with single option can be
matched, but it is wrong, packet with a few option can be matched but
only one of them can match its value.

This patch removes the "opt_len" matching unless user ask it explicitly.

Fixes: e440d6cf589e ("net/mlx5: add GENEVE TLV option flow translation")
Cc: shi...@nvidia.com

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/mlx5_flow_dv.c | 16 
 1 file changed, 16 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 115d730317..62ca742654 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9986,7 +9986,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev 
*dev, void *key,
const struct rte_flow_item_geneve_opt *geneve_opt_m;
const struct rte_flow_item_geneve_opt *geneve_opt_v;
const struct rte_flow_item_geneve_opt *geneve_opt_vv = item->spec;
-   void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters);
void *misc3_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_3);
rte_be32_t opt_data_key = 0, opt_data_mask = 0;
uint32_t *data;
@@ -10005,21 +10004,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev 
*dev, void *key,
return ret;
}
}
-   /*
-* Set the option length in GENEVE header if not requested.
-* The GENEVE TLV option length is expressed by the option length field
-* in the GENEVE header.
-* If the option length was not requested but the GENEVE TLV option item
-* is present we set the option length field implicitly.
-*/
-   if (!MLX5_GET16(fte_match_set_misc, misc_v, geneve_opt_len)) {
-   if (key_type & MLX5_SET_MATCHER_M)
-   MLX5_SET(fte_match_set_misc, misc_v, geneve_opt_len,
-MLX5_GENEVE_OPTLEN_MASK);
-   else
-   MLX5_SET(fte_match_set_misc, misc_v, geneve_opt_len,
-geneve_opt_v->option_len + 1);
-   }
/* Set the data. */
if (key_type == MLX5_SET_MATCHER_SW_V)
data = geneve_opt_vv->data;
-- 
2.25.1

[PATCH v1 02/23] common/mlx5: fix query sample info capability

[Michael Baum]

Query sample info operation might be used by either Geneve TLV option or
parse graph. Each operations can be supported regardless to another
according the configured profile.

In current implementation, the query sample info capability is turn on
only when parse graph operation is supported adding unnecessary
requirement for Geneve TLV option.

This patch adds different cap for Geneve TLV option.

Fixes: bc0a9303ed6a ("net/mlx5: adopt new sample ID")
Cc: rongw...@nvidia.com
Cc: sta...@dpdk.org

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 6 --
 drivers/common/mlx5/mlx5_devx_cmds.h | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 41f6e0a727..3eeb27fc3f 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -965,6 +965,8 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
max_geneve_tlv_options);
attr->max_geneve_tlv_option_data_len = MLX5_GET(cmd_hca_cap, hcattr,
max_geneve_tlv_option_data_len);
+   attr->query_match_sample_info = MLX5_GET(cmd_hca_cap, hcattr,
+query_match_sample_info);
attr->qos.sup = MLX5_GET(cmd_hca_cap, hcattr, qos);
attr->wqe_index_ignore = MLX5_GET(cmd_hca_cap, hcattr,
  wqe_index_ignore_cap);
@@ -1094,8 +1096,8 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
(ctx, &attr->flex);
if (rc)
return -1;
-   attr->flex.query_match_sample_info = MLX5_GET(cmd_hca_cap, 
hcattr,
- 
query_match_sample_info);
+   attr->flex.query_match_sample_info =
+   attr->query_match_sample_info;
}
if (attr->crypto) {
attr->aes_xts = MLX5_GET(cmd_hca_cap, hcattr, aes_xts) ||
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h 
b/drivers/common/mlx5/mlx5_devx_cmds.h
index 7f23e925a5..b814c8becc 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -315,6 +315,7 @@ struct mlx5_hca_attr {
uint32_t flow_counter_bulk_log_granularity:5;
uint32_t alloc_flow_counter_pd:1;
uint32_t flow_counter_access_aso:1;
+   uint32_t query_match_sample_info:1;
uint32_t flow_access_aso_opc_mod:8;
uint32_t cross_vhca:1;
uint32_t lag_rx_port_affinity:1;
-- 
2.25.1

[PATCH v1 08/23] common/mlx5: add PRM attribute for TLV sample

[Michael Baum]

Add GENEVE TLV sample fields in 2 places:
1. New HCA capabilities indicating GENEVE TLV sample is supported.
2. New fields in "mlx5_ifc_geneve_tlv_option_bits" structure.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 18 --
 drivers/common/mlx5/mlx5_devx_cmds.h |  9 +++--
 drivers/common/mlx5/mlx5_prm.h   | 15 +++
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 9855a97bf4..674130c11f 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -968,6 +968,10 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
max_geneve_tlv_options);
attr->max_geneve_tlv_option_data_len = MLX5_GET(cmd_hca_cap, hcattr,
max_geneve_tlv_option_data_len);
+   attr->geneve_tlv_option_offset = MLX5_GET(cmd_hca_cap, hcattr,
+ geneve_tlv_option_offset);
+   attr->geneve_tlv_sample = MLX5_GET(cmd_hca_cap, hcattr,
+  geneve_tlv_sample);
attr->query_match_sample_info = MLX5_GET(cmd_hca_cap, hcattr,
 query_match_sample_info);
attr->qos.sup = MLX5_GET(cmd_hca_cap, hcattr, qos);
@@ -2883,11 +2887,21 @@ mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
 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(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);
+   if (attr->option_class_ignore)
+   MLX5_SET(geneve_tlv_option, opt, option_class_ignore,
+attr->option_class_ignore);
+   else
+   MLX5_SET(geneve_tlv_option, opt, option_class,
+rte_be_to_cpu_16(attr->option_class));
+   if (attr->offset_valid) {
+   MLX5_SET(geneve_tlv_option, opt, sample_offset_valid,
+attr->offset_valid);
+   MLX5_SET(geneve_tlv_option, opt, sample_offset,
+attr->sample_offset);
+   }
geneve_tlv_opt_obj->obj = mlx5_glue->devx_obj_create(ctx, in,
 sizeof(in), out,
 sizeof(out));
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h 
b/drivers/common/mlx5/mlx5_devx_cmds.h
index 78337dff17..3f294e8f04 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -212,8 +212,10 @@ struct mlx5_hca_attr {
uint32_t lro_timer_supported_periods[MLX5_LRO_NUM_SUPP_PERIODS];
uint16_t lro_min_mss_size;
uint32_t flex_parser_protocols;
-   uint32_t max_geneve_tlv_options;
-   uint32_t max_geneve_tlv_option_data_len;
+   uint32_t max_geneve_tlv_options:8;
+   uint32_t max_geneve_tlv_option_data_len:5;
+   uint32_t geneve_tlv_sample:1;
+   uint32_t geneve_tlv_option_offset:1;
uint32_t hairpin:1;
uint32_t log_max_hairpin_queues:5;
uint32_t log_max_hairpin_wq_data_sz:5;
@@ -674,6 +676,9 @@ struct mlx5_devx_geneve_tlv_option_attr {
uint32_t option_class:16;
uint32_t option_type:8;
uint32_t option_data_len:5;
+   uint32_t option_class_ignore:1;
+   uint32_t offset_valid:1;
+   uint32_t sample_offset:8;
 };
 
 /* mlx5_devx_cmds.c */
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 9e22dce6da..59643a8788 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -1849,7 +1849,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 num_of_uars_per_page[0x20];
u8 flex_parser_protocols[0x20];
u8 max_geneve_tlv_options[0x8];
-   u8 reserved_at_568[0x3];
+   u8 geneve_tlv_sample[0x1];
+   u8 geneve_tlv_option_offset[0x1];
+   u8 reserved_at_56a[0x1];
u8 max_geneve_tlv_option_data_len[0x5];
u8 flex_parser_header_modify[0x1];
u8 reserved_at_571[0x2];
@@ -3416,16 +3418,21 @@ struct mlx5_ifc_virtio_q_counters_bits {
 
 struct mlx5_ifc_geneve_tlv_option_bits {
u8 modify_field_select[0x40];
-   u8 reserved_at_40[0x18];
+   u8 reserved_at_40[0x8];
+   u8 sample_offset[0x8];
+   u8 sample_id_valid[0x1];
+   u8 sample_offset_valid[0x1];
+   u8 option_class_ignore[0x1];
+   u8 reserved_at_53[0x5];
u8 geneve_option_fte_index[0x8];
u8 option_class[0x10];
u8 option_type[0x8];
u8 reserved_at_78[0x3];
u8 option_data_length[0x5];
-   u8 reserved_at_80[0x180];
+

[PATCH v1 05/23] net/mlx5: fix GENEVE option item translation

[Michael Baum]

The "flow_dv_translate_item_geneve_opt()" function is called twice per
flow rule, for either matcher focusing the mask or value focusing the
spec.
The spec is always provided and its field "option_len" indicates the
data size for both spec and mask. For using it, function has another
pointer "geneve_opt_vv" representing the spec regardless to focusing
while the "geneve_opt_v" pointer represents the mask for matcher and
spec for rule creation.

The current implementation has 2 issues:
1. geneve_opt_v get the spec in rule creation as sane as geneve_opt_vv,
   but function use if-else which is bacicly has same value.
2. function uses "option_len" from "geneve_opt_v" instead of
   "geneve_opt_v" even when the focus is on mask, for HWS the mask value
   may be 0 even data is valid.

This patch refactors the function implementation to avoid those issues.

Fixes: cd4ab742064a ("net/mlx5: split flow item matcher and value translation")
Cc: suanmi...@nvidia.com

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/mlx5_flow_dv.c | 28 +++-
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 62ca742654..f8e364dfdb 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9985,13 +9985,13 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev 
*dev, void *key,
 {
const struct rte_flow_item_geneve_opt *geneve_opt_m;
const struct rte_flow_item_geneve_opt *geneve_opt_v;
-   const struct rte_flow_item_geneve_opt *geneve_opt_vv = item->spec;
+   const struct rte_flow_item_geneve_opt *orig_spec = item->spec;
void *misc3_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_3);
rte_be32_t opt_data_key = 0, opt_data_mask = 0;
-   uint32_t *data;
+   size_t option_byte_len;
int ret = 0;
 
-   if (MLX5_ITEM_VALID(item, key_type))
+   if (MLX5_ITEM_VALID(item, key_type) || !orig_spec)
return -1;
MLX5_ITEM_UPDATE(item, key_type, geneve_opt_v, geneve_opt_m,
 &rte_flow_item_geneve_opt_mask);
@@ -10004,21 +10004,15 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev 
*dev, void *key,
return ret;
}
}
-   /* Set the data. */
-   if (key_type == MLX5_SET_MATCHER_SW_V)
-   data = geneve_opt_vv->data;
-   else
-   data = geneve_opt_v->data;
-   if (data) {
-   memcpy(&opt_data_key, data,
-   RTE_MIN((uint32_t)(geneve_opt_v->option_len * 4),
-   sizeof(opt_data_key)));
-   memcpy(&opt_data_mask, geneve_opt_m->data,
-   RTE_MIN((uint32_t)(geneve_opt_v->option_len * 4),
-   sizeof(opt_data_mask)));
+   /* Convert the option length from DW to bytes for using memcpy. */
+   option_byte_len = RTE_MIN((size_t)(orig_spec->option_len * 4),
+ sizeof(rte_be32_t));
+   if (geneve_opt_v->data) {
+   memcpy(&opt_data_key, geneve_opt_v->data, option_byte_len);
+   memcpy(&opt_data_mask, geneve_opt_m->data, option_byte_len);
MLX5_SET(fte_match_set_misc3, misc3_v,
-   geneve_tlv_option_0_data,
-   rte_be_to_cpu_32(opt_data_key & opt_data_mask));
+geneve_tlv_option_0_data,
+rte_be_to_cpu_32(opt_data_key & opt_data_mask));
}
return ret;
 }
-- 
2.25.1

[PATCH v1 06/23] common/mlx5: add system image GUID attribute

[Michael Baum]

Add to the "system_image_guid" filed describing uniquely the physical
device into "mlx5_hca_attr" structure.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 10 ++
 drivers/common/mlx5/mlx5_devx_cmds.h |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 3eeb27fc3f..74609e7cb2 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -518,8 +518,11 @@ mlx5_devx_cmd_query_nic_vport_context(void *ctx,
}
vctx = MLX5_ADDR_OF(query_nic_vport_context_out, out,
nic_vport_context);
-   attr->vport_inline_mode = MLX5_GET(nic_vport_context, vctx,
-  min_wqe_inline_mode);
+   if (attr->wqe_inline_mode == MLX5_CAP_INLINE_MODE_VPORT_CONTEXT)
+   attr->vport_inline_mode = MLX5_GET(nic_vport_context, vctx,
+  min_wqe_inline_mode);
+   attr->system_image_guid = MLX5_GET64(nic_vport_context, vctx,
+system_image_guid);
return 0;
 }
 
@@ -1348,8 +1351,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
}
attr->qp_ts_format = MLX5_GET(roce_caps, hcattr, qp_ts_format);
}
-   if (attr->eth_virt &&
-   attr->wqe_inline_mode == MLX5_CAP_INLINE_MODE_VPORT_CONTEXT) {
+   if (attr->eth_virt) {
rc = mlx5_devx_cmd_query_nic_vport_context(ctx, 0, attr);
if (rc) {
attr->eth_virt = 0;
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h 
b/drivers/common/mlx5/mlx5_devx_cmds.h
index b814c8becc..56ed911c2a 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -321,6 +321,7 @@ struct mlx5_hca_attr {
uint32_t lag_rx_port_affinity:1;
uint32_t wqe_based_flow_table_sup:1;
uint8_t max_header_modify_pattern_length;
+   uint64_t system_image_guid;
 };
 
 /* LAG Context. */
-- 
2.25.1

[PATCH v1 12/23] net/mlx5: add physical device handle

[Michael Baum]

Add structure describing physical device, and manage physical device
global list.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/mlx5.c | 77 -
 drivers/net/mlx5/mlx5.h | 13 +++
 2 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 3a182de248..f9fc652136 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -190,9 +190,10 @@ struct mlx5_shared_data *mlx5_shared_data;
 /** Driver-specific log messages type. */
 int mlx5_logtype;
 
-static LIST_HEAD(, mlx5_dev_ctx_shared) mlx5_dev_ctx_list =
-   LIST_HEAD_INITIALIZER();
+static LIST_HEAD(mlx5_dev_ctx_list, mlx5_dev_ctx_shared) dev_ctx_list = 
LIST_HEAD_INITIALIZER();
+static LIST_HEAD(mlx5_phdev_list, mlx5_physical_device) phdev_list = 
LIST_HEAD_INITIALIZER();
 static pthread_mutex_t mlx5_dev_ctx_list_mutex;
+
 static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = {
 #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
[MLX5_IPOOL_DECAP_ENCAP] = {
@@ -1692,6 +1693,60 @@ mlx5_init_shared_dev_registers(struct 
mlx5_dev_ctx_shared *sh)
mlx5_init_hws_flow_tags_registers(sh);
 }
 
+static struct mlx5_physical_device *
+mlx5_get_physical_device(struct mlx5_common_device *cdev)
+{
+   struct mlx5_physical_device *phdev;
+   struct mlx5_hca_attr *attr = &cdev->config.hca_attr;
+
+   /* Search for physical device by system_image_guid. */
+   LIST_FOREACH(phdev, &phdev_list, next) {
+   if (phdev->guid == attr->system_image_guid) {
+   phdev->refcnt++;
+   return phdev;
+   }
+   }
+   phdev = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
+   sizeof(struct mlx5_physical_device),
+   RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+   if (!phdev) {
+   DRV_LOG(ERR, "Physical device allocation failure.");
+   rte_errno = ENOMEM;
+   return NULL;
+   }
+   phdev->guid = attr->system_image_guid;
+   phdev->refcnt = 1;
+   LIST_INSERT_HEAD(&phdev_list, phdev, next);
+   DRV_LOG(DEBUG, "Physical device is created, guid=%" PRIu64 ".",
+   phdev->guid);
+   return phdev;
+}
+
+static void
+mlx5_physical_device_destroy(struct mlx5_physical_device *phdev)
+{
+#ifdef RTE_LIBRTE_MLX5_DEBUG
+   /* Check the object presence in the list. */
+   struct mlx5_physical_device *lphdev;
+
+   LIST_FOREACH(lphdev, &phdev_list, next)
+   if (lphdev == phdev)
+   break;
+   MLX5_ASSERT(lphdev);
+   if (lphdev != phdev) {
+   DRV_LOG(ERR, "Freeing non-existing physical device");
+   return;
+   }
+#endif
+   MLX5_ASSERT(phdev);
+   MLX5_ASSERT(phdev->refcnt);
+   if (--phdev->refcnt)
+   return;
+   /* Remove physical device from the global device list. */
+   LIST_REMOVE(phdev, next);
+   mlx5_free(phdev);
+}
+
 /**
  * Allocate shared device context. If there is multiport device the
  * master and representors will share this context, if there is single
@@ -1725,7 +1780,7 @@ mlx5_alloc_shared_dev_ctx(const struct 
mlx5_dev_spawn_data *spawn,
MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
pthread_mutex_lock(&mlx5_dev_ctx_list_mutex);
/* Search for IB context by device name. */
-   LIST_FOREACH(sh, &mlx5_dev_ctx_list, next) {
+   LIST_FOREACH(sh, &dev_ctx_list, next) {
if (!strcmp(sh->ibdev_name, spawn->phys_dev_name)) {
sh->refcnt++;
goto exit;
@@ -1765,6 +1820,9 @@ mlx5_alloc_shared_dev_ctx(const struct 
mlx5_dev_spawn_data *spawn,
sizeof(sh->ibdev_name) - 1);
strncpy(sh->ibdev_path, mlx5_os_get_ctx_device_path(sh->cdev->ctx),
sizeof(sh->ibdev_path) - 1);
+   sh->phdev = mlx5_get_physical_device(sh->cdev);
+   if (!sh->phdev)
+   goto error;
/*
 * Setting port_id to max unallowed value means there is no interrupt
 * subhandler installed for the given port index i.
@@ -1798,7 +1856,7 @@ mlx5_alloc_shared_dev_ctx(const struct 
mlx5_dev_spawn_data *spawn,
 #endif
}
mlx5_os_dev_shared_handler_install(sh);
-   if (LIST_EMPTY(&mlx5_dev_ctx_list)) {
+   if (LIST_EMPTY(&dev_ctx_list)) {
err = mlx5_flow_os_init_workspace_once();
if (err)
goto error;
@@ -1811,7 +1869,7 @@ mlx5_alloc_shared_dev_ctx(const struct 
mlx5_dev_spawn_data *spawn,
mlx5_flow_aging_init(sh);
mlx5_flow_ipool_create(sh);
/* Add context to the global device list. */
-   LIST_INSERT_HEAD(&mlx5_dev_ctx_list, sh, next);
+   LIST_INSERT_HEAD(&dev_ctx_list, sh, next);
rte_spinlock_init(&sh->geneve_tlv_opt

[PATCH v1 07/23] common/mlx5: add GENEVE TLV option attribute structure

[Michael Baum]

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 
---
 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 74609e7cb2..9855a97bf4 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -2855,19 +2855,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};
@@ -2876,25 +2872,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 56ed911c2a..78337dff17 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -667,6 +667,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
@@ -777,7 +786,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 f8e364dfdb..8894f51f4c 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9928,11 +9928,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 =

[PATCH v1 10/23] common/mlx5: query GENEVE option sample ID from HCA attr

[Michael Baum]

This patch adds the GENEVE option sample ID into HCA attribute
structure.
This sample ID is used as the input of
"mlx5_devx_cmd_match_sample_info_query" function when flex parser
profile is 1.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 2 ++
 drivers/common/mlx5/mlx5_devx_cmds.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index b30f54ab1c..332aebbe57 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -973,6 +973,8 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
   geneve_tlv_sample);
attr->query_match_sample_info = MLX5_GET(cmd_hca_cap, hcattr,
 query_match_sample_info);
+   attr->geneve_tlv_option_sample_id = MLX5_GET(cmd_hca_cap, hcattr,
+
flex_parser_id_geneve_opt_0);
attr->qos.sup = MLX5_GET(cmd_hca_cap, hcattr, qos);
attr->wqe_index_ignore = MLX5_GET(cmd_hca_cap, hcattr,
  wqe_index_ignore_cap);
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h 
b/drivers/common/mlx5/mlx5_devx_cmds.h
index 3f294e8f04..1daf2fcca4 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -216,6 +216,7 @@ struct mlx5_hca_attr {
uint32_t max_geneve_tlv_option_data_len:5;
uint32_t geneve_tlv_sample:1;
uint32_t geneve_tlv_option_offset:1;
+   uint32_t geneve_tlv_option_sample_id:4;
uint32_t hairpin:1;
uint32_t log_max_hairpin_queues:5;
uint32_t log_max_hairpin_wq_data_sz:5;
-- 
2.25.1

[PATCH v1 09/23] common/mlx5: add sample info query syndrome into error log

[Michael Baum]

Move "mlx5_devx_cmd_match_sample_info_query()" function to use
"DEVX_DRV_LOG" in case of "devx_general_cmd" failure.
This macro contains syndrome report and used by all other function
calling "devx_general_cmd".

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 674130c11f..b30f54ab1c 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -641,11 +641,10 @@ mlx5_devx_cmd_match_sample_info_query(void *ctx, uint32_t 
sample_field_id,
MLX5_SET(query_match_sample_info_in, in, sample_field_id,
 sample_field_id);
rc = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out, sizeof(out));
-   if (rc) {
-   DRV_LOG(ERR, "Failed to query match sample info using DevX: %s",
-   strerror(rc));
-   rte_errno = rc;
-   return -rc;
+   if (rc || MLX5_FW_STATUS(out)) {
+   DEVX_DRV_LOG(ERR, out, "query match sample info",
+"sample_field_id", sample_field_id);
+   return MLX5_DEVX_ERR_RC(rc);
}
attr->modify_field_id = MLX5_GET(query_match_sample_info_out, out,
 modify_field_id);
-- 
2.25.1

[PATCH v1 11/23] common/mlx5: add function to query GENEVE TLV option

[Michael Baum]

Add a new function to query information about GENEVE TLV option parser.

Signed-off-by: Michael Baum 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 50 
 drivers/common/mlx5/mlx5_devx_cmds.h |  6 
 drivers/common/mlx5/mlx5_prm.h   |  5 +++
 drivers/common/mlx5/version.map  |  1 +
 4 files changed, 62 insertions(+)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 332aebbe57..1fa75cd964 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -2915,6 +2915,56 @@ mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
return geneve_tlv_opt_obj;
 }
 
+/**
+ * Query GENEVE TLV option using DevX API.
+ *
+ * @param[in] ctx
+ *   Context used to create GENEVE TLV option object.
+ * @param[in] geneve_tlv_opt_obj
+ *   DevX object of the GENEVE TLV option.
+ * @param[out] attr
+ *   Pointer to match sample info attributes structure.
+ *
+ * @return
+ *   0 on success, a negative errno otherwise and rte_errno is set.
+ */
+int
+mlx5_devx_cmd_query_geneve_tlv_option(void *ctx,
+ struct mlx5_devx_obj *geneve_tlv_opt_obj,
+ struct 
mlx5_devx_match_sample_info_query_attr *attr)
+{
+   uint32_t in[MLX5_ST_SZ_DW(general_obj_in_cmd_hdr)] = {0};
+   uint32_t out[MLX5_ST_SZ_DW(query_geneve_tlv_option_out)] = {0};
+   void *hdr = MLX5_ADDR_OF(query_geneve_tlv_option_out, in, hdr);
+   void *opt = MLX5_ADDR_OF(query_geneve_tlv_option_out, out,
+geneve_tlv_opt);
+   int ret;
+
+   MLX5_SET(general_obj_in_cmd_hdr, hdr, opcode,
+MLX5_CMD_OP_QUERY_GENERAL_OBJECT);
+   MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_type,
+MLX5_GENERAL_OBJ_TYPE_GENEVE_TLV_OPT);
+   MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_id, geneve_tlv_opt_obj->id);
+   /* Call first query to get sample handle. */
+   ret = mlx5_glue->devx_obj_query(geneve_tlv_opt_obj->obj, in, sizeof(in),
+   out, sizeof(out));
+   if (ret) {
+   DRV_LOG(ERR, "Failed to query GENEVE TLV option using DevX.");
+   rte_errno = errno;
+   return -errno;
+   }
+   /* Call second query to get sample information. */
+   if (MLX5_GET(geneve_tlv_option, opt, sample_id_valid)) {
+   uint32_t sample_id = MLX5_GET(geneve_tlv_option, opt,
+ geneve_sample_field_id);
+
+   return mlx5_devx_cmd_match_sample_info_query(ctx, sample_id,
+attr);
+   }
+   DRV_LOG(DEBUG, "GENEVE TLV option sample isn't valid.");
+   return 0;
+}
+
 int
 mlx5_devx_cmd_wq_query(void *wq, uint32_t *counter_set_id)
 {
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h 
b/drivers/common/mlx5/mlx5_devx_cmds.h
index 1daf2fcca4..6161c275da 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -794,6 +794,12 @@ struct mlx5_devx_obj *
 mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
 struct mlx5_devx_geneve_tlv_option_attr *attr);
 
+__rte_internal
+int
+mlx5_devx_cmd_query_geneve_tlv_option(void *ctx,
+ struct mlx5_devx_obj *geneve_tlv_opt_obj,
+ struct 
mlx5_devx_match_sample_info_query_attr *attr);
+
 /**
  * Create virtio queue counters object DevX API.
  *
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 59643a8788..7c36961564 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -3721,6 +3721,11 @@ struct mlx5_ifc_create_geneve_tlv_option_in_bits {
struct mlx5_ifc_geneve_tlv_option_bits geneve_tlv_opt;
 };
 
+struct mlx5_ifc_query_geneve_tlv_option_out_bits {
+   struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr;
+   struct mlx5_ifc_geneve_tlv_option_bits geneve_tlv_opt;
+};
+
 struct mlx5_ifc_create_rtc_in_bits {
struct mlx5_ifc_general_obj_in_cmd_hdr_bits hdr;
struct mlx5_ifc_rtc_bits rtc;
diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map
index 074eed46fd..589a450145 100644
--- a/drivers/common/mlx5/version.map
+++ b/drivers/common/mlx5/version.map
@@ -54,6 +54,7 @@ INTERNAL {
mlx5_devx_cmd_modify_tir;
mlx5_devx_cmd_modify_virtq;
mlx5_devx_cmd_qp_query_tis_td;
+   mlx5_devx_cmd_query_geneve_tlv_option;
mlx5_devx_cmd_query_hca_attr;
mlx5_devx_cmd_query_lag;
mlx5_devx_cmd_query_parse_samples;
-- 
2.25.1

[PATCH v1 14/23] net/mlx5: add API to expose GENEVE option FW information

[Michael Baum]

Add a new API to expose GENEVE option FW information to DR layer.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/mlx5_flow.h| 28 +
 drivers/net/mlx5/mlx5_flow_geneve.c | 94 +
 2 files changed, 122 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 4bfc218175..dca3cacb65 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1766,6 +1766,34 @@ flow_hw_get_reg_id_from_ctx(void *dr_ctx,
return REG_NON;
 }
 
+/**
+ * Get GENEVE TLV option FW information according type and class.
+ *
+ * @param[in] dr_ctx
+ *   Pointer to HW steering DR context.
+ * @param[in] type
+ *   GENEVE TLV option type.
+ * @param[in] class
+ *   GENEVE TLV option class.
+ * @param[out] hl_ok_bit
+ *   Pointer to header layout structure describing OK bit FW information.
+ * @param[out] num_of_dws
+ *   Pointer to fill inside the size of 'hl_dws' array.
+ * @param[out] hl_dws
+ *   Pointer to header layout array describing data DWs FW information.
+ * @param[out] ok_bit_on_class
+ *   Pointer to an indicator whether OK bit includes class along with type.
+ *
+ * @return
+ *   0 on success, negative errno otherwise and rte_errno is set.
+ */
+int
+mlx5_get_geneve_hl_data(const void *dr_ctx, uint8_t type, uint16_t class,
+   struct mlx5_hl_data ** const hl_ok_bit,
+   uint8_t *num_of_dws,
+   struct mlx5_hl_data ** const hl_dws,
+   bool *ok_bit_on_class);
+
 void *
 mlx5_geneve_tlv_parser_create(uint16_t port_id,
  const struct rte_pmd_mlx5_geneve_tlv tlv_list[],
diff --git a/drivers/net/mlx5/mlx5_flow_geneve.c 
b/drivers/net/mlx5/mlx5_flow_geneve.c
index f23fb31aa0..2d593b70ba 100644
--- a/drivers/net/mlx5/mlx5_flow_geneve.c
+++ b/drivers/net/mlx5/mlx5_flow_geneve.c
@@ -58,6 +58,100 @@ struct mlx5_geneve_tlv_options {
RTE_ATOMIC(uint32_t) refcnt;
 };
 
+/**
+ * Check if type and class is matching to given GENEVE TLV option.
+ *
+ * @param type
+ *   GENEVE option type.
+ * @param class
+ *   GENEVE option class.
+ * @param option
+ *   Pointer to GENEVE TLV option structure.
+ *
+ * @return
+ *   True if this type and class match to this option, false otherwise.
+ */
+static inline bool
+option_match_type_and_class(uint8_t type, uint16_t class,
+   struct mlx5_geneve_tlv_option *option)
+{
+   if (type != option->type)
+   return false;
+   if (option->class_mode == 1 && option->class != class)
+   return false;
+   return true;
+}
+
+/**
+ * Get GENEVE TLV option matching to given type and class.
+ *
+ * @param priv
+ *   Pointer to port's private data.
+ * @param type
+ *   GENEVE option type.
+ * @param class
+ *   GENEVE option class.
+ *
+ * @return
+ *   Pointer to option structure if exist, NULL otherwise and rte_errno is set.
+ */
+static struct mlx5_geneve_tlv_option *
+mlx5_geneve_tlv_option_get(const struct mlx5_priv *priv, uint8_t type,
+  uint16_t class)
+{
+   struct mlx5_geneve_tlv_options *options;
+   uint8_t i;
+
+   if (priv->tlv_options == NULL) {
+   DRV_LOG(ERR,
+   "Port %u doesn't have configured GENEVE TLV options.",
+   priv->dev_data->port_id);
+   rte_errno = EINVAL;
+   return NULL;
+   }
+   options = priv->tlv_options;
+   MLX5_ASSERT(options != NULL);
+   for (i = 0; i < options->nb_options; ++i) {
+   struct mlx5_geneve_tlv_option *option = &options->options[i];
+
+   if (option_match_type_and_class(type, class, option))
+   return option;
+   }
+   DRV_LOG(ERR, "TLV option type %u class %u doesn't exist.", type, class);
+   rte_errno = ENOENT;
+   return NULL;
+}
+
+int
+mlx5_get_geneve_hl_data(const void *dr_ctx, uint8_t type, uint16_t class,
+   struct mlx5_hl_data ** const hl_ok_bit,
+   uint8_t *num_of_dws,
+   struct mlx5_hl_data ** const hl_dws,
+   bool *ok_bit_on_class)
+{
+   uint16_t port_id;
+
+   MLX5_ETH_FOREACH_DEV(port_id, NULL) {
+   struct mlx5_priv *priv;
+   struct mlx5_geneve_tlv_option *option;
+
+   priv = rte_eth_devices[port_id].data->dev_private;
+   if (priv->dr_ctx != dr_ctx)
+   continue;
+   /* Find specific option inside list. */
+   option = mlx5_geneve_tlv_option_get(priv, type, class);
+   if (option == NULL)
+   return -rte_errno;
+   *hl_ok_bit = &option->hl_ok_bit;
+   *hl_dws = option->match_data;
+   *num_of_dws = option->match_data_size;
+   *ok_bit_on_class = !!(option->class_mode == 1);
+   return 0;
+   }
+ 

[PATCH v1 16/23] net/mlx5/hws: increase hl size for future compatibility

[Michael Baum]

From: Alex Vesker 

In some cases we rely on header layout DW offset from FW caps,
this is done in case of future HW which may support current
flex fields natively, for this we must increase header layout to
255 DWs, which is the limit in current definer creation.

Signed-off-by: Alex Vesker 
---
 drivers/net/mlx5/hws/mlx5dr_definer.h | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h 
b/drivers/net/mlx5/hws/mlx5dr_definer.h
index 6f1c99e37a..e2be579303 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.h
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.h
@@ -523,10 +523,8 @@ struct mlx5_ifc_definer_hl_bits {
u8 unsupported_free_running_timestamp[0x40];
struct mlx5_ifc_definer_hl_flex_parser_bits flex_parser;
struct mlx5_ifc_definer_hl_registers_bits registers;
-   /* struct x ib_l3_extended; */
-   /* struct x rwh */
-   /* struct x dcceth */
-   /* struct x dceth */
+   /* Reserved in case header layout on future HW */
+   u8 unsupported_reserved[0xd40];
 };
 
 enum mlx5dr_definer_gtp {
-- 
2.25.1

[PATCH v1 13/23] net/mlx5: add GENEVE TLV options parser API

[Michael Baum]

Add a new private API to create/destroy parser for GENEVE TLV options.

Signed-off-by: Michael Baum 
Signed-off-by: Viacheslav Ovsiienko 
---
 doc/guides/nics/mlx5.rst| 122 ++
 doc/guides/platform/mlx5.rst|   6 +-
 drivers/net/mlx5/meson.build|   1 +
 drivers/net/mlx5/mlx5.c |  30 +-
 drivers/net/mlx5/mlx5.h |   8 +
 drivers/net/mlx5/mlx5_flow.c|  30 ++
 drivers/net/mlx5/mlx5_flow.h|  18 +
 drivers/net/mlx5/mlx5_flow_geneve.c | 627 
 drivers/net/mlx5/rte_pmd_mlx5.h | 102 +
 drivers/net/mlx5/version.map|   3 +
 10 files changed, 945 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_flow_geneve.c

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 6b52fb93c5..80446d8d82 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -2298,6 +2298,128 @@ and disables ``avail_thresh_triggered``.
testpmd> mlx5 set port 1 host_shaper avail_thresh_triggered 0 rate 50
 
 
+.. _geneve_parser_api:
+
+GENEVE TLV options parser
+-
+
+NVIDIA ConnectX and BlueField devices support configure flex parser for
+`GENEVE TLV options 
`_.
+
+Each physical device has 7 DWs for GENEVE TLV options.
+Partial option configuration is supported, mask for data is provided in parser
+creation indicating which DWs configuration is requested. Only masked data DWs
+can be matched later as item field using flow API.
+
+Matching of ``type`` field is supported for each configured option.
+However, for matching ``class` field, the option should be configured with
+``match_on_class_mode=2``. Matching on ``length`` field is not supported.
+When ``match_on_class_mode=2`` is requested, one extra DW is consumed for it.
+
+Parser API
+~~
+
+An API to create/destroy GENEVE TLV parser is added.
+Although the parser is created per physical device, this API is port oriented.
+Each port should call this API before using GENEVE OPT item,
+but its configuration must use the same options list with same internal order
+configured by first port.
+
+Calling this API for different ports under same physical device doesn't consume
+more DWs, the first one creates the parser and the rest use same configuration.
+
+``struct rte_pmd_mlx5_geneve_tlv`` is used for single option configuration:
+
+.. _table_rte_pmd_mlx5_geneve_tlv:
+
+.. table:: GENEVE TLV
+
+   
+-+-+
+   | Field   | Value   
|
+   
+=+=+
+   | ``option_class``| class   
|
+   
+-+-+
+   | ``option_type`` | type
|
+   
+-+-+
+   | ``option_len``  | data length in DW granularity   
|
+   
+-+-+
+   | ``match_on_class_mode`` | indicator about class field role in this option 
|
+   
+-+-+
+   | ``offset``  | offset of the first sample in DW granularity
|
+   
+-+-+
+   | ``sample_len``  | number of DW to sample  
|
+   
+-+-+
+   | ``match_data_mask`` | array of DWs which each bit marks if this bit   
|
+   | | should be sampled   
|
+   
+-+-+
+
+Creation
+
+
+Creates GENEVE TLV parser for the selected port.
+This function must be called before first use of GENEVE option.
+
+.. code-block:: c
+
+   void *
+   rte_pmd_mlx5_create_geneve_tlv_parser(uint16_t port_id,
+ const struct rte_pmd_mlx5_geneve_tlv 
tlv_list[],
+ uint8_t nb_options);
+
+The parser creation is done once for all GENEVE TLV options.
+For adding a new option, the exist parser should be destroyed first.
+
+Arguments:
+
+- ``port_id``: port identifier of Ethernet device.
+- ``tlv_list``: list of GENEVE TLV options to create parser for them.
+- ``nb_options``: number of options in TLV list.
+
+Return values:
+
+- A valid handle in case of success, NULL otherwise (``rte_errno`` is also 
set),
+  the following errors are defined.
+- ``ENODEV``: there is no Ethernet device for this port id.
+- ``EINVAL``: invalid GENEVE TLV option requested.
+- ``ENOTSUP``: the port doesn't suppor

[PATCH v1 17/23] net/mlx5/hws: support GENEVE matching

[Michael Baum]

From: Alex Vesker 

Add matching for GENEVE tunnel header.

Signed-off-by: Alex Vesker 
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 91 +++
 drivers/net/mlx5/hws/mlx5dr_definer.h | 19 ++
 2 files changed, 110 insertions(+)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c 
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index bab1869369..141941c309 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -11,6 +11,7 @@
 #define UDP_GTPU_PORT  2152
 #define UDP_VXLAN_PORT 4789
 #define UDP_PORT_MPLS  6635
+#define UDP_GENEVE_PORT 6081
 #define UDP_ROCEV2_PORT4791
 #define DR_FLOW_LAYER_TUNNEL_NO_MPLS (MLX5_FLOW_LAYER_TUNNEL & 
~MLX5_FLOW_LAYER_MPLS)
 
@@ -172,6 +173,9 @@ struct mlx5dr_definer_conv_data {
X(SET,  source_qp,  v->queue,   
mlx5_rte_flow_item_sq) \
X(SET,  tag,v->data,
rte_flow_item_tag) \
X(SET,  metadata,   v->data,
rte_flow_item_meta) \
+   X(SET_BE16, geneve_protocol,v->protocol,
rte_flow_item_geneve) \
+   X(SET,  geneve_udp_port,UDP_GENEVE_PORT,
rte_flow_item_geneve) \
+   X(SET_BE16, geneve_ctrl,v->ver_opt_len_o_c_rsvd0,   
rte_flow_item_geneve) \
X(SET_BE16, gre_c_ver,  v->c_rsvd0_ver, 
rte_flow_item_gre) \
X(SET_BE16, gre_protocol_type,  v->protocol,
rte_flow_item_gre) \
X(SET,  ipv4_protocol_gre,  IPPROTO_GRE,
rte_flow_item_gre) \
@@ -682,6 +686,16 @@ mlx5dr_definer_mpls_label_set(struct mlx5dr_definer_fc *fc,
memcpy(tag + fc->byte_off + sizeof(v->label_tc_s), &v->ttl, 
sizeof(v->ttl));
 }
 
+static void
+mlx5dr_definer_geneve_vni_set(struct mlx5dr_definer_fc *fc,
+ const void *item_spec,
+ uint8_t *tag)
+{
+   const struct rte_flow_item_geneve *v = item_spec;
+
+   memcpy(tag + fc->byte_off, v->vni, sizeof(v->vni));
+}
+
 static void
 mlx5dr_definer_ib_l4_qp_set(struct mlx5dr_definer_fc *fc,
const void *item_spec,
@@ -2172,6 +2186,79 @@ mlx5dr_definer_conv_item_ipv6_routing_ext(struct 
mlx5dr_definer_conv_data *cd,
return 0;
 }
 
+static int
+mlx5dr_definer_conv_item_geneve(struct mlx5dr_definer_conv_data *cd,
+   struct rte_flow_item *item,
+   int item_idx)
+{
+   const struct rte_flow_item_geneve *m = item->mask;
+   struct mlx5dr_definer_fc *fc;
+   bool inner = cd->tunnel;
+
+   if (inner) {
+   DR_LOG(ERR, "Inner GENEVE item not supported");
+   rte_errno = ENOTSUP;
+   return rte_errno;
+   }
+
+   /* In order to match on Geneve we must match on ip_protocol and 
l4_dport */
+   if (!cd->relaxed) {
+   fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, inner)];
+   if (!fc->tag_set) {
+   fc->item_idx = item_idx;
+   fc->tag_mask_set = &mlx5dr_definer_ones_set;
+   fc->tag_set = &mlx5dr_definer_udp_protocol_set;
+   DR_CALC_SET(fc, eth_l2, l4_type_bwc, inner);
+   }
+
+   fc = &cd->fc[DR_CALC_FNAME(L4_DPORT, inner)];
+   if (!fc->tag_set) {
+   fc->item_idx = item_idx;
+   fc->tag_mask_set = &mlx5dr_definer_ones_set;
+   fc->tag_set = &mlx5dr_definer_geneve_udp_port_set;
+   DR_CALC_SET(fc, eth_l4, destination_port, inner);
+   }
+   }
+
+   if (!m)
+   return 0;
+
+   if (m->rsvd1) {
+   rte_errno = ENOTSUP;
+   return rte_errno;
+   }
+
+   if (m->ver_opt_len_o_c_rsvd0) {
+   fc = &cd->fc[MLX5DR_DEFINER_FNAME_GENEVE_CTRL];
+   fc->item_idx = item_idx;
+   fc->tag_set = &mlx5dr_definer_geneve_ctrl_set;
+   DR_CALC_SET_HDR(fc, tunnel_header, tunnel_header_0);
+   fc->bit_mask = __mlx5_mask(header_geneve, ver_opt_len_o_c_rsvd);
+   fc->bit_off = __mlx5_dw_bit_off(header_geneve, 
ver_opt_len_o_c_rsvd);
+   }
+
+   if (m->protocol) {
+   fc = &cd->fc[MLX5DR_DEFINER_FNAME_GENEVE_PROTO];
+   fc->item_idx = item_idx;
+   fc->tag_set = &mlx5dr_definer_geneve_protocol_set;
+   DR_CALC_SET_HDR(fc, tunnel_header, tunnel_header_0);
+   fc->byte_off += MLX5_BYTE_OFF(header_geneve, protocol_type);
+   fc->bit_mask = __mlx5_mask(header_geneve, protocol_type);
+   fc->bit_off = __mlx5_dw_bit_off(header_geneve, protocol_type);
+   }
+
+   if (!is_mem_zero(m->vni, 3)) {
+   fc = &cd->fc[MLX5DR_DEFINER_FNAME_GENEVE_VNI];
+   fc->item_id

[PATCH v1 18/23] net/mlx5/hws: support GENEVE options header

[Michael Baum]

From: Alex Vesker 

Add support for matching multiple GENEVE options. Options
header introduces new complexities since there can be more
than one GENEVE option. This requires us to track the total
DWs used for matching. Current code supports 8DWs for data
including type, class, length. There is also an optimization
to use a special OK bit to reduce the use of limited data DWs.

Signed-off-by: Alex Vesker 
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 147 --
 drivers/net/mlx5/hws/mlx5dr_definer.h |  24 +
 2 files changed, 165 insertions(+), 6 deletions(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c 
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 141941c309..126e522235 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -117,6 +117,8 @@ struct mlx5dr_definer_conv_data {
uint8_t relaxed;
uint8_t tunnel;
uint8_t mpls_idx;
+   uint8_t geneve_opt_ok_idx;
+   uint8_t geneve_opt_data_idx;
enum rte_flow_item_type last_item;
 };
 
@@ -696,6 +698,29 @@ mlx5dr_definer_geneve_vni_set(struct mlx5dr_definer_fc *fc,
memcpy(tag + fc->byte_off, v->vni, sizeof(v->vni));
 }
 
+static void
+mlx5dr_definer_geneve_opt_ctrl_set(struct mlx5dr_definer_fc *fc,
+  const void *item_spec,
+  uint8_t *tag)
+{
+   const struct rte_flow_item_geneve_opt *v = item_spec;
+   uint32_t dw0 = 0;
+
+   dw0 |= v->option_type << __mlx5_dw_bit_off(header_geneve_opt, type);
+   dw0 |= rte_cpu_to_be_16(v->option_class) << 
__mlx5_dw_bit_off(header_geneve_opt, class);
+   DR_SET(tag, dw0, fc->byte_off, fc->bit_off, fc->bit_mask);
+}
+
+static void
+mlx5dr_definer_geneve_opt_data_set(struct mlx5dr_definer_fc *fc,
+  const void *item_spec,
+  uint8_t *tag)
+{
+   const struct rte_flow_item_geneve_opt *v = item_spec;
+
+   DR_SET_BE32(tag, v->data[fc->extra_data], fc->byte_off, fc->bit_off, 
fc->bit_mask);
+}
+
 static void
 mlx5dr_definer_ib_l4_qp_set(struct mlx5dr_definer_fc *fc,
const void *item_spec,
@@ -1328,7 +1353,6 @@ mlx5dr_definer_conv_item_port(struct 
mlx5dr_definer_conv_data *cd,
struct mlx5dr_cmd_query_caps *caps = cd->ctx->caps;
const struct rte_flow_item_ethdev *m = item->mask;
struct mlx5dr_definer_fc *fc;
-   uint8_t bit_offset = 0;
 
if (m->port_id) {
if (!caps->wire_regc_mask) {
@@ -1337,16 +1361,13 @@ mlx5dr_definer_conv_item_port(struct 
mlx5dr_definer_conv_data *cd,
return rte_errno;
}
 
-   while (!(caps->wire_regc_mask & (1 << bit_offset)))
-   bit_offset++;
-
fc = &cd->fc[MLX5DR_DEFINER_FNAME_VPORT_REG_C_0];
fc->item_idx = item_idx;
fc->tag_set = &mlx5dr_definer_vport_set;
fc->tag_mask_set = &mlx5dr_definer_ones_set;
DR_CALC_SET_HDR(fc, registers, register_c_0);
-   fc->bit_off = bit_offset;
-   fc->bit_mask = caps->wire_regc_mask >> bit_offset;
+   fc->bit_off = __builtin_ctz(caps->wire_regc_mask);
+   fc->bit_mask = caps->wire_regc_mask >> fc->bit_off;
} else {
DR_LOG(ERR, "Pord ID item mask must specify ID mask");
rte_errno = EINVAL;
@@ -2259,6 +2280,116 @@ mlx5dr_definer_conv_item_geneve(struct 
mlx5dr_definer_conv_data *cd,
return 0;
 }
 
+static int
+mlx5dr_definer_conv_item_geneve_opt(struct mlx5dr_definer_conv_data *cd,
+   struct rte_flow_item *item,
+   int item_idx)
+{
+   const struct rte_flow_item_geneve_opt *m = item->mask;
+   const struct rte_flow_item_geneve_opt *v = item->spec;
+   struct mlx5_hl_data *hl_ok_bit, *hl_dws;
+   struct mlx5dr_definer_fc *fc;
+   uint8_t num_of_dws, i;
+   bool ok_bit_on_class;
+   int ret;
+
+   if (!m || !(m->option_class || m->option_type || m->data))
+   return 0;
+
+   if (!v || m->option_type != 0xff) {
+   DR_LOG(ERR, "Cannot match geneve opt without valid opt type");
+   goto out_not_supp;
+   }
+
+   if (m->option_class && m->option_class != RTE_BE16(UINT16_MAX)) {
+   DR_LOG(ERR, "Geneve option class has invalid mask");
+   goto out_not_supp;
+   }
+
+   ret = mlx5_get_geneve_hl_data(cd->ctx,
+ v->option_type,
+ v->option_class,
+ &hl_ok_bit,
+ &num_of_dws,
+ &hl_dws,
+ &ok_bit_on_class);
+   if (ret) {
+   DR_LOG(ERR, "Geneve opt type and class %d not supported", 
v->opt

[PATCH v1 15/23] net/mlx5: add testpmd support for GENEVE TLV parser

[Michael Baum]

Add GENEVE TLV parser support for mlx5 testpmd using following commands:

1. Add single option to the global option list:

   testpmd> mlx5 set tlv_option class (class) type (type) len (length) \
offset (sample_offset) sample_len (sample_len) \
class_mode (ignore|fixed|matchable) \
data (0x|0x0 [0x|0x0]*)

2. Remove several options from the global option list:

   testpmd> mlx5 flush tlv_options max (nb_option)

3. Print all options which are set in the global option list so far:

   testpmd> mlx5 list tlv_options

4. Create GENEVE TLV parser for specific port using option list which
   are set so far:

   testpmd> mlx5 port (port_id) apply tlv_options

5. Destroy GENEVE TLV parser for specific port:

   testpmd> mlx5 port (port_id) destroy tlv_options

Signed-off-by: Michael Baum 
---
 doc/guides/nics/mlx5.rst|  97 ++
 drivers/net/mlx5/mlx5_testpmd.c | 556 +++-
 2 files changed, 652 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 80446d8d82..b0f2cdcd62 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -2499,3 +2499,100 @@ This command is used for testing live migration,
 and works for software steering only.
 Default FDB jump should be disabled if switchdev is enabled.
 The mode will propagate to all the probed ports.
+
+GENEVE TLV options parser
+~
+
+GENEVE TLV options parser management.
+See :ref:`options parser API ` for more information.
+
+Setting Option
+^^
+
+Add single option to the global option list::
+
+   testpmd> mlx5 set tlv_option class (class) type (type) len (length) \
+offset (sample_offset) sample_len (sample_len) \
+class_mode (ignore|fixed|matchable) data (0x|0x0 
[0x|0x0]*)
+
+where:
+
+* ``class``: option class.
+* ``type``: option type.
+* ``length``: option data length in 4 bytes granularity.
+* ``sample_offset``: offset to data list related to option data start.
+  The offset is in 4 bytes granularity.
+* ``sample_len``: length data list in 4 bytes granularity.
+* ``ignore``: ignore ``class`` field.
+* ``fixed``: option class is fixed and defines the option along with the type.
+* ``matchable``: ``class`` field is matchable.
+* ``data``: list of masks indicating which DW should be configure.
+  The size of list should be equal to ``sample_len``.
+* ``0x``: this DW should be configure.
+* ``0x0``: this DW shouldn't be configure.
+
+
+Flushing Options
+
+
+Remove several options from the global option list::
+
+   testpmd> mlx5 flush tlv_options max (nb_option)
+
+where:
+
+* ``nb_option``: maximum number of option to remove from list. The order is 
LIFO.
+
+
+Listing Options
+^^^
+
+Print all options which are set in the global option list so far::
+
+   testpmd> mlx5 list tlv_options
+
+Output contains the values of each option, one per line.
+There is no output at all when no options are configured on the global list::
+
+   ID  TypeClass   Class_mode   Len Offset  Sample_len   Data
+   [...]   [...]   [...]   [...][...]   [...]   [...][...]
+
+Setting several options and listing them::
+
+   testpmd> mlx5 set tlv_option class 1 type 1 len 4 offset 1 sample_len 3
+class_mode fixed data 0x 0x0 0x
+   testpmd: set new option in global list, now it has 1 options
+   testpmd> mlx5 set tlv_option class 1 type 2 len 2 offset 0 sample_len 2
+class_mode fixed data 0x 0x
+   testpmd: set new option in global list, now it has 2 options
+   testpmd> mlx5 set tlv_option class 1 type 3 len 5 offset 4 sample_len 1
+class_mode fixed data 0x
+   testpmd: set new option in global list, now it has 3 options
+   testpmd> mlx5 list tlv_options
+   ID  TypeClass   Class_mode   LenOffset  Sample_len  Data
+   0   1   1   fixed4  1   3   0x 
0x0 0x
+   1   2   1   fixed2  0   2   0x 
0x
+   2   3   1   fixed5  4   1   0x
+   testpmd>
+
+
+Applying Options
+
+
+Create GENEVE TLV parser for specific port using option list which are set so
+far::
+
+   testpmd> mlx5 port (port_id) apply tlv_options
+
+The same global option list can used by several ports.
+
+
+Destroying Options
+^^
+
+Destroy GENEVE TLV parser for specific port::
+
+   testpmd> mlx5 port (port_id) destroy tlv_options
+
+This command doesn't destroy the global list,
+For releasing options, ``flush`` command should be used.
diff --git a/drivers/net/mlx5/mlx5_testpmd.c b/drivers/net/mlx5/mlx5_testpmd.c
index 403f3a8f83..5bc4dd0551 100644
--- a/drivers/net/mlx5/mlx5_testpmd.c
+++ b/drivers/net/mlx5/mlx5_testpmd.c
@@ -23,9 +23,25 @@
 #include "mlx5_testpmd.h"
 #include "testpm

[PATCH v1 20/23] net/mlx5: add GENEVE option support for profile 0

[Michael Baum]

Add support for matching and modifying GENEVE option for
FLEX_PARSER_PROFILE_ENABLE=0.
Before this patch it is supported when FLEX_PARSER_PROFILE_ENABLE=8 in
HW steering and when FLEX_PARSER_PROFILE_ENABLE=0 in SW steering.

Signed-off-by: Michael Baum 
---
 doc/guides/nics/mlx5.rst|   9 ++-
 doc/guides/platform/mlx5.rst|   6 +-
 drivers/net/mlx5/mlx5_flow_geneve.c | 114 +---
 3 files changed, 95 insertions(+), 34 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 645b566d80..b946ce00c2 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -347,6 +347,7 @@ Limitations
  - Multiple of same Geneve TLV option isn't supported at the same pattern
template.
  - Supported only when ``FLEX_PARSER_PROFILE_ENABLE`` = 8.
+ - Supported also when ``FLEX_PARSER_PROFILE_ENABLE`` = 0 for single DW 
only.
 
 - VF: flow rules created on VF devices can only match traffic targeted at the
   configured MAC addresses (see ``rte_eth_dev_mac_addr_add()``).
@@ -2429,8 +2430,14 @@ Limitations
 ~~~
 
 * Supported only in HW steering (``dv_flow_en`` = 2).
-* Supported only when ``FLEX_PARSER_PROFILE_ENABLE`` = 8.
 * Supported for FW version **xx.37.0142** and above.
+* Parser creation can be done only for E-Switch manager.
+* Supported for multiple DW only when ``FLEX_PARSER_PROFILE_ENABLE`` = 8.
+* Supported for single DW also when ``FLEX_PARSER_PROFILE_ENABLE`` = 0 with 
some limitations:
+
+   - ``sample_len`` must be equal to ``option_len`` and not bigger than 1.
+   - ``match_on_class_mode`` different than 1 is not supported.
+   - ``offset`` must be 0.
 
 
 Testpmd driver specific commands
diff --git a/doc/guides/platform/mlx5.rst b/doc/guides/platform/mlx5.rst
index d16508d0da..a66cf778d1 100644
--- a/doc/guides/platform/mlx5.rst
+++ b/doc/guides/platform/mlx5.rst
@@ -536,12 +536,10 @@ Below are some firmware configurations listed.
or
FLEX_PARSER_PROFILE_ENABLE=1
 
-- enable Geneve TLV option flow matching in SW steering::
+- enable Geneve TLV option flow matching::
 
FLEX_PARSER_PROFILE_ENABLE=0
-
-- enable Geneve TLV option flow matching in HW steering::
-
+   or
FLEX_PARSER_PROFILE_ENABLE=8
 
 - enable GTP flow matching::
diff --git a/drivers/net/mlx5/mlx5_flow_geneve.c 
b/drivers/net/mlx5/mlx5_flow_geneve.c
index 2c8dc39e74..f3ee414d02 100644
--- a/drivers/net/mlx5/mlx5_flow_geneve.c
+++ b/drivers/net/mlx5/mlx5_flow_geneve.c
@@ -18,6 +18,8 @@
 #define MAX_GENEVE_OPTION_TOTAL_DATA_SIZE \
(MAX_GENEVE_OPTION_DATA_SIZE * MAX_GENEVE_OPTIONS_RESOURCES)
 
+#define INVALID_SAMPLE_ID (UINT8_MAX)
+
 /**
  * Single DW inside GENEVE TLV option.
  */
@@ -265,6 +267,8 @@ mlx5_geneve_tlv_options_unregister(struct mlx5_priv *priv,
  *   Pointer to header layout structure to update.
  * @param resource
  *   Pointer to single sample context to fill.
+ * @param sample_id
+ *   The flex parser id for single DW or UINT8_MAX for multiple DWs.
  *
  * @return
  *   0 on success, a negative errno otherwise and rte_errno is set.
@@ -274,7 +278,7 @@ mlx5_geneve_tlv_option_create_sample(void *ctx,
  struct mlx5_devx_geneve_tlv_option_attr *attr,
  struct mlx5_devx_match_sample_info_query_attr *query_attr,
  struct mlx5_hl_data *match_data,
- struct mlx5_geneve_tlv_resource *resource)
+ struct mlx5_geneve_tlv_resource *resource, uint8_t 
sample_id)
 {
struct mlx5_devx_obj *obj;
int ret;
@@ -282,7 +286,10 @@ mlx5_geneve_tlv_option_create_sample(void *ctx,
obj = mlx5_devx_cmd_create_geneve_tlv_option(ctx, attr);
if (obj == NULL)
return -rte_errno;
-   ret = mlx5_devx_cmd_query_geneve_tlv_option(ctx, obj, query_attr);
+   if (sample_id == INVALID_SAMPLE_ID)
+   ret = mlx5_devx_cmd_query_geneve_tlv_option(ctx, obj, 
query_attr);
+   else
+   ret = mlx5_devx_cmd_match_sample_info_query(ctx, sample_id, 
query_attr);
if (ret) {
claim_zero(mlx5_devx_cmd_destroy(obj));
return ret;
@@ -335,20 +342,22 @@ should_configure_sample_for_dw0(const struct 
rte_pmd_mlx5_geneve_tlv *spec)
  *   Pointer to user configuration.
  * @param option
  *   Pointer to single GENEVE TLV option to fill.
+ * @param sample_id
+ *   The flex parser id for single DW or UINT8_MAX for multiple DWs.
  *
  * @return
  *   0 on success, a negative errno otherwise and rte_errno is set.
  */
 static int
 mlx5_geneve_tlv_option_create(void *ctx, const struct rte_pmd_mlx5_geneve_tlv 
*spec,
- struct mlx5_geneve_tlv_option *option)
+ struct mlx5_geneve_tlv_option *option, uint8_t 
sample_id)
 {
struct mlx5_devx_geneve_tlv_option_attr attr = {
.option_class = spec->option_class,
.option_type = spec->option_type,
   

[PATCH v1 21/23] net/mlx5: add GENEVE option support for group 0

[Michael Baum]

Add support for HWS GENEVE options for flex parser profile 0 and group
0.

This patch avoids parser creation during matcher/flow preparation for HW
steering (MLX5_SET_MATCHER_HS) and removes some logic done in
"flow_dev_geneve_tlv_option_resource_*()" functions when dv_flow_en=2.

After this change, those functions became static and they were removed
from header file.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/mlx5.c |  8 +---
 drivers/net/mlx5/mlx5_flow.h|  4 
 drivers/net/mlx5/mlx5_flow_dv.c | 24 +++-
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 5f8af31aea..881c42a97a 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -2049,13 +2049,7 @@ mlx5_free_shared_dev_ctx(struct mlx5_dev_ctx_shared *sh)
} while (++i <= sh->bond.n_port);
if (sh->td)
claim_zero(mlx5_devx_cmd_destroy(sh->td));
-#ifdef HAVE_MLX5_HWS_SUPPORT
-   /* HWS manages geneve_tlv_option resource as global. */
-   if (sh->config.dv_flow_en == 2)
-   flow_dev_geneve_tlv_option_resource_release(sh);
-   else
-#endif
-   MLX5_ASSERT(sh->geneve_tlv_option_resource == NULL);
+   MLX5_ASSERT(sh->geneve_tlv_option_resource == NULL);
pthread_mutex_destroy(&sh->txpp.mutex);
mlx5_lwm_unset(sh);
mlx5_physical_device_destroy(sh->phdev);
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 04a2eb0b0c..808f364c6c 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -2825,10 +2825,6 @@ void flow_hw_grp_clone_free_cb(void *tool_ctx, struct 
mlx5_list_entry *entry);
 
 struct mlx5_aso_age_action *flow_aso_age_get_by_idx(struct rte_eth_dev *dev,
uint32_t age_idx);
-int flow_dev_geneve_tlv_option_resource_register(struct rte_eth_dev *dev,
-const struct rte_flow_item *item,
-struct rte_flow_error *error);
-void flow_dev_geneve_tlv_option_resource_release(struct mlx5_dev_ctx_shared 
*sh);
 
 void flow_release_workspace(void *data);
 int mlx5_flow_os_init_workspace_once(void);
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 8894f51f4c..72e0d82e7b 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9880,7 +9880,7 @@ flow_dv_translate_item_geneve(void *key, const struct 
rte_flow_item *item,
 /**
  * Create Geneve TLV option resource.
  *
- * @param dev[in, out]
+ * @param[in, out] dev
  *   Pointer to rte_eth_dev structure.
  * @param[in] item
  *   Flow pattern to translate.
@@ -9890,8 +9890,7 @@ flow_dv_translate_item_geneve(void *key, const struct 
rte_flow_item *item,
  * @return
  *   0 on success otherwise -errno and errno is set.
  */
-
-int
+static int
 flow_dev_geneve_tlv_option_resource_register(struct rte_eth_dev *dev,
 const struct rte_flow_item *item,
 struct rte_flow_error *error)
@@ -9904,6 +9903,7 @@ flow_dev_geneve_tlv_option_resource_register(struct 
rte_eth_dev *dev,
const struct rte_flow_item_geneve_opt *geneve_opt_v = item->spec;
int ret = 0;
 
+   MLX5_ASSERT(sh->config.dv_flow_en == 1);
if (!geneve_opt_v)
return -1;
rte_spinlock_lock(&sh->geneve_tlv_opt_sl);
@@ -9914,13 +9914,8 @@ flow_dev_geneve_tlv_option_resource_register(struct 
rte_eth_dev *dev,
geneve_opt_v->option_type &&
geneve_opt_resource->length ==
geneve_opt_v->option_len) {
-   /*
-* We already have GENEVE TLV option obj allocated.
-* Increasing refcnt only in SWS. HWS uses it as global.
-*/
-   if (priv->sh->config.dv_flow_en == 1)
-   
__atomic_fetch_add(&geneve_opt_resource->refcnt, 1,
-  __ATOMIC_RELAXED);
+   __atomic_fetch_add(&geneve_opt_resource->refcnt, 1,
+  __ATOMIC_RELAXED);
} else {
ret = rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
@@ -,8 +9994,11 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev 
*dev, void *key,
return -1;
MLX5_ITEM_UPDATE(item, key_type, geneve_opt_v, geneve_opt_m,
 &rte_flow_item_geneve_opt_mask);
-   /* Register resource requires item spec. */
-   if (key_type & MLX5_SET_MATCHER_V) {
+   /*
+* Register resource requires item spec for SW steering,
+* for HW steering resources is registered explicitly by user.
+

[PATCH v1 22/23] net/mlx5: add support for GENEVE VNI modify field

[Michael Baum]

Add support for GENEVE VNI field modification.
The support is only using HW steering.

Signed-off-by: Michael Baum 
---
 doc/guides/nics/mlx5.rst   |  6 +-
 doc/guides/rel_notes/release_24_03.rst |  1 +
 drivers/net/mlx5/mlx5_flow_dv.c|  4 +---
 drivers/net/mlx5/mlx5_flow_hw.c| 12 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index b946ce00c2..fceb5bd58b 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -577,7 +577,11 @@ Limitations
   - Modification of an arbitrary place in a packet via the special 
``RTE_FLOW_FIELD_START`` Field ID is not supported.
   - Modification of the MPLS header is supported only in HWS and only to copy 
from,
 the encapsulation level is always 0.
-  - Modification of the 802.1Q Tag, VXLAN Network or GENEVE Network ID's is 
not supported.
+  - Modification of the 802.1Q Tag is not supported.
+  - Modification of VXLAN Network or GENEVE Network ID's is supported only for 
HW steering.
+  - Modification of GENEVE Network ID's is not supported when configured
+``FLEX_PARSER_PROFILE_ENABLE`` supports Geneve TLV options.
+See :ref:`mlx5_firmware_config` for more flex parser information.
   - Encapsulation levels are not supported, can modify outermost header fields 
only.
   - Offsets cannot skip past the boundary of a field.
   - If the field type is ``RTE_FLOW_FIELD_MAC_TYPE``
diff --git a/doc/guides/rel_notes/release_24_03.rst 
b/doc/guides/rel_notes/release_24_03.rst
index bedef2a4c0..8a99d6bfa4 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -59,6 +59,7 @@ New Features
 
   * Added HW steering support for ``RTE_FLOW_ITEM_TYPE_GENEVE`` flow item.
   * Added HW steering support for ``RTE_FLOW_ITEM_TYPE_GENEVE_OPT`` flow item.
+  * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_VNI`` 
flow action.
 
 
 Removed Items
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 72e0d82e7b..bb3d7ddc3c 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1881,6 +1881,7 @@ mlx5_flow_field_id_to_modify_info
info[idx].offset = off_be;
break;
case RTE_FLOW_FIELD_VXLAN_VNI:
+   case RTE_FLOW_FIELD_GENEVE_VNI:
MLX5_ASSERT(data->offset + width <= 24);
/* VNI is on bits 31-8 of TUNNEL_HDR_DW_1. */
off_be = 24 - (data->offset + width) + 8;
@@ -1891,9 +1892,6 @@ mlx5_flow_field_id_to_modify_info
else
info[idx].offset = off_be;
break;
-   case RTE_FLOW_FIELD_GENEVE_VNI:
-   /* not supported yet*/
-   break;
case RTE_FLOW_FIELD_GTP_TEID:
MLX5_ASSERT(data->offset + width <= 32);
off_be = 32 - (data->offset + width);
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 7c786c432f..22ac4e0a7c 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -4952,6 +4952,8 @@ flow_hw_validate_action_modify_field(struct rte_eth_dev 
*dev,
 {
const struct rte_flow_action_modify_field *action_conf = action->conf;
const struct rte_flow_action_modify_field *mask_conf = mask->conf;
+   struct mlx5_priv *priv = dev->data->dev_private;
+   struct mlx5_hca_attr *attr = &priv->sh->cdev->config.hca_attr;
int ret;
 
if (!mask_conf)
@@ -5047,10 +5049,16 @@ flow_hw_validate_action_modify_field(struct rte_eth_dev 
*dev,
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, action,
"modifying vlan_type is not supported");
-   if (flow_hw_modify_field_is_used(action_conf, 
RTE_FLOW_FIELD_GENEVE_VNI))
+   /**
+* Geneve VNI modification is supported only when Geneve header is
+* parsed natively. When GENEVE options are supported, they both Geneve
+* and options headers are parsed as a flex parser.
+*/
+   if (flow_hw_modify_field_is_used(action_conf, 
RTE_FLOW_FIELD_GENEVE_VNI) &&
+   attr->geneve_tlv_opt)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, action,
-   "modifying Geneve VNI is not supported");
+   "modifying Geneve VNI is not supported when 
GENEVE opt is supported");
/* Due to HW bug, tunnel MPLS header is read only. */
if (action_conf->dst.field == RTE_FLOW_FIELD_MPLS)
return rte_flow_error_set(error, EINVAL,
-- 
2.25.1

[PATCH v1 19/23] net/mlx5: add support for GENEVE and option item in HWS

[Michael Baum]

Add HW steering support for both "RTE_FLOW_ITEM_TYPE_GENEVE" and
"RTE_FLOW_ITEM_TYPE_GENEVE_OPT".

Signed-off-by: Michael Baum 
---
 doc/guides/nics/mlx5.rst   |  15 ++-
 doc/guides/rel_notes/release_24_03.rst |   5 +
 drivers/net/mlx5/mlx5_flow.h   |  21 +
 drivers/net/mlx5/mlx5_flow_geneve.c| 121 -
 drivers/net/mlx5/mlx5_flow_hw.c|  44 -
 5 files changed, 199 insertions(+), 7 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index b0f2cdcd62..645b566d80 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -329,12 +329,25 @@ Limitations
  - Length
  - Data
 
-  Only one Class/Type/Length Geneve TLV option is supported per shared device.
   Class/Type/Length fields must be specified as well as masks.
   Class/Type/Length specified masks must be full.
   Matching Geneve TLV option without specifying data is not supported.
   Matching Geneve TLV option with ``data & mask == 0`` is not supported.
 
+  In SW steering (``dv_flow_en`` = 1):
+
+ - Only one Class/Type/Length Geneve TLV option is supported per shared
+   device.
+ - Supported only when ``FLEX_PARSER_PROFILE_ENABLE`` = 0.
+
+  In HW steering (``dv_flow_en`` = 2):
+
+ - Multiple Class/Type/Length Geneve TLV option are supported per physical
+   device. See :ref:`geneve_parser_api` for more information.
+ - Multiple of same Geneve TLV option isn't supported at the same pattern
+   template.
+ - Supported only when ``FLEX_PARSER_PROFILE_ENABLE`` = 8.
+
 - VF: flow rules created on VF devices can only match traffic targeted at the
   configured MAC addresses (see ``rte_eth_dev_mac_addr_add()``).
 
diff --git a/doc/guides/rel_notes/release_24_03.rst 
b/doc/guides/rel_notes/release_24_03.rst
index e9c9717706..bedef2a4c0 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -55,6 +55,11 @@ New Features
  Also, make sure to start the actual text at the margin.
  ===
 
+* **Updated NVIDIA mlx5 net driver.**
+
+  * Added HW steering support for ``RTE_FLOW_ITEM_TYPE_GENEVE`` flow item.
+  * Added HW steering support for ``RTE_FLOW_ITEM_TYPE_GENEVE_OPT`` flow item.
+
 
 Removed Items
 -
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index dca3cacb65..04a2eb0b0c 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1332,6 +1332,15 @@ struct mlx5_action_construct_data {
 
 #define MAX_GENEVE_OPTIONS_RESOURCES 7
 
+/* GENEVE TLV options manager structure. */
+struct mlx5_geneve_tlv_options_mng {
+   uint8_t nb_options; /* Number of options inside the template. */
+   struct {
+   uint8_t opt_type;
+   uint16_t opt_class;
+   } options[MAX_GENEVE_OPTIONS_RESOURCES];
+};
+
 /* Flow item template struct. */
 struct rte_flow_pattern_template {
LIST_ENTRY(rte_flow_pattern_template) next;
@@ -1351,6 +1360,8 @@ struct rte_flow_pattern_template {
 * tag pattern item for representor matching.
 */
bool implicit_tag;
+   /* Manages all GENEVE TLV options used by this pattern template. */
+   struct mlx5_geneve_tlv_options_mng geneve_opt_mng;
uint8_t flex_item; /* flex item index. */
 };
 
@@ -1799,6 +1810,16 @@ mlx5_geneve_tlv_parser_create(uint16_t port_id,
  const struct rte_pmd_mlx5_geneve_tlv tlv_list[],
  uint8_t nb_options);
 int mlx5_geneve_tlv_parser_destroy(void *handle);
+int mlx5_flow_geneve_tlv_option_validate(struct mlx5_priv *priv,
+const struct rte_flow_item *geneve_opt,
+struct rte_flow_error *error);
+
+struct mlx5_geneve_tlv_options_mng;
+int mlx5_geneve_tlv_option_register(struct mlx5_priv *priv,
+   const struct rte_flow_item_geneve_opt *spec,
+   struct mlx5_geneve_tlv_options_mng *mng);
+void mlx5_geneve_tlv_options_unregister(struct mlx5_priv *priv,
+   struct mlx5_geneve_tlv_options_mng 
*mng);
 
 void flow_hw_set_port_info(struct rte_eth_dev *dev);
 void flow_hw_clear_port_info(struct rte_eth_dev *dev);
diff --git a/drivers/net/mlx5/mlx5_flow_geneve.c 
b/drivers/net/mlx5/mlx5_flow_geneve.c
index 2d593b70ba..2c8dc39e74 100644
--- a/drivers/net/mlx5/mlx5_flow_geneve.c
+++ b/drivers/net/mlx5/mlx5_flow_geneve.c
@@ -152,6 +152,106 @@ mlx5_get_geneve_hl_data(const void *dr_ctx, uint8_t type, 
uint16_t class,
return -EINVAL;
 }
 
+/**
+ * Calculate total data size.
+ *
+ * @param[in] priv
+ *   Pointer to port's private data.
+ * @param[in] geneve_opt
+ *   Pointer to GENEVE option item structure.
+ * @param[out] error
+ *   Pointer to error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value othe

[PATCH v1 23/23] net/mlx5: add support for modify GENEVE option header

[Michael Baum]

Add support for GENEVE option fields modification.
Only fields configured in parser creation can be modified.

Signed-off-by: Michael Baum 
---
 doc/guides/nics/mlx5.rst   |   4 +
 doc/guides/rel_notes/release_24_03.rst |   3 +
 drivers/net/mlx5/mlx5_flow.h   |  21 +
 drivers/net/mlx5/mlx5_flow_dv.c|  78 -
 drivers/net/mlx5/mlx5_flow_geneve.c| 117 +
 drivers/net/mlx5/mlx5_flow_hw.c|  71 ++-
 6 files changed, 268 insertions(+), 26 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index fceb5bd58b..85820d7931 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -582,6 +582,10 @@ Limitations
   - Modification of GENEVE Network ID's is not supported when configured
 ``FLEX_PARSER_PROFILE_ENABLE`` supports Geneve TLV options.
 See :ref:`mlx5_firmware_config` for more flex parser information.
+  - Modification of GENEVE TLV option fields is supported only for HW steering.
+Only DWs configured in :ref:`parser creation ` can be 
modified,
+'type' and 'class' fields can be modified when ``match_on_class_mode=2``.
+  - Modification of GENEVE TLV option data supports one DW per action.
   - Encapsulation levels are not supported, can modify outermost header fields 
only.
   - Offsets cannot skip past the boundary of a field.
   - If the field type is ``RTE_FLOW_FIELD_MAC_TYPE``
diff --git a/doc/guides/rel_notes/release_24_03.rst 
b/doc/guides/rel_notes/release_24_03.rst
index 8a99d6bfa4..f8d87c8a3c 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -60,6 +60,9 @@ New Features
   * Added HW steering support for ``RTE_FLOW_ITEM_TYPE_GENEVE`` flow item.
   * Added HW steering support for ``RTE_FLOW_ITEM_TYPE_GENEVE_OPT`` flow item.
   * Added HW steering support for modify field ``RTE_FLOW_FIELD_GENEVE_VNI`` 
flow action.
+  * Added HW steering support for modify field 
``RTE_FLOW_FIELD_GENEVE_OPT_TYPE`` flow action.
+  * Added HW steering support for modify field 
``RTE_FLOW_FIELD_GENEVE_OPT_CLASS`` flow action.
+  * Added HW steering support for modify field 
``RTE_FLOW_FIELD_GENEVE_OPT_DATA`` flow action.
 
 
 Removed Items
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 808f364c6c..65fe5be2fd 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1805,6 +1805,25 @@ mlx5_get_geneve_hl_data(const void *dr_ctx, uint8_t 
type, uint16_t class,
struct mlx5_hl_data ** const hl_dws,
bool *ok_bit_on_class);
 
+/**
+ * Get modify field ID for single DW inside configured GENEVE TLV option.
+ *
+ * @param[in] dr_ctx
+ *   Pointer to HW steering DR context.
+ * @param[in] type
+ *   GENEVE TLV option type.
+ * @param[in] class
+ *   GENEVE TLV option class.
+ * @param[in] dw_offset
+ *   Offset of DW inside the option.
+ *
+ * @return
+ *   Modify field ID on success, negative errno otherwise and rte_errno is set.
+ */
+int
+mlx5_get_geneve_option_modify_field_id(const void *dr_ctx, uint8_t type,
+  uint16_t class, uint8_t dw_offset);
+
 void *
 mlx5_geneve_tlv_parser_create(uint16_t port_id,
  const struct rte_pmd_mlx5_geneve_tlv tlv_list[],
@@ -1813,6 +1832,8 @@ int mlx5_geneve_tlv_parser_destroy(void *handle);
 int mlx5_flow_geneve_tlv_option_validate(struct mlx5_priv *priv,
 const struct rte_flow_item *geneve_opt,
 struct rte_flow_error *error);
+int mlx5_geneve_opt_modi_field_get(struct mlx5_priv *priv,
+  const struct rte_flow_action_modify_data 
*data);
 
 struct mlx5_geneve_tlv_options_mng;
 int mlx5_geneve_tlv_option_register(struct mlx5_priv *priv,
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index bb3d7ddc3c..2a7ee4e91f 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1446,6 +1446,21 @@ mlx5_mpls_modi_field_get(const struct 
rte_flow_action_modify_data *data)
return MLX5_MODI_IN_MPLS_LABEL_0 + data->tag_index;
 }
 
+static __rte_always_inline int
+flow_geneve_opt_modi_field_get(struct mlx5_priv *priv,
+  const struct rte_flow_action_modify_data *data)
+{
+#ifdef HAVE_MLX5_HWS_SUPPORT
+   return mlx5_geneve_opt_modi_field_get(priv, data);
+#else
+   (void)priv;
+   (void)data;
+   DRV_LOG(ERR, "GENEVE option modification is not supported.");
+   rte_errno = ENOTSUP;
+   return -rte_errno;
+#endif
+}
+
 static void
 mlx5_modify_flex_item(const struct rte_eth_dev *dev,
  const struct mlx5_flex_item *flex,
@@ -1579,9 +1594,11 @@ mlx5_flow_field_id_to_modify_info
 const struct rte_flow_attr *attr, struct rte_flow_error *error)
 {
struct mlx5_priv *priv = dev->data->dev_

[PATCH v2 0/8] fix resource leak problems

[Chaoyong He]

This patch series fix some resource leak problems in NFP PMD.

---
V2:
* Add a new commit to change the process private data.
* Fix the secondary process problem found by reviewer.
---

Chaoyong He (8):
  net/nfp: modify the process private data
  net/nfp: fix resource leak for device initialization
  net/nfp: fix resource leak for CoreNIC firmware
  net/nfp: fix resource leak for PF initialization
  net/nfp: fix resource leak for flower firmware
  net/nfp: fix resource leak for exit of CoreNIC firmware
  net/nfp: fix resource leak for exit of flower firmware
  net/nfp: fix resource leak for VF

 drivers/net/nfp/flower/nfp_flower.c   |  75 ++--
 drivers/net/nfp/flower/nfp_flower.h   |   1 +
 .../net/nfp/flower/nfp_flower_representor.c   | 153 -
 .../net/nfp/flower/nfp_flower_representor.h   |   1 +
 drivers/net/nfp/nfp_ethdev.c  | 162 +-
 drivers/net/nfp/nfp_ethdev_vf.c   |  10 +-
 drivers/net/nfp/nfp_net_common.c  |   8 +-
 drivers/net/nfp/nfp_net_common.h  |   1 +
 8 files changed, 301 insertions(+), 110 deletions(-)

-- 
2.39.1

[PATCH v2 1/8] net/nfp: modify the process private data

[Chaoyong He]

Modify the process private data from 'struct nfp_cpp *' into
'struct nfp_pf_dev *'.

Signed-off-by: Chaoyong He 
---
 drivers/net/nfp/flower/nfp_flower.c |  2 +-
 drivers/net/nfp/nfp_ethdev.c| 27 +--
 drivers/net/nfp/nfp_net_common.c|  8 +---
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower.c 
b/drivers/net/nfp/flower/nfp_flower.c
index 6b523d98b0..f172c8350d 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -872,7 +872,7 @@ nfp_secondary_init_app_fw_flower(struct nfp_pf_dev *pf_dev)
return -ENODEV;
}
 
-   eth_dev->process_private = pf_dev->cpp;
+   eth_dev->process_private = pf_dev;
eth_dev->dev_ops = &nfp_flower_pf_vnic_ops;
eth_dev->rx_pkt_burst = nfp_net_recv_pkts;
eth_dev->tx_pkt_burst = nfp_flower_pf_xmit_pkts;
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index f02caf8056..9e40bce4dd 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -48,6 +48,7 @@ nfp_net_start(struct rte_eth_dev *dev)
uint16_t i;
struct nfp_hw *hw;
uint32_t new_ctrl;
+   struct nfp_cpp *cpp;
uint32_t update = 0;
uint32_t cap_extend;
uint32_t intr_vector;
@@ -166,10 +167,12 @@ nfp_net_start(struct rte_eth_dev *dev)
}
 
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-   /* Configure the physical port up */
-   nfp_eth_set_configured(net_hw->cpp, net_hw->nfp_idx, 1);
+   cpp = net_hw->cpp;
else
-   nfp_eth_set_configured(dev->process_private, net_hw->nfp_idx, 
1);
+   cpp = ((struct nfp_pf_dev *)(dev->process_private))->cpp;
+
+   /* Configure the physical port up */
+   nfp_eth_set_configured(cpp, net_hw->nfp_idx, 1);
 
for (i = 0; i < dev->data->nb_rx_queues; i++)
dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
@@ -201,30 +204,34 @@ nfp_net_start(struct rte_eth_dev *dev)
 static int
 nfp_net_set_link_up(struct rte_eth_dev *dev)
 {
+   struct nfp_cpp *cpp;
struct nfp_net_hw *hw;
 
hw = dev->data->dev_private;
 
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-   /* Configure the physical port down */
-   return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
+   cpp = hw->cpp;
else
-   return nfp_eth_set_configured(dev->process_private, 
hw->nfp_idx, 1);
+   cpp = ((struct nfp_pf_dev *)(dev->process_private))->cpp;
+
+   return nfp_eth_set_configured(cpp, hw->nfp_idx, 1);
 }
 
 /* Set the link down. */
 static int
 nfp_net_set_link_down(struct rte_eth_dev *dev)
 {
+   struct nfp_cpp *cpp;
struct nfp_net_hw *hw;
 
hw = dev->data->dev_private;
 
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-   /* Configure the physical port down */
-   return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+   cpp = hw->cpp;
else
-   return nfp_eth_set_configured(dev->process_private, 
hw->nfp_idx, 0);
+   cpp = ((struct nfp_pf_dev *)(dev->process_private))->cpp;
+
+   return nfp_eth_set_configured(cpp, hw->nfp_idx, 0);
 }
 
 static uint8_t
@@ -1361,7 +1368,7 @@ nfp_secondary_init_app_fw_nic(struct nfp_pf_dev *pf_dev)
break;
}
 
-   eth_dev->process_private = pf_dev->cpp;
+   eth_dev->process_private = pf_dev;
hw = eth_dev->data->dev_private;
nfp_net_ethdev_ops_mount(hw, eth_dev);
 
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index e969b840d6..eb480667c4 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -2115,6 +2115,7 @@ nfp_net_is_valid_nfd_version(struct nfp_net_fw_ver 
version)
 int
 nfp_net_stop(struct rte_eth_dev *dev)
 {
+   struct nfp_cpp *cpp;
struct nfp_net_hw *hw;
 
hw = nfp_net_get_hw(dev);
@@ -2126,10 +2127,11 @@ nfp_net_stop(struct rte_eth_dev *dev)
nfp_net_stop_rx_queue(dev);
 
if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-   /* Configure the physical port down */
-   nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+   cpp = hw->cpp;
else
-   nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 0);
+   cpp = ((struct nfp_pf_dev *)(dev->process_private))->cpp;
+
+   nfp_eth_set_configured(cpp, hw->nfp_idx, 0);
 
return 0;
 }
-- 
2.39.1

[PATCH v2 2/8] net/nfp: fix resource leak for device initialization

[Chaoyong He]

Fix the resource leak problem in the abnormal logic of device
initialize function.

Fixes: f26e82397f6d ("net/nfp: implement xstats")
Fixes: 547137405be7 ("net/nfp: initialize IPsec related content")
Cc: james.hers...@corigine.com
Cc: chang.m...@corigine.com
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_ethdev.c | 24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 9e40bce4dd..2a80a592f2 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -597,9 +597,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
 
net_hw->mac_stats = net_hw->mac_stats_bar;
} else {
-   if (pf_dev->ctrl_bar == NULL)
-   return -ENODEV;
-
/* Use port offset in pf ctrl_bar for this ports control bar */
hw->ctrl_bar = pf_dev->ctrl_bar + (port * NFP_NET_CFG_BAR_SZ);
net_hw->mac_stats = app_fw_nic->ports[0]->mac_stats_bar +
@@ -611,18 +608,19 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
 
err = nfp_net_common_init(pci_dev, net_hw);
if (err != 0)
-   return err;
+   goto free_area;
 
err = nfp_net_tlv_caps_parse(eth_dev);
if (err != 0) {
PMD_INIT_LOG(ERR, "Failed to parser TLV caps");
return err;
+   goto free_area;
}
 
err = nfp_ipsec_init(eth_dev);
if (err != 0) {
PMD_INIT_LOG(ERR, "Failed to init IPsec module");
-   return err;
+   goto free_area;
}
 
nfp_net_ethdev_ops_mount(net_hw, eth_dev);
@@ -632,7 +630,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
if (net_hw->eth_xstats_base == NULL) {
PMD_INIT_LOG(ERR, "no memory for xstats base values on device 
%s!",
pci_dev->device.name);
-   return -ENOMEM;
+   err = -ENOMEM;
+   goto ipsec_exit;
}
 
/* Work out where in the BAR the queues start. */
@@ -662,7 +661,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", RTE_ETHER_ADDR_LEN, 
0);
if (eth_dev->data->mac_addrs == NULL) {
PMD_INIT_LOG(ERR, "Failed to space for MAC address");
-   return -ENOMEM;
+   err = -ENOMEM;
+   goto xstats_free;
}
 
nfp_net_pf_read_mac(app_fw_nic, port);
@@ -700,6 +700,16 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
nfp_net_stats_reset(eth_dev);
 
return 0;
+
+xstats_free:
+   rte_free(net_hw->eth_xstats_base);
+ipsec_exit:
+   nfp_ipsec_uninit(eth_dev);
+free_area:
+   if (net_hw->mac_stats_area != NULL)
+   nfp_cpp_area_release_free(net_hw->mac_stats_area);
+
+   return err;
 }
 
 #define DEFAULT_FW_PATH   "/lib/firmware/netronome"
-- 
2.39.1

[PATCH v2 3/8] net/nfp: fix resource leak for CoreNIC firmware

[Chaoyong He]

Fix the resource leak problem in the logic of CoreNIC firmware
application.

Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file")
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_ethdev.c | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 2a80a592f2..c132e97d1a 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -317,6 +317,18 @@ nfp_net_keepalive_stop(struct nfp_multi_pf *multi_pf)
rte_eal_alarm_cancel(nfp_net_beat_timer, (void *)multi_pf);
 }
 
+static void
+nfp_net_uninit(struct rte_eth_dev *eth_dev)
+{
+   struct nfp_net_hw *net_hw;
+
+   net_hw = eth_dev->data->dev_private;
+   rte_free(net_hw->eth_xstats_base);
+   nfp_ipsec_uninit(eth_dev);
+   if (net_hw->mac_stats_area != NULL)
+   nfp_cpp_area_release_free(net_hw->mac_stats_area);
+}
+
 /* Reset and stop device. The device can not be restarted. */
 static int
 nfp_net_close(struct rte_eth_dev *dev)
@@ -1137,12 +1149,11 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev,
app_fw_nic->ports[id]->eth_dev != NULL) {
struct rte_eth_dev *tmp_dev;
tmp_dev = app_fw_nic->ports[id]->eth_dev;
-   nfp_ipsec_uninit(tmp_dev);
+   nfp_net_uninit(tmp_dev);
rte_eth_dev_release_port(tmp_dev);
-   app_fw_nic->ports[id] = NULL;
}
}
-   nfp_cpp_area_free(pf_dev->ctrl_area);
+   nfp_cpp_area_release_free(pf_dev->ctrl_area);
 app_cleanup:
rte_free(app_fw_nic);
 
-- 
2.39.1

[PATCH v2 4/8] net/nfp: fix resource leak for PF initialization

[Chaoyong He]

Fix the resource leak problem in the abnormal logic of PF initialize
function.

Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file")
Fixes: 8ba461d1eecc ("net/nfp: introduce keepalive mechanism for multiple PF")
Cc: peng.zh...@corigine.com
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_ethdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index c132e97d1a..6fdde105ba 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -1333,12 +1333,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
return 0;
 
 hwqueues_cleanup:
-   nfp_cpp_area_free(pf_dev->qc_area);
+   nfp_cpp_area_release_free(pf_dev->qc_area);
 sym_tbl_cleanup:
free(sym_tbl);
 fw_cleanup:
nfp_fw_unload(cpp);
nfp_net_keepalive_stop(&pf_dev->multi_pf);
+   nfp_net_keepalive_uninit(&pf_dev->multi_pf);
 eth_table_cleanup:
free(nfp_eth_table);
 hwinfo_cleanup:
-- 
2.39.1

[PATCH v2 5/8] net/nfp: fix resource leak for flower firmware

[Chaoyong He]

Fix the resource leak problem in the logic of flower firmware
application.

Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework")
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 .../net/nfp/flower/nfp_flower_representor.c   | 89 ++-
 .../net/nfp/flower/nfp_flower_representor.h   |  1 +
 2 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c 
b/drivers/net/nfp/flower/nfp_flower_representor.c
index 0f0e63aae0..7212d9e024 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -291,6 +291,43 @@ nfp_flower_repr_tx_burst(void *tx_queue,
return sent;
 }
 
+static int
+nfp_flower_repr_uninit(struct rte_eth_dev *eth_dev)
+{
+   struct nfp_flower_representor *repr;
+
+   repr = eth_dev->data->dev_private;
+   rte_ring_free(repr->ring);
+
+   return 0;
+}
+
+static int
+nfp_flower_pf_repr_uninit(__rte_unused struct rte_eth_dev *eth_dev)
+{
+   return 0;
+}
+
+static void
+nfp_flower_repr_free(struct nfp_flower_representor *repr,
+   enum nfp_repr_type repr_type)
+{
+   switch (repr_type) {
+   case NFP_REPR_TYPE_PHYS_PORT:
+   rte_eth_dev_destroy(repr->eth_dev, nfp_flower_repr_uninit);
+   break;
+   case NFP_REPR_TYPE_PF:
+   rte_eth_dev_destroy(repr->eth_dev, nfp_flower_pf_repr_uninit);
+   break;
+   case NFP_REPR_TYPE_VF:
+   rte_eth_dev_destroy(repr->eth_dev, nfp_flower_repr_uninit);
+   break;
+   default:
+   PMD_DRV_LOG(ERR, "Unsupported repr port type.");
+   break;
+   }
+}
+
 static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = {
.dev_infos_get= nfp_flower_repr_dev_infos_get,
 
@@ -410,6 +447,7 @@ nfp_flower_pf_repr_init(struct rte_eth_dev *eth_dev,
 
repr->app_fw_flower->pf_repr = repr;
repr->app_fw_flower->pf_hw->eth_dev = eth_dev;
+   repr->eth_dev = eth_dev;
 
return 0;
 }
@@ -501,6 +539,8 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
app_fw_flower->vf_reprs[index] = repr;
}
 
+   repr->eth_dev = eth_dev;
+
return 0;
 
 mac_cleanup:
@@ -511,6 +551,35 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
return ret;
 }
 
+static void
+nfp_flower_repr_free_all(struct nfp_app_fw_flower *app_fw_flower)
+{
+   uint32_t i;
+   struct nfp_flower_representor *repr;
+
+   for (i = 0; i < MAX_FLOWER_VFS; i++) {
+   repr = app_fw_flower->vf_reprs[i];
+   if (repr != NULL) {
+   nfp_flower_repr_free(repr, NFP_REPR_TYPE_VF);
+   app_fw_flower->vf_reprs[i] = NULL;
+   }
+   }
+
+   for (i = 0; i < NFP_MAX_PHYPORTS; i++) {
+   repr = app_fw_flower->phy_reprs[i];
+   if (repr != NULL) {
+   nfp_flower_repr_free(repr, NFP_REPR_TYPE_PHYS_PORT);
+   app_fw_flower->phy_reprs[i] = NULL;
+   }
+   }
+
+   repr = app_fw_flower->pf_repr;
+   if (repr != NULL) {
+   nfp_flower_repr_free(repr, NFP_REPR_TYPE_PF);
+   app_fw_flower->pf_repr = NULL;
+   }
+}
+
 static int
 nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower)
 {
@@ -585,7 +654,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower 
*app_fw_flower)
}
 
if (i < app_fw_flower->num_phyport_reprs)
-   return ret;
+   goto repr_free;
 
/*
 * Now allocate eth_dev's for VF representors.
@@ -614,9 +683,14 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower 
*app_fw_flower)
}
 
if (i < app_fw_flower->num_vf_reprs)
-   return ret;
+   goto repr_free;
 
return 0;
+
+repr_free:
+   nfp_flower_repr_free_all(app_fw_flower);
+
+   return ret;
 }
 
 int
@@ -635,7 +709,7 @@ nfp_flower_repr_create(struct nfp_app_fw_flower 
*app_fw_flower)
 
/* Allocate a switch domain for the flower app */
if (app_fw_flower->switch_domain_id == 
RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID &&
-   
rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id)) {
+   
rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id) != 0) {
PMD_INIT_LOG(WARNING, "failed to allocate switch domain for 
device");
}
 
@@ -677,8 +751,15 @@ nfp_flower_repr_create(struct nfp_app_fw_flower 
*app_fw_flower)
ret = nfp_flower_repr_alloc(app_fw_flower);
if (ret != 0) {
PMD_INIT_LOG(ERR, "representors allocation failed");
-   return -EINVAL;
+   ret = -EINVAL;
+   goto domain_free;
}
 
return 0;
+
+domain_free:
+   if (rte_eth_switch_domain_free(app_fw_flower->switch_domain_id) != 0)
+

[PATCH v2 6/8] net/nfp: fix resource leak for exit of CoreNIC firmware

[Chaoyong He]

Fix the resource leak problem in the exit logic of CoreNIC firmware.

Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file")
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_ethdev.c | 91 +---
 drivers/net/nfp/nfp_net_common.h |  1 +
 2 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 6fdde105ba..537b4fe792 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -329,6 +329,55 @@ nfp_net_uninit(struct rte_eth_dev *eth_dev)
nfp_cpp_area_release_free(net_hw->mac_stats_area);
 }
 
+static void
+nfp_cleanup_port_app_fw_nic(struct nfp_pf_dev *pf_dev,
+   uint8_t id)
+{
+   struct rte_eth_dev *eth_dev;
+   struct nfp_app_fw_nic *app_fw_nic;
+
+   app_fw_nic = pf_dev->app_fw_priv;
+   if (app_fw_nic->ports[id] != NULL) {
+   eth_dev = app_fw_nic->ports[id]->eth_dev;
+   if (eth_dev != NULL)
+   nfp_net_uninit(eth_dev);
+
+   app_fw_nic->ports[id] = NULL;
+   }
+}
+
+static void
+nfp_uninit_app_fw_nic(struct nfp_pf_dev *pf_dev)
+{
+   nfp_cpp_area_release_free(pf_dev->ctrl_area);
+   rte_free(pf_dev->app_fw_priv);
+}
+
+void
+nfp_pf_uninit(struct nfp_pf_dev *pf_dev)
+{
+   nfp_cpp_area_release_free(pf_dev->qc_area);
+   free(pf_dev->sym_tbl);
+   if (pf_dev->multi_pf.enabled) {
+   nfp_net_keepalive_stop(&pf_dev->multi_pf);
+   nfp_net_keepalive_uninit(&pf_dev->multi_pf);
+   }
+   free(pf_dev->nfp_eth_table);
+   free(pf_dev->hwinfo);
+   nfp_cpp_free(pf_dev->cpp);
+   rte_free(pf_dev);
+}
+
+static int
+nfp_pf_secondary_uninit(struct nfp_pf_dev *pf_dev)
+{
+   free(pf_dev->sym_tbl);
+   nfp_cpp_free(pf_dev->cpp);
+   rte_free(pf_dev);
+
+   return 0;
+}
+
 /* Reset and stop device. The device can not be restarted. */
 static int
 nfp_net_close(struct rte_eth_dev *dev)
@@ -340,8 +389,19 @@ nfp_net_close(struct rte_eth_dev *dev)
struct rte_pci_device *pci_dev;
struct nfp_app_fw_nic *app_fw_nic;
 
-   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   /*
+* In secondary process, a released eth device can be found by its name
+* in shared memory.
+* If the state of the eth device is RTE_ETH_DEV_UNUSED, it means the
+* eth device has been released.
+*/
+   if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+   if (dev->state == RTE_ETH_DEV_UNUSED)
+   return 0;
+
+   nfp_pf_secondary_uninit(dev->process_private);
return 0;
+   }
 
hw = dev->data->dev_private;
pf_dev = hw->pf_dev;
@@ -358,16 +418,17 @@ nfp_net_close(struct rte_eth_dev *dev)
nfp_net_close_tx_queue(dev);
nfp_net_close_rx_queue(dev);
 
-   /* Clear ipsec */
-   nfp_ipsec_uninit(dev);
-
/* Cancel possible impending LSC work here before releasing the port */
rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void 
*)dev);
 
/* Only free PF resources after all physical ports have been closed */
/* Mark this port as unused and free device priv resources */
nn_cfg_writeb(&hw->super, NFP_NET_CFG_LSC, 0xff);
-   app_fw_nic->ports[hw->idx] = NULL;
+
+   if (pf_dev->app_fw_id != NFP_APP_FW_CORE_NIC)
+   return -EINVAL;
+
+   nfp_cleanup_port_app_fw_nic(pf_dev, hw->idx);
 
for (i = 0; i < app_fw_nic->total_phyports; i++) {
id = nfp_function_id_get(pf_dev, i);
@@ -377,26 +438,16 @@ nfp_net_close(struct rte_eth_dev *dev)
return 0;
}
 
-   /* Now it is safe to free all PF resources */
-   PMD_INIT_LOG(INFO, "Freeing PF resources");
-   if (pf_dev->multi_pf.enabled) {
-   nfp_net_keepalive_stop(&pf_dev->multi_pf);
-   nfp_net_keepalive_uninit(&pf_dev->multi_pf);
-   }
-   nfp_cpp_area_free(pf_dev->ctrl_area);
-   nfp_cpp_area_free(pf_dev->qc_area);
-   free(pf_dev->hwinfo);
-   free(pf_dev->sym_tbl);
-   nfp_cpp_free(pf_dev->cpp);
-   rte_free(app_fw_nic);
-   rte_free(pf_dev);
-
+   /* Enable in nfp_net_start() */
rte_intr_disable(pci_dev->intr_handle);
 
-   /* Unregister callback func from eal lib */
+   /* Register in nfp_net_init() */
rte_intr_callback_unregister(pci_dev->intr_handle,
nfp_net_dev_interrupt_handler, (void *)dev);
 
+   nfp_uninit_app_fw_nic(pf_dev);
+   nfp_pf_uninit(pf_dev);
+
return 0;
 }
 
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index 30fea7ae02..ded491cbdc 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -272,6 +272,7 @@ int nfp_net_fl

[PATCH v2 7/8] net/nfp: fix resource leak for exit of flower firmware

[Chaoyong He]

Fix the resource leak problem in the exit logic of flower firmware.

Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework")
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower.c   | 73 ---
 drivers/net/nfp/flower/nfp_flower.h   |  1 +
 .../net/nfp/flower/nfp_flower_representor.c   | 64 
 3 files changed, 80 insertions(+), 58 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower.c 
b/drivers/net/nfp/flower/nfp_flower.c
index f172c8350d..f950ae233b 100644
--- a/drivers/net/nfp/flower/nfp_flower.c
+++ b/drivers/net/nfp/flower/nfp_flower.c
@@ -82,63 +82,6 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)
return 0;
 }
 
-/* Reset and stop device. The device can not be restarted. */
-static int
-nfp_flower_pf_close(struct rte_eth_dev *dev)
-{
-   uint16_t i;
-   struct nfp_net_hw *hw;
-   struct nfp_pf_dev *pf_dev;
-   struct nfp_net_txq *this_tx_q;
-   struct nfp_net_rxq *this_rx_q;
-   struct nfp_flower_representor *repr;
-   struct nfp_app_fw_flower *app_fw_flower;
-
-   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-   return 0;
-
-   repr = dev->data->dev_private;
-   hw = repr->app_fw_flower->pf_hw;
-   pf_dev = hw->pf_dev;
-   app_fw_flower = NFP_PRIV_TO_APP_FW_FLOWER(pf_dev->app_fw_priv);
-
-   nfp_mtr_priv_uninit(pf_dev);
-
-   /*
-* We assume that the DPDK application is stopping all the
-* threads/queues before calling the device close function.
-*/
-   nfp_net_disable_queues(dev);
-
-   /* Clear queues */
-   for (i = 0; i < dev->data->nb_tx_queues; i++) {
-   this_tx_q = dev->data->tx_queues[i];
-   nfp_net_reset_tx_queue(this_tx_q);
-   }
-
-   for (i = 0; i < dev->data->nb_rx_queues; i++) {
-   this_rx_q = dev->data->rx_queues[i];
-   nfp_net_reset_rx_queue(this_rx_q);
-   }
-
-   /* Cancel possible impending LSC work here before releasing the port */
-   rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void 
*)dev);
-
-   nn_cfg_writeb(&hw->super, NFP_NET_CFG_LSC, 0xff);
-
-   /* Now it is safe to free all PF resources */
-   PMD_DRV_LOG(INFO, "Freeing PF resources");
-   nfp_cpp_area_free(pf_dev->ctrl_area);
-   nfp_cpp_area_free(pf_dev->qc_area);
-   free(pf_dev->hwinfo);
-   free(pf_dev->sym_tbl);
-   nfp_cpp_free(pf_dev->cpp);
-   rte_free(app_fw_flower);
-   rte_free(pf_dev);
-
-   return 0;
-}
-
 static const struct eth_dev_ops nfp_flower_pf_vnic_ops = {
.dev_infos_get  = nfp_net_infos_get,
.link_update= nfp_net_link_update,
@@ -146,7 +89,6 @@ static const struct eth_dev_ops nfp_flower_pf_vnic_ops = {
 
.dev_start  = nfp_flower_pf_start,
.dev_stop   = nfp_net_stop,
-   .dev_close  = nfp_flower_pf_close,
 };
 
 static inline struct nfp_flower_representor *
@@ -858,6 +800,21 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev,
return ret;
 }
 
+void
+nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev)
+{
+   struct nfp_app_fw_flower *app_fw_flower;
+
+   app_fw_flower = pf_dev->app_fw_priv;
+   nfp_flower_cleanup_ctrl_vnic(app_fw_flower->ctrl_hw);
+   nfp_cpp_area_free(app_fw_flower->ctrl_hw->ctrl_area);
+   nfp_cpp_area_free(pf_dev->ctrl_area);
+   rte_free(app_fw_flower->pf_hw);
+   nfp_mtr_priv_uninit(pf_dev);
+   nfp_flow_priv_uninit(pf_dev);
+   rte_free(app_fw_flower);
+}
+
 int
 nfp_secondary_init_app_fw_flower(struct nfp_pf_dev *pf_dev)
 {
diff --git a/drivers/net/nfp/flower/nfp_flower.h 
b/drivers/net/nfp/flower/nfp_flower.h
index 6f27c06acc..8393de66c5 100644
--- a/drivers/net/nfp/flower/nfp_flower.h
+++ b/drivers/net/nfp/flower/nfp_flower.h
@@ -106,6 +106,7 @@ nfp_flower_support_decap_v2(const struct nfp_app_fw_flower 
*app_fw_flower)
 
 int nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev,
const struct nfp_dev_info *dev_info);
+void nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev);
 int nfp_secondary_init_app_fw_flower(struct nfp_pf_dev *pf_dev);
 bool nfp_flower_pf_dispatch_pkts(struct nfp_net_hw *hw,
struct rte_mbuf *mbuf,
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c 
b/drivers/net/nfp/flower/nfp_flower_representor.c
index 7212d9e024..02089d390e 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -328,12 +328,75 @@ nfp_flower_repr_free(struct nfp_flower_representor *repr,
}
 }
 
+/* Reset and stop device. The device can not be restarted. */
+static int
+nfp_flower_repr_dev_close(struct rte_eth_dev *dev)
+{
+   uint16_t i;
+   struct nfp_net_hw *hw;
+   struct nfp_pf_dev *pf_dev;
+   struct nfp_net_txq *this_tx_q;
+   struct n

[PATCH v2 8/8] net/nfp: fix resource leak for VF

[Chaoyong He]

Fix the resource leak problem in the logic of VF.

Fixes: f26e82397f6d ("net/nfp: implement xstats")
Cc: james.hers...@corigine.com
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_ethdev_vf.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c
index 7927f53403..88da593190 100644
--- a/drivers/net/nfp/nfp_ethdev_vf.c
+++ b/drivers/net/nfp/nfp_ethdev_vf.c
@@ -160,13 +160,17 @@ nfp_netvf_set_link_down(struct rte_eth_dev *dev 
__rte_unused)
 static int
 nfp_netvf_close(struct rte_eth_dev *dev)
 {
+   struct nfp_net_hw *net_hw;
struct rte_pci_device *pci_dev;
 
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
 
+   net_hw = dev->data->dev_private;
pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 
+   rte_free(net_hw->eth_xstats_base);
+
/*
 * We assume that the DPDK application is stopping all the
 * threads/queues before calling the device close function.
@@ -323,7 +327,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
if (eth_dev->data->mac_addrs == NULL) {
PMD_INIT_LOG(ERR, "Failed to space for MAC address");
err = -ENOMEM;
-   goto dev_err_ctrl_map;
+   goto free_xstats;
}
 
nfp_read_mac(hw);
@@ -360,8 +364,8 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
 
return 0;
 
-dev_err_ctrl_map:
-   nfp_cpp_area_free(net_hw->ctrl_area);
+free_xstats:
+   rte_free(net_hw->eth_xstats_base);
 
return err;
 }
-- 
2.39.1

[PATCH v1] mbuf: remove the redundant code for mbuf prefree

[Feifei Wang]

For 'rte_pktmbuf_prefree_seg' function, 'rte_mbuf_refcnt_read(m) == 1'
and '__rte_mbuf_refcnt_update(m, -1) == 0' are the same cases where
mbuf's refcnt value should be 1. Thus we can simplify the code and
remove the redundant part.

Furthermore, according to [1], when the mbuf is stored inside the
mempool, the m->refcnt value should be 1. And then it is detached
from its parent for an indirect mbuf. Thus change the description of
'rte_pktmbuf_prefree_seg' function.

[1] 
https://patches.dpdk.org/project/dpdk/patch/20170404162807.20157-4-olivier.m...@6wind.com/

Suggested-by: Ruifeng Wang 
Signed-off-by: Feifei Wang 
---
 lib/mbuf/rte_mbuf.h | 22 +++---
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index 286b32b788..42e9b50d51 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -1328,7 +1328,7 @@ static inline int 
__rte_pktmbuf_pinned_extbuf_decref(struct rte_mbuf *m)
  *
  * This function does the same than a free, except that it does not
  * return the segment to its pool.
- * It decreases the reference counter, and if it reaches 0, it is
+ * It decreases the reference counter, and if it reaches 1, it is
  * detached from its parent for an indirect mbuf.
  *
  * @param m
@@ -1358,25 +1358,9 @@ rte_pktmbuf_prefree_seg(struct rte_mbuf *m)
m->nb_segs = 1;
 
return m;
-
-   } else if (__rte_mbuf_refcnt_update(m, -1) == 0) {
-
-   if (!RTE_MBUF_DIRECT(m)) {
-   rte_pktmbuf_detach(m);
-   if (RTE_MBUF_HAS_EXTBUF(m) &&
-   RTE_MBUF_HAS_PINNED_EXTBUF(m) &&
-   __rte_pktmbuf_pinned_extbuf_decref(m))
-   return NULL;
-   }
-
-   if (m->next != NULL)
-   m->next = NULL;
-   if (m->nb_segs != 1)
-   m->nb_segs = 1;
-   rte_mbuf_refcnt_set(m, 1);
-
-   return m;
}
+
+   __rte_mbuf_refcnt_update(m, -1);
return NULL;
 }
 
-- 
2.25.1

[PATCH] net/iavf: fix vf startup coredump

[Shiyang He]

When the vf starts to request multiple queues, the pf sends a reset
command to the vf. During the reset process, adminq sends an abnormal
message to pf for an unknown reason, and the resource request fails
resulting in a coredump.

This patch fixes the issue by checking the reset state before resetting
and creating a separate thread to handle reset event.

Signed-off-by: Shiyang He 
---
 drivers/net/iavf/iavf.h|   4 +-
 drivers/net/iavf/iavf_ethdev.c | 172 +
 drivers/net/iavf/iavf_vchnl.c  |  13 +--
 3 files changed, 139 insertions(+), 50 deletions(-)

diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index 10868f2c30..e1cb1e0bc3 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -19,6 +19,7 @@
 #define IAVF_AQ_LEN   32
 #define IAVF_AQ_BUF_SZ4096
 #define IAVF_RESET_WAIT_CNT   500
+#define IAVF_RESET_DETECTED_CNT   100
 #define IAVF_BUF_SIZE_MIN 1024
 #define IAVF_FRAME_SIZE_MAX   9728
 #define IAVF_QUEUE_BASE_ADDR_UNIT 128
@@ -32,6 +33,7 @@
 #define IAVF_NUM_MACADDR_MAX  64
 
 #define IAVF_DEV_WATCHDOG_PERIOD 2000 /* microseconds, set 0 to disable*/
+#define IAVF_MAX_VF_COUNT256
 
 #define IAVF_DEFAULT_RX_PTHRESH  8
 #define IAVF_DEFAULT_RX_HTHRESH  8
@@ -511,5 +513,5 @@ int iavf_flow_sub_check(struct iavf_adapter *adapter,
struct iavf_fsub_conf *filter);
 void iavf_dev_watchdog_enable(struct iavf_adapter *adapter);
 void iavf_dev_watchdog_disable(struct iavf_adapter *adapter);
-int iavf_handle_hw_reset(struct rte_eth_dev *dev);
+int iavf_reset_enqueue(struct rte_eth_dev *dev);
 #endif /* _IAVF_ETHDEV_H_ */
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index d1edb0dd5c..63848f7f6e 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -90,6 +90,23 @@ static struct iavf_proto_xtr_ol iavf_proto_xtr_params[] = {
&rte_pmd_ifd_dynflag_proto_xtr_ipsec_crypto_said_mask },
 };
 
+/* struct holding pending PF-to-VF reset */
+struct iavf_reset_info {
+   pthread_mutex_t lock;
+   rte_thread_t reset_tid;
+   uint32_t pending;
+   uint32_t head;
+   uint32_t tail;
+   struct rte_eth_dev *dev[IAVF_MAX_VF_COUNT];
+};
+
+static struct iavf_reset_info reset_info = {
+   .lock = PTHREAD_MUTEX_INITIALIZER,
+   .head = 0,
+   .tail = 0,
+   .pending = 0,
+};
+
 static int iavf_dev_configure(struct rte_eth_dev *dev);
 static int iavf_dev_start(struct rte_eth_dev *dev);
 static int iavf_dev_stop(struct rte_eth_dev *dev);
@@ -310,8 +327,10 @@ iavf_dev_watchdog(void *cb_arg)
adapter->vf.vf_reset = true;
adapter->vf.link_up = false;
 
-   iavf_dev_event_post(adapter->vf.eth_dev, 
RTE_ETH_EVENT_INTR_RESET,
-   NULL, 0);
+   adapter->devargs.auto_reset ?
+   iavf_reset_enqueue(adapter->vf.eth_dev) :
+   iavf_dev_event_post(adapter->vf.eth_dev,
+   RTE_ETH_EVENT_INTR_RESET, NULL, 0);
}
}
 
@@ -1086,9 +1105,6 @@ iavf_dev_stop(struct rte_eth_dev *dev)
 
PMD_INIT_FUNC_TRACE();
 
-   if (vf->vf_reset)
-   return 0;
-
if (adapter->closed)
return -1;
 
@@ -1986,14 +2002,11 @@ iavf_check_vf_reset_done(struct iavf_hw *hw)
reset = reset >> IAVF_VFGEN_RSTAT_VFR_STATE_SHIFT;
if (reset == VIRTCHNL_VFR_VFACTIVE ||
reset == VIRTCHNL_VFR_COMPLETED)
-   break;
+   return 0;
rte_delay_ms(20);
}
 
-   if (i >= IAVF_RESET_WAIT_CNT)
-   return -1;
-
-   return 0;
+   return -1;
 }
 
 static int
@@ -2928,15 +2941,12 @@ iavf_dev_close(struct rte_eth_dev *dev)
 static int
 iavf_dev_uninit(struct rte_eth_dev *dev)
 {
-   struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return -EPERM;
 
iavf_dev_close(dev);
 
-   if (!vf->in_reset_recovery)
-   iavf_dev_event_handler_fini();
+   iavf_dev_event_handler_fini();
 
return 0;
 }
@@ -2949,7 +2959,6 @@ iavf_dev_reset(struct rte_eth_dev *dev)
 {
int ret;
struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-   struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 
/*
 * Check whether the VF reset has been done and inform application,
@@ -2961,7 +2970,6 @@ iavf_dev_reset(struct rte_eth_dev *dev)
PMD_DRV_LOG(ERR, "Wait too long for reset done!\n");
return ret;
}
-   vf->vf_reset = false;
 
PMD_DRV_LOG(DEBUG, "Start dev_reset ...\n");
ret = iavf_dev_uninit(dev)

RE: [PATCH v1] mbuf: remove the redundant code for mbuf prefree

[Morten Brørup]

> From: Feifei Wang [mailto:feifei.wa...@arm.com]
> Sent: Monday, 4 December 2023 03.39
> 
> For 'rte_pktmbuf_prefree_seg' function, 'rte_mbuf_refcnt_read(m) == 1'
> and '__rte_mbuf_refcnt_update(m, -1) == 0' are the same cases where
> mbuf's refcnt value should be 1. Thus we can simplify the code and
> remove the redundant part.
> 
> Furthermore, according to [1], when the mbuf is stored inside the
> mempool, the m->refcnt value should be 1. And then it is detached
> from its parent for an indirect mbuf. Thus change the description of
> 'rte_pktmbuf_prefree_seg' function.
> 
> [1] https://patches.dpdk.org/project/dpdk/patch/20170404162807.20157-4-
> olivier.m...@6wind.com/
> 
> Suggested-by: Ruifeng Wang 
> Signed-off-by: Feifei Wang 
> ---
>  lib/mbuf/rte_mbuf.h | 22 +++---
>  1 file changed, 3 insertions(+), 19 deletions(-)
> 
> diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
> index 286b32b788..42e9b50d51 100644
> --- a/lib/mbuf/rte_mbuf.h
> +++ b/lib/mbuf/rte_mbuf.h
> @@ -1328,7 +1328,7 @@ static inline int
> __rte_pktmbuf_pinned_extbuf_decref(struct rte_mbuf *m)
>   *
>   * This function does the same than a free, except that it does not
>   * return the segment to its pool.
> - * It decreases the reference counter, and if it reaches 0, it is
> + * It decreases the reference counter, and if it reaches 1, it is

No, the original description is correct.
However, the reference counter is set to 1 when put back in the pool, as a 
shortcut so it isn't needed to be set back to 1 when allocated from the pool.

>   * detached from its parent for an indirect mbuf.
>   *
>   * @param m
> @@ -1358,25 +1358,9 @@ rte_pktmbuf_prefree_seg(struct rte_mbuf *m)

The preceding "if (likely(rte_mbuf_refcnt_read(m) == 1)) {" is only a shortcut 
for the likely case.

>   m->nb_segs = 1;
> 
>   return m;
> -
> - } else if (__rte_mbuf_refcnt_update(m, -1) == 0) {
> -
> - if (!RTE_MBUF_DIRECT(m)) {
> - rte_pktmbuf_detach(m);
> - if (RTE_MBUF_HAS_EXTBUF(m) &&
> - RTE_MBUF_HAS_PINNED_EXTBUF(m) &&
> - __rte_pktmbuf_pinned_extbuf_decref(m))
> - return NULL;
> - }
> -
> - if (m->next != NULL)
> - m->next = NULL;
> - if (m->nb_segs != 1)
> - m->nb_segs = 1;
> - rte_mbuf_refcnt_set(m, 1);
> -
> - return m;
>   }
> +
> + __rte_mbuf_refcnt_update(m, -1);
>   return NULL;
>  }
> 
> --
> 2.25.1

NAK.

This patch is not race safe. With the patch:

This thread:
if (likely(rte_mbuf_refcnt_read(m) == 1)) { // Assume it's 2.

The other thread:
if (likely(rte_mbuf_refcnt_read(m) == 1)) { // It's 2.
__rte_mbuf_refcnt_update(m, -1); // Now it's 1.
return NULL;

This thread:
__rte_mbuf_refcnt_update(m, -1); // Now it's 0.
return NULL;

None of the threads have done the "prefree" work.

[RFC v2 2/6] argparse: support verify argument config

[Chengwen Feng]

This commit supports verify argument config.

Signed-off-by: Chengwen Feng 
---
 lib/argparse/rte_argparse.c | 310 +++-
 1 file changed, 309 insertions(+), 1 deletion(-)

diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index bf14c56858..eff504a778 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -2,13 +2,321 @@
  * Copyright(c) 2023 HiSilicon Limited
  */
 
+#include 
+#include 
+#include 
+
+#include 
+
 #include "rte_argparse.h"
 
+RTE_LOG_REGISTER_DEFAULT(rte_argparse_logtype, INFO);
+#define ARGPARSE_LOG(level, ...) \
+   rte_log(RTE_LOG_ ## level, rte_argparse_logtype, RTE_FMT("argparse: " \
+   RTE_FMT_HEAD(__VA_ARGS__,) "\n", RTE_FMT_TAIL(__VA_ARGS__,)))
+
+#define BIT(x) (1ul << (x))
+#define GENMASK_U32(h, l) \
+   (((~0u) << (l)) & (~0u >> (31 - (h
+#define BF_SHF(x) (__builtin_ffsll(x) - 1)
+#define FIELD_GET(mask, reg) \
+   ((typeof(mask))(((reg) & (mask)) >> BF_SHF(mask)))
+
+#define ARG_ATTR_HAS_VAL_MASK  GENMASK_U32(1, 0)
+#define ARG_ATTR_HAS_VAL_SHIFT 0
+#define ARG_ATTR_VAL_TYPE_MASK GENMASK_U32(10, 2)
+#define ARG_ATTR_VAL_TYPE_SHIFT2
+#define ARG_ATTR_SUPPORT_MULTI_MASKBIT(16)
+#define ARG_ATTR_SUPPORT_MULTI_SHIFT   16
+#define ARG_ATTR_FLAG_PARSED_MASK  BIT(31)
+#define ARG_ATTR_FLAG_PARSED_SHIFT 31
+
+static inline bool
+is_arg_optional(const struct rte_argparse_arg *arg)
+{
+   return arg->name_long[0] == '-';
+}
+
+static inline bool
+is_arg_positional(const struct rte_argparse_arg *arg)
+{
+   return arg->name_long[0] != '-';
+}
+
+static inline uint32_t
+arg_attr_has_val(const struct rte_argparse_arg *arg)
+{
+   return FIELD_GET(ARG_ATTR_HAS_VAL_MASK, arg->flags);
+}
+
+static inline uint32_t
+arg_attr_val_type(const struct rte_argparse_arg *arg)
+{
+   return FIELD_GET(ARG_ATTR_VAL_TYPE_MASK, arg->flags);
+}
+
+static inline bool
+arg_attr_flag_multi(const struct rte_argparse_arg *arg)
+{
+   return FIELD_GET(ARG_ATTR_SUPPORT_MULTI_MASK, arg->flags);
+}
+
+static inline uint32_t
+arg_attr_unused_bits(const struct rte_argparse_arg *arg)
+{
+#define USED_BIT_MASK  (ARG_ATTR_HAS_VAL_MASK | ARG_ATTR_VAL_TYPE_MASK | \
+ARG_ATTR_SUPPORT_MULTI_MASK)
+   return arg->flags & ~USED_BIT_MASK;
+}
+
+static int
+verify_arg_name(const struct rte_argparse_arg *arg)
+{
+   if (is_arg_optional(arg)) {
+   if (strlen(arg->name_long) <= 3) {
+   ARGPARSE_LOG(ERR, "optional long name %s too short!", 
arg->name_long);
+   return -EINVAL;
+   }
+   if (arg->name_long[1] != '-') {
+   ARGPARSE_LOG(ERR, "optional long name %s must only 
start with '--'",
+arg->name_long);
+   return -EINVAL;
+   }
+   if (arg->name_long[2] == '-') {
+   ARGPARSE_LOG(ERR, "optional long name %s should not 
start with '---'",
+arg->name_long);
+   return -EINVAL;
+   }
+   }
+
+   if (arg->name_short == NULL)
+   return 0;
+
+   if (!is_arg_optional(arg)) {
+   ARGPARSE_LOG(ERR, "short name %s corresponding long name must 
be optional!",
+arg->name_short);
+   return -EINVAL;
+   }
+
+   if (strlen(arg->name_short) != 2 || arg->name_short[0] != '-' ||
+   arg->name_short[1] == '-') {
+   ARGPARSE_LOG(ERR, "short name %s must start with a hyphen (-) 
followed by an English letter",
+arg->name_short);
+   return -EINVAL;
+   }
+
+   return 0;
+}
+
+static int
+verify_arg_help(const struct rte_argparse_arg *arg)
+{
+   if (arg->help == NULL) {
+   ARGPARSE_LOG(ERR, "argument %s must have help info!", 
arg->name_long);
+   return -EINVAL;
+   }
+
+   return 0;
+}
+
+static int
+verify_arg_has_val(const struct rte_argparse_arg *arg)
+{
+   uint32_t has_val = arg_attr_has_val(arg);
+
+   if (is_arg_positional(arg)) {
+   if (has_val == RTE_ARGPARSE_ARG_REQUIRED_VALUE)
+   return 0;
+   ARGPARSE_LOG(ERR, "argument %s is positional, should has zero 
or required-val!",
+arg->name_long);
+   return -EINVAL;
+   }
+
+   if (has_val == 0) {
+   ARGPARSE_LOG(ERR, "argument %s is optional, has-val config 
wrong!",
+arg->name_long);
+   return -EINVAL;
+   }
+
+   return 0;
+}
+
+static int
+verify_arg_saver(const struct rte_argparse *obj, uint32_t index)
+{
+   uint32_t cmp_max = FIELD_GET(ARG_ATTR_VAL_TYPE_MASK, 
RTE_ARGPARSE_ARG_VALUE_MAX);
+   const struct rte_argparse_arg *arg = &obj->args[

[RFC v2 0/6] add argparse library

[Chengwen Feng]

Introduce argparse library (which was inspired by the thread [1]),
compared with getopt, it makes it easy to write user-friendly
command-like program.

Note: the [1/6] commit contains usage examples.

[1] 
https://patchwork.dpdk.org/project/dpdk/patch/20231105054539.22303-2-fengcheng...@huawei.com/

Chengwen Feng (6):
  argparse: add argparse library
  argparse: support verify argument config
  test/argparse: add verify argument config test
  argparse: support parse parameters
  test/argparse: add parse parameters test
  examples/dma: replace getopt with argparse

---
v2: refine the definition, add implement code, add examples which
address Stephen's comments.

 app/test/meson.build   |   1 +
 app/test/test_argparse.c   | 764 +
 doc/api/doxy-api-index.md  |   1 +
 doc/api/doxy-api.conf.in   |   1 +
 doc/guides/prog_guide/argparse_lib.rst | 142 +
 doc/guides/prog_guide/index.rst|   1 +
 examples/dma/dmafwd.c  | 288 +-
 examples/dma/meson.build   |   2 +-
 lib/argparse/meson.build   |   7 +
 lib/argparse/rte_argparse.c| 611 
 lib/argparse/rte_argparse.h| 179 ++
 lib/argparse/version.map   |   7 +
 lib/meson.build|   1 +
 13 files changed, 1846 insertions(+), 159 deletions(-)
 create mode 100644 app/test/test_argparse.c
 create mode 100644 doc/guides/prog_guide/argparse_lib.rst
 create mode 100644 lib/argparse/meson.build
 create mode 100644 lib/argparse/rte_argparse.c
 create mode 100644 lib/argparse/rte_argparse.h
 create mode 100644 lib/argparse/version.map

-- 
2.17.1

[RFC v2 3/6] test/argparse: add verify argument config test

[Chengwen Feng]

This commit adds verify argument config test.

Signed-off-by: Chengwen Feng 
---
 app/test/meson.build |   1 +
 app/test/test_argparse.c | 327 +++
 2 files changed, 328 insertions(+)
 create mode 100644 app/test/test_argparse.c

diff --git a/app/test/meson.build b/app/test/meson.build
index dcc93f4a43..864b79d39f 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -27,6 +27,7 @@ source_file_deps = {
 # the various test_*.c files
 'test_acl.c': ['net', 'acl'],
 'test_alarm.c': [],
+'test_argparse.c': ['argparse'],
 'test_atomic.c': ['hash'],
 'test_barrier.c': [],
 'test_bitcount.c': [],
diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
new file mode 100644
index 00..d38ffb5775
--- /dev/null
+++ b/app/test/test_argparse.c
@@ -0,0 +1,327 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 HiSilicon Limited
+ */
+
+#include 
+#include 
+
+#include 
+
+#include "test.h"
+
+static int default_argc;
+static char *default_argv[1];
+
+/*
+ * Define strdup wrapper.
+ * 1. Mainly to fix compile error "warning: assignment discards 'const'
+ *qualifier from pointer target type [-Wdiscarded-qualifiers]" for
+ *following code:
+ *  argv[x] = "100";
+ * 2. Because this is a test, the memory release which allocated by this
+ *wrapper in the subtest is not considered.
+ */
+static char *
+test_strdup(const char *str)
+{
+   char *s = strdup(str);
+   if (s == NULL)
+   exit(-ENOMEM);
+   return s;
+}
+
+static int
+test_argparse_setup(void)
+{
+   default_argc = 1;
+   default_argv[0] = test_strdup("test_argparse");
+   return 0;
+}
+
+static void
+test_argparse_teardown(void)
+{
+   free(default_argv[0]);
+}
+
+static int
+test_argparse_callback(uint32_t index, const char *value, void *opaque)
+{
+   RTE_SET_USED(index);
+   RTE_SET_USED(value);
+   RTE_SET_USED(opaque);
+   return 0;
+}
+
+/* valid templater, must contain at least two args. */
+#define argparse_templater() { \
+   .prog_name = "test_argparse", \
+   .usage = "-a xx -b yy", \
+   .descriptor = NULL, \
+   .epilog = NULL, \
+   .exit_on_error = false, \
+   .callback = test_argparse_callback, \
+   .args = { \
+   { "--abc", "-a", "abc argument", (void *)1, (void *)1, 
RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT }, \
+   { "--xyz", "-x", "xyz argument", (void *)1, (void *)2, 
RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT }, \
+   ARGPARSE_ARG_END(), \
+   }, \
+}
+
+static void
+test_argparse_copy(struct rte_argparse *dst, struct rte_argparse *src)
+{
+   uint32_t i;
+   memcpy(dst, src, sizeof(*src));
+   for (i = 0; /* NULL */; i++) {
+   memcpy(&dst->args[i], &src->args[i], sizeof(src->args[i]));
+   if (src->args[i].name_long == NULL)
+   break;
+   }
+}
+
+static struct rte_argparse *
+test_argparse_init_obj(void)
+{
+   static struct rte_argparse backup = argparse_templater();
+   static struct rte_argparse obj = argparse_templater();
+   test_argparse_copy(&obj, &backup);
+   return &obj;
+}
+
+static int
+test_argparse_invalid_basic_param(void)
+{
+   struct rte_argparse *obj;
+   int ret;
+
+   obj = test_argparse_init_obj();
+   obj->prog_name = NULL;
+   ret = rte_argparse_parse(obj, default_argc, default_argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   obj = test_argparse_init_obj();
+   obj->usage = NULL;
+   ret = rte_argparse_parse(obj, default_argc, default_argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   return TEST_SUCCESS;
+}
+
+static int
+test_argparse_invalid_arg_name(void)
+{
+   struct rte_argparse *obj;
+   int ret;
+
+   obj = test_argparse_init_obj();
+   obj->args[0].name_long = "-ab";
+   ret = rte_argparse_parse(obj, default_argc, default_argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   obj = test_argparse_init_obj();
+   obj->args[0].name_long = "-abc";
+   ret = rte_argparse_parse(obj, default_argc, default_argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   obj = test_argparse_init_obj();
+   obj->args[0].name_long = "---c";
+   ret = rte_argparse_parse(obj, default_argc, default_argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   obj = test_argparse_init_obj();
+   obj->args[0].name_long = "abc";
+   obj->args[0].name_short = "-a";
+   ret = rte_argparse_parse(obj, default_argc, default_argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   obj = test_argparse_init_obj();
+   obj->args[0].name_short = "a";
+   ret = rte_argparse_parse(obj, default_argc, default_argv);
+   TEST_

[RFC v2 6/6] examples/dma: replace getopt with argparse

[Chengwen Feng]

Replace getopt with argparse.

Signed-off-by: Chengwen Feng 
---
 examples/dma/dmafwd.c| 288 ++-
 examples/dma/meson.build |   2 +-
 2 files changed, 131 insertions(+), 159 deletions(-)

diff --git a/examples/dma/dmafwd.c b/examples/dma/dmafwd.c
index f27317a622..950a13f486 100644
--- a/examples/dma/dmafwd.c
+++ b/examples/dma/dmafwd.c
@@ -4,11 +4,11 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -18,16 +18,18 @@
 #define MAX_PKT_BURST 32
 #define MEMPOOL_CACHE_SIZE 512
 #define MIN_POOL_SIZE 65536U
-#define CMD_LINE_OPT_MAC_UPDATING "mac-updating"
-#define CMD_LINE_OPT_NO_MAC_UPDATING "no-mac-updating"
-#define CMD_LINE_OPT_PORTMASK "portmask"
-#define CMD_LINE_OPT_NB_QUEUE "nb-queue"
-#define CMD_LINE_OPT_COPY_TYPE "copy-type"
-#define CMD_LINE_OPT_RING_SIZE "ring-size"
-#define CMD_LINE_OPT_BATCH_SIZE "dma-batch-size"
-#define CMD_LINE_OPT_FRAME_SIZE "max-frame-size"
-#define CMD_LINE_OPT_FORCE_COPY_SIZE "force-min-copy-size"
-#define CMD_LINE_OPT_STATS_INTERVAL "stats-interval"
+#define CMD_LINE_OPT_MAC_UPDATING "--mac-updating"
+#define CMD_LINE_OPT_NO_MAC_UPDATING "--no-mac-updating"
+#define CMD_LINE_OPT_PORTMASK "--portmask"
+#define CMD_LINE_OPT_PORTMASK_INDEX 1
+#define CMD_LINE_OPT_NB_QUEUE "--nb-queue"
+#define CMD_LINE_OPT_COPY_TYPE "--copy-type"
+#define CMD_LINE_OPT_COPY_TYPE_INDEX 2
+#define CMD_LINE_OPT_RING_SIZE "--ring-size"
+#define CMD_LINE_OPT_BATCH_SIZE "--dma-batch-size"
+#define CMD_LINE_OPT_FRAME_SIZE "--max-frame-size"
+#define CMD_LINE_OPT_FORCE_COPY_SIZE "--force-min-copy-size"
+#define CMD_LINE_OPT_STATS_INTERVAL "--stats-interval"
 
 /* configurable number of RX/TX ring descriptors */
 #define RX_DEFAULT_RINGSIZE 1024
@@ -84,7 +86,7 @@ typedef enum copy_mode_t {
 static uint32_t dma_enabled_port_mask;
 
 /* number of RX queues per port */
-static uint16_t nb_queues = 1;
+static int nb_queues = 1;
 
 /* MAC updating enabled by default. */
 static int mac_updating = 1;
@@ -95,10 +97,10 @@ static copy_mode_t copy_mode = COPY_MODE_DMA_NUM;
 /* size of descriptor ring for hardware copy mode or
  * rte_ring for software copy mode
  */
-static unsigned short ring_size = 2048;
+static int ring_size = 2048;
 
 /* interval, in seconds, between stats prints */
-static unsigned short stats_interval = 1;
+static int stats_interval = 1;
 /* global mbuf arrays for tracking DMA bufs */
 #define MBUF_RING_SIZE 2048
 #define MBUF_RING_MASK (MBUF_RING_SIZE - 1)
@@ -118,9 +120,9 @@ static uint16_t nb_txd = TX_DEFAULT_RINGSIZE;
 
 static volatile bool force_quit;
 
-static uint32_t dma_batch_sz = MAX_PKT_BURST;
-static uint32_t max_frame_size;
-static uint32_t force_min_copy_size;
+static int dma_batch_sz = MAX_PKT_BURST;
+static int max_frame_size;
+static int force_min_copy_size;
 
 /* ethernet addresses of ports */
 static struct rte_ether_addr dma_ports_eth_addr[RTE_MAX_ETHPORTS];
@@ -583,26 +585,6 @@ static void start_forwarding_cores(void)
 }
 /* >8 End of starting to process for each lcore. */
 
-/* Display usage */
-static void
-dma_usage(const char *prgname)
-{
-   printf("%s [EAL options] -- -p PORTMASK [-q NQ]\n"
-   "  -b --dma-batch-size: number of requests per DMA batch\n"
-   "  -f --max-frame-size: max frame size\n"
-   "  -m --force-min-copy-size: force a minimum copy length, even 
for smaller packets\n"
-   "  -p --portmask: hexadecimal bitmask of ports to configure\n"
-   "  -q NQ: number of RX queues per port (default is 1)\n"
-   "  --[no-]mac-updating: Enable or disable MAC addresses 
updating (enabled by default)\n"
-   "  When enabled:\n"
-   "   - The source MAC address is replaced by the TX port MAC 
address\n"
-   "   - The destination MAC address is replaced by 
02:00:00:00:00:TX_PORT_ID\n"
-   "  -c --copy-type CT: type of copy: sw|hw\n"
-   "  -s --ring-size RS: size of dmadev descriptor ring for 
hardware copy mode or rte_ring for software copy mode\n"
-   "  -i --stats-interval SI: interval, in seconds, between stats 
prints (default is 1)\n",
-   prgname);
-}
-
 static int
 dma_parse_portmask(const char *portmask)
 {
@@ -628,142 +610,132 @@ dma_parse_copy_mode(const char *copy_mode)
return COPY_MODE_INVALID_NUM;
 }
 
+static int
+dma_parse_args_cb(uint32_t index, const char *value, void *opaque)
+{
+   int port_mask;
+
+   RTE_SET_USED(opaque);
+
+   if (index == CMD_LINE_OPT_PORTMASK_INDEX) {
+   port_mask = dma_parse_portmask(value);
+   if (port_mask & ~dma_enabled_port_mask || port_mask <= 0) {
+   printf("Invalid portmask, %s, suggest 0x%x\n",
+   value, dma_enabled_port_mask);
+   return -1;
+   }
+   dma_enabled_port_mask = port

[RFC v2 4/6] argparse: support parse parameters

[Chengwen Feng]

This commit supports parse parameters which described in [argc, argv].

Signed-off-by: Chengwen Feng 
---
 lib/argparse/rte_argparse.c | 295 +++-
 1 file changed, 292 insertions(+), 3 deletions(-)

diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index eff504a778..5007992f0e 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -301,18 +301,307 @@ verify_argparse(const struct rte_argparse *obj)
return 0;
 }
 
+static uint32_t
+calc_position_count(const struct rte_argparse *obj)
+{
+   const struct rte_argparse_arg *arg;
+   uint32_t count = 0;
+   uint32_t i;
+
+   for (i = 0; /* NULL */; i++) {
+   arg = &obj->args[i];
+   if (obj->args[i].name_long == NULL)
+   break;
+   if (is_arg_positional(arg))
+   count++;
+   }
+
+   return count;
+}
+
+static struct rte_argparse_arg *
+find_position_arg(struct rte_argparse *obj, uint32_t index)
+{
+   struct rte_argparse_arg *arg;
+   uint32_t count = 0;
+   uint32_t i;
+
+   for (i = 0; /* NULL */; i++) {
+   arg = &obj->args[i];
+   if (arg->name_long == NULL)
+   break;
+   if (!is_arg_positional(arg))
+   continue;
+   count++;
+   if (count == index)
+   return arg;
+   }
+
+   return NULL;
+}
+
+static bool
+is_arg_match(struct rte_argparse_arg *arg, char *curr_argv, uint32_t len)
+{
+   if (strlen(arg->name_long) == len && strncmp(arg->name_long, curr_argv, 
len) == 0)
+   return true;
+
+   if (arg->name_short == NULL)
+   return false;
+
+   if (strlen(arg->name_short) == len && strncmp(arg->name_short, 
curr_argv, len) == 0)
+   return true;
+
+   return false;
+}
+
+static struct rte_argparse_arg *
+find_option_arg(struct rte_argparse *obj, char *curr_argv, char *has_equal)
+{
+   uint32_t len = strlen(curr_argv) - (has_equal != NULL ? 
strlen(has_equal) : 0);
+   struct rte_argparse_arg *arg;
+   uint32_t i;
+   bool match;
+
+   for (i = 0; /* nothing */; i++) {
+   arg = &obj->args[i];
+   if (arg->name_long == NULL)
+   break;
+   match = is_arg_match(arg, curr_argv, len);
+   if (match)
+   return arg;
+   }
+
+   return NULL;
+}
+
+static int
+parse_arg_int(struct rte_argparse_arg *arg, char *value)
+{
+   char *s = NULL;
+
+   if (value == NULL) {
+   *(int *)arg->val_saver = (int)(intptr_t)arg->val_set;
+   return 0;
+   }
+
+   errno = 0;
+   *(int *)arg->val_saver = strtol(value, &s, 0);
+   if (errno == ERANGE) {
+   ARGPARSE_LOG(ERR, "argument %s numerical out of range!", 
arg->name_long);
+   return -EINVAL;
+   }
+
+   if (s[0] != '\0') {
+   ARGPARSE_LOG(ERR, "argument %s expect an integer value!", 
arg->name_long);
+   return -EINVAL;
+   }
+
+   return 0;
+}
+
+static int
+parse_arg_autosave(struct rte_argparse_arg *arg, char *value)
+{
+   static struct {
+   uint32_t val_type;
+   int (*f_parse_type)(struct rte_argparse_arg *arg, char *value);
+   } map[] = {
+   { RTE_ARGPARSE_ARG_VALUE_INT, parse_arg_int },
+   { 0, NULL },
+   };
+   int ret = -EINVAL;
+   uint32_t i;
+
+   for (i = 0; /* NULL */; i++) {
+   if (map[i].val_type == 0)
+   break;
+   if ((arg->flags & ARG_ATTR_VAL_TYPE_MASK) == map[i].val_type) {
+   ret = map[i].f_parse_type(arg, value);
+   break;
+   }
+   }
+
+   return ret;
+}
+
+static int
+parse_arg_val(struct rte_argparse *obj, struct rte_argparse_arg *arg, char 
*value)
+{
+   int ret;
+
+   if (arg->val_saver == NULL)
+   ret = obj->callback((uint32_t)(uintptr_t)arg->val_set, value, 
obj->opaque);
+   else
+   ret = parse_arg_autosave(arg, value);
+   if (ret != 0) {
+   ARGPARSE_LOG(ERR, "argument %s parse value fail!", 
arg->name_long);
+   return ret;
+   }
+
+   return 0;
+}
+
+static bool
+is_help(char *curr_argv)
+{
+   return strcmp(curr_argv, "-h") == 0 || strcmp(curr_argv, "--help") == 0;
+}
+
+static int
+parse_args(struct rte_argparse *obj, int argc, char **argv, bool *show_help)
+{
+   uint32_t position_count = calc_position_count(obj);
+   struct rte_argparse_arg *arg;
+   uint32_t position_index = 0;
+   char *curr_argv;
+   char *has_equal;
+   char *value;
+   int ret;
+   int i;
+
+   for (i = 1; i < argc; i++) {
+   curr_argv = argv[i];
+   if (curr_argv[0] != '-') {
+

[RFC v2 1/6] argparse: add argparse library

[Chengwen Feng]

Introduce argparse library (which was inspired by the thread [1]). This
commit provides public API and doc.

[1] 
https://patchwork.dpdk.org/project/dpdk/patch/20231105054539.22303-2-fengcheng...@huawei.com/

Signed-off-by: Chengwen Feng 
---
 doc/api/doxy-api-index.md  |   1 +
 doc/api/doxy-api.conf.in   |   1 +
 doc/guides/prog_guide/argparse_lib.rst | 142 
 doc/guides/prog_guide/index.rst|   1 +
 lib/argparse/meson.build   |   7 +
 lib/argparse/rte_argparse.c|  14 ++
 lib/argparse/rte_argparse.h| 179 +
 lib/argparse/version.map   |   7 +
 lib/meson.build|   1 +
 9 files changed, 353 insertions(+)
 create mode 100644 doc/guides/prog_guide/argparse_lib.rst
 create mode 100644 lib/argparse/meson.build
 create mode 100644 lib/argparse/rte_argparse.c
 create mode 100644 lib/argparse/rte_argparse.h
 create mode 100644 lib/argparse/version.map

diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index a6a768bd7c..fe41fba6ec 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -220,6 +220,7 @@ The public API headers are grouped by topics:
   [random](@ref rte_random.h),
   [config file](@ref rte_cfgfile.h),
   [key/value args](@ref rte_kvargs.h),
+  [argument parse](@ref rte_argparse.h),
   [string](@ref rte_string_fns.h),
   [thread](@ref rte_thread.h)
 
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index e94c9e4e46..76f89afe71 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -28,6 +28,7 @@ INPUT   = @TOPDIR@/doc/api/doxy-api-index.md \
   @TOPDIR@/lib/eal/include \
   @TOPDIR@/lib/eal/include/generic \
   @TOPDIR@/lib/acl \
+  @TOPDIR@/lib/argparse \
   @TOPDIR@/lib/bbdev \
   @TOPDIR@/lib/bitratestats \
   @TOPDIR@/lib/bpf \
diff --git a/doc/guides/prog_guide/argparse_lib.rst 
b/doc/guides/prog_guide/argparse_lib.rst
new file mode 100644
index 00..d9813cbeff
--- /dev/null
+++ b/doc/guides/prog_guide/argparse_lib.rst
@@ -0,0 +1,142 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright 2023 HiSilicon Limited
+
+Argparse Library
+
+
+The argparse library provides argument parse functionality, this library makes
+it easy to write user-friendly command-line program.
+
+Features and Capabilities
+-
+
+- Support parse optional argument (which could take with no-value,
+  required-value and optional-value).
+
+- Support parse positional argument (which must take with required-value).
+
+- Support automatic generate usage information.
+
+- Support issue errors when provide with invalid arguments.
+
+- Support parse argument by two way: 1) autosave: for which known value types,
+  this way can be used; 2) callback: will invoke user callback to parse.
+
+Usage Guide
+---
+
+The following code demonstrates how to initialize:
+
+.. code-block:: C
+
+   static int
+   argparse_user_callback(uint32_t index, const char *value, void *opaque)
+   {
+  if (index == 1) {
+ /* process "--ddd" argument, because it has no-value, the parameter 
value is NULL. */
+ ...
+  } else if (index == 2) {
+ /* process "--eee" argument, because it has required-value, the 
parameter value must not NULL. */
+ ...
+  } else if (index == 3) {
+ /* process "--fff" argument, because it has optional-value, the 
parameter value maybe NULL or not NULL, depend on input. */
+ ...
+  } else if (index == 300) {
+ /* process "ppp" argument, because it's a positional argument, the 
parameter value must not NULL. */
+ ...
+  } else {
+ return -EINVAL;
+  }
+   }
+
+   int aaa_val, bbb_val, ccc_val, ooo_val;
+
+   static struct rte_argparse obj = {
+  .prog_name = "test-demo",
+  .usage = "[EAL options] -- [optional parameters] [positional 
parameters]",
+  .descriptor = NULL,
+  .epilog = NULL,
+  .exit_on_error = true,
+  .callback = argparse_user_callback,
+  .args = {
+ { "--aaa", "-a", "aaa argument", (void *)&aaa_val, (void *)100, 
RTE_ARGPARSE_ARG_NO_VALUE   | RTE_ARGPARSE_ARG_VALUE_INT },
+ { "--bbb", "-b", "bbb argument", (void *)&bbb_val, NULL,
RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
+ { "--ccc", "-c", "ccc argument", (void *)&ccc_val, (void *)200, 
RTE_ARGPARSE_ARG_OPTIONAL_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
+ { "--ddd", "-d", "ddd argument", NULL, (void *)1,   
RTE_ARGPARSE_ARG_NO_VALUE   },
+ { "--eee", "-e", "eee argument", NULL, (void *)2,   
RTE_ARGPARSE_ARG_REQUIRED_VALUE },
+ { "--fff", "-f", "fff argument", NULL, (void *)3,   
RTE_A

[RFC v2 5/6] test/argparse: add parse parameters test

[Chengwen Feng]

This commit adds parse parameters test.

Signed-off-by: Chengwen Feng 
---
 app/test/test_argparse.c | 437 +++
 1 file changed, 437 insertions(+)

diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index d38ffb5775..3e4f4a2cfa 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -301,6 +301,434 @@ test_argparse_invalid_arg_repeat(void)
return 0;
 }
 
+static int
+test_argparse_invalid_option(void)
+{
+   struct rte_argparse *obj;
+   char *argv[2];
+   int ret;
+
+   obj = test_argparse_init_obj();
+   argv[0] = test_strdup(obj->usage);
+   argv[1] = test_strdup("--invalid");
+   ret = rte_argparse_parse(obj, 2, argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   obj = test_argparse_init_obj();
+   argv[0] = test_strdup(obj->usage);
+   argv[1] = test_strdup("invalid");
+   ret = rte_argparse_parse(obj, 2, argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   return 0;
+}
+
+static int
+test_argparse_opt_autosave_parse_int_of_no_val(void)
+{
+   uint32_t flags = RTE_ARGPARSE_ARG_NO_VALUE | RTE_ARGPARSE_ARG_VALUE_INT;
+   struct rte_argparse *obj;
+   int val_saver = 0;
+   char *argv[2];
+   int ret;
+
+   obj = test_argparse_init_obj();
+   obj->args[0].name_long = "--test-long";
+   obj->args[0].name_short = "-t";
+   obj->args[0].val_saver = (void *)&val_saver;
+   obj->args[0].val_set = (void *)100;
+   obj->args[0].flags = flags;
+   obj->args[1].name_long = NULL;
+   argv[0] = test_strdup(obj->usage);
+   argv[1] = test_strdup("--test-long");
+   ret = rte_argparse_parse(obj, 2, argv);
+   TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+   TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+   obj->args[0].flags = flags;
+   val_saver = 0;
+   argv[1] = test_strdup("-t");
+   ret = rte_argparse_parse(obj, 2, argv);
+   TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+   TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+   return 0;
+}
+
+static int
+test_argparse_opt_autosave_parse_int_of_required_val(void)
+{
+   uint32_t flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | 
RTE_ARGPARSE_ARG_VALUE_INT;
+   struct rte_argparse *obj;
+   int val_saver = 0;
+   char *argv[3];
+   int ret;
+
+   obj = test_argparse_init_obj();
+   obj->args[0].name_long = "--test-long";
+   obj->args[0].name_short = "-t";
+   obj->args[0].val_saver = (void *)&val_saver;
+   obj->args[0].val_set = NULL;
+   obj->args[0].flags = flags;
+   obj->args[1].name_long = NULL;
+   argv[0] = test_strdup(obj->usage);
+   argv[1] = test_strdup("--test-long");
+   argv[2] = test_strdup("100");
+   ret = rte_argparse_parse(obj, 3, argv);
+   TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+   TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+   obj->args[0].flags = flags;
+   val_saver = 0;
+   argv[1] = test_strdup("-t");
+   ret = rte_argparse_parse(obj, 3, argv);
+   TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+   TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+   /* test invalid value. */
+   obj->args[0].flags = flags;
+   val_saver = 0;
+   argv[1] = test_strdup("-t");
+   argv[2] = test_strdup("100a");
+   ret = rte_argparse_parse(obj, 3, argv);
+   TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
+
+   return 0;
+}
+
+static int
+test_argparse_opt_autosave_parse_int_of_optional_val(void)
+{
+   uint32_t flags = RTE_ARGPARSE_ARG_OPTIONAL_VALUE | 
RTE_ARGPARSE_ARG_VALUE_INT;
+   struct rte_argparse *obj;
+   int val_saver = 0;
+   char *argv[2];
+   int ret;
+
+   obj = test_argparse_init_obj();
+   obj->args[0].name_long = "--test-long";
+   obj->args[0].name_short = "-t";
+   obj->args[0].val_saver = (void *)&val_saver;
+   obj->args[0].val_set = (void *)100;
+   obj->args[0].flags = flags;
+   obj->args[1].name_long = NULL;
+   argv[0] = test_strdup(obj->usage);
+   argv[1] = test_strdup("--test-long");
+   ret = rte_argparse_parse(obj, 2, argv);
+   TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+   TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+   obj->args[0].flags = flags;
+   val_saver = 0;
+   argv[1] = test_strdup("-t");
+   ret = rte_argparse_parse(obj, 2, argv);
+   TEST_ASSERT(ret == 0, "Argparse parse expect success!");
+   TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");
+
+   /* test with value. */
+   obj->args[0].flags = flags;
+   val_saver = 0;
+   argv[1] = test_strdup("--test-long=200");
+   ret = rte_argparse_parse(obj, 2, argv);
+