Re: [PATCH] lib: remove duplicate prefix in logs

[David Marchand]

On Wed, Jan 24, 2024 at 1:17 PM Morten Brørup  
wrote:
> > diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
> > index 5953a77bd6..dbaa14f262 100644
> > --- a/lib/dmadev/rte_dmadev.c
> > +++ b/lib/dmadev/rte_dmadev.c
> > @@ -35,8 +35,7 @@ RTE_LOG_REGISTER_DEFAULT(rte_dma_logtype, INFO);
> >  #define RTE_LOGTYPE_DMA rte_dma_logtype
> >
> >  #define RTE_DMA_LOG(level, ...) \
> > - RTE_LOG_LINE(level, DMA, RTE_FMT("dma: " RTE_FMT_HEAD(__VA_ARGS__
> > ,), \
> > - RTE_FMT_TAIL(__VA_ARGS__ ,)))
> > + RTE_LOG_LINE(level, DMA, "" __VA_ARGS__)
> >
> >  int
> >  rte_dma_dev_max(size_t dev_max)
> > diff --git a/lib/gpudev/gpudev.c b/lib/gpudev/gpudev.c
> > index de8291151f..1c2011b856 100644
> > --- a/lib/gpudev/gpudev.c
> > +++ b/lib/gpudev/gpudev.c
> > @@ -20,8 +20,7 @@ RTE_LOG_REGISTER_DEFAULT(gpu_logtype, NOTICE);
> >  #define RTE_LOGTYPE_GPUDEV gpu_logtype
> >
> >  #define GPU_LOG(level, ...) \
> > - RTE_LOG_LINE(level, GPUDEV, RTE_FMT("gpu: "
> > RTE_FMT_HEAD(__VA_ARGS__ ,), \
> > - RTE_FMT_TAIL(__VA_ARGS__ ,)))
> > + RTE_LOG_LINE(level, GPUDEV, "" __VA_ARGS__)
>
> Suggestion:
> GPUDEV -> GPU, like DMA, not DMADEV.

I had not checked before, but for consistency, I would go the other way around.

$ for dir in lib/*dev; do git grep RTE_LOG_LINE $dir; done
lib/bbdev/rte_bbdev.c:  RTE_LOG_LINE(level, BBDEV, "" __VA_ARGS__)
lib/compressdev/rte_compressdev_internal.h: RTE_LOG_LINE(level,
COMPRESSDEV, "%s(): " fmt, __func__, ## args)
lib/cryptodev/rte_cryptodev.h:  RTE_LOG_LINE(ERR, CRYPTODEV, \
lib/cryptodev/rte_cryptodev.h:  RTE_LOG_LINE(INFO, CRYPTODEV, "" __VA_ARGS__)
lib/cryptodev/rte_cryptodev.h:  RTE_LOG_LINE(DEBUG, CRYPTODEV, \
lib/cryptodev/rte_cryptodev.h:  RTE_LOG_LINE(DEBUG, CRYPTODEV, \
lib/dmadev/rte_dmadev.c:RTE_LOG_LINE(level, DMA, "" __VA_ARGS__)
lib/ethdev/rte_ethdev.h:RTE_LOG_LINE(level, ETHDEV, "" __VA_ARGS__)
lib/eventdev/eventdev_pmd.h:RTE_LOG_LINE(ERR, EVENTDEV, \
lib/eventdev/eventdev_pmd.h:RTE_LOG_LINE(DEBUG, EVENTDEV, \
lib/eventdev/rte_event_timer_adapter.c: RTE_LOG_LINE(level, logtype, \
lib/gpudev/gpudev.c:RTE_LOG_LINE(level, GPUDEV, "" __VA_ARGS__)
lib/mldev/rte_mldev.h:  RTE_LOG_LINE(level, MLDEV, "%s(): " fmt,
__func__, ##args)
lib/rawdev/rte_rawdev_pmd.h:RTE_LOG_LINE(level, RAWDEV, "%s(): "
fmt, __func__, ##args)
lib/regexdev/rte_regexdev.h:RTE_LOG_LINE(level, REGEXDEV, "" __VA_ARGS__)


-- 
David Marchand

RE: [PATCH] lib: remove duplicate prefix in logs

[Morten Brørup]

> From: David Marchand [mailto:david.march...@redhat.com]
> Sent: Thursday, 25 January 2024 09.14
> 
> On Wed, Jan 24, 2024 at 1:17 PM Morten Brørup
>  wrote:
> > > diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
> > > index 5953a77bd6..dbaa14f262 100644
> > > --- a/lib/dmadev/rte_dmadev.c
> > > +++ b/lib/dmadev/rte_dmadev.c
> > > @@ -35,8 +35,7 @@ RTE_LOG_REGISTER_DEFAULT(rte_dma_logtype, INFO);
> > >  #define RTE_LOGTYPE_DMA rte_dma_logtype
> > >
> > >  #define RTE_DMA_LOG(level, ...) \
> > > - RTE_LOG_LINE(level, DMA, RTE_FMT("dma: "
> RTE_FMT_HEAD(__VA_ARGS__
> > > ,), \
> > > - RTE_FMT_TAIL(__VA_ARGS__ ,)))
> > > + RTE_LOG_LINE(level, DMA, "" __VA_ARGS__)
> > >
> > >  int
> > >  rte_dma_dev_max(size_t dev_max)
> > > diff --git a/lib/gpudev/gpudev.c b/lib/gpudev/gpudev.c
> > > index de8291151f..1c2011b856 100644
> > > --- a/lib/gpudev/gpudev.c
> > > +++ b/lib/gpudev/gpudev.c
> > > @@ -20,8 +20,7 @@ RTE_LOG_REGISTER_DEFAULT(gpu_logtype, NOTICE);
> > >  #define RTE_LOGTYPE_GPUDEV gpu_logtype
> > >
> > >  #define GPU_LOG(level, ...) \
> > > - RTE_LOG_LINE(level, GPUDEV, RTE_FMT("gpu: "
> > > RTE_FMT_HEAD(__VA_ARGS__ ,), \
> > > - RTE_FMT_TAIL(__VA_ARGS__ ,)))
> > > + RTE_LOG_LINE(level, GPUDEV, "" __VA_ARGS__)
> >
> > Suggestion:
> > GPUDEV -> GPU, like DMA, not DMADEV.
> 
> I had not checked before, but for consistency, I would go the other way
> around.

Consistency is the goal. Either way is fine with me.
It seems with DEV is more common, so +1 to David's suggestion.

> 
> $ for dir in lib/*dev; do git grep RTE_LOG_LINE $dir; done
> lib/bbdev/rte_bbdev.c:  RTE_LOG_LINE(level, BBDEV, "" __VA_ARGS__)
> lib/compressdev/rte_compressdev_internal.h: RTE_LOG_LINE(level,
> COMPRESSDEV, "%s(): " fmt, __func__, ## args)
> lib/cryptodev/rte_cryptodev.h:  RTE_LOG_LINE(ERR, CRYPTODEV, \
> lib/cryptodev/rte_cryptodev.h:  RTE_LOG_LINE(INFO, CRYPTODEV, ""
> __VA_ARGS__)
> lib/cryptodev/rte_cryptodev.h:  RTE_LOG_LINE(DEBUG, CRYPTODEV, \
> lib/cryptodev/rte_cryptodev.h:  RTE_LOG_LINE(DEBUG, CRYPTODEV, \
> lib/dmadev/rte_dmadev.c:RTE_LOG_LINE(level, DMA, ""
> __VA_ARGS__)
> lib/ethdev/rte_ethdev.h:RTE_LOG_LINE(level, ETHDEV, ""
> __VA_ARGS__)
> lib/eventdev/eventdev_pmd.h:RTE_LOG_LINE(ERR, EVENTDEV, \
> lib/eventdev/eventdev_pmd.h:RTE_LOG_LINE(DEBUG, EVENTDEV, \
> lib/eventdev/rte_event_timer_adapter.c: RTE_LOG_LINE(level, logtype, \
> lib/gpudev/gpudev.c:RTE_LOG_LINE(level, GPUDEV, "" __VA_ARGS__)
> lib/mldev/rte_mldev.h:  RTE_LOG_LINE(level, MLDEV, "%s(): " fmt,
> __func__, ##args)
> lib/rawdev/rte_rawdev_pmd.h:RTE_LOG_LINE(level, RAWDEV, "%s(): "
> fmt, __func__, ##args)
> lib/regexdev/rte_regexdev.h:RTE_LOG_LINE(level, REGEXDEV, ""
> __VA_ARGS__)
> 
> 
> --
> David Marchand

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

[Suanming Mou]

Hi,

> -Original Message-
> From: Michael Baum 
> Sent: Sunday, December 3, 2023 7:25 PM
> To: dev@dpdk.org
> Cc: Matan Azrad ; Raslan Darawsheh
> ; Slava Ovsiienko ; Ori Kam
> ; Suanming Mou 
> Subject: [PATCH v1 00/23] net/mlx5: support Geneve and options for HWS
> 
> 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.

Series Acked-by: Suanming Mou 

Thank you!

> 
> 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

[DPDK Bug 1369] net/mlx5: RX packet metadata altered/incorrect after reception

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1369

Bug ID: 1369
   Summary: net/mlx5: RX packet metadata altered/incorrect after
reception
   Product: DPDK
   Version: 22.11
  Hardware: x86
OS: Linux
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: pt4h...@clavister.com
  Target Milestone: ---

Our platform operates with Mellanox ConnectX-5 (MT_000183) network
adapters, equipped with the latest firmware (version 16.35.3006). It utilizes
DPDK 22.11.3 and runs on Ubuntu 20.

Under heavy load, we occasionally observe the reception of packets where the
metadata is incorrect or altered at a later time. The incorrect data seem to
revolve around the "port" and "RSS" fields.

For packet reception, we use: 
rte_eth_rx_burst(port ..)

To detect the problem, we loop through the packets that have been received and
check if the "port" specified in the "mbuf" aligns with the interface
designated for the RX burst execution.

Occasionally, they will not match. Sometimes, the port appears to match
initially, only to change later during processing.

Attempts to modify the packet metadata after reception, such as changing the
port, result in its reverting to its previous state shortly after. 

The packet data for these anomalies seems accurate. For instance, if RX is
performed on port 1 and the packet mbuf indicates port 2, the IP data within
the packet still correlates with the IP ranges assigned to port 1.

Initially, we suspected a potential double free of packet buffers but found no
evidence supporting this. Also, our implementation functions correctly with
various other network adapters and drivers.

This implementation also worked with an older version of DPDK. We previously
used DPDK 20.02 without issue, but the problem emerged after upgrading to DPDK
22.11. Upgrading further to DPDK 23.11 did not resolve the issue.

We have tried different Mellanox firmware versions and even switched to
ConnectX-6 adapters, but the problem persisted. 

The only effective workaround so far has been to disable "hardware RX vector"
(rx_vec_en=0), which seem to make the problem go away.

Do you have any insights into what might be causing this problem, or
suggestions on how to proceed in resolving it?

-- 
You are receiving this mail because:
You are the assignee for the bug.

Re: [PATCH v1] doc: update guideline for fix commit messages

[Ferruh Yigit]

On 1/25/2024 3:39 AM, Sivaramakrishnan Venkat wrote:
> Maintainers remove the Cc author line when merging the patch.
> So, the guidelines is updated with a suggestion for the placement
> of Cc lines in a commit message for easy merging.
> 
> Signed-off-by: Sivaramakrishnan Venkat 
> ---
>  doc/guides/contributing/patches.rst | 6 ++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/doc/guides/contributing/patches.rst 
> b/doc/guides/contributing/patches.rst
> index e286d9e6d5..e109365599 100644
> --- a/doc/guides/contributing/patches.rst
> +++ b/doc/guides/contributing/patches.rst
> @@ -275,6 +275,12 @@ Here are some guidelines for the body of a commit 
> message:
>  
>   Signed-off-by: Alex Smith 
>  
> +* .. Note::
> +
> + Maintainers remove the "Cc: aut...@example.com" line when merging the 
> patch.
> + To help the maintainer, the submitter may move this line to the notes 
> section
> + of the commit, after the ``---`` separator.
> +
>  * When fixing an error or warning it is useful to add the error message and 
> instructions on how to reproduce it.
>  
>  * Use correct capitalization, punctuation and spelling.

Thanks Sivaramakrishnan for the doc update, that is practically what
happens,
but "Note" is to get additional attention, and there are already
multiple steps involved to prepare a commit log and this one is not
really that important, so lets not complicate it more for new contributors.

One option is add above information without ".. Note::" block, and
shorten it a little more, with adding the reasoning of adding "Cc:
aut...@example.com" (so I am asking adding more info and make paragraph
shorter :)

Other option is update samples to the desired format, it won't explain
the ask but imply it by showing requested output, as we are doing for
"Depends-on" tag.


I am for starting with the second option first, update samples, and see
if it improves things, what do you think?

[PATCH v2 0/8] 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 2nd commit contains usage examples.

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

Chengwen Feng (8):
  eal: introduce more macro for bit definition
  argparse: add argparse library
  argparse: support verify argument config
  argparse: support parse parameters
  argparse: provide parsing known type API
  argparse: support parse unsigned base type
  argparse: pretty help info
  examples/dma: replace getopt with argparse

---
v2: 
- Refine argparse_lib.rst which address Stephen's comments.
- Fix following which address Thomas's comments:  
  1. Redefine new introduce macros.
  2. Squashed the test commit to feature commit.
  3. Drop the arguments' defines and direct place in obj.
- Use RTE_LOG_LINE marco to impl log.
- Update MAINTAINERS file.

 MAINTAINERS|   5 +
 app/test/meson.build   |   1 +
 app/test/test_argparse.c   | 835 +
 doc/api/doxy-api-index.md  |   1 +
 doc/api/doxy-api.conf.in   |   1 +
 doc/guides/prog_guide/argparse_lib.rst | 185 ++
 doc/guides/prog_guide/index.rst|   1 +
 doc/guides/rel_notes/release_24_03.rst |   5 +
 examples/dma/dmafwd.c  | 269 
 examples/dma/meson.build   |   2 +-
 lib/argparse/meson.build   |   7 +
 lib/argparse/rte_argparse.c| 782 +++
 lib/argparse/rte_argparse.h| 217 +++
 lib/argparse/version.map   |   8 +
 lib/eal/include/rte_bitops.h   |  64 ++
 lib/meson.build|   1 +
 16 files changed, 2230 insertions(+), 154 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

[PATCH v2 1/8] eal: introduce more macro for bit definition

[Chengwen Feng]

Introduce macros:
1. RTE_SHIFT_VAL64: get the uint64_t value which shifted by nr.
2. RTE_SHIFT_VAL32: get the uint32_t value which shifted by nr.
3. RTE_GENMASK64: generate a contiguous 64bit bitmask starting at bit
  position low and ending at position high.
4. RTE_GENMASK32: generate a contiguous 32bit bitmask starting at bit
  position low and ending at position high.
5. RTE_FIELD_GET64: extract a 64bit field element.
6. RTE_FIELD_GET32: extract a 32bit field element.

Signed-off-by: Chengwen Feng 
---
 lib/eal/include/rte_bitops.h | 64 
 1 file changed, 64 insertions(+)

diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
index 6bd8bae21a..bab08d53ec 100644
--- a/lib/eal/include/rte_bitops.h
+++ b/lib/eal/include/rte_bitops.h
@@ -39,6 +39,70 @@ extern "C" {
  */
 #define RTE_BIT32(nr) (UINT32_C(1) << (nr))
 
+/**
+ * Get the uint64_t value which shifted by nr.
+ *
+ * @param val
+ *   The value to be shifted.
+ * @param nr
+ *   The bit number in range of 0 to (64 - width of val).
+ */
+#define RTE_SHIFT_VAL64(val, nr) (UINT64_C(val) << (nr))
+
+/**
+ * Get the uint32_t value which shifted by nr.
+ *
+ * @param val
+ *   The value to be shifted.
+ * @param nr
+ *   The bit number in range of 0 to (32 - width of val).
+ */
+#define RTE_SHIFT_VAL32(val, nr) (UINT32_C(val) << (nr))
+
+/**
+ * Generate a contiguous 64bit bitmask starting at bit position low
+ * and ending at position high.
+ *
+ * @param high
+ *   High bit position.
+ * @param low
+ *   Low bit position.
+ */
+#define RTE_GENMASK64(high, low) (((~UINT64_C(0)) << (low)) & (~UINT64_C(0) >> 
(63u - (high
+
+/**
+ * Generate a contiguous 32bit bitmask starting at bit position low
+ * and ending at position high.
+ *
+ * @param high
+ *   High bit position.
+ * @param low
+ *   Low bit position.
+ */
+#define RTE_GENMASK32(high, low) (((~UINT32_C(0)) << (low)) & (~UINT32_C(0) >> 
(31u - (high
+
+/**
+ * Extract a 64bit field element.
+ *
+ * @param mask
+ *   shifted mask.
+ * @param reg
+ *   value of entire bitfield.
+ */
+#define RTE_FIELD_GET64(mask, reg) \
+   ((typeof(mask))(((reg) & (mask)) >> rte_ctz64(mask)))
+
+/**
+ * Extract a 32bit field element.
+ *
+ * @param mask
+ *   shifted mask.
+ * @param reg
+ *   value of entire bitfield.
+ */
+#define RTE_FIELD_GET32(mask, reg) \
+   ((typeof(mask))(((reg) & (mask)) >> rte_ctz32(mask)))
+
 /* 32-bit relaxed operations */
 
 /**
-- 
2.17.1

[PATCH v2 2/8] 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 
---
 MAINTAINERS|   4 +
 doc/api/doxy-api-index.md  |   1 +
 doc/api/doxy-api.conf.in   |   1 +
 doc/guides/prog_guide/argparse_lib.rst | 185 
 doc/guides/prog_guide/index.rst|   1 +
 doc/guides/rel_notes/release_24_03.rst |   5 +
 lib/argparse/meson.build   |   7 +
 lib/argparse/rte_argparse.c|  14 ++
 lib/argparse/rte_argparse.h| 190 +
 lib/argparse/version.map   |   7 +
 lib/meson.build|   1 +
 11 files changed, 416 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/MAINTAINERS b/MAINTAINERS
index 0d1c8126e3..09fdb87a25 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1650,6 +1650,10 @@ F: doc/guides/sample_app_ug/qos_metering.rst
 Other libraries
 ---
 
+Argument parsing
+M: Chengwen Feng 
+F: lib/argparse/
+
 Configuration file
 M: Cristian Dumitrescu 
 F: lib/cfgfile/
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..00d4860ca1
--- /dev/null
+++ b/doc/guides/prog_guide/argparse_lib.rst
@@ -0,0 +1,185 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright(c) 2024 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 ways: 1) autosave: used for parsing known value
+  types; 2) callback: will invoke user callback to parse.
+
+Usage Guide
+---
+
+The following code demonstrates how to use:
+
+.. code-block:: C
+
+   static int
+   argparse_user_callback(uint32_t index, const char *value, void *opaque)
+   {
+  if (index == 1) {
+ /* process "--ddd" argument, because it is configured as no-value,
+  * the parameter 'value' is NULL.
+  */
+ ...
+  } else if (index == 2) {
+ /* process "--eee" argument, because it is configured as
+  * required-value, the parameter 'value' must not be NULL.
+  */
+ ...
+  } else if (index == 3) {
+ /* process "--fff" argument, because it is configured as
+  * 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 be NULL.
+  */
+ ...
+  } else {
+ return -EINVAL;
+  }
+   }
+
+   static 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", &aaa_val, (void *)100, 
RTE_ARGPARSE_ARG_NO_VALUE   | RTE_ARGPARSE_ARG_VALUE_INT },
+   

[PATCH v2 3/8] argparse: support verify argument config

[Chengwen Feng]

This commit supports verify argument config.

Signed-off-by: Chengwen Feng 
---
 MAINTAINERS |   1 +
 app/test/meson.build|   1 +
 app/test/test_argparse.c| 327 
 lib/argparse/rte_argparse.c | 307 -
 4 files changed, 635 insertions(+), 1 deletion(-)
 create mode 100644 app/test/test_argparse.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 09fdb87a25..a32b941e78 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1653,6 +1653,7 @@ Other libraries
 Argument parsing
 M: Chengwen Feng 
 F: lib/argparse/
+F: app/test/test_argparse.c
 
 Configuration file
 M: Cristian Dumitrescu 
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..31c46ecccf
--- /dev/null
+++ b/app/test/test_argparse.c
@@ -0,0 +1,327 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 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 = t

[PATCH v2 4/8] argparse: support parse parameters

[Chengwen Feng]

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

Signed-off-by: Chengwen Feng 
---
 app/test/test_argparse.c| 437 
 lib/argparse/rte_argparse.c | 289 +++-
 2 files changed, 723 insertions(+), 3 deletions(-)

diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 31c46ecccf..f55b57a21f 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 = 

[PATCH v2 5/8] argparse: provide parsing known type API

[Chengwen Feng]

Provide API which could parsing the value from the input string based
on the value type. This API could used in user callback when parsing
string by argparse or kvargs library.

Signed-off-by: Chengwen Feng 
---
 app/test/test_argparse.c| 22 ++
 lib/argparse/rte_argparse.c | 19 +++
 lib/argparse/rte_argparse.h | 19 +++
 lib/argparse/version.map|  1 +
 4 files changed, 61 insertions(+)

diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index f55b57a21f..98c6cd6b80 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -729,6 +729,27 @@ test_argparse_pos_callback_parse_int(void)
return 0;
 }
 
+static int
+test_argparse_parse_type(void)
+{
+   char *str_erange = test_strdup("99");
+   char *str_invalid = test_strdup("1a");
+   char *str_ok = test_strdup("123");
+   int value;
+   int ret;
+
+   /* test for int parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(value == 123, "Argparse parse type expect failed!");
+
+   return 0;
+}
+
 static struct unit_test_suite argparse_test_suite  = {
.suite_name = "Argparse Unit Test Suite",
.setup = test_argparse_setup,
@@ -750,6 +771,7 @@ static struct unit_test_suite argparse_test_suite  = {
TEST_CASE(test_argparse_opt_callback_parse_int_of_optional_val),
TEST_CASE(test_argparse_pos_autosave_parse_int),
TEST_CASE(test_argparse_pos_callback_parse_int),
+   TEST_CASE(test_argparse_parse_type),
 
TEST_CASES_END() /**< NULL terminate unit test array */
}
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index a4e7ceabf6..f33bd470ba 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -600,3 +600,22 @@ rte_argparse_parse(struct rte_argparse *obj, int argc, 
char **argv)
exit(ret);
return ret;
 }
+
+int
+rte_argparse_parse_type(const char *str, uint64_t val_type, void *val)
+{
+   uint32_t cmp_max = RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, 
RTE_ARGPARSE_ARG_VALUE_MAX);
+   struct rte_argparse_arg arg = {
+   .name_long = str,
+   .name_short = NULL,
+   .val_saver = val,
+   .val_set = NULL,
+   .flags = val_type,
+   };
+   uint32_t value_type = arg_attr_val_type(&arg);
+
+   if (value_type == 0 || value_type >= cmp_max)
+   return -EINVAL;
+
+   return parse_arg_autosave(&arg, str);
+}
diff --git a/lib/argparse/rte_argparse.h b/lib/argparse/rte_argparse.h
index 8285e812f0..a795263a81 100644
--- a/lib/argparse/rte_argparse.h
+++ b/lib/argparse/rte_argparse.h
@@ -183,6 +183,25 @@ struct rte_argparse {
 __rte_experimental
 int rte_argparse_parse(struct rte_argparse *obj, int argc, char **argv);
 
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Parse the value from the input string based on the value type.
+ *
+ * @param str
+ *   Input string.
+ * @param val_type
+ *   The value type, @see RTE_ARGPARSE_ARG_VALUE_INT or other type.
+ * @param val
+ *   Saver for the value.
+ *
+ * @return
+ *   0 on success. Otherwise negative value is returned.
+ */
+__rte_experimental
+int rte_argparse_parse_type(const char *str, uint64_t val_type, void *val);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/argparse/version.map b/lib/argparse/version.map
index 1c176f69e9..9b68464600 100644
--- a/lib/argparse/version.map
+++ b/lib/argparse/version.map
@@ -2,6 +2,7 @@ EXPERIMENTAL {
global:
 
rte_argparse_parse;
+   rte_argparse_parse_type;
 
local: *;
 };
-- 
2.17.1

[PATCH v2 6/8] argparse: support parse unsigned base type

[Chengwen Feng]

This commit supports parsing unsigned base type (u8/u16/u32/u64).

Signed-off-by: Chengwen Feng 
---
 app/test/test_argparse.c|  59 --
 lib/argparse/rte_argparse.c | 116 
 lib/argparse/rte_argparse.h |  10 +++-
 3 files changed, 179 insertions(+), 6 deletions(-)

diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 98c6cd6b80..470c1bd2b6 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -733,19 +733,68 @@ static int
 test_argparse_parse_type(void)
 {
char *str_erange = test_strdup("99");
+   char *str_erange_u32 = test_strdup("4294967296");
+   char *str_erange_u16 = test_strdup("65536");
+   char *str_erange_u8 = test_strdup("256");
char *str_invalid = test_strdup("1a");
char *str_ok = test_strdup("123");
-   int value;
+   uint16_t val_u16;
+   uint32_t val_u32;
+   uint64_t val_u64;
+   uint8_t val_u8;
+   int val_int;
int ret;
 
/* test for int parsing */
-   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT, 
&val_int);
TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
-   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT, 
&val_int);
TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
-   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT, 
&val_int);
TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
-   TEST_ASSERT(value == 123, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_int == 123, "Argparse parse type expect failed!");
+
+   /* test for u8 parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U8, 
&val_u8);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_erange_u8, RTE_ARGPARSE_ARG_VALUE_U8, 
&val_u8);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U8, 
&val_u8);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U8, 
&val_u8);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_u8 == 123, "Argparse parse type expect failed!");
+
+   /* test for u16 parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U16, 
&val_u16);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_erange_u16, 
RTE_ARGPARSE_ARG_VALUE_U16, &val_u16);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U16, 
&val_u16);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U16, 
&val_u16);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_u16 == 123, "Argparse parse type expect failed!");
+
+   /* test for u32 parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U32, 
&val_u32);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_erange_u32, 
RTE_ARGPARSE_ARG_VALUE_U32, &val_u32);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U32, 
&val_u32);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U32, 
&val_u32);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_u32 == 123, "Argparse parse type expect failed!");
+
+   /* test for u64 parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U64, 
&val_u64);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U64, 
&val_u64);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U64, 
&val_u64);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_u64 == 123, "Argparse parse type expect failed!");
 
return 0;
 }
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index f33bd470ba..3cb1557b85 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -397,6 +397,118 @

[PATCH v2 7/8] argparse: pretty help info

[Chengwen Feng]

This commit aligns help info.

Take dmafwd as an example, previous:

options:
 -h, --help: show this help message and exit.
 --mac-updating: Enable MAC addresses updating
 --no-mac-updating: Disable MAC addresses updating
 -p, --portmask: hexadecimal bitmask of ports to configure
 -q, --nb-queue: number of RX queues per port (default is 1)
 -c, --copy-type: type of copy: sw|hw
 -s, --ring-size: size of dmadev descriptor ring for hardware copy mode or 
rte_ring for software copy mode
 -b, --dma-batch-size: number of requests per DMA batch
 -f, --max-frame-size: max frame size
 -m, --force-min-copy-size: force a minimum copy length, even for smaller 
packets
 -i, --stats-interval: interval, in seconds, between stats prints (default is 1)

Now:
options:
 -h, --help show this help message and exit.
 --mac-updating Enable MAC addresses updating
 --no-mac-updating  Disable MAC addresses updating
 -p, --portmask hexadecimal bitmask of ports to configure
 -q, --nb-queue number of RX queues per port (default is 1)
 -c, --copy-typetype of copy: sw|hw
 -s, --ring-sizesize of dmadev descriptor ring for hardware copy 
mode or rte_ring for software copy mode
 -b, --dma-batch-size   number of requests per DMA batch
 -f, --max-frame-size   max frame size
 -m, --force-min-copy-size  force a minimum copy length, even for smaller 
packets
 -i, --stats-interval   interval, in seconds, between stats prints (default 
is 1)

Signed-off-by: Chengwen Feng 
---
 lib/argparse/rte_argparse.c | 67 +++--
 1 file changed, 56 insertions(+), 11 deletions(-)

diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index 3cb1557b85..e03c881f08 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -634,8 +634,47 @@ parse_args(struct rte_argparse *obj, int argc, char 
**argv, bool *show_help)
return 0;
 }
 
+static uint32_t
+calc_help_align(const struct rte_argparse *obj)
+{
+   const struct rte_argparse_arg *arg;
+   uint32_t width = 12; /* Default "-h, --help  " len. */
+   uint32_t len;
+   uint32_t i;
+
+   for (i = 0; /* NULL */; i++) {
+   arg = &obj->args[i];
+   if (arg->name_long == NULL)
+   break;
+   len = strlen(arg->name_long);
+   if (is_arg_optional(arg) && arg->name_short != NULL) {
+   len += strlen(", ");
+   len += strlen(arg->name_short);
+   }
+   width = RTE_MAX(width, 1 + len + 2); /* start with 1 & end with 
2 space. */
+   }
+
+   return width;
+}
+
+static void
+show_oneline_help(const struct rte_argparse_arg *arg, uint32_t width)
+{
+   uint32_t len = 0;
+   uint32_t i;
+
+   if (arg->name_short != NULL)
+   len = printf(" %s,", arg->name_short);
+   len += printf(" %s", arg->name_long);
+
+   for (i = len; i < width; i++)
+   printf(" ");
+
+   printf("%s\n", arg->help);
+}
+
 static void
-show_args_pos_help(const struct rte_argparse *obj)
+show_args_pos_help(const struct rte_argparse *obj, uint32_t align)
 {
uint32_t position_count = calc_position_count(obj);
const struct rte_argparse_arg *arg;
@@ -651,43 +690,49 @@ show_args_pos_help(const struct rte_argparse *obj)
break;
if (!is_arg_positional(arg))
continue;
-   printf(" %s: %s\n", arg->name_long, arg->help);
+   show_oneline_help(arg, align);
}
 }
 
 static void
-show_args_opt_help(const struct rte_argparse *obj)
+show_args_opt_help(const struct rte_argparse *obj, uint32_t align)
 {
+   static const struct rte_argparse_arg help = {
+   .name_long = "--help",
+   .name_short = "-h",
+   .help = "show this help message and exit.",
+   };
const struct rte_argparse_arg *arg;
uint32_t i;
 
-   printf("\noptions:\n"
-  " -h, --help: show this help message and exit.\n");
+   printf("\noptions:\n");
+   show_oneline_help(&help, align);
for (i = 0; /* NULL */; i++) {
arg = &obj->args[i];
if (arg->name_long == NULL)
break;
if (!is_arg_optional(arg))
continue;
-   if (arg->name_short != NULL)
-   printf(" %s, %s: %s\n", arg->name_short, 
arg->name_long, arg->help);
-   else
-   printf(" %s: %s\n", arg->name_long, arg->help);
+   show_oneline_help(arg, align);
}
 }
 
 static void
 show_args_help(const struct rte_argparse *obj)
 {
+   uint32_t align = calc_help_align(obj);
+
printf("usage: %s %s\n", obj->prog_name, obj->usage);
if (obj->descriptor != NULL)
printf("\ndescriptor: %s\n",

[PATCH v2 8/8] examples/dma: replace getopt with argparse

[Chengwen Feng]

Replace getopt with argparse.

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

diff --git a/examples/dma/dmafwd.c b/examples/dma/dmafwd.c
index f27317a622..f4a0bff06e 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,8 @@
 #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_PORTMASK_INDEX 1
+#define CMD_LINE_OPT_COPY_TYPE_INDEX 2
 
 /* configurable number of RX/TX ring descriptors */
 #define RX_DEFAULT_RINGSIZE 1024
@@ -95,10 +87,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 uint16_t ring_size = 2048;
 
 /* interval, in seconds, between stats prints */
-static unsigned short stats_interval = 1;
+static uint16_t stats_interval = 1;
 /* global mbuf arrays for tracking DMA bufs */
 #define MBUF_RING_SIZE 2048
 #define MBUF_RING_MASK (MBUF_RING_SIZE - 1)
@@ -583,26 +575,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 +600,133 @@ 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_mask;
+   } else if (index == CMD_LINE_OPT_COPY_TYPE_INDEX) {
+   copy_mode = dma_parse_copy_mode(value);
+   if (copy_mode == COPY_MODE_INVALID_NUM) {
+   printf("Invalid copy type. Use: sw, hw\n");
+   return -1;
+   }
+   } else {
+   printf("Invalid index %u\n", index);
+   return -1;
+   }
+
+   return 0;
+}
+
 /* Parse the argument given in the command line of the application */
 static int
 dma_parse_args(int argc, char **argv, unsigned int nb_ports)
 {
-   static const char short_options[] =
-   "b:"  /* dma batch size */
-   "c:"  /* copy type (sw|hw) */
-   "f:"  /* max frame size */
-   "m:"  /* force min copy size */
-   "p:"  /* portmask */
-   "q:"  /* number of RX queues per port */
-   "s:"  /* ring size */
-   "i:"  /* interval, in seconds, between stats prints */
-   ;
-
-   static const struct option lgopts[] = {
-   {CMD_LINE_OPT_MAC_UPDATING, no_argument, &mac_updating, 1},
-   {CMD_LINE_OPT_NO_M

[PATCH v5 0/2] net/mlx5: add random item support

[Michael Baum]

Add support for matching random value using the "rte_flow_item_random"
structure.

v2:
 - Rebase.
 - Move release notes to the new release file.

v3:
 - Fix typos in commit message and release notes.
 - Update limitations.

v4:
 - Fix using same value for both "MLX5_FLOW_ITEM_NSH" and
   "MLX5_FLOW_ITEM_RANDOM".
 - Add "Acked-by" from v3.

v5:
 - Rebase.
 - Remove "Depends-on" label.


Erez Shitrit (1):
  net/mlx5/hws: add support for random number match

Michael Baum (1):
  net/mlx5: add random item support

 doc/guides/nics/features/mlx5.ini  |  1 +
 doc/guides/nics/mlx5.rst   |  9 +++
 doc/guides/rel_notes/release_24_03.rst |  1 +
 drivers/net/mlx5/hws/mlx5dr_definer.c  | 33 ++
 drivers/net/mlx5/hws/mlx5dr_definer.h  |  8 ++-
 drivers/net/mlx5/mlx5_flow.h   |  3 +++
 drivers/net/mlx5/mlx5_flow_dv.c|  5 
 drivers/net/mlx5/mlx5_flow_hw.c|  5 
 8 files changed, 64 insertions(+), 1 deletion(-)

-- 
2.25.1

[PATCH v5 1/2] net/mlx5/hws: add support for random number match

[Michael Baum]

From: Erez Shitrit 

The HW adds a random number per each hash, this value can be used for
statistic calculation over the packets, for example by setting one bit in
the mask of that field we will get half of the traffic in the flow, and
so on with the rest of the mask.

Signed-off-by: Erez Shitrit 
Acked-by: Dariusz Sosnowski 
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 33 +++
 drivers/net/mlx5/hws/mlx5dr_definer.h |  8 ++-
 drivers/net/mlx5/mlx5_flow.h  |  3 +++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c 
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index af924b490c..750eb9c7c6 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -187,6 +187,7 @@ struct mlx5dr_definer_conv_data {
X(SET_BE32, ipsec_sequence_number,  v->hdr.seq, 
rte_flow_item_esp) \
X(SET,  ib_l4_udp_port, UDP_ROCEV2_PORT,
rte_flow_item_ib_bth) \
X(SET,  ib_l4_opcode,   v->hdr.opcode,  
rte_flow_item_ib_bth) \
+   X(SET,  random_number,  v->value,   
rte_flow_item_random) \
X(SET,  ib_l4_bth_a,v->hdr.a,   
rte_flow_item_ib_bth) \
 
 /* Item set function format */
@@ -2200,6 +2201,33 @@ mlx5dr_definer_conv_item_ipv6_routing_ext(struct 
mlx5dr_definer_conv_data *cd,
return 0;
 }
 
+static int
+mlx5dr_definer_conv_item_random(struct mlx5dr_definer_conv_data *cd,
+   struct rte_flow_item *item,
+   int item_idx)
+{
+   const struct rte_flow_item_random *m = item->mask;
+   const struct rte_flow_item_random *l = item->last;
+   struct mlx5dr_definer_fc *fc;
+
+   if (!m)
+   return 0;
+
+   if (m->value != (m->value & UINT16_MAX)) {
+   DR_LOG(ERR, "Random value is 16 bits only");
+   rte_errno = EINVAL;
+   return rte_errno;
+   }
+
+   fc = &cd->fc[MLX5DR_DEFINER_FNAME_RANDOM_NUM];
+   fc->item_idx = item_idx;
+   fc->tag_set = &mlx5dr_definer_random_number_set;
+   fc->is_range = l && l->value;
+   DR_CALC_SET_HDR(fc, random_number, random_number);
+
+   return 0;
+}
+
 static int
 mlx5dr_definer_mt_set_fc(struct mlx5dr_match_template *mt,
 struct mlx5dr_definer_fc *fc,
@@ -2251,6 +2279,7 @@ mlx5dr_definer_check_item_range_supp(struct rte_flow_item 
*item)
case RTE_FLOW_ITEM_TYPE_TAG:
case RTE_FLOW_ITEM_TYPE_META:
case MLX5_RTE_FLOW_ITEM_TYPE_TAG:
+   case RTE_FLOW_ITEM_TYPE_RANDOM:
return 0;
default:
DR_LOG(ERR, "Range not supported over item type %d", 
item->type);
@@ -2645,6 +2674,10 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context 
*ctx,
ret = mlx5dr_definer_conv_item_ptype(&cd, items, i);
item_flags |= MLX5_FLOW_ITEM_PTYPE;
break;
+   case RTE_FLOW_ITEM_TYPE_RANDOM:
+   ret = mlx5dr_definer_conv_item_random(&cd, items, i);
+   item_flags |= MLX5_FLOW_ITEM_RANDOM;
+   break;
case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
ret = mlx5dr_definer_conv_item_vxlan_gpe(&cd, items, i);
item_flags |= MLX5_FLOW_LAYER_VXLAN_GPE;
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h 
b/drivers/net/mlx5/hws/mlx5dr_definer.h
index 3dc5f4438d..7b7463fc91 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.h
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.h
@@ -155,6 +155,7 @@ enum mlx5dr_definer_fname {
MLX5DR_DEFINER_FNAME_PTYPE_TUNNEL,
MLX5DR_DEFINER_FNAME_PTYPE_FRAG_O,
MLX5DR_DEFINER_FNAME_PTYPE_FRAG_I,
+   MLX5DR_DEFINER_FNAME_RANDOM_NUM,
MLX5DR_DEFINER_FNAME_MAX,
 };
 
@@ -412,6 +413,11 @@ struct mlx5_ifc_definer_hl_ipv4_src_dst_bits {
u8 destination_address[0x20];
 };
 
+struct mlx5_ifc_definer_hl_random_number_bits {
+   u8 random_number[0x10];
+   u8 reserved[0x10];
+};
+
 struct mlx5_ifc_definer_hl_ipv6_addr_bits {
u8 ipv6_address_127_96[0x20];
u8 ipv6_address_95_64[0x20];
@@ -521,7 +527,7 @@ struct mlx5_ifc_definer_hl_bits {
struct mlx5_ifc_definer_hl_mpls_bits mpls_inner;
u8 unsupported_config_headers_outer[0x80];
u8 unsupported_config_headers_inner[0x80];
-   u8 unsupported_random_number[0x20];
+   struct mlx5_ifc_definer_hl_random_number_bits random_number;
struct mlx5_ifc_definer_hl_ipsec_bits ipsec;
struct mlx5_ifc_definer_hl_metadata_bits metadata;
u8 unsupported_utc_timestamp[0x40];
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index fe4f46724b..6f720de14d 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -277,6 +277,9 @@ enum mlx5_f

[PATCH v5 2/2] net/mlx5: add random item support

[Michael Baum]

Add support for random item in HWS mode.

Signed-off-by: Michael Baum 
Acked-by: Dariusz Sosnowski 
---
 doc/guides/nics/features/mlx5.ini  | 1 +
 doc/guides/nics/mlx5.rst   | 9 +
 doc/guides/rel_notes/release_24_03.rst | 1 +
 drivers/net/mlx5/mlx5_flow_dv.c| 5 +
 drivers/net/mlx5/mlx5_flow_hw.c| 5 +
 5 files changed, 21 insertions(+)

diff --git a/doc/guides/nics/features/mlx5.ini 
b/doc/guides/nics/features/mlx5.ini
index 0739fe9d63..6261b7d657 100644
--- a/doc/guides/nics/features/mlx5.ini
+++ b/doc/guides/nics/features/mlx5.ini
@@ -88,6 +88,7 @@ port_id  = Y
 port_representor = Y
 ptype= Y
 quota= Y
+random   = Y
 tag  = Y
 tcp  = Y
 udp  = Y
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 27384d5a86..f8930cb902 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -167,6 +167,7 @@ Features
 - Sub-Function.
 - Matching on represented port.
 - Matching on aggregated affinity.
+- Matching on random value.
 
 
 Limitations
@@ -571,6 +572,7 @@ Limitations
   - 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.
+  - Modify field action using ``RTE_FLOW_FIELD_RANDOM`` is not supported.
   - 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``
@@ -777,6 +779,13 @@ Limitations
   - In HW steering (``dv_flow_en`` = 2):
 - not supported on guest port.
 
+- Match on random value:
+
+  - Supported only with HW Steering enabled (``dv_flow_en`` = 2).
+  - Supported only in table with ``nb_flows=1``.
+  - NIC ingress/egress flow in group 0 is not supported.
+  - Supports matching only 16 bits (LSB).
+
 - During live migration to a new process set its flow engine as standby mode,
   the user should only program flow rules in group 0 (``fdb_def_rule_en=0``).
   Live migration is only supported under SWS (``dv_flow_en=1``).
diff --git a/doc/guides/rel_notes/release_24_03.rst 
b/doc/guides/rel_notes/release_24_03.rst
index 5e545da867..a1dfea263c 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -75,6 +75,7 @@ New Features
   * Added support for VXLAN-GPE matching in HW Steering flow engine
 (``dv_flow_en`` = 2).
 
+  * Added support for ``RTE_FLOW_ITEM_TYPE_RANDOM`` flow item.
 
 Removed Items
 -
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index bc0572a763..88b5c20758 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -5496,6 +5496,11 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev 
*dev,
RTE_FLOW_ERROR_TYPE_ACTION, action,
"modifications of the MPLS header "
"is not supported");
+   if (dst_data->field == RTE_FLOW_FIELD_RANDOM ||
+   src_data->field == RTE_FLOW_FIELD_RANDOM)
+   return rte_flow_error_set(error, ENOTSUP,
+   RTE_FLOW_ERROR_TYPE_ACTION, action,
+   "modifications of random value is not 
supported");
if (dst_data->field == RTE_FLOW_FIELD_MARK ||
src_data->field == RTE_FLOW_FIELD_MARK)
if (config->dv_xmeta_en == MLX5_XMETA_MODE_LEGACY ||
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 48b70c0c29..f06d2ce273 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -5085,6 +5085,10 @@ 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_RANDOM))
+   return rte_flow_error_set(error, EINVAL,
+   RTE_FLOW_ERROR_TYPE_ACTION, action,
+   "modifying random value is not supported");
if (flow_hw_modify_field_is_used(action_conf, 
RTE_FLOW_FIELD_GENEVE_VNI))
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, action,
@@ -6851,6 +6855,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev,
case RTE_FLOW_ITEM_TYPE_FLEX:
case RTE_FLOW_ITEM_TYPE_IB_BTH:
case RTE_FLOW_ITEM_TYPE_PTYPE:
+   case RTE_FLOW_ITEM_TYPE_RANDOM:
break;
case RTE_FLOW_ITEM_TYPE_INTEGRITY:
/*
-- 
2.25.1

Re: [PATCH v8 4/4] app/dma-perf: add SG copy support

[fengchengwen]

LGTM
Acked-by: Chengwen Feng 

Thanks

On 2023/11/22 19:06, Gowrishankar Muthukrishnan wrote:
> Add SG copy support.
> 
> Signed-off-by: Gowrishankar Muthukrishnan 
> Acked-by: Anoob Joseph 
> ---
>  app/test-dma-perf/benchmark.c | 274 +-
>  app/test-dma-perf/config.ini  |  19 ++-
>  app/test-dma-perf/main.c  |  34 -
>  app/test-dma-perf/main.h  |   5 +-
>  4 files changed, 292 insertions(+), 40 deletions(-)
> 

...

Re: [PATCH 0/9] use C11 alignof

[fengchengwen]

Series-acked-by: Chengwen Feng 

On 2024/1/25 7:17, Tyler Retzlaff wrote:
> Replace use of __alignof__(T) and __alignof__(e) with C11 alignof(T)
> and alignof(typeof(e)) respectively to improve portability of the code
> between toolchains.
> 
> Tyler Retzlaff (9):
>   ring: use C11 alignof
>   mbuf: use C11 alignof
>   ethdev: use C11 alignof
>   eventdev: use C11 alignof
>   stack: use C11 alignof
>   node: use C11 alignof
>   pdcp: use C11 alignof
>   reorder: use C11 alignof
>   security: use C11 alignof
> 
>  lib/ethdev/ethdev_driver.c  | 3 ++-
>  lib/ethdev/rte_flow.c   | 3 ++-
>  lib/eventdev/rte_eventdev.c | 3 ++-
>  lib/mbuf/rte_mbuf_dyn.c | 3 ++-
>  lib/node/node_private.h | 4 +++-
>  lib/pdcp/rte_pdcp.c | 4 +++-
>  lib/reorder/rte_reorder.c   | 3 ++-
>  lib/ring/rte_ring.c | 3 ++-
>  lib/security/rte_security.c | 5 +++--
>  lib/stack/rte_stack.c   | 3 ++-
>  10 files changed, 23 insertions(+), 11 deletions(-)
> 

[PATCH v2] lib: remove duplicate prefix in logs

[David Marchand]

RTE_LOG() macros prefixe the log messages based on the logtype.
This results in logs like:

TMTY: TELEMETRY: Attempting socket bind to path '/run/user/...'
TMTY: TELEMETRY: Socket creation and binding ok
TMTY: TELEMETRY: Telemetry initialized ok

Remove redundancy in some libraries following their conversion to
RTE_LOG/RTE_LOG_LINE.

Note: for consistency, dmadev logs are now prefixed with "DMADEV: "
instead of a too generic "dma: ".

Fixes: 97433132c2ed ("lib: use per line logging in helpers")
Fixes: 0e21c7c07d62 ("lib: replace logging helpers")

Reported-by: Thomas Monjalon 
Signed-off-by: David Marchand 
Acked-by: Morten Brørup 
Acked-by: Ciara Power 
Reviewed-by: Chengwen Feng 
---
Changes since v1:
- changed lib/dmadev logs prefix to DMADEV,

---
 lib/dmadev/rte_dmadev.c   | 5 ++---
 lib/gpudev/gpudev.c   | 3 +--
 lib/graph/graph_private.h | 2 +-
 lib/node/node_private.h   | 2 +-
 lib/telemetry/telemetry.c | 4 ++--
 lib/vhost/vhost.h | 6 +++---
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
index 5953a77bd6..67434c805f 100644
--- a/lib/dmadev/rte_dmadev.c
+++ b/lib/dmadev/rte_dmadev.c
@@ -32,11 +32,10 @@ static struct {
 } *dma_devices_shared_data;
 
 RTE_LOG_REGISTER_DEFAULT(rte_dma_logtype, INFO);
-#define RTE_LOGTYPE_DMA rte_dma_logtype
+#define RTE_LOGTYPE_DMADEV rte_dma_logtype
 
 #define RTE_DMA_LOG(level, ...) \
-   RTE_LOG_LINE(level, DMA, RTE_FMT("dma: " RTE_FMT_HEAD(__VA_ARGS__ ,), \
-   RTE_FMT_TAIL(__VA_ARGS__ ,)))
+   RTE_LOG_LINE(level, DMADEV, "" __VA_ARGS__)
 
 int
 rte_dma_dev_max(size_t dev_max)
diff --git a/lib/gpudev/gpudev.c b/lib/gpudev/gpudev.c
index de8291151f..1c2011b856 100644
--- a/lib/gpudev/gpudev.c
+++ b/lib/gpudev/gpudev.c
@@ -20,8 +20,7 @@ RTE_LOG_REGISTER_DEFAULT(gpu_logtype, NOTICE);
 #define RTE_LOGTYPE_GPUDEV gpu_logtype
 
 #define GPU_LOG(level, ...) \
-   RTE_LOG_LINE(level, GPUDEV, RTE_FMT("gpu: " RTE_FMT_HEAD(__VA_ARGS__ 
,), \
-   RTE_FMT_TAIL(__VA_ARGS__ ,)))
+   RTE_LOG_LINE(level, GPUDEV, "" __VA_ARGS__)
 
 /* Set any driver error as EPERM */
 #define GPU_DRV_RET(function) \
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index f9274ce96c..fb88d4bc84 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -22,7 +22,7 @@ extern int rte_graph_logtype;
 
 #define GRAPH_LOG(level, ...)  
\
RTE_LOG_LINE(level, GRAPH, \
-   RTE_FMT("GRAPH: %s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,), \
+   RTE_FMT("%s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,),\
__func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__ ,)))
 
 #define graph_err(...) GRAPH_LOG(ERR, __VA_ARGS__)
diff --git a/lib/node/node_private.h b/lib/node/node_private.h
index 845fdaa12e..73563e4cd2 100644
--- a/lib/node/node_private.h
+++ b/lib/node/node_private.h
@@ -15,7 +15,7 @@ extern int rte_node_logtype;
 
 #define NODE_LOG(level, node_name, ...)
\
RTE_LOG_LINE(level, NODE,  \
-   RTE_FMT("NODE %s: %s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,),   \
+   RTE_FMT("%s: %s():%u " RTE_FMT_HEAD(__VA_ARGS__ ,),\
node_name, __func__, __LINE__, \
RTE_FMT_TAIL(__VA_ARGS__ ,)))
 
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 31e2391867..47846ef868 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -56,8 +56,8 @@ static const char *socket_dir;/* runtime directory */
 static rte_cpuset_t *thread_cpuset;
 
 RTE_LOG_REGISTER_DEFAULT(logtype, WARNING);
-#define RTE_LOGTYPE_TMTY logtype
-#define TMTY_LOG_LINE(l, ...) RTE_LOG_LINE(l, TMTY, "TELEMETRY: " __VA_ARGS__)
+#define RTE_LOGTYPE_TELEMETRY logtype
+#define TMTY_LOG_LINE(l, ...) RTE_LOG_LINE(l, TELEMETRY, "" __VA_ARGS__)
 
 /* list of command callbacks, with one command registered by default */
 static struct cmd_callback *callbacks;
diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index 470dadbba6..0b13374980 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -678,10 +678,10 @@ extern int vhost_data_log_level;
 #define RTE_LOGTYPE_VHOST_DATA vhost_data_log_level
 
 #define VHOST_CONFIG_LOG(prefix, level, fmt, args...)  \
-   RTE_LOG_LINE(level, VHOST_CONFIG, "VHOST_CONFIG: (%s) " fmt, prefix, 
##args)
+   RTE_LOG_LINE(level, VHOST_CONFIG, "(%s) " fmt, prefix, ##args)
 
 #define VHOST_DATA_LOG(prefix, level, fmt, args...)\
-   RTE_LOG_DP_LINE(level, VHOST_DATA, "VHOST_DATA: (%s) " fmt, prefix, 
##args)
+   RTE_LOG_DP_LINE(level, VHOST_DATA, "(%s) " fmt, prefix, ##args)
 
 #ifdef RTE_LIBRTE_VHOST_DEBUG
 #define VHOST_MAX_PRINT_BUFF 6072
@@ -700,7 +700,7 @@ extern int vhost_data_l

Re: [PATCH 0/2] more replacement of zero length array

[fengchengwen]

Series-acked-by: Chengwen Feng 

On 2024/1/25 6:17, Tyler Retzlaff wrote:
> Replace some missed zero length arrays not captured in the
> original series.
> https://patchwork.dpdk.org/project/dpdk/list/?series=30410&state=*
> 
> Zero length arrays are a GNU extension that has been
> superseded by flex arrays.
> 
> https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
> 
> Tyler Retzlaff (2):
>   hash: replace zero length array with flex array
>   rcu: replace zero length array with flex array
> 
>  lib/hash/rte_thash.c   | 4 ++--
>  lib/rcu/rcu_qsbr_pvt.h | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 

Re: [PATCH] app/testpmd: add command to get Tx queue used count

[fengchengwen]

Please doc this command in doc/guides/testpmd_app_ug/testpmd_funcs.rst
Also why not extend "show port rxq xxx" command to support txq ?

On 2024/1/24 20:18, skotesh...@marvell.com wrote:
> From: Satha Rao 
> 
> Fastpath API to get txq used count.
> 
>testpmd> show port 0 txq 0 desc count
> 
> Signed-off-by: Satha Rao 
> ---
>  app/test-pmd/cmdline.c | 78 
> ++
>  1 file changed, 78 insertions(+)
> 
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index f704319..1d09633 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -12638,6 +12638,83 @@ struct cmd_show_port_supported_ptypes_result {
>   },
>  };
>  
> +/* *** display tx queue desc used count *** */
> +struct cmd_show_tx_queue_desc_count_result {
> + cmdline_fixed_string_t cmd_show;
> + cmdline_fixed_string_t cmd_port;
> + cmdline_fixed_string_t cmd_txq;
> + cmdline_fixed_string_t cmd_desc;
> + cmdline_fixed_string_t cmd_count;
> + portid_t cmd_pid;
> + portid_t cmd_qid;
> +};
> +
> +static void
> +cmd_show_tx_queue_desc_count_parsed(void *parsed_result,
> + __rte_unused struct cmdline *cl,
> + __rte_unused void *data)
> +{
> + struct cmd_show_tx_queue_desc_count_result *res = parsed_result;
> + int rc;
> +
> + if (rte_eth_tx_queue_is_valid(res->cmd_pid, res->cmd_qid) != 0) {
> + fprintf(stderr, "Invalid input: port id = %d, queue id = %d\n", 
> res->cmd_pid,
> + res->cmd_qid);
> + return;
> + }
> +
> + rc = rte_eth_tx_queue_count(res->cmd_pid, res->cmd_qid);
> + if (rc < 0) {
> + fprintf(stderr, "Tx queue count get failed rc=%d 
> queue_id=%d\n", rc, res->cmd_qid);
> + return;
> + }
> + printf("TxQ %d used desc count = %d\n", res->cmd_qid, rc);
> +}
> +
> +static cmdline_parse_token_string_t cmd_show_tx_queue_desc_count_show =
> + TOKEN_STRING_INITIALIZER
> + (struct cmd_show_tx_queue_desc_count_result,
> +  cmd_show, "show");
> +static cmdline_parse_token_string_t cmd_show_tx_queue_desc_count_port =
> + TOKEN_STRING_INITIALIZER
> + (struct cmd_show_tx_queue_desc_count_result,
> +  cmd_port, "port");
> +static cmdline_parse_token_num_t cmd_show_tx_queue_desc_count_pid =
> + TOKEN_NUM_INITIALIZER
> + (struct cmd_show_tx_queue_desc_count_result,
> +  cmd_pid, RTE_UINT16);
> +static cmdline_parse_token_string_t cmd_show_tx_queue_desc_count_txq =
> + TOKEN_STRING_INITIALIZER
> + (struct cmd_show_tx_queue_desc_count_result,
> +  cmd_txq, "txq");
> +static cmdline_parse_token_num_t cmd_show_tx_queue_desc_count_qid =
> + TOKEN_NUM_INITIALIZER
> + (struct cmd_show_tx_queue_desc_count_result,
> +  cmd_qid, RTE_UINT16);
> +static cmdline_parse_token_string_t cmd_show_tx_queue_desc_count_desc =
> + TOKEN_STRING_INITIALIZER
> + (struct cmd_show_tx_queue_desc_count_result,
> +  cmd_desc, "desc");
> +static cmdline_parse_token_string_t cmd_show_tx_queue_desc_count_count =
> + TOKEN_STRING_INITIALIZER
> + (struct cmd_show_tx_queue_desc_count_result,
> +  cmd_count, "count");
> +static cmdline_parse_inst_t cmd_show_tx_queue_desc_count = {
> + .f = cmd_show_tx_queue_desc_count_parsed,
> + .data = NULL,
> + .help_str = "show port  txq  desc count",
> + .tokens = {
> + (void *)&cmd_show_tx_queue_desc_count_show,
> + (void *)&cmd_show_tx_queue_desc_count_port,
> + (void *)&cmd_show_tx_queue_desc_count_pid,
> + (void *)&cmd_show_tx_queue_desc_count_txq,
> + (void *)&cmd_show_tx_queue_desc_count_qid,
> + (void *)&cmd_show_tx_queue_desc_count_desc,
> + (void *)&cmd_show_tx_queue_desc_count_count,
> + NULL,
> + },
> +};
> +
>  /* *** display rx/tx descriptor status *** */
>  struct cmd_show_rx_tx_desc_status_result {
>   cmdline_fixed_string_t cmd_show;
> @@ -13346,6 +13423,7 @@ struct cmd_config_tx_affinity_map {
>   (cmdline_parse_inst_t *)&cmd_show_tx_metadata,
>   (cmdline_parse_inst_t *)&cmd_show_rx_tx_desc_status,
>   (cmdline_parse_inst_t *)&cmd_show_rx_queue_desc_used_count,
> + (cmdline_parse_inst_t *)&cmd_show_tx_queue_desc_count,
>   (cmdline_parse_inst_t *)&cmd_set_raw,
>   (cmdline_parse_inst_t *)&cmd_show_set_raw,
>   (cmdline_parse_inst_t *)&cmd_show_set_raw_all,
> 

[PATCH v2 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.

v2:
 - Rebase.
 - Add "Acked-by" from v1.

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  |  281 ++-
 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, 2811 insertions(+), 186 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_flow_geneve.c

-- 
2.25.1

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 3a894f894a..faa38a9f95 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 v2 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 
Acked-by: Suanming Mou 
---
 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 faa38a9f95..9b1cfcc135 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 4a6008dc1a..0c5727b669 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -316,6 +316,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 v2 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 
Acked-by: Suanming Mou 
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 43 +--
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c 
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 750eb9c7c6..219bffd3b5 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -8,9 +8,10 @@
 #define BAD_PORT   0xBAD
 #define ETH_TYPE_IPV4_VXLAN0x0800
 #define ETH_TYPE_IPV6_VXLAN0x86DD
-#define ETH_VXLAN_DEFAULT_PORT 4789
-#define ETH_VXLAN_GPE_DEFAULT_PORT 4790
-#define IP_UDP_PORT_MPLS   6635
+#define UDP_VXLAN_PORT 4789
+#define UDP_VXLAN_GPE_PORT 4790
+#define UDP_GTPU_PORT  2152
+#define UDP_PORT_MPLS  6635
 #define UDP_ROCEV2_PORT4791
 #define DR_FLOW_LAYER_TUNNEL_NO_MPLS (MLX5_FLOW_LAYER_TUNNEL & 
~MLX5_FLOW_LAYER_MPLS)
 
@@ -159,7 +160,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) \
@@ -167,12 +168,12 @@ 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,  vxlan_gpe_udp_port, ETH_VXLAN_GPE_DEFAULT_PORT, 
rte_flow_item_vxlan_gpe) \
+   X(SET,  vxlan_udp_port, UDP_VXLAN_PORT, 
rte_flow_item_vxlan) \
+   X(SET,  vxlan_gpe_udp_port, UDP_VXLAN_GPE_PORT, 
rte_flow_item_vxlan_gpe) \
X(SET,  vxlan_gpe_flags,v->flags,   
rte_flow_item_vxlan_gpe) \
X(SET,  vxlan_gpe_protocol, v->protocol,
rte_flow_item_vxlan_gpe) \
X(SET,  vxlan_gpe_rsvd1,v->rsvd1,   
rte_flow_item_vxlan_gpe) \
-   X(SET,  mpls_udp_port,  IP_UDP_PORT_MPLS,   
rte_flow_item_mpls) \
+   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) \
@@ -1198,6 +1199,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) {
@@ -1372,9 +1379,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) {
@@ -1397,12 +1408,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

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 b091eb9d11..cc5549f9ce 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -10103,13 +10103,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);
@@ -10122,21 +10122,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 v2 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 
Acked-by: Suanming Mou 
---
 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 88b5c20758..b091eb9d11 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -10104,7 +10104,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;
@@ -10123,21 +10122,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 v2 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 
Acked-by: Suanming Mou 
---
 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 9b1cfcc135..d3ecdfece7 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;
 }
 
@@ -1351,8 +1354,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 0c5727b669..dfb1148b84 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -322,6 +322,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 v2 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 
Acked-by: Suanming Mou 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 28 +---
 drivers/common/mlx5/mlx5_devx_cmds.h | 11 ++-
 drivers/net/mlx5/mlx5_flow_dv.c  | 10 +++---
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index d3ecdfece7..c783fc0e10 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -2858,19 +2858,15 @@ mlx5_devx_cmd_create_conn_track_offload_obj(void *ctx, 
uint32_t pd,
  *
  * @param[in] ctx
  *   Context returned from mlx5 open_device() glue function.
- * @param [in] class
- *   TLV option variable value of class
- * @param [in] type
- *   TLV option variable value of type
- * @param [in] len
- *   TLV option variable value of len
+ * @param[in] attr
+ *   Pointer to GENEVE TLV option attributes structure.
  *
  * @return
  *   The DevX object created, NULL otherwise and rte_errno is set.
  */
 struct mlx5_devx_obj *
 mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
-   uint16_t class, uint8_t type, uint8_t len)
+ struct mlx5_devx_geneve_tlv_option_attr *attr)
 {
uint32_t in[MLX5_ST_SZ_DW(create_geneve_tlv_option_in)] = {0};
uint32_t out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {0};
@@ -2879,25 +2875,27 @@ mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
   0, SOCKET_ID_ANY);
 
if (!geneve_tlv_opt_obj) {
-   DRV_LOG(ERR, "Failed to allocate geneve tlv option object.");
+   DRV_LOG(ERR, "Failed to allocate GENEVE TLV option object.");
rte_errno = ENOMEM;
return NULL;
}
void *hdr = MLX5_ADDR_OF(create_geneve_tlv_option_in, in, hdr);
void *opt = MLX5_ADDR_OF(create_geneve_tlv_option_in, in,
-   geneve_tlv_opt);
+geneve_tlv_opt);
MLX5_SET(general_obj_in_cmd_hdr, hdr, opcode,
-   MLX5_CMD_OP_CREATE_GENERAL_OBJECT);
+MLX5_CMD_OP_CREATE_GENERAL_OBJECT);
MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_type,
 MLX5_GENERAL_OBJ_TYPE_GENEVE_TLV_OPT);
MLX5_SET(geneve_tlv_option, opt, option_class,
-   rte_be_to_cpu_16(class));
-   MLX5_SET(geneve_tlv_option, opt, option_type, type);
-   MLX5_SET(geneve_tlv_option, opt, option_data_length, len);
+rte_be_to_cpu_16(attr->option_class));
+   MLX5_SET(geneve_tlv_option, opt, option_type, attr->option_type);
+   MLX5_SET(geneve_tlv_option, opt, option_data_length,
+attr->option_data_len);
geneve_tlv_opt_obj->obj = mlx5_glue->devx_obj_create(ctx, in,
-   sizeof(in), out, sizeof(out));
+sizeof(in), out,
+sizeof(out));
if (!geneve_tlv_opt_obj->obj) {
-   DEVX_DRV_LOG(ERR, out, "create GENEVE TLV", NULL, 0);
+   DEVX_DRV_LOG(ERR, out, "create GENEVE TLV option", NULL, 0);
mlx5_free(geneve_tlv_opt_obj);
return NULL;
}
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h 
b/drivers/common/mlx5/mlx5_devx_cmds.h
index dfb1148b84..d11f1d650f 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -668,6 +668,15 @@ struct mlx5_devx_crypto_login_attr {
uint8_t credential[MLX5_CRYPTO_CREDENTIAL_SIZE];
 };
 
+/*
+ * GENEVE TLV option attributes structure, used by GENEVE TLV option create.
+ */
+struct mlx5_devx_geneve_tlv_option_attr {
+   uint32_t option_class:16;
+   uint32_t option_type:8;
+   uint32_t option_data_len:5;
+};
+
 /* mlx5_devx_cmds.c */
 
 __rte_internal
@@ -778,7 +787,7 @@ int mlx5_devx_cmd_register_write(void *ctx, uint16_t reg_id,
 __rte_internal
 struct mlx5_devx_obj *
 mlx5_devx_cmd_create_geneve_tlv_option(void *ctx,
-   uint16_t class, uint8_t type, uint8_t len);
+struct mlx5_devx_geneve_tlv_option_attr *attr);
 
 /**
  * Create virtio queue counters object DevX API.
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index cc5549f9ce..ae10981165 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -10046,11 +10046,15 @@ flow_dev_geneve_tlv_option_resource_register(struct 
rte_eth_dev *dev,
goto exit;
}
} else {
+   struct mlx5_devx_geneve_tlv_option_attr attr = {
+   .option_class = geneve_opt_v->option_class,
+   

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 c783fc0e10..68137dc535 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);
@@ -2886,11 +2890,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 d11f1d650f..4f264560a9 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;
@@ -675,6 +677,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 69404b5ed8..f15e3c2bd7 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -1854,7 +1854,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];
@@ -3424,16 +3426,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 rese

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 68137dc535..b8f4a840e7 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 v2 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 0.

Signed-off-by: Michael Baum 
Acked-by: Suanming Mou 
---
 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 b8f4a840e7..394149d542 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 4f264560a9..7747c230de 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 v2 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 
Acked-by: Suanming Mou 
---
 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 394149d542..9b7ababae7 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -2918,6 +2918,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 7747c230de..c79f8dc48d 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -795,6 +795,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 f15e3c2bd7..f64f25dbb7 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -3729,6 +3729,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 v2 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 
Acked-by: Suanming Mou 
---
 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_

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 4bf9ed7e4d..14806fa78e 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1772,6 +1772,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);
+   re

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 e82f7034aa..2e5274edb8 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -2515,3 +2515,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_test

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 7b7463fc91..f6a3a7ec28 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.h
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.h
@@ -534,10 +534,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 v2 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 
Acked-by: Suanming Mou 
---
 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 f8930cb902..e82f7034aa 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -2314,6 +2314,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``:

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

[Michael Baum]

From: Alex Vesker 

Add matching for GENEVE tunnel header.

Signed-off-by: Alex Vesker 
Acked-by: Suanming Mou 
---
 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 219bffd3b5..7c0ce805f1 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -12,6 +12,7 @@
 #define UDP_VXLAN_GPE_PORT 4790
 #define UDP_GTPU_PORT  2152
 #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)
 
@@ -177,6 +178,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) \
@@ -688,6 +692,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,
@@ -2227,6 +2241,79 @@ mlx5dr_definer_conv_item_random(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];
+

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 0459472fe4..655e4d3d86 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -2832,10 +2832,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 ae10981165..857813368b 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -9998,7 +9998,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.
@@ -10008,8 +10008,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)
@@ -10022,6 +10021,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);
@@ -10032,13 +10032,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,
@@ -10117,8 +10112,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 register

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 a6d00ecd2b..0e3d0bc099 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -585,8 +585,12 @@ 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.
   - Modify field action using ``RTE_FLOW_FIELD_RANDOM`` 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 0c8491ce37..8b14ab8986 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -80,6 +80,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 857813368b..5d5e2cadf6 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1957,6 +1957,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;
@@ -1967,9 +1968,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 00dc9bc890..687d809b1b 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -4990,6 +4990,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)
@@ -5089,10 +5091,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 random value 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 v2 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 
Acked-by: Suanming Mou 
---
 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 7c0ce805f1..79d98bbf78 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -118,6 +118,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;
 };
 
@@ -702,6 +704,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,
@@ -1356,7 +1381,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) {
@@ -1365,16 +1389,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;
@@ -2314,6 +2335,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

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 62fd27d859..a6d00ecd2b 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -355,6 +355,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()``).
@@ -2445,8 +2446,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->opti

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 2e5274edb8..62fd27d859 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -337,12 +337,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 a1dfea263c..0c8491ce37 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -77,6 +77,11 @@ New Features
 
   * Added support for ``RTE_FLOW_ITEM_TYPE_RANDOM`` flow item.
 
+  * 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 14806fa78e..0459472fe4 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1338,6 +1338,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;
@@ -1357,6 +1366,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. */
 };
 
@@ -1805,6 +1816,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 otherwise and rte_errno is set.
+ */
+int
+mlx5_flow_geneve_tlv_option_vali

[PATCH v2 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 
Acked-by: Suanming Mou 
---
 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 0e3d0bc099..6e1e2df79a 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -591,6 +591,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 8b14ab8986..73515aad1e 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -81,6 +81,9 @@ New Features
 
   * 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 655e4d3d86..c9cc942d80 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1811,6 +1811,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[],
@@ -1819,6 +1838,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 5d5e2cadf6..6998be107f 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1465,6 +1465,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,
@@ -1604,9 +1619,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_private;
+   enum mlx5_modification_field modi

After apt-get install dpdk problem

[Hare, John]

[AMD Official Use Only - General]

On an Ubuntu systems I ran

apt-get install dpdk

I still could not get to any of the dpdk tools for example dpdk-devbind.

What did I do wrong.

Sincerely,

John Hare

Regarding https://mails.dpdk.org/archives/dev/2023-June/270558.html dpdk patch

[Amiya Ranjan Mohakud]

Hi Kaiwenx

I came across the below DPDK iavf error message during the initialization
of X710 NICs in ESX.  It seems the functionality works fine, but with below
error messages.
DPDK Version: 22.11.2

2023-12-08T09:58:00.901 |9322| MSG  [NET] dpdk_port_configure:1717
Configure port eth3/1. lsc_intr=1, rxq/txq=1/1, (rss_enabled=1)
rss_hf=0x0c30 tx_ol=0x06 rx_ol=0x080007

2023-12-08T09:58:00.906 |9322| MSG  [NET] dpdk_log_write:107
iavf_execute_vf_cmd(): Return failure -4 for cmd 27
2023-12-08T09:58:00.906 |9322| MSG  [NET] dpdk_log_write:107
iavf_enable_vlan_strip(): Failed to execute command of
OP_ENABLE_VLAN_STRIPPING
2023-12-08T09:58:00.906 |9322| MSG  [NET] dpdk_log_write:107
iavf_dev_init_vlan(): Failed to update vlan offload
2023-12-08T09:58:00.906 |9322| MSG  [NET] dpdk_log_write:107
iavf_dev_configure(): configure VLAN failed: -5
2023-12-08T09:58:01.156 |9322| MSG  [NET] dpdk_log_write:107
iavf_execute_vf_cmd(): Return failure -5 for cmd 14


On search, I came across your above patch. I am not able to make out
properly from the description. Could you please help elaborate the root
cause/fix for my understanding and kindly confirm if this patch would fix
the above issue. Thanks in advance.

Regards,
Amiya

-- 
This electronic communication and the information and any files transmitted 
with it, or attached to it, are confidential and are intended solely for 
the use of the individual or entity to whom it is addressed and may contain 
information that is confidential, legally privileged, protected by privacy 
laws, or otherwise restricted from disclosure to anyone else. If you are 
not the intended recipient or the person responsible for delivering the 
e-mail to the intended recipient, you are hereby notified that any use, 
copying, distributing, dissemination, forwarding, printing, or copying of 
this e-mail is strictly prohibited. If you received this e-mail in error, 
please return the e-mail to the sender, delete it from your computer, and 
destroy any printed copy of it.

[PATCH v6 1/2] drivers/net: fix buffer overflow for ptypes list

[Sivaramakrishnan Venkat]

Address Sanitizer detects a buffer overflow caused by an incorrect
ptypes list. Missing "RTE_PTYPE_UNKNOWN" ptype causes buffer overflow.
Fix the ptypes list for drivers.

Fixes: 0849ac3b6122 ("net/tap: add packet type management")
Fixes: a7bdc3bd4244 ("net/dpaa: support packet type parsing")
Fixes: 4ccc8d770d3b ("net/mvneta: add PMD skeleton")
Fixes: f3f0d77db6b0 ("net/mrvl: support packet type parsing")
Fixes: 71e8bb65046e ("net/nfp: update supported list of packet types")
Fixes: 659b494d3d88 ("net/pfe: add packet types and basic statistics")
Fixes: 398a1be14168 ("net/thunderx: remove generic passX references")

Signed-off-by: Sivaramakrishnan Venkat 
Reviewed-by: Ferruh Yigit 
---
Cc: pascal.ma...@6wind.com
Cc: shreyansh.j...@nxp.com
Cc: z...@semihalf.com
Cc: t...@semihalf.com
Cc: qin...@corigine.com
Cc: g.si...@nxp.com
Cc: jerin.ja...@caviumnetworks.com
Cc: sta...@dpdk.org

v6: moved Cc email line after the "--" separator in the commit message.
v5: modified commit message.
v4: split into two patches, one for backporting and one for upstream rework
v3: reworked the function to return number of elements and remove the need
for RTE_PTYPE_UNKNOWN in list.
v2: extended fix for multiple drivers.
---
 drivers/net/dpaa/dpaa_ethdev.c  | 3 ++-
 drivers/net/mvneta/mvneta_ethdev.c  | 3 ++-
 drivers/net/mvpp2/mrvl_ethdev.c | 3 ++-
 drivers/net/nfp/nfp_net_common.c| 1 +
 drivers/net/pfe/pfe_ethdev.c| 3 ++-
 drivers/net/tap/rte_eth_tap.c   | 1 +
 drivers/net/thunderx/nicvf_ethdev.c | 2 ++
 7 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index ef4c06db6a..779bdc5860 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -363,7 +363,8 @@ dpaa_supported_ptypes_get(struct rte_eth_dev *dev)
RTE_PTYPE_L4_TCP,
RTE_PTYPE_L4_UDP,
RTE_PTYPE_L4_SCTP,
-   RTE_PTYPE_TUNNEL_ESP
+   RTE_PTYPE_TUNNEL_ESP,
+   RTE_PTYPE_UNKNOWN
};
 
PMD_INIT_FUNC_TRACE();
diff --git a/drivers/net/mvneta/mvneta_ethdev.c 
b/drivers/net/mvneta/mvneta_ethdev.c
index daa69e533a..212c300c14 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -198,7 +198,8 @@ mvneta_dev_supported_ptypes_get(struct rte_eth_dev *dev 
__rte_unused)
RTE_PTYPE_L3_IPV4,
RTE_PTYPE_L3_IPV6,
RTE_PTYPE_L4_TCP,
-   RTE_PTYPE_L4_UDP
+   RTE_PTYPE_L4_UDP,
+   RTE_PTYPE_UNKNOWN
};
 
return ptypes;
diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index c12364941d..4cc64c7cad 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -1777,7 +1777,8 @@ mrvl_dev_supported_ptypes_get(struct rte_eth_dev *dev 
__rte_unused)
RTE_PTYPE_L3_IPV6_EXT,
RTE_PTYPE_L2_ETHER_ARP,
RTE_PTYPE_L4_TCP,
-   RTE_PTYPE_L4_UDP
+   RTE_PTYPE_L4_UDP,
+   RTE_PTYPE_UNKNOWN
};
 
return ptypes;
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index e969b840d6..46d0e07850 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -1299,6 +1299,7 @@ nfp_net_supported_ptypes_get(struct rte_eth_dev *dev)
RTE_PTYPE_INNER_L4_NONFRAG,
RTE_PTYPE_INNER_L4_ICMP,
RTE_PTYPE_INNER_L4_SCTP,
+   RTE_PTYPE_UNKNOWN
};
 
if (dev->rx_pkt_burst != nfp_net_recv_pkts)
diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c
index 551f3cf193..0073dd7405 100644
--- a/drivers/net/pfe/pfe_ethdev.c
+++ b/drivers/net/pfe/pfe_ethdev.c
@@ -520,7 +520,8 @@ pfe_supported_ptypes_get(struct rte_eth_dev *dev)
RTE_PTYPE_L3_IPV6_EXT,
RTE_PTYPE_L4_TCP,
RTE_PTYPE_L4_UDP,
-   RTE_PTYPE_L4_SCTP
+   RTE_PTYPE_L4_SCTP,
+   RTE_PTYPE_UNKNOWN
};
 
if (dev->rx_pkt_burst == pfe_recv_pkts ||
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index b41fa971cb..3fa03cdbee 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -1803,6 +1803,7 @@ tap_dev_supported_ptypes_get(struct rte_eth_dev *dev 
__rte_unused)
RTE_PTYPE_L4_UDP,
RTE_PTYPE_L4_TCP,
RTE_PTYPE_L4_SCTP,
+   RTE_PTYPE_UNKNOWN
};
 
return ptypes;
diff --git a/drivers/net/thunderx/nicvf_ethdev.c 
b/drivers/net/thunderx/nicvf_ethdev.c
index a504d41dfe..5a0c3dc4a6 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -392,12 +392,14 @@ nicvf_dev_supported_ptypes_get(struct rte_eth_dev *dev)
RTE_PTYPE_L4_TCP,
RTE_PTYPE_L4_UDP,

[PATCH v6 2/2] drivers/net: return number of types in get supported types

[Sivaramakrishnan Venkat]

Missing "RTE_PTYPE_UNKNOWN" ptype causes buffer overflow.
Enhance code such that the dev_supported_ptypes_get()
function pointer now returns  the number of elements to
eliminate the need for "RTE_PTYPE_UNKNOWN" as the last item.

Signed-off-by: Sivaramakrishnan Venkat 

---
  v6:
 - missed drivers reworked for the removal of RTE_PTYPE_UNKNOWN in list.
 - added code back in that incorrectly removed in v5 for set_ptypes 
function last element.
  v5:
 - modified commit message.
 - tidied formatting of code.
 - added doxygen comment.
  v4:
 - split into two patches, one for backporting and another one for
   upstream rework.
  v3:
 - reworked the function to return number of elements and remove the
   need for RTE_PTYPE_UNKNOWN in list.
  v2:
 - extended fix for multiple drivers.
---
 drivers/net/atlantic/atl_ethdev.c  | 10 ++
 drivers/net/axgbe/axgbe_ethdev.c   |  9 +
 drivers/net/bnxt/bnxt_ethdev.c |  4 ++--
 drivers/net/cnxk/cnxk_ethdev.h |  2 +-
 drivers/net/cnxk/cnxk_lookup.c |  6 +++---
 drivers/net/cpfl/cpfl_ethdev.c |  5 +++--
 drivers/net/cxgbe/cxgbe_ethdev.c   |  7 ---
 drivers/net/cxgbe/cxgbe_pfvf.h |  2 +-
 drivers/net/dpaa/dpaa_ethdev.c |  7 ---
 drivers/net/dpaa2/dpaa2_ethdev.c   |  7 ---
 drivers/net/e1000/igb_ethdev.c | 10 ++
 drivers/net/enetc/enetc_ethdev.c   |  4 ++--
 drivers/net/enic/enic_ethdev.c | 12 +++-
 drivers/net/failsafe/failsafe_ops.c|  4 ++--
 drivers/net/fm10k/fm10k_ethdev.c   |  8 
 drivers/net/hns3/hns3_rxtx.c   | 11 ++-
 drivers/net/hns3/hns3_rxtx.h   |  2 +-
 drivers/net/i40e/i40e_rxtx.c   |  7 ---
 drivers/net/i40e/i40e_rxtx.h   |  2 +-
 drivers/net/iavf/iavf_ethdev.c |  8 +---
 drivers/net/ice/ice_dcf_ethdev.c   |  4 ++--
 drivers/net/ice/ice_ethdev.c   |  8 +---
 drivers/net/ice/ice_rxtx.c | 11 ++-
 drivers/net/ice/ice_rxtx.h |  2 +-
 drivers/net/idpf/idpf_ethdev.c |  4 ++--
 drivers/net/igc/igc_ethdev.c   |  7 ---
 drivers/net/ionic/ionic_rxtx.c |  4 ++--
 drivers/net/ionic/ionic_rxtx.h |  2 +-
 drivers/net/ixgbe/ixgbe_ethdev.c   | 14 +-
 drivers/net/mana/mana.c|  4 ++--
 drivers/net/mlx4/mlx4.h|  2 +-
 drivers/net/mlx4/mlx4_ethdev.c | 11 ++-
 drivers/net/mlx5/mlx5.h|  2 +-
 drivers/net/mlx5/mlx5_ethdev.c |  7 ---
 drivers/net/mvneta/mvneta_ethdev.c |  4 ++--
 drivers/net/mvpp2/mrvl_ethdev.c|  4 ++--
 drivers/net/netvsc/hn_var.h|  2 +-
 drivers/net/netvsc/hn_vf.c |  4 ++--
 drivers/net/nfp/nfp_net_common.c   |  4 ++--
 drivers/net/nfp/nfp_net_common.h   |  2 +-
 drivers/net/ngbe/ngbe_ethdev.c |  4 ++--
 drivers/net/ngbe/ngbe_ethdev.h |  2 +-
 drivers/net/ngbe/ngbe_ptypes.c |  6 +++---
 drivers/net/ngbe/ngbe_ptypes.h |  2 +-
 drivers/net/octeontx/octeontx_ethdev.c |  7 ---
 drivers/net/pfe/pfe_ethdev.c   |  7 ---
 drivers/net/qede/qede_ethdev.c |  7 ---
 drivers/net/sfc/sfc_dp_rx.h|  2 +-
 drivers/net/sfc/sfc_ef10.h |  2 +-
 drivers/net/sfc/sfc_ef100_rx.c |  4 ++--
 drivers/net/sfc/sfc_ef10_rx.c  |  6 +++---
 drivers/net/sfc/sfc_ethdev.c   |  4 ++--
 drivers/net/sfc/sfc_rx.c   |  4 ++--
 drivers/net/tap/rte_eth_tap.c  |  4 ++--
 drivers/net/thunderx/nicvf_ethdev.c|  7 ++-
 drivers/net/txgbe/txgbe_ethdev.c   |  4 ++--
 drivers/net/txgbe/txgbe_ethdev.h   |  2 +-
 drivers/net/txgbe/txgbe_ptypes.c   |  4 ++--
 drivers/net/txgbe/txgbe_ptypes.h   |  2 +-
 drivers/net/vmxnet3/vmxnet3_ethdev.c   |  9 +
 lib/ethdev/ethdev_driver.h | 21 ++---
 lib/ethdev/rte_ethdev.c| 24 +++-
 62 files changed, 205 insertions(+), 158 deletions(-)

diff --git a/drivers/net/atlantic/atl_ethdev.c 
b/drivers/net/atlantic/atl_ethdev.c
index 3a028f4290..2232f09fd9 100644
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -43,7 +43,8 @@ static int atl_dev_stats_reset(struct rte_eth_dev *dev);
 static int atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
  size_t fw_size);
 
-static const uint32_t *atl_dev_supported_ptypes_get(struct rte_eth_dev *dev);
+static const uint32_t *atl_dev_supported_ptypes_get(struct rte_eth_dev *dev,
+ size_t *no_of_elements);
 
 static int atl_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
 
@@ -1132,7 +1133,7 @@ atl_dev_info_get(struct rte_eth_dev *dev, struct 
rte_eth_dev_info *dev_info)
 }
 
 static const uint32_t *
-atl_dev_supported_ptypes_get(struct rte_eth_dev *dev)
+atl_dev_supported_ptypes_get(

DPDK Release Status Meeting 2024-01-25

[Mcnamara, John]

Release status meeting minutes 2024-01-25
=

Agenda:
* Release Dates
* Subtrees
* Roadmaps
* LTS
* Defects
* Opens

Participants:
* AMD
* Intel
* Marvell
* Nvidia [No]
* Red Hat

Release Dates
-

The following are the current working dates for 24.03:

* V1:  29 December 2023
* RC1:  5 February 2024
* RC2: 23 February 2024
* RC3:  4 March2024
* Release: 14 March2024

https://core.dpdk.org/roadmap/#dates


Subtrees


* next-net
  * No update.

* next-net-intel
  * Merged to main.

* next-net-mlx
  * No update.

* next-net-mvl
  * Port representor for cnxk work in progress.

* next-eventdev
  * New feature MLdev Event Adaptor library.

* next-baseband
  * Reviews started and changes requested.
  * New version of BBdev patches.

* next-virtio
  * Patch from Marvell under review.

* next-crypto
  * Started merging.
  * ~40 merged. ~40 patches in backlog.
  * TLS support in cnxk driver.
  * New Nitrox PMD for compressdev.

* main
  * Cleanups in progress.
  * Windows patches in progress.
  * New bus driver from Huawei.
  * Looking at argument parsing.



LTS
---

* 22.11.4 - Released.
* 21.11.6 - Released.
* 20.11.10 - Released.
* 19.11.15 - Will only be updated with CVE and critical fixes.


* Distros
  * Debian 12 contains DPDK v22.11
  * Ubuntu 22.04-LTS contains DPDK v21.11
  * Ubuntu 23.04 contains DPDK v22.11

Defects
---

* Bugzilla links, 'Bugs',  added for hosted projects
  * https://www.dpdk.org/hosted-projects/



DPDK Release Status Meetings


The DPDK Release Status Meeting is intended for DPDK Committers to discuss the
status of the master tree and sub-trees, and for project managers to track
progress or milestone dates.

The meeting occurs on every Thursday at 9:30 UTC over Jitsi on 
https://meet.jit.si/DPDK

You don't need an invite to join the meeting but if you want a calendar 
reminder just
send an email to "John McNamara john.mcnam...@intel.com" for the invite.

[DPDK Bug 1370] DTS: configure hugepage size as well as quantity

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1370

Bug ID: 1370
   Summary: DTS: configure hugepage size as well as quantity
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: dts
  Assignee: dev@dpdk.org
  Reporter: jspew...@iol.unh.edu
CC: juraj.lin...@pantheon.tech, pr...@iol.unh.edu
  Target Milestone: ---

Currently the config file we have allows you to configure the number of huge
pages (defaulted to 256), but it doesn't do anything to change the size.
Creating 256 2M hugepages is very different from creating 256 1G hugepages and
if you run this default config on a host where you have the default hugepage
size set to 1G, this would cause major problems for hosts without enough memory
to support 256gb of hugepages.Of course this configuration is optional, but
still would be ideal if it were slightly more configurable so that you can
control what you mean by 256 hugepages.

-- 
You are receiving this mail because:
You are the assignee for the bug.

Re: [PATCH] RFC: use C11 alignas instead of GCC attribute aligned

[Tyler Retzlaff]

ping.

Please review this thread if you have time, the main point of discussion
I would like to receive consensus on the following questions.

1. Should we continue to expand common alignments behind an __rte_macro

  i.e. what do we prefer to appear in code

  alignas(RTE_CACHE_LINE_MIN_SIZE)

  -- or --

  __rte_cache_aligned

One of the benefits of dropping the macro is it provides a clear visual
indicator that it is not placed in the same location or get applied
to types as is done with __attribute__((__aligned__(n))).

2. where should we place alignas(n) or __rte_macro (if we use a macro)

Should it be on the same line as the variable or field or on the
preceeding line?

  /* same line example struct */
  struct T {
  /* alignas(64) applies to field0 *not* struct T type declaration */
  alignas(64) void *field0;
  void *field1;

  ... other fields ...

  alignas(64) uint64_t field5;
  uint32_t field6;

  ... more fields ...

  };

  /* same line example array */
  alignas(64) static const uint32_t array[4] = { ... };

  -- or --

  /* preceeding line example struct */
  struct T {
  /* alignas(64) applies to field0 *not* struct T type declaration */
  alignas(64)
  void *field0;
  void *field1;

  ... other fields ...

  alignas(64)
  uint64_t field5;
  uint32_t field6;

  ... more fields ...

  };

  /* preceeding line example array */
  alignas(64)
  static const uint32_t array[4] = { ... };


I'll submit patches for lib/* once the discussion is concluded.

thanks folks

On Wed, Nov 15, 2023 at 09:39:56AM -0800, Tyler Retzlaff wrote:
> Now that we require a C11 conformant toolchain we are able to improve
> portability by further adoption of C11 features.
> 
> Adapt EAL to use C11 alignas replacing __rte_cache_aligned and
> __rte_aligned(a) that expand to __attribute__((__aligned__(a))).
> 
> Note: it appears that use of alignas has exposed a bug in
>   lib/eal/riscv/include/rte_vect.h where the alignment
>   specified was reduced to 8 for xmm_t.
> 
> Please comment, subject to the outcome I will submit further series for
> lib/*
> 
> Thanks
> 
> Tyler Retzlaff (1):
>   eal: use C11 alignas instead of GCC attribute aligned
> 
>  lib/eal/arm/include/rte_vect.h   | 4 +++-
>  lib/eal/common/malloc_elem.h | 4 +++-
>  lib/eal/common/malloc_heap.h | 4 +++-
>  lib/eal/common/rte_keepalive.c   | 4 +++-
>  lib/eal/common/rte_random.c  | 5 -
>  lib/eal/common/rte_service.c | 7 +--
>  lib/eal/include/generic/rte_atomic.h | 4 +++-
>  lib/eal/loongarch/include/rte_vect.h | 7 +--
>  lib/eal/ppc/include/rte_vect.h   | 5 -
>  lib/eal/riscv/include/rte_vect.h | 4 +++-
>  lib/eal/x86/include/rte_vect.h   | 4 +++-
>  lib/eal/x86/rte_power_intrinsics.c   | 8 ++--
>  12 files changed, 45 insertions(+), 15 deletions(-)
> 
> -- 
> 1.8.3.1

Re: [PATCH v4 0/2] eal: initialize shared plugins on Windows

[Tyler Retzlaff]

ping for Windows maintainers

thanks!

On Mon, Jan 08, 2024 at 03:38:09PM -0800, Tyler Retzlaff wrote:
> When EAL is built with MSVC it is possible to dynamically load plugins
> on Windows. Hook eal_plugins_init into rte_eal_init if built with MSVC
> and provide code to load plugins on Windows.
> 
> v4:
>   * include winipfamily.h header for WINAPI_FAMILY macros and provide
> definition for PHONE_APP if mingw winipfamily.h doesn't supply it
> 
> v3:
>   * revert use of PRIu32 from previous patch just use %lu to make
> unsigned long format happy
> 
> v2:
>   * revert unintended / unrelated whitespace change
>   * include inttypes.h for use of PRIu32 in log format string
> 
> Tyler Retzlaff (2):
>   windows: include winapifamily header for macros
>   eal: initialize shared plugins on Windows
> 
>  lib/eal/common/eal_common_options.c | 90 
> ++---
>  lib/eal/windows/eal.c   |  8 
>  lib/eal/windows/include/dirent.h|  6 +++
>  3 files changed, 89 insertions(+), 15 deletions(-)
> 
> -- 
> 1.8.3.1

rte_atomic_*_explicit

[Mattias Rönnblom]

Why do rte_stdatomic.h functions have the suffix "_explicit"? Especially 
since there aren't any wrappers for the implicit variants.


More to type, more to read.

When was this API introduced? Shouldn't it say "experimental" somewhere?

DPDK LTO and semantic interpositioning

[Mattias Rönnblom]

Hi.

When DPDK is built configured with b_lto=true, it seems like 
-fno-semantic-interposition is not passed to GCC.


Is this intentional?

Not providing this flag prevents most cross-unit optimizations for 
shared objects.


Best regards,
Mattias

[RFC] service: extend service function call statistics

[Mattias Rönnblom]

Add two new per-service counters.

RTE_SERVICE_ATTR_IDLE_CALL_COUNT tracks the number of service function
invocations where no work was performed.

RTE_SERVICE_ATTR_ERROR_CALL_COUNT tracks the number invocations
resulting in an error.

The semantics of RTE_SERVICE_ATTR_CALL_COUNT remains the same (i.e.,
counting all invocations, regardless of return value).

The new statistics may be useful for both debugging and profiling
(e.g., calculate the average per-call processing latency for non-idle
service calls).

Service core tests are extended to cover the new counters, and
coverage for RTE_SERVICE_ATTR_CALL_COUNT is improved.

The documentation for the CYCLES attributes are updated to reflect
their actual semantics.

Signed-off-by: Mattias Rönnblom 
---
 app/test/test_service_cores.c | 70 ++-
 lib/eal/common/rte_service.c  | 70 ---
 lib/eal/include/rte_service.h | 24 ++--
 3 files changed, 131 insertions(+), 33 deletions(-)

diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c
index c12d52d8f1..13a01b195f 100644
--- a/app/test/test_service_cores.c
+++ b/app/test/test_service_cores.c
@@ -3,11 +3,12 @@
  */
 
 #include 
+#include 
 #include 
-#include 
 #include 
+#include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -16,8 +17,10 @@
 
 /* used as the service core ID */
 static uint32_t slcore_id;
-/* used as timestamp to detect if a service core is running */
-static uint64_t service_tick;
+/* track service call count */
+static uint64_t service_calls;
+static uint64_t service_idle_calls;
+static uint64_t service_error_calls;
 /* used as a flag to check if a function was run */
 static uint32_t service_remote_launch_flag;
 
@@ -46,9 +49,21 @@ testsuite_teardown(void)
 static int32_t dummy_cb(void *args)
 {
RTE_SET_USED(args);
-   service_tick++;
+
+   service_calls++;
+
+   switch (rte_rand_max(3)) {
+   case 0:
+   return 0;
+   case 1:
+   service_idle_calls++;
+   return -EAGAIN;
+   default:
+   service_error_calls++;
+   return -ENOENT;
+   }
+
rte_delay_ms(SERVICE_DELAY);
-   return 0;
 }
 
 static int32_t dummy_mt_unsafe_cb(void *args)
@@ -121,6 +136,10 @@ unregister_all(void)
rte_service_lcore_reset_all();
rte_eal_mp_wait_lcore();
 
+   service_calls = 0;
+   service_idle_calls = 0;
+   service_error_calls = 0;
+
return TEST_SUCCESS;
 }
 
@@ -295,12 +314,19 @@ service_attr_get(void)
"Valid attr_get() call didn't return success");
TEST_ASSERT_EQUAL(0, attr_value,
"attr_get() call didn't set correct cycles (zero)");
-   /* check correct call count */
+   /* check correct call counts */
const int attr_calls = RTE_SERVICE_ATTR_CALL_COUNT;
TEST_ASSERT_EQUAL(0, rte_service_attr_get(id, attr_calls, &attr_value),
"Valid attr_get() call didn't return success");
-   TEST_ASSERT_EQUAL(0, attr_value,
-   "attr_get() call didn't get call count (zero)");
+   TEST_ASSERT_EQUAL(0, attr_value, "Call count was not zero");
+   const int attr_idle_calls = RTE_SERVICE_ATTR_IDLE_CALL_COUNT;
+   TEST_ASSERT_EQUAL(0, rte_service_attr_get(id, attr_idle_calls, 
&attr_value),
+   "Valid attr_get() call didn't return success");
+   TEST_ASSERT_EQUAL(0, attr_value, "Idle call count was not zero");
+   const int attr_error_calls = RTE_SERVICE_ATTR_ERROR_CALL_COUNT;
+   TEST_ASSERT_EQUAL(0, rte_service_attr_get(id, attr_error_calls, 
&attr_value),
+   "Valid attr_get() call didn't return success");
+   TEST_ASSERT_EQUAL(0, attr_value, "Error call count was not zero");
 
/* Call service to increment cycle count */
TEST_ASSERT_EQUAL(0, rte_service_lcore_add(slcore_id),
@@ -331,8 +357,13 @@ service_attr_get(void)
 
TEST_ASSERT_EQUAL(0, rte_service_attr_get(id, attr_calls, &attr_value),
"Valid attr_get() call didn't return success");
-   TEST_ASSERT_EQUAL(1, (attr_value > 0),
-   "attr_get() call didn't get call count (zero)");
+   TEST_ASSERT_EQUAL(service_calls, attr_value, "Unexpected call count");
+   TEST_ASSERT_EQUAL(0, rte_service_attr_get(id, attr_idle_calls, 
&attr_value),
+   "Valid attr_get() call didn't return success");
+   TEST_ASSERT_EQUAL(service_idle_calls, attr_value, "Unexpected idle call 
count");
+   TEST_ASSERT_EQUAL(0, rte_service_attr_get(id, attr_error_calls, 
&attr_value),
+   "Valid attr_get() call didn't return success");
+   TEST_ASSERT_EQUAL(service_error_calls, attr_value, "Unexpected error 
call count");
 
TEST_ASSERT_EQUAL(0, rte_service_attr_reset_all(id),
"Valid attr_reset_all() return success");
@@ -

[DPDK Bug 1371] Add function to start "simple" testpmd with default params for DTS

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1371

Bug ID: 1371
   Summary: Add function to start "simple" testpmd with default
params for DTS
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: dts
  Assignee: dev@dpdk.org
  Reporter: pr...@iol.unh.edu
CC: juraj.lin...@pantheon.tech, pr...@iol.unh.edu
  Target Milestone: ---

eal args are already gathered from conf.yaml. It may make sense to have some
"default" testpmd start function for the sut_node. Another related ask is
abstracting away the testpmd.start() and testpmd.stop() from the code which
needs to be written by devs writing a new testsuite. Anything we can do to make
writing a testsuite less burdensome.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[DPDK Bug 1372] Add function for packing packet payload with a generic payload.

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1372

Bug ID: 1372
   Summary: Add function for packing packet payload with a generic
payload.
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: dts
  Assignee: dev@dpdk.org
  Reporter: pr...@iol.unh.edu
CC: juraj.lin...@pantheon.tech, pr...@iol.unh.edu
  Target Milestone: ---

For the scatter suite we pack the payload with specific content so we can
compare against it, but in many cases we don't care about the specific payload
of the packet. So, we should be able to add a function which abstracts away
this aspect of building the packet.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[DPDK Bug 1373] Make docstrings less verbose, or reduce repeats

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1373

Bug ID: 1373
   Summary: Make docstrings less verbose, or reduce repeats
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: dts
  Assignee: dev@dpdk.org
  Reporter: pr...@iol.unh.edu
CC: juraj.lin...@pantheon.tech, pr...@iol.unh.edu
  Target Milestone: ---

Thomas mentions that testsuites files should have as few lines as possible. Of
course, we will be adding some functions which simplify the actual code, which
will aleviate this issue, but we can also look at reducing the amount of
docstring lines in DTS. He mentions if a superclass has a docstring for a
function and that function is overridden by the subclass, the docstring may not
need to be repeated in the subclass.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[DPDK Bug 1374] Stop using xmlrpc server for handling scapy on the TG, move to sending scapy commands via a remote shell.

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1374

Bug ID: 1374
   Summary: Stop using xmlrpc server for handling scapy on the TG,
move to sending scapy commands via a remote shell.
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: dts
  Assignee: dev@dpdk.org
  Reporter: pr...@iol.unh.edu
CC: juraj.lin...@pantheon.tech, pr...@iol.unh.edu
  Target Milestone: ---

This is a significant effort to move to a solution which (at best) has feature
parity with our current approach. I agree with Juraj's assessment from the 1/24
DTS meeting that the cost/benefit of this work right now is not compared to
other tickets. So, in my view this can be deprioritized or dropped altogether.
But, just making the ticket anyways so that our meeting topics are represented
here and anyone can chime in if they want.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[DPDK Bug 1375] Make limited use of "per testsuite" conf files.

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1375

Bug ID: 1375
   Summary: Make limited use of "per testsuite" conf files.
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: dts
  Assignee: dev@dpdk.org
  Reporter: pr...@iol.unh.edu
CC: juraj.lin...@pantheon.tech, pr...@iol.unh.edu
  Target Milestone: ---

There will be examples of testsuite which require some divserse input on a per
testsuite or environment basis (setting expected baselines for a testsuite in
perf testing is one example). So, we are going to be doing this at some point
anyways, and I think it is okay to do so now with functional tests too if it
can help make testsuites more concise.

I don't want this suggestion to be conflated with our previous discussion about
building a YAML schema and intepreter for taking testsuite parameters and also
python functions and mapping that to a python testsuite. I think it's clear
based on our 1/24 meeting that we are not going in that direction. However, we
probably do need per-testsuite conf files for some (but not all) suites. I
think how we best leverage this can be a discussion point for next week's DTS
meeting.

-- 
You are receiving this mail because:
You are the assignee for the bug.

RE: [PATCH v1] crypto/ipsec_mb: upgrade IPsec Multi-buffer to 1.4

[De Lara Guarch, Pablo]

Hi Venkat,

> -Original Message-
> From: Sivaramakrishnan, VenkatX 
> Sent: Friday, January 19, 2024 11:40 AM
> To: Ji, Kai ; De Lara Guarch, Pablo
> 
> Cc: dev@dpdk.org; Sivaramakrishnan, VenkatX
> 
> Subject: [PATCH v1] crypto/ipsec_mb: upgrade IPsec Multi-buffer to 1.4

Could you change the commit title to "bump minimum IPSec Multi-buffer version"
> 
> SW PMDs do not support IPsec Multi-buffer version 1.3 and less.

I wouldn't say this is correct. The PMDs support these versions, but this patch 
is bumping the minimum
version to make the code more maintainable (it's simpler) and to force users to 
use a newer library
(which includes bugfixes and performance optimizations), with more algorithms 
enabled (win-win situation).
 
> A minimum IPsec Multi-buffer version of 1.4 or greater is now required.
> 
> Signed-off-by: Sivaramakrishnan Venkat
> 
> ---

A couple of things more:
- Could you update the AESNI MB (aesni_mb.rst) documentation to show this 
change (the version compatibility table)? 
- There is a macro not needed any longer in ipsec_mb_ops.c: IMB_MP_REQ_VER_STR.

Thanks!
Pablo

Re: [PATCH v4 1/2] windows: include winapifamily header for macros

[Dmitry Kozlyuk]

2024-01-08 15:38 (UTC-0800), Tyler Retzlaff:
> Include winapifamily.h for WINAPI_FAMILY macro and provide a definition
> of WINAPI_FAMILY_PHONE_APP if not present (happens compiling under
> mingw)

Given this explanation, I think the subject should be:

eal/windows: make dirent.h shim compatible with MinGW

Acked-by: Dmitry Kozlyuk 

RE: rte_atomic_*_explicit

[Morten Brørup]

> From: Mattias Rönnblom [mailto:hof...@lysator.liu.se]
> Sent: Thursday, 25 January 2024 19.54
> 
> Why do rte_stdatomic.h functions have the suffix "_explicit"?
> Especially
> since there aren't any wrappers for the implicit variants.
> 
> More to type, more to read.

They have the "_explicit" suffix to make their names similar to those in 
stdatomic.h.

You might consider their existence somewhat temporary until C11 stdatomics can 
be fully phased in, so there's another argument for similar names. (This 
probably does not happen as long as compilers generate slower code for C11 
stdatomics than with their atomic built-ins.)

> 
> When was this API introduced? Shouldn't it say "experimental"
> somewhere?

They were introduced as part of the migration to C11.
I suppose they were not marked experimental because they replaced something we 
didn't want anymore (the compiler built-ins for atomics, e.g. 
__atomic_load_n()). I don't recall if we discussed experimental marking or not.


Reverse paper trail:
https://git.dpdk.org/dpdk/log/lib/eal/include/rte_stdatomic.h
https://patchwork.dpdk.org/project/dpdk/patch/1692738045-32363-2-git-send-email-roret...@linux.microsoft.com/
https://patchwork.dpdk.org/project/dpdk/patch/1692738045-32363-2-git-send-email-roret...@linux.microsoft.com/

Re: rte_atomic_*_explicit

[Tyler Retzlaff]

On Thu, Jan 25, 2024 at 11:10:47PM +0100, Morten Brørup wrote:
> > From: Mattias Rönnblom [mailto:hof...@lysator.liu.se]
> > Sent: Thursday, 25 January 2024 19.54
> > 
> > Why do rte_stdatomic.h functions have the suffix "_explicit"?
> > Especially
> > since there aren't any wrappers for the implicit variants.
> > 
> > More to type, more to read.
> 
> They have the "_explicit" suffix to make their names similar to those in 
> stdatomic.h.
> 
> You might consider their existence somewhat temporary until C11 stdatomics 
> can be fully phased in, so there's another argument for similar names. (This 
> probably does not happen as long as compilers generate slower code for C11 
> stdatomics than with their atomic built-ins.)

yes, there was feedback at the time it was.

* we should *not* have non-explicit versions of the macros
* the atomic generic functions should be named to match C11 standard
  with a rte_ prefix.

> 
> > 
> > When was this API introduced? Shouldn't it say "experimental"
> > somewhere?
> 
> They were introduced as part of the migration to C11.
> I suppose they were not marked experimental because they replaced something 
> we didn't want anymore (the compiler built-ins for atomics, e.g. 
> __atomic_load_n()). I don't recall if we discussed experimental marking or 
> not.

i don't think we discussed it since they're wrapper macros.

> 
> 
> Reverse paper trail:
> https://git.dpdk.org/dpdk/log/lib/eal/include/rte_stdatomic.h
> https://patchwork.dpdk.org/project/dpdk/patch/1692738045-32363-2-git-send-email-roret...@linux.microsoft.com/
> https://patchwork.dpdk.org/project/dpdk/patch/1692738045-32363-2-git-send-email-roret...@linux.microsoft.com/
> 

RE: [PATCH] RFC: use C11 alignas instead of GCC attribute aligned

[Morten Brørup]

> From: Tyler Retzlaff [mailto:roret...@linux.microsoft.com]
> Sent: Thursday, 25 January 2024 19.37
> 
> ping.
> 
> Please review this thread if you have time, the main point of
> discussion
> I would like to receive consensus on the following questions.
> 
> 1. Should we continue to expand common alignments behind an __rte_macro
> 
>   i.e. what do we prefer to appear in code
> 
>   alignas(RTE_CACHE_LINE_MIN_SIZE)
> 
>   -- or --
> 
>   __rte_cache_aligned
> 
> One of the benefits of dropping the macro is it provides a clear visual
> indicator that it is not placed in the same location or get applied
> to types as is done with __attribute__((__aligned__(n))).

We don't want our own proprietary variant of something that already exists in 
the C standard. Now that we have moved to C11, the __rte alignment macros 
should be considered obsolete.

Note: I don't mind convenience macros for common use cases, so we could also 
introduce the macro suggested by Mattias [1]:

#define RTE_CACHE_ALIGNAS alignas(RTE_CACHE_LINE_SIZE)

[1]: 
https://inbox.dpdk.org/dev/dc3f3131-38e6-4219-861e-b31ec10c0...@lysator.liu.se/

> 
> 2. where should we place alignas(n) or __rte_macro (if we use a macro)
> 
> Should it be on the same line as the variable or field or on the
> preceeding line?
> 
>   /* same line example struct */
>   struct T {
>   /* alignas(64) applies to field0 *not* struct T type declaration
> */
>   alignas(64) void *field0;
>   void *field1;
> 
>   ... other fields ...
> 
>   alignas(64) uint64_t field5;
>   uint32_t field6;
> 
>   ... more fields ...
> 
>   };
> 
>   /* same line example array */
>   alignas(64) static const uint32_t array[4] = { ... };
> 
>   -- or --
> 
>   /* preceeding line example struct */
>   struct T {
>   /* alignas(64) applies to field0 *not* struct T type declaration
> */
>   alignas(64)
>   void *field0;
>   void *field1;
> 
>   ... other fields ...
> 
>   alignas(64)
>   uint64_t field5;
>   uint32_t field6;
> 
>   ... more fields ...
> 
>   };
> 
>   /* preceeding line example array */
>   alignas(64)
>   static const uint32_t array[4] = { ... };
> 

Searching the net for what other projects do, I came across this required 
placement [2]:

uint64_t alignas(64) field5;

[2]: https://lore.kernel.org/buildroot/2023073851.6faa3391@windsurf/T/

So let's follow the standard's intention and put them on the same line.
On an case-by-case basis, we can wrap lines if it improves readability, like we 
do with function headers that have a lot of attributes.

> 
> I'll submit patches for lib/* once the discussion is concluded.
> 
> thanks folks

Re: [PATCH v4 2/2] eal: initialize shared plugins on Windows

[Dmitry Kozlyuk]

2024-01-08 15:38 (UTC-0800), Tyler Retzlaff:
> When EAL is built with MSVC it is possible to dynamically load plugins
> on Windows. Hook eal_plugins_init into rte_eal_init if built with MSVC
> and provide code to load plugins on Windows.

Windows implementation does not check directory permissions like its Unix
counterpart does. I don't insist on porting it, because this feature is not
documented and is more like a safety net.
Just making sure this is a conscious decision and not an oversight.

Acked-by: Dmitry Kozlyuk 

RE: [RFC] service: extend service function call statistics

[Morten Brørup]

> From: Mattias Rönnblom [mailto:mattias.ronnb...@ericsson.com]
> Sent: Thursday, 25 January 2024 20.15
> 
> Add two new per-service counters.
> 
> RTE_SERVICE_ATTR_IDLE_CALL_COUNT tracks the number of service function
> invocations where no work was performed.
> 
> RTE_SERVICE_ATTR_ERROR_CALL_COUNT tracks the number invocations
> resulting in an error.
> 
> The semantics of RTE_SERVICE_ATTR_CALL_COUNT remains the same (i.e.,
> counting all invocations, regardless of return value).
> 
> The new statistics may be useful for both debugging and profiling
> (e.g., calculate the average per-call processing latency for non-idle
> service calls).
> 
> Service core tests are extended to cover the new counters, and
> coverage for RTE_SERVICE_ATTR_CALL_COUNT is improved.

OK to all of the above. Good stuff.

> 
> The documentation for the CYCLES attributes are updated to reflect
> their actual semantics.

If this is intended behavior, then updating the documentation seems appropriate 
- I would even go so far as considering it a bug fix.

However, quite a few cycles may be consumed by a service before it can conclude 
that it had no work to do. Shouldn't that be considered time spent by the 
service? I.e. should the code be fixed instead of the documentation?

Alternatively, keep the behavior (for backwards compatibility) and fix the 
documentation, as this patch does, and add an IDLE_CYCLES counter for time 
spent in idle calls.

PS: We're not using DPDK service cores in our applications, so I'm not familiar 
with the details. We are using something somewhat similar (but homegrown), also 
for profiling and power management purposes, and my feedback is based on my 
experience with our own variant of service cores.

Either way:

Acked-by: Morten Brørup 

Re: [PATCH] RFC: use C11 alignas instead of GCC attribute aligned

[Tyler Retzlaff]

On Thu, Jan 25, 2024 at 11:53:04PM +0100, Morten Brørup wrote:
> > From: Tyler Retzlaff [mailto:roret...@linux.microsoft.com]
> > Sent: Thursday, 25 January 2024 19.37
> > 
> > ping.
> > 
> > Please review this thread if you have time, the main point of
> > discussion
> > I would like to receive consensus on the following questions.
> > 
> > 1. Should we continue to expand common alignments behind an __rte_macro
> > 
> >   i.e. what do we prefer to appear in code
> > 
> >   alignas(RTE_CACHE_LINE_MIN_SIZE)
> > 
> >   -- or --
> > 
> >   __rte_cache_aligned
> > 
> > One of the benefits of dropping the macro is it provides a clear visual
> > indicator that it is not placed in the same location or get applied
> > to types as is done with __attribute__((__aligned__(n))).
> 
> We don't want our own proprietary variant of something that already exists in 
> the C standard. Now that we have moved to C11, the __rte alignment macros 
> should be considered obsolete.
> 
> Note: I don't mind convenience macros for common use cases, so we could also 
> introduce the macro suggested by Mattias [1]:

ack

> 
> #define RTE_CACHE_ALIGNAS alignas(RTE_CACHE_LINE_SIZE)
> 
> [1]: 
> https://inbox.dpdk.org/dev/dc3f3131-38e6-4219-861e-b31ec10c0...@lysator.liu.se/

i'm good with this, it satisfies that it is a different name than the
original and therefore achieves the same intent. i'll spin the patch
series with this macro.

> 
> > 
> > 2. where should we place alignas(n) or __rte_macro (if we use a macro)
> > 
> > Should it be on the same line as the variable or field or on the
> > preceeding line?
> > 
> >   /* same line example struct */
> >   struct T {
> >   /* alignas(64) applies to field0 *not* struct T type declaration
> > */
> >   alignas(64) void *field0;
> >   void *field1;
> > 
> >   ... other fields ...
> > 
> >   alignas(64) uint64_t field5;
> >   uint32_t field6;
> > 
> >   ... more fields ...
> > 
> >   };
> > 
> >   /* same line example array */
> >   alignas(64) static const uint32_t array[4] = { ... };
> > 
> >   -- or --
> > 
> >   /* preceeding line example struct */
> >   struct T {
> >   /* alignas(64) applies to field0 *not* struct T type declaration
> > */
> >   alignas(64)
> >   void *field0;
> >   void *field1;
> > 
> >   ... other fields ...
> > 
> >   alignas(64)
> >   uint64_t field5;
> >   uint32_t field6;
> > 
> >   ... more fields ...
> > 
> >   };
> > 
> >   /* preceeding line example array */
> >   alignas(64)
> >   static const uint32_t array[4] = { ... };
> > 
> 
> Searching the net for what other projects do, I came across this required 
> placement [2]:
> 
> uint64_t alignas(64) field5;
> 
> [2]: https://lore.kernel.org/buildroot/2023073851.6faa3391@windsurf/T/
>
> So let's follow the standard's intention and put them on the same line.
> On an case-by-case basis, we can wrap lines if it improves readability, like 
> we do with function headers that have a lot of attributes.

just fyi.

the linked code is c++ and standard c++ has both semantic and syntactic
differences from standard c. notably standard c is moving away
from the notion that you can alignas types and instead you align
variables/fields/members.

further restricting placement is the need to choose an intersecting
placement that works when consumed in either a c or c++ translation
unit. so the options i present above are that intersection.

ty

> 
> 
> > 
> > I'll submit patches for lib/* once the discussion is concluded.
> > 
> > thanks folks

RE: [PATCH] net/mana: use rte_pktmbuf_alloc_bulk for allocating RX WQEs

[Long Li]

> Subject: Re: [PATCH] net/mana: use rte_pktmbuf_alloc_bulk for allocating RX
> WQEs
> 
> On Wed, 24 Jan 2024 18:42:42 -0800
> lon...@linuxonhyperv.com wrote:
> 
> > +   struct rte_mbuf **mbufs;
> > +
> > +   mbufs = rte_calloc("mana_rx_mbufs", count, sizeof(struct rte_mbuf *), 
> > 0);
> > +   if (!mbufs)
> > +   return -ENOMEM;
> 
> Looks good, you might want to make this numa aware in some future version.
> 
> Reviewed-by: Stephen Hemminger 

Thank you!

I'm sending v2 to fix this.

There are a couple of other places in MANA doing memory allocation that should 
be NUMA aware. I will send another patch to make them NUMA aware.

Long

[DPDK Bug 1327] [dpdk-23.11] tso/tso_tunneling: tunnel tso setting to not take effect

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=1327

Jiale Song (songx.ji...@intel.com) changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|UNCONFIRMED |RESOLVED

--- Comment #4 from Jiale Song (songx.ji...@intel.com) ---
the fix patch has been merged into the DPDK main branch.
DPDK commit daac90272857812b3da(net/ice: fix tunnel TSO capabilities) 
DPDK fix patch:
https://patches.dpdk.org/project/dpdk/patch/20231207023051.1914021-1-kaiwenx.d...@intel.com/
close this bug.

-- 
You are receiving this mail because:
You are the assignee for the bug.

RE: rte_atomic_*_explicit

[Honnappa Nagarahalli]

> 
> On Thu, Jan 25, 2024 at 11:10:47PM +0100, Morten Br�rup wrote:
> > > From: Mattias R�nnblom [mailto:hof...@lysator.liu.se]
> > > Sent: Thursday, 25 January 2024 19.54
> > >
> > > Why do rte_stdatomic.h functions have the suffix "_explicit"?
> > > Especially
> > > since there aren't any wrappers for the implicit variants.
> > >
> > > More to type, more to read.
> >
> > They have the "_explicit" suffix to make their names similar to those in
> stdatomic.h.
> >
> > You might consider their existence somewhat temporary until C11 stdatomics
> can be fully phased in, so there's another argument for similar names. (This
> probably does not happen as long as compilers generate slower code for C11
> stdatomics than with their atomic built-ins.)
> 
> yes, there was feedback at the time it was.
> 
> * we should *not* have non-explicit versions of the macros
> * the atomic generic functions should be named to match C11 standard
>   with a rte_ prefix.
This was mainly done to ensure that users think through the memory ordering 
they want to use. This also matches with the compiler atomic built-ins. Without 
explicit, it is sequentially consistent memory order.

> 
> >
> > >
> > > When was this API introduced? Shouldn't it say "experimental"
> > > somewhere?
> >
> > They were introduced as part of the migration to C11.
> > I suppose they were not marked experimental because they replaced
> something we didn't want anymore (the compiler built-ins for atomics, e.g.
> __atomic_load_n()). I don't recall if we discussed experimental marking or 
> not.
> 
> i don't think we discussed it since they're wrapper macros.
> 
> >
> >
> > Reverse paper trail:
> > https://git.dpdk.org/dpdk/log/lib/eal/include/rte_stdatomic.h
> > https://patchwork.dpdk.org/project/dpdk/patch/1692738045-32363-2-git-
> send-email-roret...@linux.microsoft.com/
> > https://patchwork.dpdk.org/project/dpdk/patch/1692738045-32363-2-git-
> send-email-roret...@linux.microsoft.com/
> >

[PATCH] app/testpmd: fix crash in multi-process packet forwarding

[Dengdui Huang]

On multi-process scenario, each process creates flows based on the
number of queues. When nbcore is greater than 1, multiple cores may
use the same queue to forward packet, like:
dpdk-testpmd -a BDF --proc-type=auto -- -i --rxq=4 --txq=4
--nb-cores=2 --num-procs=2 --proc-id=0
testpmd> start
mac packet forwarding - ports=1 - cores=2 - streams=4 - NUMA support
enabled, MP allocation mode: native
Logical Core 2 (socket 0) forwards packets on 2 streams:
RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00
RX P=0/Q=1 (socket 0) -> TX P=0/Q=1 (socket 0) peer=02:00:00:00:00:00
Logical Core 3 (socket 0) forwards packets on 2 streams:
RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00
RX P=0/Q=1 (socket 0) -> TX P=0/Q=1 (socket 0) peer=02:00:00:00:00:00

After this commit, the result will be:
dpdk-testpmd -a BDF --proc-type=auto -- -i --rxq=4 --txq=4
--nb-cores=2 --num-procs=2 --proc-id=0
testpmd> start
io packet forwarding - ports=1 - cores=2 - streams=2 - NUMA support
enabled, MP allocation mode: native
Logical Core 2 (socket 0) forwards packets on 1 streams:
  RX P=0/Q=0 (socket 2) -> TX P=0/Q=0 (socket 2) peer=02:00:00:00:00:00
Logical Core 3 (socket 0) forwards packets on 1 streams:
  RX P=0/Q=1 (socket 2) -> TX P=0/Q=1 (socket 2) peer=02:00:00:00:00:00

Fixes: a550baf24af9 ("app/testpmd: support multi-process")
Cc: sta...@dpdk.org

Signed-off-by: Dengdui Huang 
---
 app/test-pmd/config.c | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index cad7537bc6..2c4dedd603 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -4794,7 +4794,6 @@ rss_fwd_config_setup(void)
queueid_t  nb_q;
streamid_t  sm_id;
int start;
-   int end;
 
nb_q = nb_rxq;
if (nb_q > nb_txq)
@@ -4802,7 +4801,7 @@ rss_fwd_config_setup(void)
cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
cur_fwd_config.nb_fwd_streams =
-   (streamid_t) (nb_q * cur_fwd_config.nb_fwd_ports);
+   (streamid_t) (nb_q / num_procs * cur_fwd_config.nb_fwd_ports);
 
if (cur_fwd_config.nb_fwd_streams < cur_fwd_config.nb_fwd_lcores)
cur_fwd_config.nb_fwd_lcores =
@@ -4824,7 +4823,6 @@ rss_fwd_config_setup(void)
 * the 2~3 queue for secondary process.
 */
start = proc_id * nb_q / num_procs;
-   end = start + nb_q / num_procs;
rxp = 0;
rxq = start;
for (sm_id = 0; sm_id < cur_fwd_config.nb_fwd_streams; sm_id++) {
@@ -4843,8 +4841,6 @@ rss_fwd_config_setup(void)
continue;
rxp = 0;
rxq++;
-   if (rxq >= end)
-   rxq = start;
}
 }
 
-- 
2.33.0

[PATCH v3 1/8] eal: introduce more macro for bit definition

[Chengwen Feng]

Introduce macros:
1. RTE_SHIFT_VAL64: get the uint64_t value which shifted by nr.
2. RTE_SHIFT_VAL32: get the uint32_t value which shifted by nr.
3. RTE_GENMASK64: generate a contiguous 64bit bitmask starting at bit
  position low and ending at position high.
4. RTE_GENMASK32: generate a contiguous 32bit bitmask starting at bit
  position low and ending at position high.
5. RTE_FIELD_GET64: extract a 64bit field element.
6. RTE_FIELD_GET32: extract a 32bit field element.

Signed-off-by: Chengwen Feng 
---
 lib/eal/include/rte_bitops.h | 64 
 1 file changed, 64 insertions(+)

diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
index 6bd8bae21a..bab08d53ec 100644
--- a/lib/eal/include/rte_bitops.h
+++ b/lib/eal/include/rte_bitops.h
@@ -39,6 +39,70 @@ extern "C" {
  */
 #define RTE_BIT32(nr) (UINT32_C(1) << (nr))
 
+/**
+ * Get the uint64_t value which shifted by nr.
+ *
+ * @param val
+ *   The value to be shifted.
+ * @param nr
+ *   The bit number in range of 0 to (64 - width of val).
+ */
+#define RTE_SHIFT_VAL64(val, nr) (UINT64_C(val) << (nr))
+
+/**
+ * Get the uint32_t value which shifted by nr.
+ *
+ * @param val
+ *   The value to be shifted.
+ * @param nr
+ *   The bit number in range of 0 to (32 - width of val).
+ */
+#define RTE_SHIFT_VAL32(val, nr) (UINT32_C(val) << (nr))
+
+/**
+ * Generate a contiguous 64bit bitmask starting at bit position low
+ * and ending at position high.
+ *
+ * @param high
+ *   High bit position.
+ * @param low
+ *   Low bit position.
+ */
+#define RTE_GENMASK64(high, low) (((~UINT64_C(0)) << (low)) & (~UINT64_C(0) >> 
(63u - (high
+
+/**
+ * Generate a contiguous 32bit bitmask starting at bit position low
+ * and ending at position high.
+ *
+ * @param high
+ *   High bit position.
+ * @param low
+ *   Low bit position.
+ */
+#define RTE_GENMASK32(high, low) (((~UINT32_C(0)) << (low)) & (~UINT32_C(0) >> 
(31u - (high
+
+/**
+ * Extract a 64bit field element.
+ *
+ * @param mask
+ *   shifted mask.
+ * @param reg
+ *   value of entire bitfield.
+ */
+#define RTE_FIELD_GET64(mask, reg) \
+   ((typeof(mask))(((reg) & (mask)) >> rte_ctz64(mask)))
+
+/**
+ * Extract a 32bit field element.
+ *
+ * @param mask
+ *   shifted mask.
+ * @param reg
+ *   value of entire bitfield.
+ */
+#define RTE_FIELD_GET32(mask, reg) \
+   ((typeof(mask))(((reg) & (mask)) >> rte_ctz32(mask)))
+
 /* 32-bit relaxed operations */
 
 /**
-- 
2.17.1

[PATCH v3 0/8] 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 2nd commit contains usage examples.

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

Chengwen Feng (8):
  eal: introduce more macro for bit definition
  argparse: add argparse library
  argparse: support verify argument config
  argparse: support parse parameters
  argparse: provide parsing known type API
  argparse: support parse unsigned base type
  argparse: pretty help info
  examples/dma: replace getopt with argparse

---
v3:
- Fix argparse_autotest asan fail due to don't free memory.
- When a parsing error occurs, display exact parameter name (long_name
  or short_name).
v2:
- Refine argparse_lib.rst which address Stephen's comments.
- Fix following which address Thomas's comments:
  1. Redefine new introduce macros.
  2. Squashed the test commit to feature commit.
  3. Drop the arguments' defines and direct place in obj.
- Use RTE_LOG_LINE marco to impl log.
- Update MAINTAINERS file.

 MAINTAINERS|   5 +
 app/test/meson.build   |   1 +
 app/test/test_argparse.c   | 857 +
 doc/api/doxy-api-index.md  |   1 +
 doc/api/doxy-api.conf.in   |   1 +
 doc/guides/prog_guide/argparse_lib.rst | 185 ++
 doc/guides/prog_guide/index.rst|   1 +
 doc/guides/rel_notes/release_24_03.rst |   5 +
 examples/dma/dmafwd.c  | 269 
 examples/dma/meson.build   |   2 +-
 lib/argparse/meson.build   |   7 +
 lib/argparse/rte_argparse.c| 788 +++
 lib/argparse/rte_argparse.h| 217 +++
 lib/argparse/version.map   |   8 +
 lib/eal/include/rte_bitops.h   |  64 ++
 lib/meson.build|   1 +
 16 files changed, 2258 insertions(+), 154 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

[PATCH v3 5/8] argparse: provide parsing known type API

[Chengwen Feng]

Provide API which could parsing the value from the input string based
on the value type. This API could used in user callback when parsing
string by argparse or kvargs library.

Signed-off-by: Chengwen Feng 
---
 app/test/test_argparse.c| 22 ++
 lib/argparse/rte_argparse.c | 19 +++
 lib/argparse/rte_argparse.h | 19 +++
 lib/argparse/version.map|  1 +
 4 files changed, 61 insertions(+)

diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 59dc79c8c6..2b1391f3b0 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -747,6 +747,27 @@ test_argparse_pos_callback_parse_int(void)
return 0;
 }
 
+static int
+test_argparse_parse_type(void)
+{
+   char *str_erange = test_strdup("99");
+   char *str_invalid = test_strdup("1a");
+   char *str_ok = test_strdup("123");
+   int value;
+   int ret;
+
+   /* test for int parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(value == 123, "Argparse parse type expect failed!");
+
+   return 0;
+}
+
 static struct unit_test_suite argparse_test_suite = {
.suite_name = "Argparse Unit Test Suite",
.setup = test_argparse_setup,
@@ -768,6 +789,7 @@ static struct unit_test_suite argparse_test_suite = {
TEST_CASE(test_argparse_opt_callback_parse_int_of_optional_val),
TEST_CASE(test_argparse_pos_autosave_parse_int),
TEST_CASE(test_argparse_pos_callback_parse_int),
+   TEST_CASE(test_argparse_parse_type),
 
TEST_CASES_END() /**< NULL terminate unit test array */
}
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index ed9b2f778a..c179041e89 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -606,3 +606,22 @@ rte_argparse_parse(struct rte_argparse *obj, int argc, 
char **argv)
exit(ret);
return ret;
 }
+
+int
+rte_argparse_parse_type(const char *str, uint64_t val_type, void *val)
+{
+   uint32_t cmp_max = RTE_FIELD_GET64(ARG_ATTR_VAL_TYPE_MASK, 
RTE_ARGPARSE_ARG_VALUE_MAX);
+   struct rte_argparse_arg arg = {
+   .name_long = str,
+   .name_short = NULL,
+   .val_saver = val,
+   .val_set = NULL,
+   .flags = val_type,
+   };
+   uint32_t value_type = arg_attr_val_type(&arg);
+
+   if (value_type == 0 || value_type >= cmp_max)
+   return -EINVAL;
+
+   return parse_arg_autosave(&arg, str);
+}
diff --git a/lib/argparse/rte_argparse.h b/lib/argparse/rte_argparse.h
index 8285e812f0..a795263a81 100644
--- a/lib/argparse/rte_argparse.h
+++ b/lib/argparse/rte_argparse.h
@@ -183,6 +183,25 @@ struct rte_argparse {
 __rte_experimental
 int rte_argparse_parse(struct rte_argparse *obj, int argc, char **argv);
 
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Parse the value from the input string based on the value type.
+ *
+ * @param str
+ *   Input string.
+ * @param val_type
+ *   The value type, @see RTE_ARGPARSE_ARG_VALUE_INT or other type.
+ * @param val
+ *   Saver for the value.
+ *
+ * @return
+ *   0 on success. Otherwise negative value is returned.
+ */
+__rte_experimental
+int rte_argparse_parse_type(const char *str, uint64_t val_type, void *val);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/argparse/version.map b/lib/argparse/version.map
index 1c176f69e9..9b68464600 100644
--- a/lib/argparse/version.map
+++ b/lib/argparse/version.map
@@ -2,6 +2,7 @@ EXPERIMENTAL {
global:
 
rte_argparse_parse;
+   rte_argparse_parse_type;
 
local: *;
 };
-- 
2.17.1

[PATCH v3 4/8] argparse: support parse parameters

[Chengwen Feng]

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

Signed-off-by: Chengwen Feng 
---
 app/test/test_argparse.c| 437 
 lib/argparse/rte_argparse.c | 295 +++-
 2 files changed, 729 insertions(+), 3 deletions(-)

diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 24d108f992..59dc79c8c6 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -319,6 +319,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 = 

[PATCH v3 2/8] 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 
---
 MAINTAINERS|   4 +
 doc/api/doxy-api-index.md  |   1 +
 doc/api/doxy-api.conf.in   |   1 +
 doc/guides/prog_guide/argparse_lib.rst | 185 
 doc/guides/prog_guide/index.rst|   1 +
 doc/guides/rel_notes/release_24_03.rst |   5 +
 lib/argparse/meson.build   |   7 +
 lib/argparse/rte_argparse.c|  14 ++
 lib/argparse/rte_argparse.h| 190 +
 lib/argparse/version.map   |   7 +
 lib/meson.build|   1 +
 11 files changed, 416 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/MAINTAINERS b/MAINTAINERS
index 0d1c8126e3..09fdb87a25 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1650,6 +1650,10 @@ F: doc/guides/sample_app_ug/qos_metering.rst
 Other libraries
 ---
 
+Argument parsing
+M: Chengwen Feng 
+F: lib/argparse/
+
 Configuration file
 M: Cristian Dumitrescu 
 F: lib/cfgfile/
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..00d4860ca1
--- /dev/null
+++ b/doc/guides/prog_guide/argparse_lib.rst
@@ -0,0 +1,185 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright(c) 2024 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 ways: 1) autosave: used for parsing known value
+  types; 2) callback: will invoke user callback to parse.
+
+Usage Guide
+---
+
+The following code demonstrates how to use:
+
+.. code-block:: C
+
+   static int
+   argparse_user_callback(uint32_t index, const char *value, void *opaque)
+   {
+  if (index == 1) {
+ /* process "--ddd" argument, because it is configured as no-value,
+  * the parameter 'value' is NULL.
+  */
+ ...
+  } else if (index == 2) {
+ /* process "--eee" argument, because it is configured as
+  * required-value, the parameter 'value' must not be NULL.
+  */
+ ...
+  } else if (index == 3) {
+ /* process "--fff" argument, because it is configured as
+  * 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 be NULL.
+  */
+ ...
+  } else {
+ return -EINVAL;
+  }
+   }
+
+   static 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", &aaa_val, (void *)100, 
RTE_ARGPARSE_ARG_NO_VALUE   | RTE_ARGPARSE_ARG_VALUE_INT },
+   

[PATCH v3 7/8] argparse: pretty help info

[Chengwen Feng]

This commit aligns help info.

Take dmafwd as an example, previous:

options:
 -h, --help: show this help message and exit.
 --mac-updating: Enable MAC addresses updating
 --no-mac-updating: Disable MAC addresses updating
 -p, --portmask: hexadecimal bitmask of ports to configure
 -q, --nb-queue: number of RX queues per port (default is 1)
 -c, --copy-type: type of copy: sw|hw
 -s, --ring-size: size of dmadev descriptor ring for hardware copy mode or 
rte_ring for software copy mode
 -b, --dma-batch-size: number of requests per DMA batch
 -f, --max-frame-size: max frame size
 -m, --force-min-copy-size: force a minimum copy length, even for smaller 
packets
 -i, --stats-interval: interval, in seconds, between stats prints (default is 1)

Now:
options:
 -h, --help show this help message and exit.
 --mac-updating Enable MAC addresses updating
 --no-mac-updating  Disable MAC addresses updating
 -p, --portmask hexadecimal bitmask of ports to configure
 -q, --nb-queue number of RX queues per port (default is 1)
 -c, --copy-typetype of copy: sw|hw
 -s, --ring-sizesize of dmadev descriptor ring for hardware copy 
mode or rte_ring for software copy mode
 -b, --dma-batch-size   number of requests per DMA batch
 -f, --max-frame-size   max frame size
 -m, --force-min-copy-size  force a minimum copy length, even for smaller 
packets
 -i, --stats-interval   interval, in seconds, between stats prints (default 
is 1)

Signed-off-by: Chengwen Feng 
---
 lib/argparse/rte_argparse.c | 67 +++--
 1 file changed, 56 insertions(+), 11 deletions(-)

diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index 4b10f3e519..2d953f1694 100644
--- a/lib/argparse/rte_argparse.c
+++ b/lib/argparse/rte_argparse.c
@@ -640,8 +640,47 @@ parse_args(struct rte_argparse *obj, int argc, char 
**argv, bool *show_help)
return 0;
 }
 
+static uint32_t
+calc_help_align(const struct rte_argparse *obj)
+{
+   const struct rte_argparse_arg *arg;
+   uint32_t width = 12; /* Default "-h, --help  " len. */
+   uint32_t len;
+   uint32_t i;
+
+   for (i = 0; /* NULL */; i++) {
+   arg = &obj->args[i];
+   if (arg->name_long == NULL)
+   break;
+   len = strlen(arg->name_long);
+   if (is_arg_optional(arg) && arg->name_short != NULL) {
+   len += strlen(", ");
+   len += strlen(arg->name_short);
+   }
+   width = RTE_MAX(width, 1 + len + 2); /* start with 1 & end with 
2 space. */
+   }
+
+   return width;
+}
+
+static void
+show_oneline_help(const struct rte_argparse_arg *arg, uint32_t width)
+{
+   uint32_t len = 0;
+   uint32_t i;
+
+   if (arg->name_short != NULL)
+   len = printf(" %s,", arg->name_short);
+   len += printf(" %s", arg->name_long);
+
+   for (i = len; i < width; i++)
+   printf(" ");
+
+   printf("%s\n", arg->help);
+}
+
 static void
-show_args_pos_help(const struct rte_argparse *obj)
+show_args_pos_help(const struct rte_argparse *obj, uint32_t align)
 {
uint32_t position_count = calc_position_count(obj);
const struct rte_argparse_arg *arg;
@@ -657,43 +696,49 @@ show_args_pos_help(const struct rte_argparse *obj)
break;
if (!is_arg_positional(arg))
continue;
-   printf(" %s: %s\n", arg->name_long, arg->help);
+   show_oneline_help(arg, align);
}
 }
 
 static void
-show_args_opt_help(const struct rte_argparse *obj)
+show_args_opt_help(const struct rte_argparse *obj, uint32_t align)
 {
+   static const struct rte_argparse_arg help = {
+   .name_long = "--help",
+   .name_short = "-h",
+   .help = "show this help message and exit.",
+   };
const struct rte_argparse_arg *arg;
uint32_t i;
 
-   printf("\noptions:\n"
-  " -h, --help: show this help message and exit.\n");
+   printf("\noptions:\n");
+   show_oneline_help(&help, align);
for (i = 0; /* NULL */; i++) {
arg = &obj->args[i];
if (arg->name_long == NULL)
break;
if (!is_arg_optional(arg))
continue;
-   if (arg->name_short != NULL)
-   printf(" %s, %s: %s\n", arg->name_short, 
arg->name_long, arg->help);
-   else
-   printf(" %s: %s\n", arg->name_long, arg->help);
+   show_oneline_help(arg, align);
}
 }
 
 static void
 show_args_help(const struct rte_argparse *obj)
 {
+   uint32_t align = calc_help_align(obj);
+
printf("usage: %s %s\n", obj->prog_name, obj->usage);
if (obj->descriptor != NULL)
printf("\ndescriptor: %s\n",

[PATCH v3 3/8] argparse: support verify argument config

[Chengwen Feng]

This commit supports verify argument config.

Signed-off-by: Chengwen Feng 
---
 MAINTAINERS |   1 +
 app/test/meson.build|   1 +
 app/test/test_argparse.c| 345 
 lib/argparse/rte_argparse.c | 307 +++-
 4 files changed, 653 insertions(+), 1 deletion(-)
 create mode 100644 app/test/test_argparse.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 09fdb87a25..a32b941e78 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1653,6 +1653,7 @@ Other libraries
 Argument parsing
 M: Chengwen Feng 
 F: lib/argparse/
+F: app/test/test_argparse.c
 
 Configuration file
 M: Cristian Dumitrescu 
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..24d108f992
--- /dev/null
+++ b/app/test/test_argparse.c
@@ -0,0 +1,345 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 HiSilicon Limited
+ */
+
+#include 
+#include 
+
+#include 
+
+#include "test.h"
+
+static int default_argc;
+static char *default_argv[1];
+
+#define MAX_STRDUP_STORE_NUM   512
+static char *strdup_store_array[MAX_STRDUP_STORE_NUM];
+static uint32_t strdup_store_index;
+
+/*
+ * 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. The strdup result will store in the strdup_store_array, and then
+ *freed in the teardown function, prevent ASAN errors from being
+ *triggered.
+ */
+static char *
+test_strdup(const char *str)
+{
+   char *s = strdup(str);
+   if (s == NULL) {
+   printf("strdup failed! exiting...\n");
+   exit(-ENOMEM);
+   }
+   if (strdup_store_index >= MAX_STRDUP_STORE_NUM) {
+   printf("too much strdup calls! exiting...\n");
+   exit(-ERANGE);
+   }
+   strdup_store_array[strdup_store_index++] = s;
+   return s;
+}
+
+static int
+test_argparse_setup(void)
+{
+   strdup_store_index = 0;
+   default_argc = 1;
+   default_argv[0] = test_strdup("test_argparse");
+   return 0;
+}
+
+static void
+test_argparse_teardown(void)
+{
+   uint32_t i;
+   printf("total used strdup_store_index = %u\n", strdup_store_index);
+   for (i = 0; i < strdup_store_index; i++)
+   free(strdup_store_array[i]);
+   strdup_store_index = 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();
+   /* Because obj may be overwritten, do a deep copy. */
+   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(v

[PATCH v3 8/8] examples/dma: replace getopt with argparse

[Chengwen Feng]

Replace getopt with argparse.

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

diff --git a/examples/dma/dmafwd.c b/examples/dma/dmafwd.c
index f27317a622..f4a0bff06e 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,8 @@
 #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_PORTMASK_INDEX 1
+#define CMD_LINE_OPT_COPY_TYPE_INDEX 2
 
 /* configurable number of RX/TX ring descriptors */
 #define RX_DEFAULT_RINGSIZE 1024
@@ -95,10 +87,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 uint16_t ring_size = 2048;
 
 /* interval, in seconds, between stats prints */
-static unsigned short stats_interval = 1;
+static uint16_t stats_interval = 1;
 /* global mbuf arrays for tracking DMA bufs */
 #define MBUF_RING_SIZE 2048
 #define MBUF_RING_MASK (MBUF_RING_SIZE - 1)
@@ -583,26 +575,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 +600,133 @@ 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_mask;
+   } else if (index == CMD_LINE_OPT_COPY_TYPE_INDEX) {
+   copy_mode = dma_parse_copy_mode(value);
+   if (copy_mode == COPY_MODE_INVALID_NUM) {
+   printf("Invalid copy type. Use: sw, hw\n");
+   return -1;
+   }
+   } else {
+   printf("Invalid index %u\n", index);
+   return -1;
+   }
+
+   return 0;
+}
+
 /* Parse the argument given in the command line of the application */
 static int
 dma_parse_args(int argc, char **argv, unsigned int nb_ports)
 {
-   static const char short_options[] =
-   "b:"  /* dma batch size */
-   "c:"  /* copy type (sw|hw) */
-   "f:"  /* max frame size */
-   "m:"  /* force min copy size */
-   "p:"  /* portmask */
-   "q:"  /* number of RX queues per port */
-   "s:"  /* ring size */
-   "i:"  /* interval, in seconds, between stats prints */
-   ;
-
-   static const struct option lgopts[] = {
-   {CMD_LINE_OPT_MAC_UPDATING, no_argument, &mac_updating, 1},
-   {CMD_LINE_OPT_NO_M

[PATCH v3 6/8] argparse: support parse unsigned base type

[Chengwen Feng]

This commit supports parsing unsigned base type (u8/u16/u32/u64).

Signed-off-by: Chengwen Feng 
---
 app/test/test_argparse.c|  63 ++--
 lib/argparse/rte_argparse.c | 116 
 lib/argparse/rte_argparse.h |  10 +++-
 3 files changed, 183 insertions(+), 6 deletions(-)

diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 2b1391f3b0..df11a129ba 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -751,19 +751,72 @@ static int
 test_argparse_parse_type(void)
 {
char *str_erange = test_strdup("99");
+   char *str_erange_u32 = test_strdup("4294967296");
+   char *str_erange_u16 = test_strdup("65536");
+   char *str_erange_u8 = test_strdup("256");
char *str_invalid = test_strdup("1a");
char *str_ok = test_strdup("123");
-   int value;
+   uint16_t val_u16;
+   uint32_t val_u32;
+   uint64_t val_u64;
+   uint8_t val_u8;
+   int val_int;
int ret;
 
/* test for int parsing */
-   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_INT, 
&val_int);
TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
-   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_INT, 
&val_int);
TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
-   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT, 
&value);
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_INT, 
&val_int);
TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
-   TEST_ASSERT(value == 123, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_int == 123, "Argparse parse type expect failed!");
+
+   /* test for u8 parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U8, 
&val_u8);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_erange_u8, RTE_ARGPARSE_ARG_VALUE_U8, 
&val_u8);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U8, 
&val_u8);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   val_u8 = 0;
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U8, 
&val_u8);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_u8 == 123, "Argparse parse type expect failed!");
+
+   /* test for u16 parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U16, 
&val_u16);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_erange_u16, 
RTE_ARGPARSE_ARG_VALUE_U16, &val_u16);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U16, 
&val_u16);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   val_u16 = 0;
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U16, 
&val_u16);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_u16 == 123, "Argparse parse type expect failed!");
+
+   /* test for u32 parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U32, 
&val_u32);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_erange_u32, 
RTE_ARGPARSE_ARG_VALUE_U32, &val_u32);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U32, 
&val_u32);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   val_u32 = 0;
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U32, 
&val_u32);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_u32 == 123, "Argparse parse type expect failed!");
+
+   /* test for u64 parsing */
+   ret = rte_argparse_parse_type(str_erange, RTE_ARGPARSE_ARG_VALUE_U64, 
&val_u64);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   ret = rte_argparse_parse_type(str_invalid, RTE_ARGPARSE_ARG_VALUE_U64, 
&val_u64);
+   TEST_ASSERT(ret != 0, "Argparse parse type expect failed!");
+   val_u64 = 0;
+   ret = rte_argparse_parse_type(str_ok, RTE_ARGPARSE_ARG_VALUE_U64, 
&val_u64);
+   TEST_ASSERT(ret == 0, "Argparse parse type expect failed!");
+   TEST_ASSERT(val_u64 == 123, "Argparse parse type expect failed!");
 
return 0;
 }
diff --git a/lib/argparse/rte_argparse.c b/lib/argparse/rte_argparse.c
index c179041e89..4b10f3e519 100644
---

Re: [PATCH] app/testpmd: fix crash in multi-process packet forwarding

[fengchengwen]

Hi Dengdui,

On 2024/1/26 10:41, Dengdui Huang wrote:
> On multi-process scenario, each process creates flows based on the
> number of queues. When nbcore is greater than 1, multiple cores may
> use the same queue to forward packet, like:
> dpdk-testpmd -a BDF --proc-type=auto -- -i --rxq=4 --txq=4
> --nb-cores=2 --num-procs=2 --proc-id=0
> testpmd> start
> mac packet forwarding - ports=1 - cores=2 - streams=4 - NUMA support
> enabled, MP allocation mode: native
> Logical Core 2 (socket 0) forwards packets on 2 streams:
> RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00
> RX P=0/Q=1 (socket 0) -> TX P=0/Q=1 (socket 0) peer=02:00:00:00:00:00
> Logical Core 3 (socket 0) forwards packets on 2 streams:
> RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00
> RX P=0/Q=1 (socket 0) -> TX P=0/Q=1 (socket 0) peer=02:00:00:00:00:00

tip: it would be more readable if with an indent, just like below example.

Acked-by: Chengwen Feng 

Thanks

> 
> After this commit, the result will be:
> dpdk-testpmd -a BDF --proc-type=auto -- -i --rxq=4 --txq=4
> --nb-cores=2 --num-procs=2 --proc-id=0
> testpmd> start
> io packet forwarding - ports=1 - cores=2 - streams=2 - NUMA support
> enabled, MP allocation mode: native
> Logical Core 2 (socket 0) forwards packets on 1 streams:
>   RX P=0/Q=0 (socket 2) -> TX P=0/Q=0 (socket 2) peer=02:00:00:00:00:00
> Logical Core 3 (socket 0) forwards packets on 1 streams:
>   RX P=0/Q=1 (socket 2) -> TX P=0/Q=1 (socket 2) peer=02:00:00:00:00:00
> 
> Fixes: a550baf24af9 ("app/testpmd: support multi-process")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Dengdui Huang 
> ---
>  app/test-pmd/config.c | 6 +-
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index cad7537bc6..2c4dedd603 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -4794,7 +4794,6 @@ rss_fwd_config_setup(void)
>   queueid_t  nb_q;
>   streamid_t  sm_id;
>   int start;
> - int end;
>  
>   nb_q = nb_rxq;
>   if (nb_q > nb_txq)
> @@ -4802,7 +4801,7 @@ rss_fwd_config_setup(void)
>   cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
>   cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
>   cur_fwd_config.nb_fwd_streams =
> - (streamid_t) (nb_q * cur_fwd_config.nb_fwd_ports);
> + (streamid_t) (nb_q / num_procs * cur_fwd_config.nb_fwd_ports);
>  
>   if (cur_fwd_config.nb_fwd_streams < cur_fwd_config.nb_fwd_lcores)
>   cur_fwd_config.nb_fwd_lcores =
> @@ -4824,7 +4823,6 @@ rss_fwd_config_setup(void)
>* the 2~3 queue for secondary process.
>*/
>   start = proc_id * nb_q / num_procs;
> - end = start + nb_q / num_procs;
>   rxp = 0;
>   rxq = start;
>   for (sm_id = 0; sm_id < cur_fwd_config.nb_fwd_streams; sm_id++) {
> @@ -4843,8 +4841,6 @@ rss_fwd_config_setup(void)
>   continue;
>   rxp = 0;
>   rxq++;
> - if (rxq >= end)
> - rxq = start;
>   }
>  }
>  
>