date:20240904

Hemant, Sachin,

dpaa_event_dequeue_wait() uses select(), which doesn't work if qman_thread_fd() 
returns a file descriptor number above FD_SETSIZE.

You should not use select(), but a modern alternative.

-Morten

[PATCH] config: add 32-bit cross-compilation x86 target

2024-09-04 Thread Bruce Richardson

To simplify building 32-bit binaries on 64-bit system, we can supply a
cross-compilation file which provides the relevant compiler flags and
settings needed - '-m32' compile/link flag, and appropriate
PKG_CONFIG_LIBDIR value. This latter setting will depend upon the layout
format of the particular OS/distro in use, so initially add a cross file
with paths set for Debian or Ubuntu systems.

Signed-off-by: Bruce Richardson 
---

The generation of 32-bit cross-files for other distros is left as an
exercise for the reader! I suspect that for Fedora/RHEL and Arch
variants that only the "pkg_config_libdir" and "libdir" setting should
be adjusted. However, I don't currently have a machine set up to test
that assumption, so getting the ball rolling for now with just this
patch to get feedback.

---

 config/x86/cross-debian-32bit | 22 ++
 1 file changed, 22 insertions(+)
 create mode 100644 config/x86/cross-debian-32bit

diff --git a/config/x86/cross-debian-32bit b/config/x86/cross-debian-32bit
new file mode 100644
index 00..2f6e4714cb
--- /dev/null
+++ b/config/x86/cross-debian-32bit
@@ -0,0 +1,22 @@
+[binaries]
+c = 'cc'
+cpp = 'c++'
+ar = 'ar'
+strip = 'strip'
+pkg-config = 'pkg-config'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'x86'
+cpu = 'native'
+endian = 'little'
+
+[properties]
+pkg_config_libdir = '/usr/lib/i386-linux-gnu/pkgconfig'
+
+[built-in options]
+c_args = '-m32'
+c_link_args = '-m32'
+cpp_args = '-m32'
+cpp_link_args = '-m32'
+libdir = 'lib/i386-linux-gnu'
-- 
2.43.0

[RFC PATCH] devtools/test-meson-builds: use cross file for 32bit build

2024-09-04 Thread Bruce Richardson

When testing the 32-bit x86 build on debian or ubuntu linux systems, use
the cross-file rather than using args and pkgconfig environment
variable. The advantage of using the cross-file is that the paths are
saved across runs. While the '-m32' args settings are preserved in the
current setup, the PKG_CONFIG_LIBDIR value from environment is not,
which can cause rebuilds of the build-32b directory to fail if meson
needs to do a reconfiguration first.

Signed-off-by: Bruce Richardson 
---
 devtools/test-meson-builds.sh | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index d71bb1ded0..1d9d04ce7c 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -253,21 +253,24 @@ build build-x86-generic cc skipABI -Dcheck_includes=true \
 
 # 32-bit with default compiler
 if check_cc_flags '-m32' ; then
+   target_override='i386-pc-linux-gnu'
if [ -d '/usr/lib/i386-linux-gnu' ] ; then
-   # 32-bit pkgconfig on Debian/Ubuntu
-   export PKG_CONFIG_LIBDIR='/usr/lib/i386-linux-gnu/pkgconfig'
+   # 32-bit pkgconfig on Debian/Ubuntu, use cross file
+   build build-32b $srcdir/config/x86/cross-debian-32bit ABI
elif [ -d '/usr/lib32' ] ; then
# 32-bit pkgconfig on Arch
export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
+   build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32' \
+   -Dcpp_args='-m32' -Dcpp_link_args='-m32'
+   unset PKG_CONFIG_LIBDIR
else
# 32-bit pkgconfig on RHEL/Fedora (lib vs lib64)
export PKG_CONFIG_LIBDIR='/usr/lib/pkgconfig'
+   build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32' \
+   -Dcpp_args='-m32' -Dcpp_link_args='-m32'
+   unset PKG_CONFIG_LIBDIR
fi
-   target_override='i386-pc-linux-gnu'
-   build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32' \
-   -Dcpp_args='-m32' -Dcpp_link_args='-m32'
target_override=
-   unset PKG_CONFIG_LIBDIR
 fi
 
 # x86 MinGW
-- 
2.43.0

DPDK 23.11.2 released

2024-09-04 Thread Xueming Li

Hi all,

Here is a new stable release:
https://fast.dpdk.org/rel/dpdk-23.11.2.tar.xz

The git tree is at:
https://dpdk.org/browse/dpdk-stable/?h=23.11

Xueming Li 

---
 .mailmap   |  24 +-
 VERSION|   2 +-
 app/dumpcap/main.c |  14 +-
 app/pdump/main.c   |  21 +-
 app/test-bbdev/test_bbdev_perf.c   | 113 ---
 app/test-crypto-perf/cperf_ops.c   |   9 +-
 app/test-crypto-perf/cperf_test_common.c   |   6 +-
 app/test-crypto-perf/cperf_test_latency.c  |  14 +-
 app/test-pmd/bpf_cmd.c |   2 +-
 app/test-pmd/cmdline_flow.c|   5 +-
 app/test-pmd/config.c  |  15 +-
 app/test-pmd/csumonly.c|  21 +-
 app/test-pmd/ieee1588fwd.c |  15 +-
 app/test-pmd/parameters.c  |   4 +-
 app/test-pmd/testpmd.h |   2 +-
 app/test/test_cryptodev.c  | 124 +--
 app/test/test_cryptodev_asym.c | 140 
 app/test/test_cryptodev_rsa_test_vectors.h |   2 +-
 app/test/test_fbarray.c| 207 ++--
 app/test/test_graph.c  |  72 
 app/test/test_power_intel_uncore.c |   4 +-
 buildtools/map-list-symbol.sh  |   1 +
 buildtools/meson.build |  19 +-
 buildtools/pmdinfogen.py   |  13 +-
 config/arm/arm32_armv8_linux_gcc   |   1 +
 config/arm/arm64_altra_linux_gcc   |   1 +
 config/arm/arm64_ampereone_linux_gcc   |   1 +
 config/arm/arm64_armada_linux_gcc  |   1 +
 config/arm/arm64_armv8_linux_clang_ubuntu  |   1 +
 config/arm/arm64_armv8_linux_gcc   |   1 +
 config/arm/arm64_bluefield3_linux_gcc  |   1 +
 config/arm/arm64_bluefield_linux_gcc   |   1 +
 config/arm/arm64_cdx_linux_gcc |   1 +
 config/arm/arm64_centriq2400_linux_gcc |   1 +
 config/arm/arm64_cn10k_linux_gcc   |   1 +
 config/arm/arm64_cn9k_linux_gcc|   1 +
 config/arm/arm64_dpaa_linux_gcc|   1 +
 config/arm/arm64_emag_linux_gcc|   1 +
 config/arm/arm64_ft2000plus_linux_gcc  |   1 +
 config/arm/arm64_graviton2_linux_gcc   |   1 +
 config/arm/arm64_graviton3_linux_gcc   |   1 +
 config/arm/arm64_hip10_linux_gcc   |   1 +
 config/arm/arm64_kunpeng920_linux_gcc  |   1 +
 config/arm/arm64_kunpeng930_linux_gcc  |   1 +
 config/arm/arm64_n1sdp_linux_gcc   |   1 +
 config/arm/arm64_n2_linux_gcc  |   1 +
 config/arm/arm64_stingray_linux_gcc|   1 +
 config/arm/arm64_thunderx2_linux_gcc   |   1 +
 config/arm/arm64_thunderxt83_linux_gcc |   1 +
 config/arm/arm64_thunderxt88_linux_gcc |   1 +
 config/arm/arm64_tys2500_linux_gcc |   1 +
 config/x86/cross-mingw |   1 +
 doc/api/doxy-api-index.md  |   1 +
 doc/guides/cryptodevs/cnxk.rst |   2 +-
 doc/guides/dmadevs/hisilicon.rst   |   1 -
 doc/guides/eventdevs/cnxk.rst  |   4 +-
 doc/guides/howto/af_xdp_cni.rst| 253 --
 doc/guides/howto/af_xdp_dp.rst | 323 ++
 doc/guides/howto/index.rst |   2 +-
 doc/guides/linux_gsg/enable_func.rst   |   3 +-
 doc/guides/mempool/cnxk.rst|   2 +-
 doc/guides/mldevs/cnxk.rst |   2 +-
 doc/guides/nics/af_xdp.rst |  19 +-
 doc/guides/nics/cnxk.rst   |   4 +-
 doc/guides/nics/features/iavf.ini  |   2 +-
 doc/guides/nics/mlx5.rst   |  20 ++
 doc/guides/nics/nfp.rst|   4 -
 doc/guides/platform/cnxk.rst   |   4 +-
 doc/guides/prog_guide/img/mbuf1.svg|   2 +-
 doc/guides/prog_guide/img/mbuf2.svg|   6 +-
 doc/guides/prog_guide/mbuf_lib.rst |   8 +-
 doc/guides/rel_notes/release_23_11.rst | 371 +
 doc/guides/sample_app_ug/l2_forward_crypto.rst |   2 +-
 doc/guides/sample_app_ug/l3_forward_power_man.rst  |   3 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst|  14 +-
 doc/guides/tools/dmaperf.rst   |   2 +-
 drivers/baseband/acc/acc_common.h  |   5 +-
 drivers/baseband/la12xx/bbdev_la12xx.c |   3 +
 drivers/bus/dp

Re: [RFC 0/2] introduce LLC aware functions

On Wed, 4 Sep 2024 11:30:59 +0200
Mattias Rönnblom  wrote:

> On 2024-09-02 02:39, Varghese, Vipin wrote:
> > 
> > 
> > Thank you Mattias for the comments and question, please let me try to 
> > explain the same below
> >   
> >> We shouldn't have a separate CPU/cache hierarchy API instead?  
> > 
> > Based on the intention to bring in CPU lcores which share same L3 (for 
> > better cache hits and less noisy neighbor) current API focuses on using
> > 
> > Last Level Cache. But if the suggestion is `there are SoC where L2 cache 
> > are also shared, and the new API should be provisioned`, I am also
> > 
> > comfortable with the thought.
> >   
> 
> Rather than some AMD special case API hacked into , I think 
> we are better off with no DPDK API at all for this kind of functionality.
> 
> A DPDK CPU/memory hierarchy topology API very much makes sense, but it 
> should be reasonably generic and complete from the start.

Agreed. This one of those cases where the existing project hwloc which
is part of open-mpi is more complete and well supported. It supports
multiple OS's and can deal with more quirks.

https://github.com/open-mpi/hwloc

[PATCH v3 8/8] devtools: add script to generate DPDK dependency graphs

From: Bruce Richardson 

Rather than the single monolithic graph that would be output from the
deps.dot file in a build directory, we can post-process that to generate
simpler graphs for different tasks. This new "draw_dependency_graphs"
script takes the "deps.dot" as input and generates an output file that
has the nodes categorized, filtering them based off the requested node or
category. For example, use "--match net/ice" to show the dependency tree
from that driver, or "--match lib" to show just the library dependency
tree.

Signed-off-by: Bruce Richardson 
Signed-off-by: Anatoly Burakov 
---
 devtools/draw-dependency-graphs.py | 223 +
 1 file changed, 223 insertions(+)
 create mode 100755 devtools/draw-dependency-graphs.py

diff --git a/devtools/draw-dependency-graphs.py 
b/devtools/draw-dependency-graphs.py
new file mode 100755
index 00..4fb765498d
--- /dev/null
+++ b/devtools/draw-dependency-graphs.py
@@ -0,0 +1,223 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 Intel Corporation
+
+import argparse
+import collections
+import sys
+import typing as T
+
+# typedef for dependency data types
+Deps = T.Set[str]
+DepData = T.Dict[str, T.Dict[str, T.Dict[bool, Deps]]]
+
+
+def parse_dep_line(line: str) -> T.Tuple[str, Deps, str, bool]:
+"""Parse digraph line into (component, {dependencies}, type, optional)."""
+# extract attributes first
+first, last = line.index("["), line.rindex("]")
+edge_str, attr_str = line[:first], line[first + 1 : last]
+# key=value, key=value, ...
+attrs = {
+key.strip('" '): value.strip('" ')
+for attr_kv in attr_str.split(",")
+for key, value in [attr_kv.strip().split("=", 1)]
+}
+# check if edge is defined as dotted line, meaning it's optional
+optional = "dotted" in attrs.get("style", "")
+try:
+component_type = attrs["dpdk_componentType"]
+except KeyError as _e:
+raise ValueError(f"Error: missing component type: {line}") from _e
+
+# now, extract component name and any of its dependencies
+deps: T.Set[str] = set()
+try:
+component, deps_str = edge_str.strip('" ').split("->", 1)
+component = component.strip().strip('" ')
+deps_str = deps_str.strip().strip("{}")
+deps = {d.strip('" ') for d in deps_str.split(",")}
+except ValueError as _e:
+component = edge_str.strip('" ')
+
+return component, deps, component_type, optional
+
+
+def gen_dep_line(component: str, deps: T.Set[str], optional: bool) -> str:
+"""Generate a dependency line for a component."""
+# we use dotted line to represent optional components
+attr_str = ' [style="dotted"]' if optional else ""
+dep_list_str = '", "'.join(deps)
+deps_str = "" if not deps else f' -> {{ "{dep_list_str}" }}'
+return f'"{component}"{deps_str}{attr_str}\n'
+
+
+def read_deps_list(lines: T.List[str]) -> DepData:
+"""Read a list of dependency lines into a dictionary."""
+deps_data: T.Dict[str, T.Any] = {}
+for ln in lines:
+if ln.startswith("digraph") or ln == "}":
+continue
+
+component, deps, component_type, optional = parse_dep_line(ln)
+
+# each component will have two sets of dependencies - required and 
optional
+c_dict = deps_data.setdefault(component_type, 
{}).setdefault(component, {})
+c_dict[optional] = deps
+return deps_data
+
+
+def create_classified_graph(deps_data: DepData) -> T.Iterator[str]:
+"""Create a graph of dependencies with components classified by type."""
+yield "digraph dpdk_dependencies {\n  overlap=false\n  model=subset\n"
+for n, deps_t in enumerate(deps_data.items()):
+component_type, component_dict = deps_t
+yield f'  subgraph cluster_{n} {{\nlabel = "{component_type}"\n'
+for component, optional_d in component_dict.items():
+for optional, deps in optional_d.items():
+yield gen_dep_line(component, deps, optional)
+yield "  }\n"
+yield "}\n"
+
+
+def parse_match(line: str, dep_data: DepData) -> T.List[str]:
+"""Extract list of components from a category string."""
+# if this is not a compound string, we have very few valid choices
+if "/" not in line:
+# is this a category?
+if line in dep_data:
+return list(dep_data[line].keys())
+# this isn't a category. maybe an app name?
+maybe_app_name = f"dpdk-{line}"
+if maybe_app_name in dep_data["app"]:
+return [maybe_app_name]
+if maybe_app_name in dep_data["examples"]:
+return [maybe_app_name]
+# this isn't an app name either, so just look for component with that 
name
+for _, component_dict in dep_data.items():
+if line in component_dict:
+return [line]
+# nothing found still. one last try: maybe it's a driver? we have to 
be ca

[PATCH v3 6/8] build: reduce driver dependencies

From: Bruce Richardson 

Remove any unnecessary dependencies from the driver dependency lists.
This will give each driver a near-minimum set of required dependencies.

Signed-off-by: Bruce Richardson 
---
 drivers/baseband/fpga_5gnr_fec/meson.build | 2 +-
 drivers/baseband/fpga_lte_fec/meson.build  | 2 +-
 drivers/baseband/la12xx/meson.build| 2 +-
 drivers/baseband/null/meson.build  | 2 +-
 drivers/baseband/turbo_sw/meson.build  | 2 +-
 drivers/bus/auxiliary/meson.build  | 2 --
 drivers/bus/dpaa/meson.build   | 2 +-
 drivers/bus/fslmc/meson.build  | 2 +-
 drivers/bus/ifpga/meson.build  | 2 +-
 drivers/bus/pci/meson.build| 4 +---
 drivers/bus/platform/meson.build   | 1 -
 drivers/bus/uacce/meson.build  | 2 --
 drivers/bus/vdev/meson.build   | 2 --
 drivers/common/cnxk/meson.build| 4 ++--
 drivers/common/cpt/meson.build | 2 +-
 drivers/common/idpf/meson.build| 2 +-
 drivers/common/mlx5/meson.build| 2 +-
 drivers/compress/mlx5/meson.build  | 2 +-
 drivers/compress/nitrox/meson.build| 2 +-
 drivers/compress/octeontx/meson.build  | 2 +-
 drivers/crypto/bcmfs/meson.build   | 2 +-
 drivers/crypto/cnxk/meson.build| 2 +-
 drivers/crypto/dpaa_sec/meson.build| 2 +-
 drivers/crypto/ipsec_mb/meson.build| 2 +-
 drivers/crypto/mlx5/meson.build| 2 +-
 drivers/crypto/nitrox/meson.build  | 2 +-
 drivers/dma/cnxk/meson.build   | 2 +-
 drivers/dma/dpaa/meson.build   | 2 +-
 drivers/dma/dpaa2/meson.build  | 2 +-
 drivers/dma/odm/meson.build| 2 +-
 drivers/dma/skeleton/meson.build   | 2 +-
 drivers/event/cnxk/meson.build | 2 +-
 drivers/event/dlb2/meson.build | 2 +-
 drivers/event/dpaa2/meson.build| 2 +-
 drivers/event/octeontx/meson.build | 3 +--
 drivers/event/sw/meson.build   | 2 +-
 drivers/mempool/cnxk/meson.build   | 2 +-
 drivers/mempool/dpaa/meson.build   | 2 +-
 drivers/mempool/dpaa2/meson.build  | 2 +-
 drivers/mempool/octeontx/meson.build   | 2 +-
 drivers/net/cnxk/meson.build   | 3 +--
 drivers/net/iavf/meson.build   | 2 +-
 drivers/net/ice/meson.build| 2 +-
 drivers/net/mana/meson.build   | 2 +-
 drivers/net/mlx5/meson.build   | 2 +-
 drivers/net/sfc/meson.build| 2 +-
 drivers/net/softnic/meson.build| 2 +-
 drivers/raw/cnxk_bphy/meson.build  | 2 +-
 drivers/raw/cnxk_gpio/meson.build  | 2 +-
 drivers/raw/ntb/meson.build| 2 +-
 drivers/raw/skeleton/meson.build   | 2 +-
 drivers/regex/mlx5/meson.build | 2 +-
 drivers/vdpa/ifc/meson.build   | 2 +-
 drivers/vdpa/meson.build   | 3 +--
 drivers/vdpa/mlx5/meson.build  | 2 +-
 drivers/vdpa/sfc/meson.build   | 2 +-
 56 files changed, 53 insertions(+), 65 deletions(-)

diff --git a/drivers/baseband/fpga_5gnr_fec/meson.build 
b/drivers/baseband/fpga_5gnr_fec/meson.build
index c3678d23eb..31b9e92fbb 100644
--- a/drivers/baseband/fpga_5gnr_fec/meson.build
+++ b/drivers/baseband/fpga_5gnr_fec/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2020 Intel Corporation
 
-deps += ['bus_vdev', 'ring', 'pci', 'bus_pci']
+deps += ['bus_vdev', 'bus_pci']
 
 sources = files('rte_fpga_5gnr_fec.c')
 
diff --git a/drivers/baseband/fpga_lte_fec/meson.build 
b/drivers/baseband/fpga_lte_fec/meson.build
index 14e07826ef..fbf24755db 100644
--- a/drivers/baseband/fpga_lte_fec/meson.build
+++ b/drivers/baseband/fpga_lte_fec/meson.build
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2019 Intel Corporation
 
-deps += ['bus_vdev', 'ring', 'pci', 'bus_pci']
+deps += ['bus_vdev', 'bus_pci']
 sources = files('fpga_lte_fec.c')
diff --git a/drivers/baseband/la12xx/meson.build 
b/drivers/baseband/la12xx/meson.build
index 7b7e41c961..e1dbdd0fa7 100644
--- a/drivers/baseband/la12xx/meson.build
+++ b/drivers/baseband/la12xx/meson.build
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2020-2021 NXP
 
-deps += ['bus_vdev', 'ring']
+deps += ['bus_vdev']
 
 sources = files('bbdev_la12xx.c')
diff --git a/drivers/baseband/null/meson.build 
b/drivers/baseband/null/meson.build
index 22863f0bd8..716d6c6fdb 100644
--- a/drivers/baseband/null/meson.build
+++ b/drivers/baseband/null/meson.build
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi 
 
-deps += ['bus_vdev', 'ring']
+deps += ['bus_vdev']
 sources = files('bbdev_null.c')
diff --git a/drivers/baseband/turbo_sw/meson.build 
b/drivers/baseband/turbo_sw/meson.build
index a9035a753e..ac18e8a9b6 100644
--- a/drivers/baseband/turbo_sw/meson.build
+++ b/drivers/baseband/turbo_sw/meson.

[PATCH v3 0/8] record and rework component dependencies

As part of the meson build, we can record the dependencies for each
component as we process it, logging them to a file. This file can be
used as input to a number of other scripts and tools, for example, to
graph the dependencies, or to allow higher-level build-config tools to
automatically enable component requirements, etc.

The first patch of this set separates dependencies inside meson into
optional or mandatory. The second patch of this set generates the basic
dependency tree. The third patch does some processing of that dependency
tree to identify cases where dependencies are being unnecessarily
specified. Reducing these makes it easier to have readable dependency
graphs in future, without affecting the build.

The following 4 patches are based on the output of the second patch, and
greatly cut down the number of direct dependency links between
components. Even with the cut-down dependencies, the full dependency
graph is nigh-unreadable, so the final patch adds a new script to
generate dependency tree subgraphs, creating dot files for e.g. the
dependencies of a particular component, or a component class such as
mempool drivers.

v2 -> v3:
- Split dependencies into optional and mandatory
- Fixup graph scripts to read and generate graphs that encode optional
  dependencies into the graph
- Python version fixes to avoid using features not available in minimum
  supported Python version
- Formatting with Ruff, and PEP-484 compliance

Anatoly Burakov (1):
  build: split dependencies into mandatory and optional

Bruce Richardson (7):
  build: output a dependency log in build directory
  devtools: add script to flag unneeded dependencies
  build: remove kvargs from driver class dependencies
  build: reduce library dependencies
  build: reduce driver dependencies
  build: reduce app dependencies
  devtools: add script to generate DPDK dependency graphs

 app/dumpcap/meson.build|   2 +-
 app/graph/meson.build  |   2 +-
 app/meson.build|  11 +-
 app/pdump/meson.build  |   2 +-
 app/proc-info/meson.build  |   4 +-
 app/test-bbdev/meson.build |   8 +-
 app/test-crypto-perf/meson.build   |   4 +-
 app/test-fib/meson.build   |   2 +-
 app/test-pmd/meson.build   |  26 +--
 app/test-sad/meson.build   |   2 +-
 app/test/meson.build   |  14 +-
 buildtools/log-deps.py |  81 
 buildtools/meson.build |   2 +
 devtools/draw-dependency-graphs.py | 223 +
 devtools/find-duplicate-deps.py|  53 +
 drivers/baseband/fpga_5gnr_fec/meson.build |   2 +-
 drivers/baseband/fpga_lte_fec/meson.build  |   2 +-
 drivers/baseband/la12xx/meson.build|   2 +-
 drivers/baseband/null/meson.build  |   2 +-
 drivers/baseband/turbo_sw/meson.build  |   2 +-
 drivers/bus/auxiliary/meson.build  |   2 -
 drivers/bus/dpaa/meson.build   |   2 +-
 drivers/bus/fslmc/meson.build  |   2 +-
 drivers/bus/ifpga/meson.build  |   2 +-
 drivers/bus/pci/meson.build|   4 +-
 drivers/bus/platform/meson.build   |   1 -
 drivers/bus/uacce/meson.build  |   2 -
 drivers/bus/vdev/meson.build   |   2 -
 drivers/common/cnxk/meson.build|   4 +-
 drivers/common/cpt/meson.build |   2 +-
 drivers/common/idpf/meson.build|   2 +-
 drivers/common/mlx5/meson.build|   2 +-
 drivers/compress/mlx5/meson.build  |   2 +-
 drivers/compress/nitrox/meson.build|   2 +-
 drivers/compress/octeontx/meson.build  |   2 +-
 drivers/crypto/bcmfs/meson.build   |   2 +-
 drivers/crypto/cnxk/meson.build|   2 +-
 drivers/crypto/dpaa_sec/meson.build|   2 +-
 drivers/crypto/ipsec_mb/meson.build|   2 +-
 drivers/crypto/mlx5/meson.build|   2 +-
 drivers/crypto/nitrox/meson.build  |   2 +-
 drivers/dma/cnxk/meson.build   |   2 +-
 drivers/dma/dpaa/meson.build   |   2 +-
 drivers/dma/dpaa2/meson.build  |   2 +-
 drivers/dma/odm/meson.build|   2 +-
 drivers/dma/skeleton/meson.build   |   2 +-
 drivers/event/cnxk/meson.build |   2 +-
 drivers/event/dlb2/meson.build |   2 +-
 drivers/event/dpaa2/meson.build|   2 +-
 drivers/event/meson.build  |   2 +-
 drivers/event/octeontx/meson.build |   3 +-
 drivers/event/sw/meson.build   |   2 +-
 drivers/mempool/cnxk/meson.build   |   2 +-
 drivers/mempool/dpaa/meson.build   |   2 +-
 drivers/mempool/dpaa2/meson.build  |   2 +-
 drivers/mempool/octeontx/meson.build   |   2 +-
 drivers/meson.build|   9 +-
 drivers/net/cnxk/meson.build   |   3 +-
 drivers/net/iavf

[PATCH v3 2/8] build: output a dependency log in build directory

From: Bruce Richardson 

As meson processes our DPDK source tree it manages dependencies
specified by each individual driver. To enable future analysis of the
dependency links between components, log the dependencies of each DPDK
component as it gets processed. This could potentially allow other tools
to automatically enable or disable components based on the desired end
components to be built, e.g. if the user requests net/ice, ensure that
common/iavf is also enabled in the drivers.

The output file produced is in "dot" or "graphviz" format, which allows
producing a graphical representation of the DPDK dependency tree if so
desired. For example: "dot -Tpng -O build/deps.dot" to produce the
image file "build/deps.dot.png".

Signed-off-by: Bruce Richardson 
Acked-by: Konstantin Ananyev 
Signed-off-by: Anatoly Burakov 
---
 app/meson.build|  8 -
 buildtools/log-deps.py | 81 ++
 buildtools/meson.build |  2 ++
 drivers/meson.build|  6 
 examples/meson.build   |  8 -
 lib/meson.build|  5 +++
 6 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 buildtools/log-deps.py

diff --git a/app/meson.build b/app/meson.build
index 1c61cd862c..55a1f076cd 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -75,8 +75,14 @@ foreach app:apps
 reason = 'explicitly disabled via build config'
 endif
 
+app_name = 'dpdk-' + name
 if build
 subdir(name)
+type_cmd = '--type=app'
+run_command([log_deps_cmd, type_cmd, app_name, deps], check: false)
+if optional_deps.length() > 0
+run_command([log_deps_cmd, '--optional', type_cmd, app_name, 
optional_deps], check: false)
+endif
 if not build and require_apps
 error('Cannot build explicitly requested app "@0@".\n'.format(name)
   + '\tReason: ' + reason)
@@ -115,7 +121,7 @@ foreach app:apps
 link_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
-exec = executable('dpdk-' + name,
+exec = executable(app_name,
 sources,
 c_args: cflags,
 link_args: ldflags,
diff --git a/buildtools/log-deps.py b/buildtools/log-deps.py
new file mode 100644
index 00..e11a102242
--- /dev/null
+++ b/buildtools/log-deps.py
@@ -0,0 +1,81 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 Intel Corporation
+
+"""Utility script to build up a list of dependencies from meson."""
+
+import os
+import sys
+import argparse
+import typing as T
+
+
+def file_to_list(filename: str) -> T.List[str]:
+"""Read file into a list of strings."""
+with open(filename, encoding="utf-8") as f:
+return f.readlines()
+
+
+def list_to_file(filename: str, lines: T.List[str]):
+"""Write a list of strings out to a file."""
+with open(filename, "w", encoding="utf-8") as f:
+f.writelines(lines)
+
+
+def gen_deps(
+component_type: str, optional: bool, component: str, deps: T.List[str]
+) -> str:
+"""Generate a dependency graph for meson."""
+dep_list_str = '", "'.join(deps)
+deps_str = "" if not deps else f' -> {{ "{dep_list_str}" }}'
+# we define custom attributes for the nodes
+attr_str = f'dpdk_componentType="{component_type}"'
+if optional:
+# we use a dotted line to represent optional dependencies
+attr_str += ',style="dotted"'
+return f'"{component}"{deps_str} [{attr_str}]\n'
+
+
+def _main():
+depsfile = f'{os.environ["MESON_BUILD_ROOT"]}/deps.dot'
+
+# to reset the deps file on each build, the script is called without any 
params
+if len(sys.argv) == 1:
+os.remove(depsfile)
+sys.exit(0)
+
+# we got arguments, parse them
+parser = argparse.ArgumentParser(
+description="Generate a dependency graph for meson."
+)
+# type is required
+parser.add_argument(
+"--type", required=True, help="Type of dependency (lib, examples, 
etc.)"
+)
+parser.add_argument(
+"--optional", action="store_true", help="Whether the dependency is 
optional"
+)
+# component is required
+parser.add_argument("component", help="The component to add to the graph")
+parser.add_argument("deps", nargs="*", help="The dependencies of the 
component")
+
+parsed = parser.parse_args()
+
+try:
+contents = file_to_list(depsfile)
+except FileNotFoundError:
+contents = ["digraph {\n", "}\n"]
+
+c_type = parsed.type
+optional = parsed.optional
+component = parsed.component
+deps = parsed.deps
+contents[-1] = gen_deps(c_type, optional, component, deps)
+
+contents.append("}\n")
+
+list_to_file(depsfile, contents)
+
+
+if __name__ == "__main__":
+_main()
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 3adf34e1a8..e2ba9d0ad4 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -24,6 +24,8 @@ get_numa_count_cmd = py3 + fi

[PATCH v3 3/8] devtools: add script to flag unneeded dependencies

From: Bruce Richardson 

While not a serious problem, DPDK components often list more
dependencies than are actually necessary to build, due to the use of
recursive dependencies. In extreme cases, such as with core libraries,
this can lead to longer configuration times due to meson having to
deduplicate long lists of dependencies. Therefore we can add a script to
identify when a component has got unnecessary dependencies listed.

Signed-off-by: Bruce Richardson 
---
 devtools/find-duplicate-deps.py | 53 +
 1 file changed, 53 insertions(+)
 create mode 100755 devtools/find-duplicate-deps.py

diff --git a/devtools/find-duplicate-deps.py b/devtools/find-duplicate-deps.py
new file mode 100755
index 00..b1eacf21ce
--- /dev/null
+++ b/devtools/find-duplicate-deps.py
@@ -0,0 +1,53 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 Intel Corporation
+
+"""Identify any superfluous dependencies listed in DPDK deps graph."""
+
+import sys
+
+all_deps = {}
+
+
+class dep:
+"""Holds a component and its dependencies."""
+
+def __init__(self, name, dep_names):
+"""Create and process a component and its deps."""
+self.name = name.strip('" ')
+self.base_deps = [all_deps[dn.strip('" ')] for dn in dep_names]
+self.recursive_deps = []
+for d in self.base_deps:
+self.recursive_deps.extend(d.base_deps)
+self.recursive_deps.extend(d.recursive_deps)
+self.extra_deps = []
+for d in self.base_deps:
+if d in self.recursive_deps:
+self.extra_deps.append(d.name)
+if self.extra_deps:
+print(f'{self.name}: extra deps {self.extra_deps}')
+
+def dict_add(self, d):
+"""Add this object to a dictionary by name."""
+d[self.name] = self
+
+
+def main(argv):
+"""Read the dependency tree from a dot file and process it."""
+if len(argv) != 2:
+print(f'Usage: {argv[0]} /deps.dot', file=sys.stderr)
+sys.exit(1)
+
+with open(argv[1]) as f:
+for ln in f.readlines():
+ln = ln.strip()
+if '->' in ln:
+name, deps = ln.split('->')
+deps = deps.strip(' {}')
+dep(name, deps.split(',')).dict_add(all_deps)
+elif ln.startswith('"') and ln.endswith('"'):
+dep(ln.strip('"'), []).dict_add(all_deps)
+
+
+if __name__ == '__main__':
+main(sys.argv)
-- 
2.43.5

[PATCH v3 1/8] build: split dependencies into mandatory and optional

Allow specifying dependencies as either mandatory or optional. This does
not change anything about the build, but it is useful for tooling to know
if a dependency is required or not.

Signed-off-by: Anatoly Burakov 
---
 app/meson.build   |  3 ++-
 app/proc-info/meson.build |  2 +-
 app/test-bbdev/meson.build|  8 
 app/test-crypto-perf/meson.build  |  2 +-
 app/test-pmd/meson.build  | 26 +-
 app/test/meson.build  | 12 ++--
 drivers/meson.build   |  3 ++-
 examples/ethtool/meson.build  |  2 +-
 examples/l2fwd-crypto/meson.build |  2 +-
 examples/l3fwd/meson.build|  2 +-
 examples/meson.build  |  3 ++-
 examples/vm_power_manager/meson.build |  6 +++---
 lib/meson.build   |  3 ++-
 13 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/app/meson.build b/app/meson.build
index 5b2c80c7a1..1c61cd862c 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -65,6 +65,7 @@ foreach app:apps
 # external package/library requirements
 ext_deps = []
 deps = []
+optional_deps = []
 
 if not enable_apps.contains(app)
 build = false
@@ -84,7 +85,7 @@ foreach app:apps
 
 if build
 dep_objs = []
-foreach d:deps
+foreach d:deps + optional_deps
 var_name = get_option('default_library') + '_rte_' + d
 if not is_variable(var_name)
 build = false
diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build
index 4f83f29a64..156592119b 100644
--- a/app/proc-info/meson.build
+++ b/app/proc-info/meson.build
@@ -10,5 +10,5 @@ endif
 sources = files('main.c')
 deps += ['ethdev', 'security', 'eventdev']
 if dpdk_conf.has('RTE_LIB_METRICS')
-deps += 'metrics'
+optional_deps += 'metrics'
 endif
diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 926e0a5271..c26e46a987 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -15,14 +15,14 @@ sources = files(
 )
 deps += ['bbdev', 'bus_vdev']
 if dpdk_conf.has('RTE_BASEBAND_FPGA_LTE_FEC')
-deps += ['baseband_fpga_lte_fec']
+optional_deps += ['baseband_fpga_lte_fec']
 endif
 if dpdk_conf.has('RTE_BASEBAND_FPGA_5GNR_FEC')
-deps += ['baseband_fpga_5gnr_fec']
+optional_deps += ['baseband_fpga_5gnr_fec']
 endif
 if dpdk_conf.has('RTE_BASEBAND_ACC')
-deps += ['baseband_acc']
+optional_deps += ['baseband_acc']
 endif
 if dpdk_conf.has('RTE_BASEBAND_LA12XX')
-deps += ['baseband_la12xx']
+optional_deps += ['baseband_la12xx']
 endif
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 7b02b518f0..05c71e0a0c 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -21,5 +21,5 @@ sources = files(
 )
 deps += ['cryptodev', 'net', 'security']
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-deps += 'crypto_scheduler'
+optional_deps += 'crypto_scheduler'
 endif
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 719f875be0..5559829e09 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -36,44 +36,44 @@ endif
 
 deps += ['ethdev', 'cmdline']
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-deps += 'crypto_scheduler'
+optional_deps += 'crypto_scheduler'
 endif
 if dpdk_conf.has('RTE_LIB_BITRATESTATS')
-deps += 'bitratestats'
+optional_deps += 'bitratestats'
 endif
 if dpdk_conf.has('RTE_LIB_BPF')
 sources += files('bpf_cmd.c')
-deps += 'bpf'
+optional_deps += 'bpf'
 endif
 if dpdk_conf.has('RTE_LIB_GRO')
-deps += 'gro'
+optional_deps += 'gro'
 endif
 if dpdk_conf.has('RTE_LIB_GSO')
-deps += 'gso'
+optional_deps += 'gso'
 endif
 if dpdk_conf.has('RTE_LIB_LATENCYSTATS')
-deps += 'latencystats'
+optional_deps += 'latencystats'
 endif
 if dpdk_conf.has('RTE_LIB_METRICS')
-deps += 'metrics'
+optional_deps += 'metrics'
 endif
 if dpdk_conf.has('RTE_LIB_PDUMP')
-deps += 'pdump'
+optional_deps += 'pdump'
 endif
 if dpdk_conf.has('RTE_NET_BNXT')
-deps += 'net_bnxt'
+optional_deps += 'net_bnxt'
 endif
 if dpdk_conf.has('RTE_NET_I40E')
-deps += 'net_i40e'
+optional_deps += 'net_i40e'
 endif
 if dpdk_conf.has('RTE_NET_IXGBE')
-deps += 'net_ixgbe'
+optional_deps += 'net_ixgbe'
 endif
 if dpdk_conf.has('RTE_NET_DPAA')
-deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
+optional_deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
 endif
 
 # Driver-specific commands are located in driver directories.
 includes = include_directories('.')
 sources += testpmd_drivers_sources
-deps += testpmd_drivers_deps
+optional_deps += testpmd_drivers_deps
diff --git a/app/test/meson.build b/app/test/meson.build
index e29258e6ec..bb0a38b3a5 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -7,7 +7,7 @@ sources += files('commands.c', 'test.c')
 
 # option

[PATCH v3 4/8] build: remove kvargs from driver class dependencies

From: Bruce Richardson 

The kvargs library is used by EAL, and therefore is implicitly a
dependency of every DPDK driver. Remove it from the minimum set of
dependencies for each driver class as it's unnecessary to call it out
there.

Signed-off-by: Bruce Richardson 
---
 drivers/event/meson.build | 2 +-
 drivers/net/meson.build   | 2 +-
 drivers/regex/meson.build | 2 +-
 drivers/vdpa/meson.build  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/event/meson.build b/drivers/event/meson.build
index d6706b57f7..2708833adf 100644
--- a/drivers/event/meson.build
+++ b/drivers/event/meson.build
@@ -19,4 +19,4 @@ if not (toolchain == 'gcc' and 
cc.version().version_compare('<4.8.6') and
 dpdk_conf.has('RTE_ARCH_ARM64'))
 drivers += 'octeontx'
 endif
-std_deps = ['eventdev', 'kvargs']
+std_deps = ['eventdev']
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index fb6d34b782..ebd12364df 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -63,6 +63,6 @@ drivers = [
 'virtio',
 'vmxnet3',
 ]
-std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
+std_deps = ['ethdev']   # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std
 std_deps += ['bus_vdev']# same with vdev bus
diff --git a/drivers/regex/meson.build b/drivers/regex/meson.build
index ff2a8fea89..10192e7c77 100644
--- a/drivers/regex/meson.build
+++ b/drivers/regex/meson.build
@@ -5,4 +5,4 @@ drivers = [
 'mlx5',
 'cn9k',
 ]
-std_deps = ['ethdev', 'kvargs', 'regexdev'] # 'ethdev' also pulls in mbuf, 
net, eal etc
+std_deps = ['ethdev', 'regexdev'] # 'ethdev' also pulls in mbuf, net, eal etc
diff --git a/drivers/vdpa/meson.build b/drivers/vdpa/meson.build
index 896e8e0304..e01c277b9e 100644
--- a/drivers/vdpa/meson.build
+++ b/drivers/vdpa/meson.build
@@ -11,5 +11,5 @@ drivers = [
 'nfp',
 'sfc',
 ]
-std_deps = ['bus_pci', 'kvargs']
+std_deps = ['bus_pci']
 std_deps += ['vhost']
-- 
2.43.5

[PATCH v3 5/8] build: reduce library dependencies

From: Bruce Richardson 

Rather than having each library depend up on EAL + any extra libs, we
can take advantage of recursive dependency support in meson and
just assign the dependencies of each directory directly, rather than
appending to the array. For libraries which only depend upon EAL, keep
that as a default, but for libraries which depend upon even a single
extra lib, that EAL dependency is unnecessary.

Going further, we can identify using the find_duplicate_deps.py script
any unnecessary deps in each library's list, and remove them to slim the
dependency tree down.

Reducing number of dependencies means that meson
takes less time processing and deduplicating the dependency tree for
each component, and also shrinks the dependency graph for DPDK itself.

Signed-off-by: Bruce Richardson 
---
 lib/argparse/meson.build | 2 +-
 lib/bbdev/meson.build| 2 +-
 lib/bitratestats/meson.build | 2 +-
 lib/bpf/meson.build  | 2 +-
 lib/cmdline/meson.build  | 2 +-
 lib/compressdev/meson.build  | 2 +-
 lib/cryptodev/meson.build| 2 +-
 lib/dispatcher/meson.build   | 2 +-
 lib/distributor/meson.build  | 2 +-
 lib/dmadev/meson.build   | 2 --
 lib/eal/meson.build  | 5 +
 lib/efd/meson.build  | 2 +-
 lib/ethdev/meson.build   | 2 +-
 lib/eventdev/meson.build | 3 +--
 lib/fib/meson.build  | 2 +-
 lib/gpudev/meson.build   | 2 +-
 lib/graph/meson.build| 2 +-
 lib/gro/meson.build  | 2 +-
 lib/gso/meson.build  | 2 +-
 lib/hash/meson.build | 4 +---
 lib/ip_frag/meson.build  | 2 +-
 lib/ipsec/meson.build| 2 +-
 lib/kvargs/meson.build   | 2 +-
 lib/latencystats/meson.build | 2 +-
 lib/lpm/meson.build  | 3 +--
 lib/mbuf/meson.build | 2 +-
 lib/member/meson.build   | 2 +-
 lib/mempool/meson.build  | 2 +-
 lib/metrics/meson.build  | 2 +-
 lib/mldev/meson.build| 2 +-
 lib/net/meson.build  | 2 +-
 lib/node/meson.build | 2 +-
 lib/pcapng/meson.build   | 2 +-
 lib/pdcp/meson.build | 2 +-
 lib/pdump/meson.build| 2 +-
 lib/pipeline/meson.build | 2 +-
 lib/port/meson.build | 2 +-
 lib/power/meson.build| 2 +-
 lib/rawdev/meson.build   | 2 --
 lib/rcu/meson.build  | 2 +-
 lib/regexdev/meson.build | 2 +-
 lib/reorder/meson.build  | 2 +-
 lib/rib/meson.build  | 2 +-
 lib/ring/meson.build | 1 -
 lib/sched/meson.build| 2 +-
 lib/security/meson.build | 2 +-
 lib/table/meson.build| 2 +-
 lib/telemetry/meson.build| 2 +-
 lib/vhost/meson.build| 2 +-
 49 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/lib/argparse/meson.build b/lib/argparse/meson.build
index 8ab4c408ee..5d602c1f2a 100644
--- a/lib/argparse/meson.build
+++ b/lib/argparse/meson.build
@@ -10,4 +10,4 @@ endif
 sources = files('rte_argparse.c')
 headers = files('rte_argparse.h')
 
-deps += ['log']
+deps = ['log']
diff --git a/lib/bbdev/meson.build b/lib/bbdev/meson.build
index 07685e7578..2e68aa7873 100644
--- a/lib/bbdev/meson.build
+++ b/lib/bbdev/meson.build
@@ -11,4 +11,4 @@ sources = files('rte_bbdev.c')
 headers = files('rte_bbdev.h',
 'rte_bbdev_pmd.h',
 'rte_bbdev_op.h')
-deps += ['mbuf']
+deps = ['mbuf']
diff --git a/lib/bitratestats/meson.build b/lib/bitratestats/meson.build
index ede7e0a579..8defcd53bf 100644
--- a/lib/bitratestats/meson.build
+++ b/lib/bitratestats/meson.build
@@ -3,4 +3,4 @@
 
 sources = files('rte_bitrate.c')
 headers = files('rte_bitrate.h')
-deps += ['ethdev', 'metrics']
+deps = ['metrics']
diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build
index aa258a9061..82127bc657 100644
--- a/lib/bpf/meson.build
+++ b/lib/bpf/meson.build
@@ -31,7 +31,7 @@ headers = files('bpf_def.h',
 'rte_bpf.h',
 'rte_bpf_ethdev.h')
 
-deps += ['mbuf', 'net', 'ethdev']
+deps = ['ethdev']
 
 dep = dependency('libelf', required: false, method: 'pkg-config')
 if dep.found()
diff --git a/lib/cmdline/meson.build b/lib/cmdline/meson.build
index 63fb69100d..4451f3da29 100644
--- a/lib/cmdline/meson.build
+++ b/lib/cmdline/meson.build
@@ -31,4 +31,4 @@ else
 sources += files('cmdline_os_unix.c')
 endif
 
-deps += ['net']
+deps = ['net']
diff --git a/lib/compressdev/meson.build b/lib/compressdev/meson.build
index c80295dc0d..4b86955baf 100644
--- a/lib/compressdev/meson.build
+++ b/lib/compressdev/meson.build
@@ -16,4 +16,4 @@ driver_sdk_headers = files(
 'rte_compressdev_pmd.h',
 'rte_compressdev_internal.h',
 )
-deps += ['kvargs', 'mbuf']
+deps = ['mbuf']
diff --git a/lib/cryptodev/meson.build b/lib/cryptodev/meson.build
index 4734acf321..74e42ac700 100644
--- a/lib/cryptodev/meson.build
+++ b/lib/cryptodev/meson.build
@@ -20,4 +20,4 @@ driver_sdk_headers += files(
 'cryptodev_pmd.h',
 )
 
-deps += ['kvargs', 'mbuf', 'rcu', 'telemetry']
+deps = ['mbuf', 'rcu']
diff --git a/lib/dispatcher/meson.build b/lib/dispatcher/meson.build
ind

[PATCH v3 7/8] build: reduce app dependencies

From: Bruce Richardson 

Remove any unnecessary dependencies from the app dependency lists.
This will give each app a near-minimum set of required dependencies.

Signed-off-by: Bruce Richardson 
---
 app/dumpcap/meson.build  | 2 +-
 app/graph/meson.build| 2 +-
 app/pdump/meson.build| 2 +-
 app/proc-info/meson.build| 2 +-
 app/test-crypto-perf/meson.build | 2 +-
 app/test-fib/meson.build | 2 +-
 app/test-sad/meson.build | 2 +-
 app/test/meson.build | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/dumpcap/meson.build b/app/dumpcap/meson.build
index 69c016c780..6204cf051a 100644
--- a/app/dumpcap/meson.build
+++ b/app/dumpcap/meson.build
@@ -14,4 +14,4 @@ endif
 
 ext_deps += pcap_dep
 sources = files('main.c')
-deps += ['ethdev', 'pdump', 'pcapng', 'bpf']
+deps += ['pdump']
diff --git a/app/graph/meson.build b/app/graph/meson.build
index 6dc54d5ee6..9c4cd080d9 100644
--- a/app/graph/meson.build
+++ b/app/graph/meson.build
@@ -9,7 +9,7 @@ if not build
 subdir_done()
 endif
 
-deps += ['graph', 'eal', 'lpm', 'ethdev', 'node', 'cmdline']
+deps += ['node', 'cmdline']
 sources = files(
 'cli.c',
 'conn.c',
diff --git a/app/pdump/meson.build b/app/pdump/meson.build
index fb282bba1f..a10f9d6124 100644
--- a/app/pdump/meson.build
+++ b/app/pdump/meson.build
@@ -8,4 +8,4 @@ if is_windows
 endif
 
 sources = files('main.c')
-deps += ['ethdev', 'kvargs', 'pdump']
+deps += ['pdump']
diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build
index 156592119b..24b75b9ace 100644
--- a/app/proc-info/meson.build
+++ b/app/proc-info/meson.build
@@ -8,7 +8,7 @@ if is_windows
 endif
 
 sources = files('main.c')
-deps += ['ethdev', 'security', 'eventdev']
+deps += ['security', 'eventdev']
 if dpdk_conf.has('RTE_LIB_METRICS')
 optional_deps += 'metrics'
 endif
diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build
index 05c71e0a0c..8904f8607d 100644
--- a/app/test-crypto-perf/meson.build
+++ b/app/test-crypto-perf/meson.build
@@ -19,7 +19,7 @@ sources = files(
 'cperf_test_verify.c',
 'main.c',
 )
-deps += ['cryptodev', 'net', 'security']
+deps += ['cryptodev']
 if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
 optional_deps += 'crypto_scheduler'
 endif
diff --git a/app/test-fib/meson.build b/app/test-fib/meson.build
index eb36772cf3..25e2ea1a1d 100644
--- a/app/test-fib/meson.build
+++ b/app/test-fib/meson.build
@@ -8,4 +8,4 @@ if is_windows
 endif
 
 sources = files('main.c')
-deps += ['fib', 'lpm', 'net']
+deps += ['fib', 'lpm']
diff --git a/app/test-sad/meson.build b/app/test-sad/meson.build
index a50616a9c7..414e2a05cb 100644
--- a/app/test-sad/meson.build
+++ b/app/test-sad/meson.build
@@ -8,4 +8,4 @@ if is_windows
 endif
 
 sources = files('main.c')
-deps += ['ipsec', 'net']
+deps += ['ipsec']
diff --git a/app/test/meson.build b/app/test/meson.build
index bb0a38b3a5..f0a8e58218 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017-2023 Intel Corporation
 
 # the main test files [test.c and commands.c] relies on these libraries
-deps += ['cmdline', 'ring', 'mempool', 'mbuf']
+deps += ['cmdline']
 sources += files('commands.c', 'test.c')
 
 # optional dependencies: some files may use these - and so we should link them 
in -
-- 
2.43.5

[PATCH v1 0/1] Add DPDK build directory configuration script

Note: this patch depends upon Bruce's v3 patchset:

https://patches.dpdk.org/project/dpdk/list/?series=32891

This patch is based on initial script for VSCode configuration:

https://patches.dpdk.org/project/dpdk/patch/6a6b20c037cffcc5f68a341c4b4e4f21990ae991.1721997016.git.anatoly.bura...@intel.com/

This is basically a TUI frontend for Meson. It is by no means meant to be used
as
a replacement for using Meson proper, it is merely a shortcut for those who
constantly
deal with creating new Meson build directories but doesn't want to type out all
components
each time.

It relies on dependency graphs from the above Bruce's patchset (v3 introduced
support
for optional dependencies, which this script requires) to work. It'll create a
Meson build
directory in the background, enabling all options, and then using both
dependency graph and
meson introspection to figure out what can be built, and what dependencies it
has.

With this script it is possible to produce very minimal builds - the script is
not only able
to track dependencies between components to enable them, but it can also (with
a command line
switch) specify which libraries we want to enable (omitting those not required
by currently
selected components). This can be useful for users who frequently reconfigure
their tree with
e.g. debug/release, shared/static etc. builds while keeping the reconfiguration
time fairly
small.

We used to have a "setup.sh" script to "set up" DPDK. This is not that, but
it's a good start.

Anatoly Burakov (1):
usertools: add DPDK build directory setup script

usertools/dpdk-setup.py | 669
1 file changed, 669 insertions(+)
create mode 100755 usertools/dpdk-setup.py

--
2.43.5

[PATCH v1 1/1] usertools: add DPDK build directory setup script

Currently, the only way to set up a build directory for DPDK development
is through running Meson directly. This has a number of drawbacks.

For one, the default configuration is very "fat", meaning everything gets
enabled and built (aside from examples, which have to be enabled
manually), so while Meson is very good at minimizing work needed to rebuild
DPDK, for any change that affects a lot of components (such as editing an
EAL header), there's a lot of rebuilding to do.

It is of course possible to reduce the number of components built through
meson options, but this mechanism isn't perfect, as the user needs to
remember exact spelling of all the options and components, and currently
it doesn't handle inter-component dependencies very well (e.g. if net/ice
is enabled, common/iavf is not automatically enabled, so net/ice can't be
built unless user also doesn't forget to specify common/iavf).

Enter this script. It relies on Meson's introspection capabilities as well
as the dependency graphs generated by our build system to display all
available components, and handle any dependencies for them automatically,
while also not forcing user to remember any command-line options and lists
of drivers, and instead relying on interactive TUI to display list of
available options. It can also produce builds that are as minimal as
possible (including cutting down libraries being built) by utilizing the
fact that our dependency graphs report which dependency is mandatory and
which one is optional.

Because it is not meant to replace native Meson build configuration but
is rather targeted at users who are not intimately familiar wtih DPDK's
build system, it is run in interactive mode by default. However, it is
also possible to run it without interaction, in which case it will pass
all its parameters to Meson directly, with added benefit of dependency
tracking and producing minimal builds if desired.

Signed-off-by: Anatoly Burakov 
---
 usertools/dpdk-setup.py | 669 
 1 file changed, 669 insertions(+)
 create mode 100755 usertools/dpdk-setup.py

diff --git a/usertools/dpdk-setup.py b/usertools/dpdk-setup.py
new file mode 100755
index 00..a1ac247e4c
--- /dev/null
+++ b/usertools/dpdk-setup.py
@@ -0,0 +1,669 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 Intel Corporation
+
+"""
+Displays an interactive TUI-based menu for configuring a DPDK build directory.
+"""
+
+# This is an interactive script that allows the user to configure a DPDK build 
directory using a
+# text-based user interface (TUI). The script will prompt the user to select 
various configuration
+# options, and will then call `meson setup` to configure the build directory 
with the selected
+# options.
+#
+# To be more user-friendly, the script will also run `meson setup` into a 
temporary directory in
+# the background, which will generate both the list of available options, and 
any dependencies
+# between them, so whenever the user selects an option, we automatically 
enable its dependencies.
+# This will also allow us to use meson introspection to get list of things we 
are capable of
+# building, and warn the user if they selected something that can't be built.
+
+import argparse
+import collections
+import fnmatch
+import json
+import os
+import subprocess
+import sys
+import textwrap
+import typing as T
+from tempfile import TemporaryDirectory
+
+
+# cut off dpdk- prefix
+def _rename_app(app: str) -> str:
+return app[5:]
+
+
+# replace underscore with slash
+def _rename_driver(driver: str) -> str:
+return driver.replace("_", "/", 1)
+
+
+def wrap_text(message: str, cols: int) -> T.Tuple[int, int, str]:
+"""Wrap text to N columns and calculate resulting dimensions."""
+wrapped_lines = textwrap.wrap(message.strip(), cols)
+h = len(wrapped_lines)
+w = max(len(line) for line in wrapped_lines)
+return h, w, "\n".join(wrapped_lines)
+
+
+def calc_opt_width(option: T.Any) -> int:
+"""Calculate the width of an option."""
+if isinstance(option, str):
+return len(option)
+return sum(calc_opt_width(opt) for opt in option) + len(option)  # padding
+
+
+def calc_list_width(options: T.List[T.Any], checkbox: bool) -> int:
+"""Calculate the width of a list."""
+pad = 5
+# add 4 for the checkbox
+if checkbox:
+pad += 4
+return max(calc_opt_width(opt) for opt in options) + pad
+
+
+def whiptail_msgbox(message: str) -> None:
+"""Display a message box."""
+# set max width to 60
+h, w, message = wrap_text(message, 60)
+# add some padding
+w += 10
+h += 6
+args = ["whiptail", "--msgbox", message, str(h), str(w)]
+subprocess.run(args, check=True)
+
+
+def whiptail_checklist(
+title: str, prompt: str, options: T.List[T.Tuple[str, str]], checked: 
T.List[str]
+) -> T.List[str]:
+"""Display a checklist and get user input."""
+# at least two free spaces, but no more tha

[PATCH v1 1/1] dts: add send_packets to test suites and rework packet addressing

From: Jeremy Spewock 

Currently the only method provided in the test suite class for sending
packets sends a single packet and then captures the results. There is,
in some cases, a need to send multiple packets at once while not really
needing to capture any traffic received back. The method to do this
exists in the traffic generator already, but this patch exposes the
method to test suites.

This patch also updates the _adjust_addresses method of test suites so
that addresses of packets are only modified if the developer did not
configure them beforehand. This allows for developers to have more
control over the content of their packets when sending them through the
framework.

Signed-off-by: Jeremy Spewock 
---
 dts/framework/test_suite.py| 87 +++---
 dts/framework/testbed_model/tg_node.py |  9 +++
 2 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py
index 694b2eba65..11aaa0a93a 100644
--- a/dts/framework/test_suite.py
+++ b/dts/framework/test_suite.py
@@ -199,7 +199,7 @@ def send_packet_and_capture(
 Returns:
 A list of received packets.
 """
-packet = self._adjust_addresses(packet)
+packet = self._adjust_addresses([packet])[0]
 return self.tg_node.send_packet_and_capture(
 packet,
 self._tg_port_egress,
@@ -208,6 +208,18 @@ def send_packet_and_capture(
 duration,
 )
 
+def send_packets(
+self,
+packets: list[Packet],
+) -> None:
+"""Send packets using the traffic generator and do not capture 
received traffic.
+
+Args:
+packets: Packets to send.
+"""
+packets = self._adjust_addresses(packets)
+self.tg_node.send_packets(packets, self._tg_port_egress)
+
 def get_expected_packet(self, packet: Packet) -> Packet:
 """Inject the proper L2/L3 addresses into `packet`.
 
@@ -217,41 +229,74 @@ def get_expected_packet(self, packet: Packet) -> Packet:
 Returns:
 `packet` with injected L2/L3 addresses.
 """
-return self._adjust_addresses(packet, expected=True)
+return self._adjust_addresses([packet], expected=True)[0]
 
-def _adjust_addresses(self, packet: Packet, expected: bool = False) -> 
Packet:
+def _adjust_addresses(self, packets: list[Packet], expected: bool = False) 
-> list[Packet]:
 """L2 and L3 address additions in both directions.
 
+Packets in `packets` will be directly modified in this method. The 
returned list of packets
+however will be copies of the modified packets in order to keep the 
two lists distinct.
+
+Only missing addresses are added to packets, existing addresses will 
not be overridden. If
+any packet in `packets` has multiple IP layers (using GRE, for 
example) only the inner-most
+IP layer will have its addresses adjusted.
+
 Assumptions:
 Two links between SUT and TG, one link is TG -> SUT, the other SUT 
-> TG.
 
 Args:
-packet: The packet to modify.
+packets: The packets to modify.
 expected: If :data:`True`, the direction is SUT -> TG,
 otherwise the direction is TG -> SUT.
+
+Returns:
+A list containing copies of all packets in `packets` after 
modification.
 """
-if expected:
-# The packet enters the TG from SUT
-# update l2 addresses
-packet.src = self._sut_port_egress.mac_address
-packet.dst = self._tg_port_ingress.mac_address
+ret_packets = []
+for packet in packets:
+# The fields parameter of a packet does not include fields of the 
payload, so this can
+# only be the Ether src/dst.
+pkt_src_is_unset = "src" not in packet.fields
+pkt_dst_is_unset = "dst" not in packet.fields
+num_ip_layers = packet.layers().count(IP)
+
+# Update the last IP layer if there are multiple to account for 
GRE addressing (the
+# framework should be modifying the packet address instead of the 
tunnel).
+l3_to_use = packet.getlayer(IP, num_ip_layers)
+if num_ip_layers > 0:
+ip_src_is_unset = "src" not in l3_to_use.fields
+ip_dst_is_unset = "dst" not in l3_to_use.fields
+else:
+ip_src_is_unset = None
+ip_dst_is_unset = None
 
-# The packet is routed from TG egress to TG ingress
-# update l3 addresses
-packet.payload.src = self._tg_ip_address_egress.ip.exploded
-packet.payload.dst = self._tg_ip_address_ingress.ip.exploded
-else:
-# The packet leaves TG towards SUT
 # update l2 addresses
-packet.src = self._tg_port_egress.mac_address
-packet.dst = self._sut_port_i

[PATCH v1 0/1] dts: adjust packet addressing and sending

From: Jeremy Spewock 

This patch was originally part of the dynamic queue test suite series,
but since other patches require it this series creates an independent
patch to allow it to be prioritized.

This patch is slightly different than the one in dynamic queue as this
version supports address updating on packets with multiple IP layers by
modifying the method of checking whether or not the developer updated
the addresses.

Jeremy Spewock (1):
  dts: add send_packets to test suites and rework packet addressing

 dts/framework/test_suite.py| 87 +++---
 dts/framework/testbed_model/tg_node.py |  9 +++
 2 files changed, 75 insertions(+), 21 deletions(-)

-- 
2.46.0

[PATCH] doc: update TAP device features

The TAP device does have per-queue stats and handles multi-process.

Signed-off-by: Stephen Hemminger 
---
 doc/guides/nics/features/tap.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/guides/nics/features/tap.ini b/doc/guides/nics/features/tap.ini
index f26355e57f..f2ea5cd833 100644
--- a/doc/guides/nics/features/tap.ini
+++ b/doc/guides/nics/features/tap.ini
@@ -14,10 +14,12 @@ Basic stats  = Y
 L3 checksum offload  = Y
 L4 checksum offload  = Y
 MTU update   = Y
+Multiprocess aware   = Y
 Multicast MAC filter = Y
 Unicast MAC filter   = Y
 Packet type parsing  = Y
 Flow control = Y
+Stats per queue  = Y
 Linux= Y
 ARMv7= Y
 ARMv8= Y
-- 
2.45.2

[PATCH v4 1/2] dts: add port queue modification and forwarding stats to testpmd

From: Jeremy Spewock 

This patch adds methods for querying and modifying port queue state and
configuration. In addition to this, it also adds the ability to capture
the forwarding statistics that get outputted when you send the "stop"
command in testpmd. Querying of port queue information is handled
through a TextParser dataclass in case there is future need for using
more of the output from the command used to query the information.

Signed-off-by: Jeremy Spewock 
---
 dts/framework/remote_session/testpmd_shell.py | 233 +-
 1 file changed, 231 insertions(+), 2 deletions(-)

diff --git a/dts/framework/remote_session/testpmd_shell.py 
b/dts/framework/remote_session/testpmd_shell.py
index 43e9f56517..b545040638 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -19,7 +19,7 @@
 from dataclasses import dataclass, field
 from enum import Flag, auto
 from pathlib import PurePath
-from typing import ClassVar
+from typing import ClassVar, cast
 
 from typing_extensions import Self, Unpack
 
@@ -541,6 +541,56 @@ class TestPmdPort(TextParser):
 )
 
 
+@dataclass
+class TestPmdPortQueue(TextParser):
+"""Dataclass representation of the common parts of the testpmd `show 
rxq/txq info` commands."""
+
+#:
+prefetch_threshold: int = field(metadata=TextParser.find_int(r"prefetch 
threshold: (\d+)"))
+#:
+host_threshold: int = field(metadata=TextParser.find_int(r"host threshold: 
(\d+)"))
+#:
+writeback_threshold: int = field(metadata=TextParser.find_int(r"writeback 
threshold: (\d+)"))
+#:
+free_threshold: int = field(metadata=TextParser.find_int(r"free threshold: 
(\d+)"))
+#:
+deferred_start: bool = field(metadata=TextParser.find("deferred start: 
on"))
+#: The number of RXD/TXDs is just the ring size of the queue.
+ring_size: int = field(metadata=TextParser.find_int(r"Number of 
(?:RXDs|TXDs): (\d+)"))
+#:
+is_queue_started: bool = field(metadata=TextParser.find("queue state: 
started"))
+#:
+burst_mode: str | None = field(
+default=None, metadata=TextParser.find(r"Burst mode: ([^\r\n]+)")
+)
+
+
+@dataclass
+class TestPmdTxPortQueue(TestPmdPortQueue):
+"""Dataclass representation for testpmd `show txq info` command."""
+
+#:
+rs_threshold: int | None = field(
+default=None, metadata=TextParser.find_int(r"RS threshold: (\d+)")
+)
+
+
+@dataclass
+class TestPmdRxPortQueue(TestPmdPortQueue):
+"""Dataclass representation for testpmd `show rxq info` command."""
+
+#:
+mempool: str | None = field(default=None, 
metadata=TextParser.find(r"Mempool: ([^\r\n]+)"))
+#:
+can_drop_packets: bool | None = field(
+default=None, metadata=TextParser.find(r"drop packets: on")
+)
+#:
+is_scattering_packets: bool | None = field(
+default=None, metadata=TextParser.find(r"scattered packets: on")
+)
+
+
 @dataclass
 class TestPmdPortStats(TextParser):
 """Port statistics."""
@@ -645,7 +695,7 @@ def start(self, verify: bool = True) -> None:
 "Not all ports came up after starting packet 
forwarding in testpmd."
 )
 
-def stop(self, verify: bool = True) -> None:
+def stop(self, verify: bool = True) -> str:
 """Stop packet forwarding.
 
 Args:
@@ -653,6 +703,9 @@ def stop(self, verify: bool = True) -> None:
 forwarding was stopped successfully or not started. If neither 
is found, it is
 considered an error.
 
+Returns:
+Output gathered from sending the stop command.
+
 Raises:
 InteractiveCommandExecutionError: If `verify` is :data:`True` and 
the command to stop
 forwarding results in an error.
@@ -665,6 +718,7 @@ def stop(self, verify: bool = True) -> None:
 ):
 self._logger.debug(f"Failed to stop packet forwarding: 
\n{stop_cmd_output}")
 raise InteractiveCommandExecutionError("Testpmd failed to stop 
packet forwarding.")
+return stop_cmd_output
 
 def get_devices(self) -> list[TestPmdDevice]:
 """Get a list of device names that are known to testpmd.
@@ -806,6 +860,181 @@ def show_port_stats(self, port_id: int) -> 
TestPmdPortStats:
 
 return TestPmdPortStats.parse(output)
 
+def show_port_queue_info(
+self, port_id: int, queue_id: int, is_rx_queue: bool
+) -> TestPmdPortQueue:
+"""Get the info for a queue on a given port.
+
+Args:
+port_id: ID of the port where the queue resides.
+queue_id: ID of the queue to query.
+is_rx_queue: Whether to check an RX or TX queue. If :data:`True` 
an RX queue will be
+queried, otherwise a TX queue will be queried.
+
+Raises:
+InteractiveCommandExecutionError: If there is a failure when 
getting the info for the
+queue.
+
+

[PATCH v4 0/2] dts: add dynamic queue configuration test suite

From: Jeremy Spewock 

v4:
 * split patch for updating packet addressing into its own series and
   added a dependency in this one.
 * squash commit for adding test suite to the yaml schema into the last
   commit.

Jeremy Spewock (2):
  dts: add port queue modification and forwarding stats to testpmd
  dts: add dynamic queue test suite

 dts/framework/config/conf_yaml_schema.json|   3 +-
 dts/framework/remote_session/testpmd_shell.py | 233 +-
 dts/tests/TestSuite_dynamic_queue_conf.py | 286 ++
 3 files changed, 519 insertions(+), 3 deletions(-)
 create mode 100644 dts/tests/TestSuite_dynamic_queue_conf.py

-- 
2.46.0

[PATCH v4 2/2] dts: add dynamic queue test suite

From: Jeremy Spewock 

This patch adds a new test suite that is designed to test the stopping
and modification of port queues at runtime. Specifically, there are
test cases that display the ports ability to stop some queues but still
send and receive traffic on others, as well as the ability to configure
the ring size of the queue without blocking the traffic on other queues.

Depends-on: patch-143594 ("dts: add send_packets to test suites and
rework packet addressing")

Signed-off-by: Jeremy Spewock 
---
 dts/framework/config/conf_yaml_schema.json |   3 +-
 dts/tests/TestSuite_dynamic_queue_conf.py  | 286 +
 2 files changed, 288 insertions(+), 1 deletion(-)
 create mode 100644 dts/tests/TestSuite_dynamic_queue_conf.py

diff --git a/dts/framework/config/conf_yaml_schema.json 
b/dts/framework/config/conf_yaml_schema.json
index f02a310bb5..d83a2f51c5 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -187,7 +187,8 @@
   "enum": [
 "hello_world",
 "os_udp",
-"pmd_buffer_scatter"
+"pmd_buffer_scatter",
+"dynamic_queue_conf"
   ]
 },
 "test_target": {
diff --git a/dts/tests/TestSuite_dynamic_queue_conf.py 
b/dts/tests/TestSuite_dynamic_queue_conf.py
new file mode 100644
index 00..f5c667cdeb
--- /dev/null
+++ b/dts/tests/TestSuite_dynamic_queue_conf.py
@@ -0,0 +1,286 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+
+"""Dynamic configuration of port queues test suite.
+
+This test suite tests the support of being able to either stop or reconfigure 
port queues at
+runtime without stopping the entire device. Previously, to configure a DPDK 
ethdev, the application
+first specifies how many Tx and Rx queues to include in the ethdev and then 
application sets up
+each queue individually. Only once all the queues have been set up can the 
application then start
+the device, and at this point traffic can flow. If device stops, this halts 
the flow of traffic on
+all queues in the ethdev completely. Dynamic queue is a capability present on 
some NICs that
+specifies whether the NIC is able to delay the configuration of queues on its 
port. This capability
+allows for the support of stopping and reconfiguring queues on a port at 
runtime without stopping
+the entire device.
+
+Support of this capability is shown by starting the Poll Mode Driver with 
multiple Rx and Tx queues
+configured and stopping some prior to forwarding packets, then examining 
whether or not the stopped
+ports and the unmodified ports were able to handle traffic. In addition to 
just stopping the ports,
+the ports must also show that they support configuration changes on their 
queues at runtime without
+stopping the entire device. This is shown by changing the ring size of the 
queues.
+
+If the Poll Mode Driver is able to stop some queues on a port and modify them 
then handle traffic
+on the unmodified queues while the others are stopped, then it is the case 
that the device properly
+supports dynamic configuration of its queues.
+"""
+
+import random
+from typing import Callable, ClassVar, MutableSet
+
+from scapy.layers.inet import IP  # type: ignore[import-untyped]
+from scapy.layers.l2 import Ether  # type: ignore[import-untyped]
+from scapy.packet import Raw  # type: ignore[import-untyped]
+
+from framework.exception import InteractiveCommandExecutionError
+from framework.params.testpmd import PortTopology, SimpleForwardingModes
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.test_suite import TestSuite
+
+
+def setup_and_teardown_test(
+test_meth: Callable[
+["TestDynamicQueueConf", int, MutableSet, MutableSet, TestPmdShell, 
bool], None
+],
+) -> Callable[["TestDynamicQueueConf", bool], None]:
+"""Decorator that provides a setup and teardown for testing methods.
+
+This decorator provides a method that sets up the environment for testing, 
runs the test
+method, and then does a clean-up verification step after the queues are 
started again. The
+decorated method will be provided with all the variables it should need to 
run testing
+including: The ID of the port where the queues for testing reside, 
disjoint sets of IDs for
+queues that are/aren't modified, a testpmd session to run testing with, 
and a flag that
+indicates whether or not testing should be done on Rx or Tx queues.
+
+Args:
+test_meth: The decorated method that tests configuration of port 
queues at runtime.
+This method must have the following parameters in order: An int 
that represents a
+port ID, a set of queues for testing, a set of unmodified queues, 
a testpmd
+interactive shell, and a boolean that, when :data:`True`, does Rx 
testing,
+otherwise does Tx testing. This method must also be a member of the
+:class:`TestDynamicQueueConf` cl

Re: [PATCH] hash: separate param checks in hash create func

2024-09-04 Thread Medvedkin, Vladimir


Acked-by: Vladimir Medvedkin 

On 26/07/2024 15:54, Niall Meade wrote:

Separated name, entries and key_len parameter checks in
rte_hash_create().  Also made the error messages more
informative/verbose to help with debugging. Also added myself to the
mailing list.

Signed-off-by: Niall Meade 

---

I had name set to NULL in the parameters I was passing to
rte_hash_create() and the error message I got didn't specify which
parameter was invalid.
---
  .mailmap   |  1 +
  lib/hash/rte_cuckoo_hash.c | 22 ++
  2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 8aef1c59a4..e2a1d55203 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1054,6 +1054,7 @@ Nelson Escobar 
  Nemanja Marjanovic 
  Netanel Belgazal 
  Netanel Gonen 
+Niall Meade 
  Niall Power 
  Nicholas Pratte 
  Nick Connolly  
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 577b5839d3..97d55ca23b 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -190,11 +190,18 @@ rte_hash_create(const struct rte_hash_parameters *params)
  
  	/* Check for valid parameters */

if ((params->entries > RTE_HASH_ENTRIES_MAX) ||
-   (params->entries < RTE_HASH_BUCKET_ENTRIES) ||
-   (params->name == NULL) ||
-   (params->key_len == 0)) {
+   (params->entries < RTE_HASH_BUCKET_ENTRIES)) {
rte_errno = EINVAL;
-   HASH_LOG(ERR, "%s has invalid parameters", __func__);
+   HASH_LOG(ERR, "%s has invalid parameters, entries must be "
+"in the range %d to %d inclusive", __func__,
+ RTE_HASH_BUCKET_ENTRIES, RTE_HASH_ENTRIES_MAX);
+   return NULL;
+   }
+
+   if (params->key_len == 0) {
+   rte_errno = EINVAL;
+   HASH_LOG(ERR, "%s has invalid parameters, key_len must be "
+"greater than 0", __func__);
return NULL;
}
  
@@ -204,6 +211,13 @@ rte_hash_create(const struct rte_hash_parameters *params)

return NULL;
}
  
+	if (params->name == NULL) {

+   rte_errno = EINVAL;
+   HASH_LOG(ERR, "%s has invalid parameters, name can't be NULL",
+   __func__);
+   return NULL;
+   }
+
/* Validate correct usage of extra options */
if ((params->extra_flag & RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY) &&
(params->extra_flag & RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF)) {


--
Regards,
Vladimir

[PATCH v5 0/2] Add link_speed lanes support

2024-09-04 Thread Damodharam Ammepalli

This patch series is a continuation of the patch set that supports configuring 
speed lanes.
https://patchwork.dpdk.org/project/dpdk/patch/20240708232351.491529-1-damodharam.ammepa...@broadcom.com/

The patchset consists
1) rtelib/testpmd changes (Addressing the comments). Earlier comments are 
available here, 
https://patchwork.dpdk.org/project/dpdk/list/?q=Add%20link_speed%20lanes%20support&archive=both&series=&submitter=&delegate=&state=*

2) Driver implementation of bnxt PMD.

v2->v3 Consolidating the testpmd and rtelib patches into a single patch as 
requested.
v3->v4 Addressed comments and fix help string and documentation.
v4->v5 Addressed comments given in v4 and also driver implementation of bnxt 
PMD.

Damodharam Ammepalli (2):
  ethdev: Add link_speed lanes support
  net/bnxt: code refactor for supporting speed lanes

 app/test-pmd/cmdline.c | 248 -
 app/test-pmd/config.c  |   4 +
 drivers/net/bnxt/bnxt.h|   3 +
 drivers/net/bnxt/bnxt_ethdev.c | 182 ++--
 drivers/net/bnxt/bnxt_hwrm.c   |  40 +-
 lib/ethdev/ethdev_driver.h |  91 
 lib/ethdev/rte_ethdev.c|  52 +++
 lib/ethdev/rte_ethdev.h|  95 +
 lib/ethdev/version.map |   5 +
 9 files changed, 700 insertions(+), 20 deletions(-)

-- 
2.43.5


-- 
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 v5 1/2] ethdev: Add link_speed lanes support

2024-09-04 Thread Damodharam Ammepalli

Update the eth_dev_ops structure with new function vectors
to get, get capabilities and set ethernet link speed lanes.
Update the testpmd to provide required config and information
display infrastructure.

The supporting ethernet controller driver will register callbacks
to avail link speed lanes config and get services. This lanes
configuration is applicable only when the nic is forced to fixed
speeds. In Autonegiation mode, the hardware automatically
negotiates the number of lanes.

These are the new commands.

testpmd> show port 0 speed_lanes capabilities

 Supported speeds Valid lanes
---
 10 Gbps  1
 25 Gbps  1
 40 Gbps  4
 50 Gbps  1 2
 100 Gbps 1 2 4
 200 Gbps 2 4
 400 Gbps 4 8
testpmd>

testpmd>
testpmd> port stop 0
testpmd> port config 0 speed_lanes 4
testpmd> port config 0 speed 20 duplex full
testpmd> port start 0
testpmd>
testpmd> show port info 0

* Infos for port 0  *
MAC address: 14:23:F2:C3:BA:D2
Device name: :b1:00.0
Driver name: net_bnxt
Firmware-version: 228.9.115.0
Connect to socket: 2
memory allocation on the socket: 2
Link status: up
Link speed: 200 Gbps
Active Lanes: 4
Link duplex: full-duplex
Autoneg status: Off

Signed-off-by: Damodharam Ammepalli 
---
 app/test-pmd/cmdline.c | 248 -
 app/test-pmd/config.c  |   4 +
 lib/ethdev/ethdev_driver.h |  91 ++
 lib/ethdev/rte_ethdev.c|  52 
 lib/ethdev/rte_ethdev.h|  95 ++
 lib/ethdev/version.map |   5 +
 6 files changed, 494 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b7759e38a8..643102032e 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -284,6 +284,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 
"dump_log_types\n"
"Dumps the log level for all the dpdk modules\n\n"
+
+   "show port (port_id) speed_lanes capabilities"
+   "   Show speed lanes capabilities of a port.\n\n"
);
}
 
@@ -823,6 +826,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"port config (port_id) txq (queue_id) affinity 
(value)\n"
"Map a Tx queue with an aggregated port "
"of the DPDK port\n\n"
+
+   "port config (port_id|all) speed_lanes (0|1|4|8)\n"
+   "Set number of lanes for all ports or port_id for a 
forced speed\n\n"
);
}
 
@@ -1560,6 +1566,244 @@ static cmdline_parse_inst_t cmd_config_speed_specific = 
{
},
 };
 
+static int
+parse_speed_lanes_cfg(portid_t pid, uint32_t lanes)
+{
+   int ret;
+
+   ret = rte_eth_speed_lanes_set(pid, lanes);
+   if (ret == -ENOTSUP) {
+   fprintf(stderr, "Function not implemented\n");
+   return -1;
+   } else if (ret < 0) {
+   fprintf(stderr, "Set speed lanes failed\n");
+   return -1;
+   }
+
+   return 0;
+}
+
+static void
+show_speed_lanes_capability(unsigned int num, struct rte_eth_speed_lanes_capa 
*speed_lanes_capa)
+{
+   unsigned int i;
+   uint32_t capa;
+
+   printf("\n%-15s %-10s", "Supported-speeds", "Valid-lanes");
+   printf("\n---\n");
+   for (i = 0; i < num; i++) {
+   printf("%-17s ",
+  rte_eth_link_speed_to_str(speed_lanes_capa[i].speed));
+   capa = speed_lanes_capa[i].capa;
+   int s = 0;
+
+   while (capa) {
+   if (capa & 0x1)
+   printf("%-2d ", s);
+   s++;
+   capa = capa >> 1;
+   }
+   printf("\n");
+   }
+}
+
+/* *** display speed lanes per port capabilities *** */
+struct cmd_show_speed_lanes_result {
+   cmdline_fixed_string_t cmd_show;
+   cmdline_fixed_string_t cmd_port;
+   cmdline_fixed_string_t cmd_keyword;
+   portid_t cmd_pid;
+};
+
+static void
+cmd_show_speed_lanes_parsed(void *parsed_result,
+   __rte_unused struct cmdline *cl,
+   __rte_unused void *data)
+{
+   struct cmd_show_speed_lanes_result *res = parsed_result;
+   struct rte_eth_speed_lanes_capa *speed_lanes_capa;
+   unsigned int num;
+   int ret;
+
+   if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
+   fprintf(stderr, "Invalid port id %u\n", res->cmd_pid);
+   return;
+   }
+
+   ret = rte_eth_speed_lanes_get_capability(res->cmd_pid, NULL, 0);
+   if (ret == -ENOTSUP) {
+   fprintf(stderr, "Function not implemented\n");
+   return;
+

[PATCH v5 2/2] net/bnxt: code refactor for supporting speed lanes

2024-09-04 Thread Damodharam Ammepalli

Broadcom Thor2 NICs support link mode settings where user
can configure fixed speed and associated supported number of
lanes. This patch does code-refactoring to address proposed
poll mode library design updates.

Signed-off-by: Damodharam Ammepalli 
---
 drivers/net/bnxt/bnxt.h|   3 +
 drivers/net/bnxt/bnxt_ethdev.c | 182 ++---
 drivers/net/bnxt/bnxt_hwrm.c   |  40 ++--
 3 files changed, 206 insertions(+), 19 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index aaa7ea00cc..667fc84eb2 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -328,6 +328,7 @@ struct bnxt_link_info {
uint16_tcfg_auto_link_speeds2_mask;
uint8_t active_lanes;
uint8_t option_flags;
+   uint16_tpmd_speed_lanes;
 };
 
 #define BNXT_COS_QUEUE_COUNT   8
@@ -1219,6 +1220,7 @@ extern int bnxt_logtype_driver;
 #define BNXT_LINK_SPEEDS_V2_VF(bp) (BNXT_VF((bp)) && 
((bp)->link_info->option_flags))
 #define BNXT_LINK_SPEEDS_V2(bp) (((bp)->link_info) && 
(((bp)->link_info->support_speeds_v2) || \
   
BNXT_LINK_SPEEDS_V2_VF((bp
+#define BNXT_MAX_SPEED_LANES 8
 extern const struct rte_flow_ops bnxt_ulp_rte_flow_ops;
 int32_t bnxt_ulp_port_init(struct bnxt *bp);
 void bnxt_ulp_port_deinit(struct bnxt *bp);
@@ -1244,4 +1246,5 @@ int bnxt_flow_meter_ops_get(struct rte_eth_dev *eth_dev, 
void *arg);
 struct bnxt_vnic_info *bnxt_get_default_vnic(struct bnxt *bp);
 struct tf *bnxt_get_tfp_session(struct bnxt *bp, enum bnxt_session_type type);
 uint64_t bnxt_eth_rss_support(struct bnxt *bp);
+uint16_t bnxt_parse_eth_link_speed_v2(struct bnxt *bp);
 #endif
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index e63febe782..9bd26c5149 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -122,6 +122,30 @@ static const char *const bnxt_dev_args[] = {
NULL
 };
 
+#define BNXT_SPEEDS_SUPP_SPEED_LANES (RTE_ETH_LINK_SPEED_10G | \
+ RTE_ETH_LINK_SPEED_25G | \
+ RTE_ETH_LINK_SPEED_40G | \
+ RTE_ETH_LINK_SPEED_50G | \
+ RTE_ETH_LINK_SPEED_100G | \
+ RTE_ETH_LINK_SPEED_200G | \
+ RTE_ETH_LINK_SPEED_400G)
+
+static const struct rte_eth_speed_lanes_capa speed_lanes_capa_tbl[] = {
+   { RTE_ETH_SPEED_NUM_10G, RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_1) },
+   { RTE_ETH_SPEED_NUM_25G, RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_1) },
+
+   { RTE_ETH_SPEED_NUM_40G, RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_4) },
+   { RTE_ETH_SPEED_NUM_50G, RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_1) |
+   RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_2) },
+   { RTE_ETH_SPEED_NUM_100G, RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_1) |
+   RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_2) |
+   RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_4) },
+   { RTE_ETH_SPEED_NUM_200G, RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_2) |
+   RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_4) },
+   { RTE_ETH_SPEED_NUM_400G, RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_4) |
+   RTE_ETH_SPEED_LANES_CAPA_MASK(LANE_8) },
+};
+
 /*
  * cqe-mode = an non-negative 8-bit number
  */
@@ -696,22 +720,50 @@ static inline bool bnxt_force_link_config(struct bnxt *bp)
}
 }
 
-static int bnxt_update_phy_setting(struct bnxt *bp)
+static int bnxt_validate_speed_lanes_change(struct bnxt *bp)
 {
struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
struct rte_eth_link *link = &bp->eth_dev->data->dev_link;
-   struct rte_eth_link new;
uint32_t curr_speed_bit;
int rc;
 
+   /* Check if speed x lanes combo is supported */
+   if (dev_conf->link_speeds)  {
+   rc = bnxt_parse_eth_link_speed_v2(bp);
+   if (rc == 0)
+   return -EINVAL;
+   }
+
+   /* convert to speedbit flag */
+   curr_speed_bit = rte_eth_speed_bitflag((uint32_t)link->link_speed, 1);
+
+   /* check if speed and lanes have changed */
+   if (dev_conf->link_speeds != curr_speed_bit ||
+   bp->link_info->active_lanes != bp->link_info->pmd_speed_lanes)
+   return 1;
+
+   return 0;
+}
+
+static int bnxt_update_phy_setting(struct bnxt *bp)
+{
+   struct rte_eth_link new;
+   int rc, rc1 = 0;
+
rc = bnxt_get_hwrm_link_config(bp, &new);
if (rc) {
PMD_DRV_LOG(ERR, "Failed to get link settings\n");
return rc;
}
 
-   /* convert to speedbit flag */
-   curr_speed_bit = rte_eth_speed_bitflag((uint32_t)link->link_speed, 1);
+   /* Validate speeds2 requirements */
+   if (BNXT_LINK_SPEEDS_V2(bp)) {
+   rc1 = bnxt_validate_speed_lanes_

[PATCH 0/3] eal: mark API's as stable

The API's in ethtool from before 23.11 should be marked stable.
Should probably include the trace api's but that is more complex change.

Stephen Hemminger (3):
  eal: make rte_cpu_get_intrinsics_support stable
  eal: mark rte_lcore_register_usage_cb stable
  eal: mark rte_memzone_max_get/set stable

 lib/eal/include/generic/rte_cpuflags.h |  4 
 lib/eal/include/rte_lcore.h|  4 
 lib/eal/include/rte_memzone.h  |  8 
 lib/eal/version.map| 10 --
 4 files changed, 4 insertions(+), 22 deletions(-)

-- 
2.45.2

[PATCH 1/3] eal: make rte_cpu_get_intrinsics_support stable

This API was added in 20.11, after four years it should be stable.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/include/generic/rte_cpuflags.h | 4 
 lib/eal/version.map| 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/eal/include/generic/rte_cpuflags.h 
b/lib/eal/include/generic/rte_cpuflags.h
index d35551e931..fe48d62518 100644
--- a/lib/eal/include/generic/rte_cpuflags.h
+++ b/lib/eal/include/generic/rte_cpuflags.h
@@ -29,15 +29,11 @@ struct rte_cpu_intrinsics {
 };
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Check CPU support for various intrinsics at runtime.
  *
  * @param intrinsics
  * Pointer to a structure to be filled.
  */
-__rte_experimental
 void
 rte_cpu_get_intrinsics_support(struct rte_cpu_intrinsics *intrinsics);
 
diff --git a/lib/eal/version.map b/lib/eal/version.map
index e3ff412683..cabe881bfe 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -23,6 +23,7 @@ DPDK_25 {
rte_class_unregister;
rte_cpu_get_flag_enabled;
rte_cpu_get_flag_name;
+   rte_cpu_get_intrinsics_support; # WINDOWS_NO_EXPORT
rte_cpu_is_supported; # WINDOWS_NO_EXPORT
rte_cycles_vmware_tsc_map; # WINDOWS_NO_EXPORT
rte_delay_us;
@@ -384,7 +385,6 @@ EXPERIMENTAL {
 
# added in 20.11
__rte_eal_trace_generic_size_t; # WINDOWS_NO_EXPORT
-   rte_cpu_get_intrinsics_support; # WINDOWS_NO_EXPORT
 
# added in 23.03
rte_lcore_register_usage_cb;
-- 
2.45.2

[PATCH 2/3] eal: mark rte_lcore_register_usage_cb stable

This API was added back in 23.03, can be marked stable now.

Signed-off-by: Stephen Hemminger 
---
 lib/eal/include/rte_lcore.h | 4 
 lib/eal/version.map | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/eal/include/rte_lcore.h b/lib/eal/include/rte_lcore.h
index 7deae47af3..549b9e68c5 100644
--- a/lib/eal/include/rte_lcore.h
+++ b/lib/eal/include/rte_lcore.h
@@ -359,9 +359,6 @@ struct rte_lcore_usage {
 typedef int (*rte_lcore_usage_cb)(unsigned int lcore_id, struct 
rte_lcore_usage *usage);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
  * Register a callback from an application to be called in rte_lcore_dump() and
  * the /eal/lcore/info telemetry endpoint handler. Applications are expected to
  * report lcore usage statistics via this callback.
@@ -373,7 +370,6 @@ typedef int (*rte_lcore_usage_cb)(unsigned int lcore_id, 
struct rte_lcore_usage
  * @param cb
  *   The callback function.
  */
-__rte_experimental
 void rte_lcore_register_usage_cb(rte_lcore_usage_cb cb);
 
 /**
diff --git a/lib/eal/version.map b/lib/eal/version.map
index cabe881bfe..e0fa68bbfc 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -165,6 +165,7 @@ DPDK_25 {
rte_lcore_iterate;
rte_lcore_to_cpu_id;
rte_lcore_to_socket_id;
+   rte_lcore_register_usage_cb;
rte_malloc;
rte_malloc_dump_heaps;
rte_malloc_dump_stats;
@@ -387,7 +388,6 @@ EXPERIMENTAL {
__rte_eal_trace_generic_size_t; # WINDOWS_NO_EXPORT
 
# added in 23.03
-   rte_lcore_register_usage_cb;
__rte_eal_trace_generic_blob;
 
# added in 23.07
-- 
2.45.2

[PATCH 3/3] eal: mark rte_memzone_max_get/set stable

These were added in 23.03

Signed-off-by: Stephen Hemminger 
---
 lib/eal/include/rte_memzone.h | 8 
 lib/eal/version.map   | 6 ++
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
index 931497f37c..e1563994d5 100644
--- a/lib/eal/include/rte_memzone.h
+++ b/lib/eal/include/rte_memzone.h
@@ -65,9 +65,6 @@ struct rte_memzone {
 } __rte_packed;
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
  * Set the maximum number of memzones.
  *
  * This function can only be called prior to rte_eal_init().
@@ -77,13 +74,9 @@ struct rte_memzone {
  * @return
  *  0 on success, -1 otherwise.
  */
-__rte_experimental
 int rte_memzone_max_set(size_t max);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice.
- *
  * Get the maximum number of memzones.
  *
  * @note: The maximum value will not change after calling rte_eal_init().
@@ -91,7 +84,6 @@ int rte_memzone_max_set(size_t max);
  * @return
  *   Maximum number of memzones.
  */
-__rte_experimental
 size_t rte_memzone_max_get(void);
 
 /**
diff --git a/lib/eal/version.map b/lib/eal/version.map
index e0fa68bbfc..c45fc55486 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -225,6 +225,8 @@ DPDK_25 {
rte_memzone_dump;
rte_memzone_free;
rte_memzone_lookup;
+   rte_memzone_max_get;
+   rte_memzone_max_set;
rte_memzone_reserve;
rte_memzone_reserve_aligned;
rte_memzone_reserve_bounded;
@@ -390,10 +392,6 @@ EXPERIMENTAL {
# added in 23.03
__rte_eal_trace_generic_blob;
 
-   # added in 23.07
-   rte_memzone_max_get;
-   rte_memzone_max_set;
-
# added in 24.03
rte_vfio_get_device_info; # WINDOWS_NO_EXPORT
 };
-- 
2.45.2

Re: [PATCH] dts: add l2fwd test suite

2024-09-04 Thread Dean Marx

On Tue, Aug 6, 2024 at 8:53 AM Luca Vizzarro  wrote:

> Add a basic L2 forwarding test suite which tests the correct
> functionality of the forwarding facility built-in in the DPDK.
>
> The tests are performed with different queues numbers per port.
>
> Bugzilla ID: 1481
>
> Signed-off-by: Luca Vizzarro 
> Reviewed-by: Paul Szczepanek 
> ---
> Depends-on: series-32714 ("dts: add pktgen and testpmd changes")
>

Jeremy already mentioned this but the suite is missing the copyright and
license header, otherwise:

Reviewed-by: Dean Marx

Re: [PATCH v1 2/3] dts: rework testbed_model Port objects to contain unique identifiers

On Wed, Aug 21, 2024 at 2:43 PM Nicholas Pratte  wrote:
>
> In order to leverage the usability of unique identifiers on ports, the
> testbed_model Port object needs some refactoring/trimming of obsolete or
> needless attributes.
>
> Bugzilla ID: 1478
>
> Signed-off-by: Nicholas Pratte 

Reviewed-by: Jeremy Spewock

Re: [PATCH v1 1/3] dts: rework port attributes in config module

On Wed, Aug 21, 2024 at 2:43 PM Nicholas Pratte  wrote:

> diff --git a/dts/framework/config/__init__.py 
> b/dts/framework/config/__init__.py
> index df60a5030e..534821ed22 100644
> --- a/dts/framework/config/__init__.py
> +++ b/dts/framework/config/__init__.py
> @@ -151,11 +151,10 @@ class PortConfig:
>  """
>
>  node: str
> +name: str
>  pci: str
>  os_driver_for_dpdk: str
>  os_driver: str
> -peer_node: str
> -peer_pci: str
>
>  @classmethod
>  def from_dict(cls, node: str, d: PortConfigDict) -> Self:
> @@ -487,12 +486,19 @@ def from_dict(
>  system_under_test_node, SutNodeConfiguration
>  ), f"Invalid SUT configuration {system_under_test_node}"
>
> -tg_name = d["traffic_generator_node"]
> +tg_name = d["traffic_generator_node"]["node_name"]
>  assert tg_name in node_map, f"Unknown TG {tg_name} in test run {d}"
>  traffic_generator_node = node_map[tg_name]
>  assert isinstance(
>  traffic_generator_node, TGNodeConfiguration
>  ), f"Invalid TG configuration {traffic_generator_node}"
> +assert len(traffic_generator_node.ports) == len(
> +system_under_test_node.ports
> +), "Insufficient ports defined on nodes."

Do we want to assert that the list of ports on the tester is the same
as the number on the SUT, or would it be better here to assert that
the same number of SUT and TG ports  are present in the test_run?
There could be a case where a TG is the generator for multiple SUT
hosts and therefore maybe the TG has 4 ports, but each of the SUT
nodes only has 2 which would get flagged as invalid in this assertion.

Maybe something better to compare here is the length of
d["traffic_generator_node"]["test_bed"] and
d["system_under_test_node"]["test_bed"].

> +for port_name in d["system_under_test_node"]["test_bed"]:
> +assert port_name in {port.name: port for port in 
> system_under_test_node.ports}

A little nit-picky, but you could achieve the same thing here using a
list rather than a dictionary here that might be a little easier to
read since we don't need the port info anyway:

assert port_name in [port.name for port in system_under_test_node.ports]


> +for port_name in d["traffic_generator_node"]["test_bed"]:
> +assert port_name in {port.name: port for port in 
> traffic_generator_node.ports}
>
>  vdevs = (
>  d["system_under_test_node"]["vdevs"] if "vdevs" in 
> d["system_under_test_node"] else []

> 2.44.0
>

Re: [PATCH v1 3/3] dts: rework test suite and dts runner to include test_run configs

On Wed, Aug 21, 2024 at 2:43 PM Nicholas Pratte  wrote:

> diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py
> index 694b2eba65..fd51796a06 100644
> --- a/dts/framework/test_suite.py
> +++ b/dts/framework/test_suite.py
> @@ -20,6 +20,7 @@
>  from scapy.layers.l2 import Ether  # type: ignore[import-untyped]
>  from scapy.packet import Packet, Padding  # type: ignore[import-untyped]
>
> +from framework.config import TestRunConfiguration
>  from framework.testbed_model.port import Port, PortLink
>  from framework.testbed_model.sut_node import SutNode
>  from framework.testbed_model.tg_node import TGNode
> @@ -64,6 +65,7 @@ class TestSuite:

>  def _process_links(self) -> None:
>  """Construct links between SUT and TG ports."""
> -for sut_port in self.sut_node.ports:
> -for tg_port in self.tg_node.ports:
> -if (sut_port.identifier, sut_port.peer) == (

It might be better to squash this commit into the previous just
because this line will cause an error in the previous commit due to
the removal of the identifier and peer attributes. While it is easier
to read broken apart, squashing saves the history from having a
"broken" commit.

> -tg_port.peer,
> -tg_port.identifier,
> -):
> -self._port_links.append(PortLink(sut_port=sut_port, 
> tg_port=tg_port))
> +sut_ports = []
> +for port in self.sut_node.ports:
> +if port.name in [
> +sut_port.name for sut_port in 
> self.test_run_config.system_under_test_node.ports
> +]:

I'm not sure I understand what this check is doing fully. You're
looping through all ports in the SUT's list of ports, and then you are
checking that the name of that port exists in the configuration for
the SUT node in the test run, but aren't the list of ports from the
testrun config going to be the same as the ones from self.sut_node?
The list of ports in self.sut_node is created from the list of ports
that is in the NodeConfiguration, so as long as self.sut_node is the
node that is currently being used in the test run, which should be
handled elsewhere, this will always be True I think. Correct me if I
am misunderstanding though.

I think what you might be trying to do is access the
`system_under_test_node` field in `test_run` inside of conf.yaml, but
`self.test_run_config.system_under_test_node` does not point to that,
it points to the configuration of the SUT node from `nodes` in
conf.yaml. That would make sense since we really want to limit the
test suites to only having access to the ports that are listed in the
test_run configuration, but if you have only 2 ports in the test_run
configuration with this series applied and 3 in the node
configuration, this list will contain all 3 ports on the node. Maybe
something you could do to solve this is adding `sut_ports` and
`tg_ports` attributes to the TestRunConfiguration and only adding
ports to the test suite if they are in those lists. Admittedly, the
fact that `self.test_run_config.system_under_test_node` is named the
same as something in conf.yaml but points to a different thing than
that key in conf.yaml is pretty confusing. I had to do a couple
double-takes and look through the code path for making these config
classes myself to make sure this was doing what I thought it was.
Maybe we should rename this attribute in the TestRunConfiguration to
be something more like `sut_config` so it is more clear it is pointing
to the configuration of the whole SUT node.

> +sut_ports.append(port)
> +tg_ports = []
> +for port in self.tg_node.ports:
> +if port.name in [
> +tg_port.name for tg_port in 
> self.test_run_config.traffic_generator_node.ports
> +]:
> +tg_ports.append(port)
> +
> +# Both the TG and SUT nodes will have an equal number of ports.
> +for i in range(len(sut_ports)):
> +self._port_links.append(PortLink(sut_ports[i], tg_ports[i]))
>
>  def set_up_suite(self) -> None:
>  """Set up test fixtures common to all test cases.
> --
> 2.44.0
>

Re: [PATCH v2 1/2] dts: add VXLAN port method to testpmd shell

Just a few comments on doc-strings, otherwise:

Reviewed-by: Jeremy Spewock 

On Fri, Aug 23, 2024 at 4:22 PM Dean Marx  wrote:
>
> Add rx_vxlan_port add/rm method to testpmd shell for adding
> or removing a vxlan id to the specified port filter list.
>
> Signed-off-by: Dean Marx 
> ---
>  dts/framework/remote_session/testpmd_shell.py | 23 +++
>  1 file changed, 23 insertions(+)
>
> diff --git a/dts/framework/remote_session/testpmd_shell.py 
> b/dts/framework/remote_session/testpmd_shell.py
> index 43e9f56517..00b75954ef 100644
> --- a/dts/framework/remote_session/testpmd_shell.py
> +++ b/dts/framework/remote_session/testpmd_shell.py
> @@ -806,6 +806,29 @@ def show_port_stats(self, port_id: int) -> 
> TestPmdPortStats:
>
>  return TestPmdPortStats.parse(output)
>
> +def rx_vxlan(self, vxlan_id: int, port_id: int, add: bool, verify: bool 
> = True) -> None:
> +"""Add or remove vxlan id to filter list.

It might read better if you replaced "to" here with "to/from".

> +
> +Args:
> +vxlan_id: Number of VXLAN ID to add to port filter list.

This is a little nit-picky, but it might be worth removing "Number of"
here and replacing "add to" with "add to/remove from" so it is "VXLAN
ID to add to/remove from port filter list." just so that it reflects
that you can both add and remove using this method.

> +port_id: Number of port to add VXLAN ID to.

For this line I might be in favor of simplifying it down to something
like "ID of the port to modify VXLAN filter of." That way it doesn't
need all the slashes to account for both adding and removing.

> +add: If :data:`True`, adds specified VXLAN ID, otherwise removes 
> it.
> +verify: If :data:`True`, the output of the command is checked to 
> verify
> +the VXLAN ID was successfully added/removed from the port.
> +
> +Raises:
> +InteractiveCommandExecutionError: If `verify` is :data:`True` 
> and VXLAN ID
> +is not successfully added or removed.
> +"""
> +action = "add" if add else "rm"
> +vxlan_output = self.send_command(f"rx_vxlan_port {action} {vxlan_id} 
> {port_id}")
> +if verify:
> +if "udp tunneling add error" in vxlan_output:
> +self._logger.debug(f"Failed to set VXLAN:\n{vxlan_output}")
> +raise InteractiveCommandExecutionError(
> +f"Failed to set VXLAN:\n{vxlan_output}"
> +)
> +
>  def _close(self) -> None:
>  """Overrides :meth:`~.interactive_shell.close`."""
>  self.stop()
> --
> 2.44.0
>

Re: [PATCH v2 2/2] dts: port over unified packet suite

I just left some general formatting comments and a few idea that I
thought might be helpful, but it looks good to me in general:

Reviewed-by: Jeremy Spewock 

On Fri, Aug 23, 2024 at 4:22 PM Dean Marx  wrote:
>
> Port over unified packet testing suite from old DTS. This suite
> tests the ability of the PMD to recognize valid or invalid packet flags.
>
> Depends-on: Patch-143033
> ("dts: add text parser for testpmd verbose output")
> Depends-on: Patch-142691
> ("dts: add send_packets to test suites and rework
> packet addressing")
> Depends-on: Patch-143005
> ("dts: add functions to testpmd shell")
>
> Signed-off-by: Dean Marx 
> ---

> +
> +from scapy.packet import Packet  # type: ignore[import-untyped]
> +from scapy.layers.vxlan import VXLAN  # type: ignore[import-untyped]
> +from scapy.contrib.nsh import NSH  # type: ignore[import-untyped]
> +from scapy.layers.inet import IP, ICMP, TCP, UDP, GRE  # type: 
> ignore[import-untyped]
> +from scapy.layers.l2 import Ether, ARP  # type: ignore[import-untyped]
> +from scapy.packet import Raw

I think this import also needs a type: ignore comment, but regardless
it is probably better to combine it with the other file that imports
from the `scapy.packet` library to keep things concise.

> +from scapy.layers.inet6 import IPv6, IPv6ExtHdrFragment  # type: 
> ignore[import-untyped]
> +from scapy.layers.sctp import SCTP, SCTPChunkData  # type: 
> ignore[import-untyped]
> +
> +from framework.remote_session.testpmd_shell import (SimpleForwardingModes, 
> TestPmdShell,
> +RtePTypes, 
> TestPmdVerbosePacket)

There isn't anything wrong with breaking lines like this, but it is a
little different than how the formatting script would separate it and
how it is done in other parts of the framework. It might be worth
putting the newline after the opening parenthesis to match how it is
done elsewhere.

> +from framework.test_suite import TestSuite
> +
> +
> +class TestUniPkt(TestSuite):
> +"""DPDK Unified packet test suite.
> +
> +This testing suite uses testpmd's verbose output hardware/software
> +packet type field to verify the ability of the driver to recognize
> +unified packet types when receiving different packets.
> +
> +"""
> +
> +def set_up_suite(self) -> None:
> +"""Set up the test suite.
> +
> +Setup:
> +Verify that at least two ports are open for session.
> +"""
> +self.verify(len(self._port_links) > 1, "Not enough ports")
> +
> +def send_packet_and_verify_flags(self, expected_flags: list[RtePTypes],
> + packet: Packet, testpmd: TestPmdShell) 
> -> None:

Same thing here as the comment above, generally these function
definitions elsewhere in the framework will break the lines at the
opening parenthesis and then again before the closing one.

Additionally, something that might save you some space/complexity in
this method is you can combine all of your flags into one rather than
storing them in a list, and compare the combinations rather than
looping through and comparing them one at a time. Since flag values
are really just bytes and combinations of flags are always unique, if
expected_flags were just the type RtePTypes, instead of looping
through all of the individual values you could have your boolean check
be something like:

any(packet.dst_mac == "00:00:00:00:00:01" and (expected_flags in
packet.hw_ptype or expected_flags in packet.sw_ptype) for packet in
verbose_output)

and that "in" statement will check for you that all of the flags that
are part of expected_flags are present in the sw_ptype and hw_ptype
flags.

> +"""Sends a packet to the DUT and verifies the verbose ptype flags."""
> +testpmd.start()
> +self.send_packet_and_capture(packet=packet)
> +verbose_output = testpmd.extract_verbose_output(testpmd.stop())
> +valid = self.check_for_matching_packet(output=verbose_output, 
> flags=expected_flags)
> +self.verify(valid, f"Packet type flag did not match the expected 
> flag: {expected_flags}.")
> +
> +def check_for_matching_packet(self, output: list[TestPmdVerbosePacket],
> +  flags: list[RtePTypes]) -> bool:
> +"""Returns :data:`True` if the packet in verbose output contains all 
> specified flags."""
> +for packet in output:
> +if packet.dst_mac == "00:00:00:00:00:01":
> +for flag in flags:
> +if (flag not in packet.hw_ptype and flag not in 
> packet.sw_ptype):
> +return False
> +return True

This might just be personal preference too, but I think it is a little
easier to read if methods are defined above the one where they are
used.

> +
> +def setup_session(self, testpmd: TestPmdShell) -> None:
> +"""Sets the forwarding and verbose mode of each test case 
> interactive shell session."""
> +testpmd.

Re: [PATCH v14 2/2] dts: VLAN test suite implementation

All looks great to me, thank you for the patch and addressing
comments, there is just one comment that I left here about something
that I missed pointing out on the previous version, but once that is
addressed I think this will be ready.

On Fri, Aug 23, 2024 at 5:16 PM Dean Marx  wrote:

> +def send_packet_and_verify_insertion(self, expected_id: int) -> None:
> +"""Generate a packet with no vlan tag, send and verify on the dut.
> +
> +Args:
> +expected_id: The vlan id that is being inserted through 
> tx_offload configuration.
> +"""
> +packet = Ether() / Raw(load="x")
> +received_packets = self.send_packet_and_capture(packet)
> +test_packet = None
> +for packet in received_packets:
> +if b"x" in packet.load:

Sorry, it looks like I missed putting a comment on this conditional in
my last review, but we should probably also put a hasattr() check in
here as well.

> +test_packet = packet
> +break
> +self.verify(test_packet is not None, "Packet was dropped when it 
> should have been received")
> +if test_packet is not None:
> +self.verify(test_packet.haslayer(Dot1Q), "The received packet 
> did not have a vlan tag")
> +self.verify(
> +test_packet.vlan == expected_id, "The received tag did not 
> match the expected tag"
> +)

>

Re: [PATCH v14 1/2] dts: add VLAN methods to testpmd shell

On Fri, Aug 23, 2024 at 5:16 PM Dean Marx  wrote:
>
> added the following methods to testpmd shell class:
> vlan set filter on/off, rx vlan add/rm,
> vlan set strip on/off, port stop/start all/port,
> tx vlan set/reset, set promisc/verbose
>
> fixed bug in vlan_offload for
> show port info, removed $ at end of regex
>
> Signed-off-by: Dean Marx 

Reviewed-by: Jeremy Spewock

Re: [RFC] ethdev: jump to table support

2024-09-04 Thread Alexander Kozyrev

>> +__rte_experimental
>> +struct rte_flow *
>> +rte_flow_async_create_by_index_with_pattern(uint16_t port_id,
>> + uint32_t queue_id,
>> + const struct rte_flow_op_attr 
>> *op_attr,
>> + struct rte_flow_template_table 
>> *template_table,
>> + uint32_t rule_index,
>> + const struct rte_flow_item 
>> pattern[],
>> + uint8_t pattern_template_index,
>> + const struct rte_flow_action 
>> actions[],
>> + uint8_t actions_template_index,
>> + void *user_data,
>> + struct rte_flow_error *error);

>Choosing names is hard, long names are not always better. Can you think
>of a more concise name?

>Je n’ai fait celle-ci plus longue que parce que je n’ai pas eu le loisir de la 
>faire plus courte. -- Blaise Pascal

I would love to get a shorter name, but that's the best one I came up with.
Do you have any alternative suggestions? I'm open to any ideas here.

Re: [PATCH] mbuf: add transport mode ESP packet type

2024-09-04 Thread Alexander Kozyrev

> I think we already discussed this same patch in previous emails
> (Aug-Oct 2023) at
> https://mails.dpdk.org/archives/dev/2023-October/279390.html and
> concluded that it is not needed ?
> Did anything change from then ?

Yes, Nithin, we found a way to distinguish the modes by looking into the next 
header field.
And we definitely need RTE_PTYPE_INNER_L4_ESP for ESP over UDP support.
Having RTE_PTYPE_INNER_TUNNEL_ESP for this case doesn't make sense,
and, I think, it is better to introduce two L4 types for ESP now. What are your 
thoughts on this?

Re: [PATCH v4 2/2] dts: mac filter test suite refactored for new dts

2024-09-04 Thread Dean Marx

>
> 
> +if should_receive:
> +self.verify(len(received_packets) == 1, "Expected packet not
> received")
> +else:
> +self.verify(len(received_packets) == 0, "Expected packet
> received")
>

Side note, didn't notice until I tested it but "Expected packet received"
doesn't really make sense as an error message

Re: [PATCH v3 1/2] dts: add csum HW offload to testpmd shell

Hey Dean,

This patch is looking good, I like the changes from the previous
version, there were just a few comments that I left but they should be
pretty easy fixes.

On Mon, Aug 26, 2024 at 5:22 PM Dean Marx  wrote:

> +def csum_set_hw(self, layer: ChecksumOffloadOptions, port_id: int, 
> verify: bool = True) -> None:
> +"""Enables hardware checksum offloading on the specified layer.
> +
> +Args:
> +layer: The layer that checksum offloading should be enabled on.
> +port_id: The port number to enable checksum offloading on, 
> should be within 0-32.
> +verify: If :data:`True` the output of the command will be 
> scanned in an attempt to
> +verify that checksum offloading was enabled on the port.
> +
> +Raises:
> +InteractiveCommandExecutionError: If checksum offload is not 
> enabled successfully.
> +"""
> +for name, offload in ChecksumOffloadOptions.__members__.items():
> +if offload in layer:
> +name = name.replace("_", "-")
> +csum_output = self.send_command(f"csum set {name} hw 
> {port_id}")
> +if verify:

I think this line and all of the ones below it in this method need to
be indented one more time so that they are only done if the offload is
one that the user is trying to set. csum_output might not exist if the
previous statement is false, so I don't think we would be able to even
use it in that case, but even if we could I don't think we really need
to verify if the offload is set or not if it isn't in `layer`.

> +if ("Bad arguments" in csum_output
> +or f"Please stop port {port_id} first" in csum_output
> +or f"checksum offload is not supported by port 
> {port_id}" in csum_output):
> +self._logger.debug(f"Csum set hw error:\n{csum_output}")
> +raise InteractiveCommandExecutionError(
> +f"Failed to set csum hw {name} mode on port 
> {port_id}"
> +)
> +success = False
> +if "-" in name:
> +name.title()

For both this and the call to upper() below, they return a new string
that has the results applied, so `name` here would have to get
re-assigned for the changes to take place. So I think this line would
need to be `name = name.title()`.

> +else:
> +name.upper()
> +if f"{name} checksum offload is hw" in csum_output:

Another thing you could do which I should have thought about sooner is
you could just change this if-statement to be:

if f"{name} checksum offload is hw" in csum_output.lower():

and then you wouldn't need to worry at all about which letters are
uppercase or lowercase in the output and it would all be the same so
you don't have to do this either upper() or title() call. It might be
technically less efficient, but we've mentioned before that we're fine
with that as long as it isn't grossly inefficient, so if it is easier
to just make it all lowercase then I think it is fine :).

> +success = True
> +if not success and verify:
> +self._logger.debug(f"Failed to set csum hw mode on port 
> {port_id}:\n{csum_output}")

Should we also raise the exception here as a failure?

> +
>  def _close(self) -> None:
>  """Overrides :meth:`~.interactive_shell.close`."""
>  self.stop()
> --
> 2.44.0
>

Re: [PATCH v3 2/2] dts: checksum offload test suite

Just one comment here but it is a super small doc-string thing that
still passes the formatting script and everything, but whenever we add
Ruff for checking format in the future, it would get caught so it
might be better to just add it now. Otherwise:

Reviewed-by: Jeremy Spewock 

On Mon, Aug 26, 2024 at 5:22 PM Dean Marx  wrote:

> +def setup_hw_offload(self, testpmd: TestPmdShell) -> None:
> +"""Sets IP, UDP, TCP, and SCTP layers to hardware offload."""

Since this is a public method and it also has an argument, I think
that it should follow the Google doc-string format and have an Args:
section for it.

> +testpmd.port_stop(port=0)
> +offloads = (
> +ChecksumOffloadOptions.ip
> +| ChecksumOffloadOptions.udp
> +| ChecksumOffloadOptions.tcp
> +| ChecksumOffloadOptions.sctp
> +)
> +testpmd.csum_set_hw(layer=offloads, port_id=0)
> +testpmd.port_start(port=0)
> +

>

[PATCH 0/3] add frequency adjustment support for PTP

[1/3] ethdev: add frequency adjustment API
[2/3] net/ice: add frequency adjustment support for PTP
[3/3] examples/ptpclient: add frequency adjustment support

Mingjin Ye (3):
  ethdev: add frequency adjustment API
  net/ice: add frequency adjustment support for PTP
  examples/ptpclient: add frequency adjustment support

 doc/guides/nics/features.rst |   3 +-
 doc/guides/nics/ice.rst  |  15 ++
 drivers/net/ice/ice_ethdev.c | 177 +-
 drivers/net/ice/ice_ethdev.h |   2 +
 drivers/net/ice/ice_rxtx.c   |   4 +-
 examples/ptpclient/ptpclient.c   | 300 +++
 lib/ethdev/ethdev_driver.h   |   5 +
 lib/ethdev/ethdev_trace.h|   9 +
 lib/ethdev/ethdev_trace_points.c |   3 +
 lib/ethdev/rte_ethdev.c  |  18 ++
 lib/ethdev/rte_ethdev.h  |  19 ++
 11 files changed, 474 insertions(+), 81 deletions(-)

-- 
2.25.1

[PATCH 1/3] ethdev: add frequency adjustment API

This patch adds freq adjustment API for PTP high accuracy.

Signed-off-by: Simei Su 
Signed-off-by: Mingjin Ye 
---
 doc/guides/nics/features.rst |  3 ++-
 lib/ethdev/ethdev_driver.h   |  5 +
 lib/ethdev/ethdev_trace.h|  9 +
 lib/ethdev/ethdev_trace_points.c |  3 +++
 lib/ethdev/rte_ethdev.c  | 18 ++
 lib/ethdev/rte_ethdev.h  | 19 +++
 6 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index cd0115ffb3..a2a19623b7 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -677,7 +677,8 @@ Supports IEEE1588/802.1AS timestamping.
 
 * **[implements] eth_dev_ops**: ``timesync_enable``, ``timesync_disable``
   ``timesync_read_rx_timestamp``, ``timesync_read_tx_timestamp``,
-  ``timesync_adjust_time``, ``timesync_read_time``, ``timesync_write_time``.
+  ``timesync_adjust_time``, ``timesync_adjust_freq``,
+  ``timesync_read_time``, ``timesync_write_time``.
 * **[related]API**: ``rte_eth_timesync_enable()``, 
``rte_eth_timesync_disable()``,
   ``rte_eth_timesync_read_rx_timestamp()``,
   ``rte_eth_timesync_read_tx_timestamp``, ``rte_eth_timesync_adjust_time()``,
diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 883e59a927..68cadc14a5 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -664,6 +664,9 @@ typedef int (*eth_timesync_read_tx_timestamp_t)(struct 
rte_eth_dev *dev,
 /** @internal Function used to adjust the device clock. */
 typedef int (*eth_timesync_adjust_time)(struct rte_eth_dev *dev, int64_t);
 
+/** @internal Function used to adjust the clock frequency. */
+typedef int (*eth_timesync_adjust_freq)(struct rte_eth_dev *dev, int64_t);
+
 /** @internal Function used to get time from the device clock. */
 typedef int (*eth_timesync_read_time)(struct rte_eth_dev *dev,
  struct timespec *timestamp);
@@ -1378,6 +1381,8 @@ struct eth_dev_ops {
eth_timesync_read_tx_timestamp_t timesync_read_tx_timestamp;
/** Adjust the device clock */
eth_timesync_adjust_time   timesync_adjust_time;
+   /** Adjust the clock frequency */
+   eth_timesync_adjust_freq   timesync_adjust_freq;
/** Get the device clock time */
eth_timesync_read_time timesync_read_time;
/** Set the device clock time */
diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h
index 3bec87bfdb..e273d5853e 100644
--- a/lib/ethdev/ethdev_trace.h
+++ b/lib/ethdev/ethdev_trace.h
@@ -2183,6 +2183,15 @@ RTE_TRACE_POINT_FP(
rte_trace_point_emit_int(ret);
 )
 
+/* Called in loop in examples/ptpclient */
+RTE_TRACE_POINT_FP(
+   rte_eth_trace_timesync_adjust_freq,
+   RTE_TRACE_POINT_ARGS(uint16_t port_id, int64_t ppm, int ret),
+   rte_trace_point_emit_u16(port_id);
+   rte_trace_point_emit_i64(ppm);
+   rte_trace_point_emit_int(ret);
+)
+
 /* Called in loop in app/test-flow-perf */
 RTE_TRACE_POINT_FP(
rte_flow_trace_create,
diff --git a/lib/ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c
index 99e04f5893..a99fec0c1e 100644
--- a/lib/ethdev/ethdev_trace_points.c
+++ b/lib/ethdev/ethdev_trace_points.c
@@ -409,6 +409,9 @@ 
RTE_TRACE_POINT_REGISTER(rte_eth_trace_timesync_read_tx_timestamp,
 RTE_TRACE_POINT_REGISTER(rte_eth_trace_timesync_adjust_time,
lib.ethdev.timesync_adjust_time)
 
+RTE_TRACE_POINT_REGISTER(rte_eth_trace_timesync_adjust_freq,
+   lib.ethdev.timesync_adjust_freq)
+
 RTE_TRACE_POINT_REGISTER(rte_eth_trace_timesync_read_time,
lib.ethdev.timesync_read_time)
 
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index f1c658f49e..660eab2f1e 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -6310,6 +6310,24 @@ rte_eth_timesync_adjust_time(uint16_t port_id, int64_t 
delta)
return ret;
 }
 
+int
+rte_eth_timesync_adjust_freq(uint16_t port_id, int64_t ppm)
+{
+   struct rte_eth_dev *dev;
+   int ret;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+   dev = &rte_eth_devices[port_id];
+
+   if (*dev->dev_ops->timesync_adjust_freq == NULL)
+   return -ENOTSUP;
+   ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_freq)(dev, ppm));
+
+   rte_eth_trace_timesync_adjust_freq(port_id, ppm, ret);
+
+   return ret;
+}
+
 int
 rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp)
 {
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 548fada1c7..42fa2ca39c 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -5297,6 +5297,25 @@ int rte_eth_timesync_read_tx_timestamp(uint16_t port_id,
  */
 int rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta);
 
+/**
+ * Adjust the clock increment rate on an Ethernet device.
+ *
+ * This is usually used in conjunction with other Ethdev timesync functions to
+ * synchronize the

[PATCH 2/3] net/ice: add frequency adjustment support for PTP

Add ice support for new ethdev API to adjust frequency for IEEE1588
PTP. Also, this patch reworks code for converting software update
to hardware update.

Signed-off-by: Simei Su 
Signed-off-by: Mingjin Ye 
---
 doc/guides/nics/ice.rst  |  15 +++
 drivers/net/ice/ice_ethdev.c | 177 ++-
 drivers/net/ice/ice_ethdev.h |   2 +
 drivers/net/ice/ice_rxtx.c   |   4 +-
 4 files changed, 153 insertions(+), 45 deletions(-)

diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index ae975d19ad..dec4cc2434 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -328,6 +328,21 @@ Forward Error Correction (FEC)
 
 Supports get/set FEC mode and get FEC capability.
 
+Time Synchronisation
+
+
+The system operator can run a PTP (Precision Time Protocol) client application
+to synchronise the time on the network card (and optionally the time on the
+system) to the PTP master.
+
+ICE PMD supports PTP client applications that use the DPDK IEEE1588 API to
+communicate with the PTP master clock. Note that the PTP client application
+needs to run on the PF and vector mode needs to be disabled.
+
+.. code-block:: console
+
+examples/dpdk-ptpclient -c f -n 3 -a :ec:00.1 -- -T 1 -p 0x1 
--controller=pi
+
 Generic Flow Support
 
 
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 304f959b7e..33293a917f 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -176,6 +177,7 @@ static int ice_timesync_read_rx_timestamp(struct 
rte_eth_dev *dev,
 static int ice_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
  struct timespec *timestamp);
 static int ice_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta);
+static int ice_timesync_adjust_freq(struct rte_eth_dev *dev, int64_t ppm);
 static int ice_timesync_read_time(struct rte_eth_dev *dev,
  struct timespec *timestamp);
 static int ice_timesync_write_time(struct rte_eth_dev *dev,
@@ -307,6 +309,7 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
.timesync_read_rx_timestamp   = ice_timesync_read_rx_timestamp,
.timesync_read_tx_timestamp   = ice_timesync_read_tx_timestamp,
.timesync_adjust_time = ice_timesync_adjust_time,
+   .timesync_adjust_freq = ice_timesync_adjust_freq,
.timesync_read_time   = ice_timesync_read_time,
.timesync_write_time  = ice_timesync_write_time,
.timesync_disable = ice_timesync_disable,
@@ -2332,6 +2335,34 @@ ice_get_supported_rxdid(struct ice_hw *hw)
return supported_rxdid;
 }
 
+static void ice_ptp_init_info(struct rte_eth_dev *dev)
+{
+   struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   struct ice_adapter *ad =
+   ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+
+   switch (hw->phy_model) {
+   case ICE_PHY_ETH56G:
+   ad->ptp_tx_block = hw->pf_id;
+   ad->ptp_tx_index = 0;
+   break;
+   case ICE_PHY_E810:
+   /* fallthrough */
+   case ICE_PHY_E830:
+   ad->ptp_tx_block = hw->port_info->lport;
+   ad->ptp_tx_index = 0;
+   break;
+   case ICE_PHY_E822:
+   ad->ptp_tx_block = hw->pf_id / ICE_PORTS_PER_QUAD;
+   ad->ptp_tx_index = (hw->pf_id % ICE_PORTS_PER_QUAD) *
+   ICE_PORTS_PER_PHY_E822 * ICE_QUADS_PER_PHY_E822;
+   break;
+   default:
+   PMD_DRV_LOG(WARNING, "Unsupported PHY model");
+   break;
+   }
+}
+
 static int
 ice_dev_init(struct rte_eth_dev *dev)
 {
@@ -2499,6 +2530,9 @@ ice_dev_init(struct rte_eth_dev *dev)
/* Initialize PHY model */
ice_ptp_init_phy_model(hw);
 
+   /* Initialize PTP info */
+   ice_ptp_init_info(dev);
+
if (hw->phy_model == ICE_PHY_E822) {
ret = ice_start_phy_timer_e822(hw, hw->pf_id);
if (ret)
@@ -6466,23 +6500,6 @@ ice_timesync_enable(struct rte_eth_dev *dev)
}
}
 
-   /* Initialize cycle counters for system time/RX/TX timestamp */
-   memset(&ad->systime_tc, 0, sizeof(struct rte_timecounter));
-   memset(&ad->rx_tstamp_tc, 0, sizeof(struct rte_timecounter));
-   memset(&ad->tx_tstamp_tc, 0, sizeof(struct rte_timecounter));
-
-   ad->systime_tc.cc_mask = ICE_CYCLECOUNTER_MASK;
-   ad->systime_tc.cc_shift = 0;
-   ad->systime_tc.nsec_mask = 0;
-
-   ad->rx_tstamp_tc.cc_mask = ICE_CYCLECOUNTER_MASK;
-   ad->rx_tstamp_tc.cc_shift = 0;
-   ad->rx_tstamp_tc.nsec_mask = 0;
-
-   ad->tx_tstamp_tc.cc_mask = ICE_CYCLECOUNTER_MASK;
-   ad->tx_tstamp_tc.cc_shift = 0;
-   ad->tx_tstamp_tc.nsec_mask = 0;
-
ad->ptp_ena = 1;

[PATCH 3/3] examples/ptpclient: add frequency adjustment support

This patch adds PI servo algorithm to support frequency
adjustment API for IEEE1588 PTP.

For example, the command for starting ptpclient with PI algorithm is:
./build/examples/dpdk-ptpclient -a :81:00.0 -c 1 -n 3 -- -T 0 -p 0x1
--controller=pi

Signed-off-by: Simei Su 
Signed-off-by: Wenjun Wu 
Signed-off-by: Mingjin Ye 
---
 examples/ptpclient/ptpclient.c | 300 +
 1 file changed, 265 insertions(+), 35 deletions(-)

diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c
index afb61bba51..b97b858310 100644
--- a/examples/ptpclient/ptpclient.c
+++ b/examples/ptpclient/ptpclient.c
@@ -46,6 +46,35 @@ static volatile bool force_quit;
 #define KERNEL_TIME_ADJUST_LIMIT  2
 #define PTP_PROTOCOL 0x88F7
 
+#define KP 0.7
+#define KI 0.3
+#define FREQ_EST_MARGIN 0.001
+
+enum servo_state {
+   SERVO_UNLOCKED,
+   SERVO_JUMP,
+   SERVO_LOCKED,
+};
+
+struct pi_servo {
+   double offset[2];
+   double local[2];
+   double drift;
+   double last_freq;
+   int count;
+
+   double max_frequency;
+   double step_threshold;
+   double first_step_threshold;
+   int first_update;
+};
+
+enum controller_mode {
+   MODE_NONE,
+   MODE_PI,
+   MAX_ALL
+} mode = MODE_PI;
+
 struct rte_mempool *mbuf_pool;
 uint32_t ptp_enabled_port_mask;
 uint8_t ptp_enabled_port_nb;
@@ -135,6 +164,9 @@ struct ptpv2_data_slave_ordinary {
uint8_t ptpset;
uint8_t kernel_time_set;
uint16_t current_ptp_port;
+   int64_t master_offset;
+   int64_t path_delay;
+   struct pi_servo *servo;
 };
 
 static struct ptpv2_data_slave_ordinary ptp_data;
@@ -293,36 +325,44 @@ print_clock_info(struct ptpv2_data_slave_ordinary 
*ptp_data)
ptp_data->tstamp3.tv_sec,
(ptp_data->tstamp3.tv_nsec));
 
-   printf("\nT4 - Master Clock.  %lds %ldns ",
+   printf("\nT4 - Master Clock.  %lds %ldns\n",
ptp_data->tstamp4.tv_sec,
(ptp_data->tstamp4.tv_nsec));
 
-   printf("\nDelta between master and slave clocks:%"PRId64"ns\n",
+   if (mode == MODE_NONE) {
+   printf("\nDelta between master and slave clocks:%"PRId64"ns\n",
ptp_data->delta);
 
-   clock_gettime(CLOCK_REALTIME, &sys_time);
-   rte_eth_timesync_read_time(ptp_data->current_ptp_port, &net_time);
+   clock_gettime(CLOCK_REALTIME, &sys_time);
+   rte_eth_timesync_read_time(ptp_data->current_ptp_port,
+  &net_time);
 
-   time_t ts = net_time.tv_sec;
+   time_t ts = net_time.tv_sec;
 
-   printf("\n\nComparison between Linux kernel Time and PTP:");
+   printf("\n\nComparison between Linux kernel Time and PTP:");
 
-   printf("\nCurrent PTP Time: %.24s %.9ld ns",
+   printf("\nCurrent PTP Time: %.24s %.9ld ns",
ctime(&ts), net_time.tv_nsec);
 
-   nsec = (int64_t)timespec64_to_ns(&net_time) -
+   nsec = (int64_t)timespec64_to_ns(&net_time) -
(int64_t)timespec64_to_ns(&sys_time);
-   ptp_data->new_adj = ns_to_timeval(nsec);
+   ptp_data->new_adj = ns_to_timeval(nsec);
 
-   gettimeofday(&ptp_data->new_adj, NULL);
+   gettimeofday(&ptp_data->new_adj, NULL);
 
-   time_t tp = ptp_data->new_adj.tv_sec;
+   time_t tp = ptp_data->new_adj.tv_sec;
 
-   printf("\nCurrent SYS Time: %.24s %.6ld ns",
-   ctime(&tp), ptp_data->new_adj.tv_usec);
+   printf("\nCurrent SYS Time: %.24s %.6ld ns",
+   ctime(&tp), ptp_data->new_adj.tv_usec);
 
-   printf("\nDelta between PTP and Linux Kernel time:%"PRId64"ns\n",
-   nsec);
+   printf("\nDelta between PTP and Linux Kernel 
time:%"PRId64"ns\n",
+   nsec);
+   }
+
+   if (mode == MODE_PI) {
+   printf("path delay: %"PRId64"ns\n", ptp_data->path_delay);
+   printf("master offset: %"PRId64"ns\n", ptp_data->master_offset);
+   }
 
printf("[Ctrl+C to quit]\n");
 
@@ -385,21 +425,11 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, 
uint16_t rx_tstamp_idx)
 static void
 parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)
 {
-   struct rte_ether_hdr *eth_hdr;
-   struct rte_ether_addr eth_addr;
struct ptp_header *ptp_hdr;
-   struct clock_id *client_clkid;
struct ptp_message *ptp_msg;
-   struct delay_req_msg *req_msg;
-   struct rte_mbuf *created_pkt;
struct tstamp *origin_tstamp;
-   struct rte_ether_addr eth_multicast = ether_multicast;
-   size_t pkt_size;
-   int wait_us;
struct rte_mbuf *m = ptp_data->m;
-   int ret;
 
-   eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
ptp_hdr = rte_pktm

Re: [PATCH v3 0/3] bugfix about KEEP CRC offload


Hi, all maintainers,

Kindly ping for review.

Thanks,
Jie Hai

On 2024/7/19 17:04, Jie Hai wrote:

For hns3 NIC, when KEEP_CRC offload is enabled, the CRC data is
still be stripped in rare scenarios. Some users of hns3 are
already using this feature. So driver has to recaculate packet CRC.
In addition, in the mbuf, the data that exceeds the length specified
by pkt_len is invalid. Therefore, if the packet contains CRC data,
pkt_len should contain the CRC data length. However, almost of drivers
supported KEEP CRC feature didn't add the CRC data length to pkt_len.

This patch adds description for KEEP CRC offload.

Dengdui Huang (3):
   ethdev: add description for KEEP CRC offload
   net/hns3: fix packet length do not contain CRC data length
   net/hns3: fix Rx packet without CRC data

  drivers/net/hns3/hns3_ethdev.c|   5 +
  drivers/net/hns3/hns3_ethdev.h|  23 +
  drivers/net/hns3/hns3_rxtx.c  | 134 --
  drivers/net/hns3/hns3_rxtx.h  |   3 +
  drivers/net/hns3/hns3_rxtx_vec.c  |   3 +-
  drivers/net/hns3/hns3_rxtx_vec_neon.h |  19 
  drivers/net/hns3/hns3_rxtx_vec_sve.c  |   3 +-
  lib/ethdev/rte_ethdev.h   |   6 ++
  8 files changed, 124 insertions(+), 72 deletions(-)

Re: [PATCH] app/dma-perf: per device config support

2024-09-04 Thread fengchengwen

Hi Amit,

It indeed provide more flexible configuration.

There is a small comment below, with that fixed,
Acked-by: Chengwen Feng 

Thanks

On 2024/8/5 21:51, Amit Prakash Shukla wrote:
> Add support to configure device specific config parameters for a
> testcase. Example:
> 
> lcore_dma0=lcore=11,dev=:00:04.1,dir=mem2dev,raddr=0x3,
> coreid=1,pfid=2,vfid=3
> lcore_dma1=lcore=12,dev=:00:04.2,dir=dev2mem,raddr=0x2,
> coreid=3,pfid=2,vfid=1
> 
> Signed-off-by: Amit Prakash Shukla 
> ---

...

>  
> -static int populate_pcie_config(const char *key, const char *value, void 
> *test)
> +static int populate_dma_dev_config(const char *key, const char *value, void 
> *test)
>  {
> - struct test_configure *test_case = (struct test_configure *)test;
> + struct lcore_dma_config *dma_config = (struct lcore_dma_config *)test;
> + struct vchan_dev_config *vchan_config = &dma_config->vchan_dev;
> + struct lcore_dma_map_t *lcore_map = &dma_config->lcore_dma_map;
>   char *endptr;
>   int ret = 0;
>  
> - if (strcmp(key, "raddr") == 0)
> - test_case->vchan_dev.raddr = strtoull(value, &endptr, 16);
> + if (strcmp(key, "lcore") == 0)
> + lcore_map->lcore = (uint8_t)atoi(value);

Suggest use uint16_t, because maybe >=256 cores

RE: [EXT] Re: [PATCH v11 0/4] add support for self monitoring

2024-09-04 Thread Tomasz Duszynski

[...]

> > From: David Marchand [mailto:david.march...@redhat.com]
> > Sent: Thursday, 21 September 2023 10.27
> >
> > Hello,
> >
> > On Mon, Aug 7, 2023 at 10:12 AM Tomasz Duszynski
> > 
> > wrote:
> > > >Ping for update
> > > >What is the status of this feature?
> > >
> > > I'll re-spin the series soon.
> >
> > -rc1 is getting closer.
> > Any update?
> 
> @Thomasz, @Jerin,
> 
> I expect this feature to be useful for profiling of systems deployed in 
> production, and would like
> to see it go into DPDK.
> 
> What is its status?
> 
> -Morten

Hi Morten, 

I was buried in other things and did not work on that so to speak. If there's 
still need 
for this feature, as you say, I'll respin this series for good. Hopefully new 
version 
will be available this month.

RE: [PATCH v3 0/8] record and rework component dependencies

> From: Anatoly Burakov [mailto:anatoly.bura...@intel.com]
> 
> As part of the meson build, we can record the dependencies for each
> component as we process it, logging them to a file. This file can be
> used as input to a number of other scripts and tools, for example, to
> graph the dependencies, or to allow higher-level build-config tools to
> automatically enable component requirements, etc.
> 
> The first patch of this set separates dependencies inside meson into
> optional or mandatory. The second patch of this set generates the basic
> dependency tree. The third patch does some processing of that dependency
> tree to identify cases where dependencies are being unnecessarily
> specified. Reducing these makes it easier to have readable dependency
> graphs in future, without affecting the build.
> 
> The following 4 patches are based on the output of the second patch, and
> greatly cut down the number of direct dependency links between
> components. Even with the cut-down dependencies, the full dependency
> graph is nigh-unreadable, so the final patch adds a new script to
> generate dependency tree subgraphs, creating dot files for e.g. the
> dependencies of a particular component, or a component class such as
> mempool drivers.
> 

For the series,
Acked-by: Morten Brørup

RE: [PATCH v1 1/1] usertools: add DPDK build directory setup script

> From: Anatoly Burakov [mailto:anatoly.bura...@intel.com]
> 
> Currently, the only way to set up a build directory for DPDK development
> is through running Meson directly. This has a number of drawbacks.
> 
> For one, the default configuration is very "fat", meaning everything gets
> enabled and built (aside from examples, which have to be enabled
> manually), so while Meson is very good at minimizing work needed to rebuild
> DPDK, for any change that affects a lot of components (such as editing an
> EAL header), there's a lot of rebuilding to do.
> 
> It is of course possible to reduce the number of components built through
> meson options, but this mechanism isn't perfect, as the user needs to
> remember exact spelling of all the options and components, and currently
> it doesn't handle inter-component dependencies very well (e.g. if net/ice
> is enabled, common/iavf is not automatically enabled, so net/ice can't be
> built unless user also doesn't forget to specify common/iavf).
> 
> Enter this script. It relies on Meson's introspection capabilities as well
> as the dependency graphs generated by our build system to display all
> available components, and handle any dependencies for them automatically,
> while also not forcing user to remember any command-line options and lists
> of drivers, and instead relying on interactive TUI to display list of
> available options. It can also produce builds that are as minimal as
> possible (including cutting down libraries being built) by utilizing the
> fact that our dependency graphs report which dependency is mandatory and
> which one is optional.
> 
> Because it is not meant to replace native Meson build configuration but
> is rather targeted at users who are not intimately familiar wtih DPDK's
> build system, it is run in interactive mode by default. However, it is
> also possible to run it without interaction, in which case it will pass
> all its parameters to Meson directly, with added benefit of dependency
> tracking and producing minimal builds if desired.
> 
> Signed-off-by: Anatoly Burakov 

Acked-by: Morten Brørup

RE: [PATCH 0/3] eal: mark API's as stable

> From: Stephen Hemminger [mailto:step...@networkplumber.org]
> Sent: Wednesday, 4 September 2024 20.09
> 
> The API's in ethtool from before 23.11 should be marked stable.
> Should probably include the trace api's but that is more complex change.

For the series,
Acked-by: Morten Brørup

[PATCH 0/8] fix the representor port link status and speed

This patch series aims to fix some problems in the representor port link
status and speed update logic, also do some refactors to the related
logics.

Qin Ke (8):
  net/nfp: fix incorrect type declaration of some variables
  net/nfp: add help function to check link speed
  net/nfp: add help function to update VF link speed
  net/nfp: rename PF speed update function
  net/nfp: add new data field into representor port structure
  net/nfp: fix representor port link speed update problem
  net/nfp: standardize the use of port index in some functions
  net/nfp: fix representor port link status update problem

 .../net/nfp/flower/nfp_flower_representor.c   |  11 +-
 .../net/nfp/flower/nfp_flower_representor.h   |   2 +
 drivers/net/nfp/nfp_ethdev.c  |   6 +-
 drivers/net/nfp/nfp_net_common.c  | 124 +++---
 drivers/net/nfp/nfp_net_common.h  |   2 +-
 5 files changed, 90 insertions(+), 55 deletions(-)

-- 
2.39.1

[PATCH 1/8] net/nfp: fix incorrect type declaration of some variables

From: Qin Ke 

The type declaration of variable 'speed' and 'i' in
'nfp_net_link_speed_rte2nfp()' is not correct, fix it.

Fixes: 36a9abd4b679 ("net/nfp: write link speed to control BAR")
Cc: james.hers...@corigine.com
Cc: sta...@dpdk.org

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

diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 5f92c2c31d..be0b6dc0cf 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -157,10 +157,10 @@ static const uint32_t nfp_net_link_speed_nfp2rte[] = {
[NFP_NET_CFG_STS_LINK_RATE_100G]= RTE_ETH_SPEED_NUM_100G,
 };
 
-static uint16_t
-nfp_net_link_speed_rte2nfp(uint16_t speed)
+static size_t
+nfp_net_link_speed_rte2nfp(uint32_t speed)
 {
-   uint16_t i;
+   size_t i;
 
for (i = 0; i < RTE_DIM(nfp_net_link_speed_nfp2rte); i++) {
if (speed == nfp_net_link_speed_nfp2rte[i])
-- 
2.39.1

[PATCH 2/8] net/nfp: add help function to check link speed

From: Qin Ke 

Add help function to check link speed.

Signed-off-by: Qin Ke 
Reviewed-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_net_common.c | 23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index be0b6dc0cf..25872a4131 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -170,6 +170,19 @@ nfp_net_link_speed_rte2nfp(uint32_t speed)
return NFP_NET_CFG_STS_LINK_RATE_UNKNOWN;
 }
 
+static uint32_t
+nfp_net_link_speed_nfp2rte_check(uint32_t speed)
+{
+   size_t i;
+
+   for (i = 0; i < RTE_DIM(nfp_net_link_speed_nfp2rte); i++) {
+   if (speed == nfp_net_link_speed_nfp2rte[i])
+   return nfp_net_link_speed_nfp2rte[i];
+   }
+
+   return RTE_ETH_SPEED_NUM_NONE;
+}
+
 static void
 nfp_net_notify_port_speed(struct nfp_net_hw *hw,
struct rte_eth_link *link)
@@ -734,8 +747,6 @@ nfp_net_speed_aneg_update(struct rte_eth_dev *dev,
struct nfp_net_hw_priv *hw_priv,
struct rte_eth_link *link)
 {
-   uint32_t i;
-   uint32_t speed;
enum nfp_eth_aneg aneg;
struct nfp_pf_dev *pf_dev;
struct nfp_eth_table *nfp_eth_table;
@@ -758,14 +769,8 @@ nfp_net_speed_aneg_update(struct rte_eth_dev *dev,
 
nfp_eth_table = pf_dev->nfp_eth_table;
eth_port = &nfp_eth_table->ports[hw->idx];
-   speed = eth_port->speed;
 
-   for (i = 0; i < RTE_DIM(nfp_net_link_speed_nfp2rte); i++) {
-   if (nfp_net_link_speed_nfp2rte[i] == speed) {
-   link->link_speed = speed;
-   break;
-   }
-   }
+   link->link_speed = nfp_net_link_speed_nfp2rte_check(eth_port->speed);
 
if (dev->data->dev_conf.link_speeds == RTE_ETH_LINK_SPEED_AUTONEG &&
eth_port->supp_aneg)
-- 
2.39.1

[PATCH 3/8] net/nfp: add help function to update VF link speed

From: Qin Ke 

Add help function to encapsulate logic of updating vf link speed.

Signed-off-by: Qin Ke 
Reviewed-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_net_common.c | 33 
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 25872a4131..c918469047 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -777,6 +777,24 @@ nfp_net_speed_aneg_update(struct rte_eth_dev *dev,
link->link_autoneg = RTE_ETH_LINK_AUTONEG;
 }
 
+static void
+nfp_net_vf_speed_update(struct rte_eth_link *link,
+   uint32_t link_status)
+{
+   size_t link_rate_index;
+
+   /*
+* Shift and mask link_status so that it is effectively the value
+* at offset NFP_NET_CFG_STS_NSP_LINK_RATE.
+*/
+   link_rate_index = (link_status >> NFP_NET_CFG_STS_LINK_RATE_SHIFT) &
+   NFP_NET_CFG_STS_LINK_RATE_MASK;
+   if (link_rate_index < RTE_DIM(nfp_net_link_speed_nfp2rte))
+   link->link_speed = nfp_net_link_speed_nfp2rte[link_rate_index];
+   else
+   link->link_speed = RTE_ETH_SPEED_NUM_NONE;
+}
+
 int
 nfp_net_link_update_common(struct rte_eth_dev *dev,
struct nfp_net_hw *hw,
@@ -784,23 +802,14 @@ nfp_net_link_update_common(struct rte_eth_dev *dev,
uint32_t link_status)
 {
int ret;
-   uint32_t nn_link_status;
struct nfp_net_hw_priv *hw_priv;
 
hw_priv = dev->process_private;
if (link->link_status == RTE_ETH_LINK_UP) {
-   if (hw_priv->is_pf) {
+   if (hw_priv->is_pf)
nfp_net_speed_aneg_update(dev, hw, hw_priv, link);
-   } else {
-   /*
-* Shift and mask nn_link_status so that it is 
effectively the value
-* at offset NFP_NET_CFG_STS_NSP_LINK_RATE.
-*/
-   nn_link_status = (link_status >> 
NFP_NET_CFG_STS_LINK_RATE_SHIFT) &
-   NFP_NET_CFG_STS_LINK_RATE_MASK;
-   if (nn_link_status < 
RTE_DIM(nfp_net_link_speed_nfp2rte))
-   link->link_speed = 
nfp_net_link_speed_nfp2rte[nn_link_status];
-   }
+   else
+   nfp_net_vf_speed_update(link, link_status);
}
 
ret = rte_eth_linkstatus_set(dev, link);
-- 
2.39.1

[PATCH 4/8] net/nfp: rename PF speed update function

From: Qin Ke 

Rename PF speed update function of 'nfp_net_speed_aneg_update()'
to 'nfp_net_pf_speed_update()', which make codes more readable.

Also use maroc to replace the hard coded value.

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

diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index c918469047..6761a16ef2 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -742,7 +742,7 @@ nfp_net_allmulticast_disable(struct rte_eth_dev *dev)
 }
 
 static void
-nfp_net_speed_aneg_update(struct rte_eth_dev *dev,
+nfp_net_pf_speed_update(struct rte_eth_dev *dev,
struct nfp_net_hw *hw,
struct nfp_net_hw_priv *hw_priv,
struct rte_eth_link *link)
@@ -807,14 +807,14 @@ nfp_net_link_update_common(struct rte_eth_dev *dev,
hw_priv = dev->process_private;
if (link->link_status == RTE_ETH_LINK_UP) {
if (hw_priv->is_pf)
-   nfp_net_speed_aneg_update(dev, hw, hw_priv, link);
+   nfp_net_pf_speed_update(dev, hw, hw_priv, link);
else
nfp_net_vf_speed_update(link, link_status);
}
 
ret = rte_eth_linkstatus_set(dev, link);
if (ret == 0) {
-   if (link->link_status != 0)
+   if (link->link_status == RTE_ETH_LINK_UP)
PMD_DRV_LOG(INFO, "NIC Link is Up");
else
PMD_DRV_LOG(INFO, "NIC Link is Down");
-- 
2.39.1

[PATCH 5/8] net/nfp: add new data field into representor port structure

From: Qin Ke 

Add a new data field 'idx' into 'nfp_flower_representor' structure
to indicate the sequential physical port number of representor
devices, also initialize it for all representor ports.

Signed-off-by: Qin Ke 
Reviewed-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower_representor.c | 4 
 drivers/net/nfp/flower/nfp_flower_representor.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c 
b/drivers/net/nfp/flower/nfp_flower_representor.c
index 872b8a6db4..e7593313e2 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -649,6 +649,7 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev,
}
 
/* Copy data here from the input representor template */
+   repr->idx  = init_repr_data->idx;
repr->vf_id= init_repr_data->vf_id;
repr->switch_domain_id = init_repr_data->switch_domain_id;
repr->port_id  = init_repr_data->port_id;
@@ -822,6 +823,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower 
*app_fw_flower,
 
/* Create a rte_eth_dev for PF vNIC representor */
flower_repr.repr_type = NFP_REPR_TYPE_PF;
+   flower_repr.idx = 0;
 
/* PF vNIC reprs get a random MAC address */
rte_eth_random_addr(flower_repr.mac_addr.addr_bytes);
@@ -854,6 +856,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower 
*app_fw_flower,
flower_repr.port_id = 
nfp_flower_get_phys_port_id(eth_port->index);
flower_repr.nfp_idx = eth_port->index;
flower_repr.vf_id = i + 1;
+   flower_repr.idx = id;
 
/* Copy the real mac of the interface to the representor struct 
*/
rte_ether_addr_copy(ð_port->mac_addr, &flower_repr.mac_addr);
@@ -887,6 +890,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower 
*app_fw_flower,
NFP_FLOWER_CMSG_PORT_VNIC_TYPE_VF, i + 
pf_dev->vf_base_id, 0);
flower_repr.nfp_idx = 0;
flower_repr.vf_id = i;
+   flower_repr.idx = 0;
 
/* VF reprs get a random MAC address */
rte_eth_random_addr(flower_repr.mac_addr.addr_bytes);
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.h 
b/drivers/net/nfp/flower/nfp_flower_representor.h
index 70ca7b97db..4211ddf798 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.h
+++ b/drivers/net/nfp/flower/nfp_flower_representor.h
@@ -23,6 +23,8 @@ struct nfp_flower_representor {
 
struct rte_eth_xstat *repr_xstats_base;
uint8_t *mac_stats;
+   /** Sequential physical port number, only valid for repr of physical 
port */
+   uint8_t idx;
 };
 
 int nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower,
-- 
2.39.1

[PATCH 6/8] net/nfp: fix representor port link speed update problem

From: Qin Ke 

For representor port link speed, the original logic finally calls
'nfp_net_speed_aneg_update()' to update it. But the reference of
'hw->idx' in this function is invalid for representor port devices,
the logic has problem.

Fix it by getting correct 'idx' for all type of deives including
representor port and make reference to it.

Fixes: 8412feed3f26 ("net/nfp: modify link update function")
Cc: zerun...@corigine.com
Cc: sta...@dpdk.org

Signed-off-by: Qin Ke 
Reviewed-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 .../net/nfp/flower/nfp_flower_representor.c   |  2 +-
 drivers/net/nfp/nfp_net_common.c  | 32 +++
 drivers/net/nfp/nfp_net_common.h  |  2 +-
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c 
b/drivers/net/nfp/flower/nfp_flower_representor.c
index e7593313e2..054ea1a938 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -40,7 +40,7 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev,
pf_hw = repr->app_fw_flower->pf_hw;
nn_link_status = nn_cfg_readw(&pf_hw->super, NFP_NET_CFG_STS);
 
-   ret = nfp_net_link_update_common(dev, pf_hw, link, nn_link_status);
+   ret = nfp_net_link_update_common(dev, link, nn_link_status);
 
return ret;
 }
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index 6761a16ef2..daed57e374 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -311,6 +311,24 @@ nfp_net_get_hw(const struct rte_eth_dev *dev)
return hw;
 }
 
+uint8_t
+nfp_net_get_idx(const struct rte_eth_dev *dev)
+{
+   uint8_t idx;
+
+   if (rte_eth_dev_is_repr(dev)) {
+   struct nfp_flower_representor *repr;
+   repr = dev->data->dev_private;
+   idx = repr->idx;
+   } else {
+   struct nfp_net_hw *hw;
+   hw = dev->data->dev_private;
+   idx = hw->idx;
+   }
+
+   return idx;
+}
+
 /*
  * Configure an Ethernet device.
  *
@@ -743,17 +761,18 @@ nfp_net_allmulticast_disable(struct rte_eth_dev *dev)
 
 static void
 nfp_net_pf_speed_update(struct rte_eth_dev *dev,
-   struct nfp_net_hw *hw,
struct nfp_net_hw_priv *hw_priv,
struct rte_eth_link *link)
 {
+   uint8_t idx;
enum nfp_eth_aneg aneg;
struct nfp_pf_dev *pf_dev;
struct nfp_eth_table *nfp_eth_table;
struct nfp_eth_table_port *eth_port;
 
pf_dev = hw_priv->pf_dev;
-   aneg = pf_dev->nfp_eth_table->ports[hw->idx].aneg;
+   idx = nfp_net_get_idx(dev);
+   aneg = pf_dev->nfp_eth_table->ports[idx].aneg;
 
/* Compare whether the current status has changed. */
if (pf_dev->speed_updated || aneg == NFP_ANEG_AUTO) {
@@ -761,14 +780,14 @@ nfp_net_pf_speed_update(struct rte_eth_dev *dev,
if (nfp_eth_table == NULL) {
PMD_DRV_LOG(WARNING, "Failed to update port speed.");
} else {
-   pf_dev->nfp_eth_table->ports[hw->idx] = 
nfp_eth_table->ports[hw->idx];
+   pf_dev->nfp_eth_table->ports[idx] = 
nfp_eth_table->ports[idx];
free(nfp_eth_table);
pf_dev->speed_updated = false;
}
}
 
nfp_eth_table = pf_dev->nfp_eth_table;
-   eth_port = &nfp_eth_table->ports[hw->idx];
+   eth_port = &nfp_eth_table->ports[idx];
 
link->link_speed = nfp_net_link_speed_nfp2rte_check(eth_port->speed);
 
@@ -797,7 +816,6 @@ nfp_net_vf_speed_update(struct rte_eth_link *link,
 
 int
 nfp_net_link_update_common(struct rte_eth_dev *dev,
-   struct nfp_net_hw *hw,
struct rte_eth_link *link,
uint32_t link_status)
 {
@@ -807,7 +825,7 @@ nfp_net_link_update_common(struct rte_eth_dev *dev,
hw_priv = dev->process_private;
if (link->link_status == RTE_ETH_LINK_UP) {
if (hw_priv->is_pf)
-   nfp_net_pf_speed_update(dev, hw, hw_priv, link);
+   nfp_net_pf_speed_update(dev, hw_priv, link);
else
nfp_net_vf_speed_update(link, link_status);
}
@@ -851,7 +869,7 @@ nfp_net_link_update(struct rte_eth_dev *dev,
 
link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
 
-   ret = nfp_net_link_update_common(dev, hw, &link, nn_link_status);
+   ret = nfp_net_link_update_common(dev, &link, nn_link_status);
if (ret == -EIO)
return ret;
 
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index be5705636f..a32f3b330a 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -293,7 +293,6 @@ int nfp_net_promisc_disable(struct rte_eth_dev *dev);
 int nfp_net_allmulticast_enable(

[PATCH 7/8] net/nfp: standardize the use of port index in some functions

From: Qin Ke 

Standardize the use of 'idx' in some functions which could be
used for both flower and coreNIC firmware.

Signed-off-by: Qin Ke 
Reviewed-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_ethdev.c |  6 --
 drivers/net/nfp/nfp_net_common.c | 26 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index b35e40a7d0..2ddfdcd048 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -281,6 +281,7 @@ static int
 nfp_net_speed_configure(struct rte_eth_dev *dev)
 {
int ret;
+   uint8_t idx;
uint32_t speed_capa;
uint32_t link_speeds;
uint32_t configure_speed;
@@ -289,8 +290,9 @@ nfp_net_speed_configure(struct rte_eth_dev *dev)
struct nfp_net_hw *net_hw = dev->data->dev_private;
struct nfp_net_hw_priv *hw_priv = dev->process_private;
 
+   idx = nfp_net_get_idx(dev);
nfp_eth_table = hw_priv->pf_dev->nfp_eth_table;
-   eth_port = &nfp_eth_table->ports[net_hw->idx];
+   eth_port = &nfp_eth_table->ports[idx];
 
speed_capa = hw_priv->pf_dev->speed_capa;
if (speed_capa == 0) {
@@ -308,7 +310,7 @@ nfp_net_speed_configure(struct rte_eth_dev *dev)
 
/* NFP4000 does not allow the port 0 25Gbps and port 1 10Gbps at the 
same time. */
if (net_hw->device_id == PCI_DEVICE_ID_NFP4000_PF_NIC) {
-   ret = nfp_net_nfp4000_speed_configure_check(net_hw->idx,
+   ret = nfp_net_nfp4000_speed_configure_check(idx,
configure_speed, nfp_eth_table);
if (ret != 0) {
PMD_DRV_LOG(ERR, "Failed to configure speed for 
NFP4000.");
diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c
index daed57e374..f440f31a4d 100644
--- a/drivers/net/nfp/nfp_net_common.c
+++ b/drivers/net/nfp/nfp_net_common.c
@@ -2489,20 +2489,20 @@ nfp_net_flow_ctrl_set(struct rte_eth_dev *dev,
struct rte_eth_fc_conf *fc_conf)
 {
int ret;
-   struct nfp_net_hw *net_hw;
+   uint8_t idx;
enum rte_eth_fc_mode set_mode;
struct nfp_net_hw_priv *hw_priv;
enum rte_eth_fc_mode original_mode;
struct nfp_eth_table *nfp_eth_table;
struct nfp_eth_table_port *eth_port;
 
-   net_hw = nfp_net_get_hw(dev);
+   idx = nfp_net_get_idx(dev);
hw_priv = dev->process_private;
if (hw_priv == NULL || hw_priv->pf_dev == NULL)
return -EINVAL;
 
nfp_eth_table = hw_priv->pf_dev->nfp_eth_table;
-   eth_port = &nfp_eth_table->ports[net_hw->idx];
+   eth_port = &nfp_eth_table->ports[idx];
 
original_mode = nfp_net_get_pause_mode(eth_port);
set_mode = fc_conf->mode;
@@ -2526,20 +2526,20 @@ nfp_net_fec_get_capability(struct rte_eth_dev *dev,
struct rte_eth_fec_capa *speed_fec_capa,
__rte_unused unsigned int num)
 {
+   uint8_t idx;
uint16_t speed;
-   struct nfp_net_hw *hw;
uint32_t supported_fec;
struct nfp_net_hw_priv *hw_priv;
struct nfp_eth_table *nfp_eth_table;
struct nfp_eth_table_port *eth_port;
 
-   hw = nfp_net_get_hw(dev);
+   idx = nfp_net_get_idx(dev);
hw_priv = dev->process_private;
if (hw_priv == NULL || hw_priv->pf_dev == NULL)
return -EINVAL;
 
nfp_eth_table = hw_priv->pf_dev->nfp_eth_table;
-   eth_port = &nfp_eth_table->ports[hw->idx];
+   eth_port = &nfp_eth_table->ports[idx];
 
speed = eth_port->speed;
supported_fec = nfp_eth_supported_fec_modes(eth_port);
@@ -2587,24 +2587,24 @@ int
 nfp_net_fec_get(struct rte_eth_dev *dev,
uint32_t *fec_capa)
 {
-   struct nfp_net_hw *hw;
+   uint8_t idx;
struct nfp_net_hw_priv *hw_priv;
struct nfp_eth_table *nfp_eth_table;
struct nfp_eth_table_port *eth_port;
 
-   hw = nfp_net_get_hw(dev);
+   idx = nfp_net_get_idx(dev);
hw_priv = dev->process_private;
if (hw_priv == NULL || hw_priv->pf_dev == NULL)
return -EINVAL;
 
if (dev->data->dev_link.link_status == RTE_ETH_LINK_DOWN) {
nfp_eth_table = nfp_eth_read_ports(hw_priv->pf_dev->cpp);
-   hw_priv->pf_dev->nfp_eth_table->ports[hw->idx] = 
nfp_eth_table->ports[hw->idx];
+   hw_priv->pf_dev->nfp_eth_table->ports[idx] = 
nfp_eth_table->ports[idx];
free(nfp_eth_table);
}
 
nfp_eth_table = hw_priv->pf_dev->nfp_eth_table;
-   eth_port = &nfp_eth_table->ports[hw->idx];
+   eth_port = &nfp_eth_table->ports[idx];
 
if (!nfp_eth_can_support_fec(eth_port)) {
PMD_DRV_LOG(ERR, "NFP can not support FEC.");
@@ -2648,20 +2648,20 @@ int
 nfp_net_fec_set(struct rte_eth_dev *dev,
uint32_t fec_capa)
 {
+   uint8

[PATCH 8/8] net/nfp: fix representor port link status update problem

From: Qin Ke 

The link status of representor port is reported by the flower
firmware through control message and it already parsed and
stored in the 'link' field of representor port structure.

The original logic read link status from the control BAR again,
and use it rather then the 'link' field of the representor port
structure in the following logic wrongly.

Fix this by delete the read control BAR statement and use the
right link status value.

Fixes: c4de52eca76c ("net/nfp: remove redundancy for representor port")
Cc: chaoyong...@corigine.com
Cc: sta...@dpdk.org

Signed-off-by: Qin Ke 
Reviewed-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_flower_representor.c | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c 
b/drivers/net/nfp/flower/nfp_flower_representor.c
index 054ea1a938..5db7d50618 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -29,18 +29,13 @@ nfp_flower_repr_link_update(struct rte_eth_dev *dev,
__rte_unused int wait_to_complete)
 {
int ret;
-   uint32_t nn_link_status;
-   struct nfp_net_hw *pf_hw;
struct rte_eth_link *link;
struct nfp_flower_representor *repr;
 
repr = dev->data->dev_private;
link = &repr->link;
 
-   pf_hw = repr->app_fw_flower->pf_hw;
-   nn_link_status = nn_cfg_readw(&pf_hw->super, NFP_NET_CFG_STS);
-
-   ret = nfp_net_link_update_common(dev, link, nn_link_status);
+   ret = nfp_net_link_update_common(dev, link, link->link_status);
 
return ret;
 }
-- 
2.39.1

Re: [PATCH v3 1/3] ethdev: add description for KEEP CRC offload

2024-09-04 Thread Andrew Rybchenko


On 7/19/24 12:04, Jie Hai wrote:

From: Dengdui Huang 

The data exceeds the pkt_len in mbuf is inavailable for user.
When KEEP CRC offload is enabled, CRC field length should be
included in the pkt_len in mbuf. However, almost of drivers
supported KEEP CRC feature didn't add the CRC data length to
pkt_len. So it is very necessary to add comments for this.

Fixes: 70815c9ecadd ("ethdev: add new offload flag to keep CRC")
Cc: sta...@dpdk.org

Signed-off-by: Dengdui Huang 
Acked-by: Morten Brørup 
Acked-by: Huisong Li 
Acked-by: Jie Hai 


Acked-by: Andrew Rybchenko

[RESEND v6 0/8] support dump reigser names and filter

The registers can be dumped through the API rte_eth_dev_get_reg_info.
However, only register values are exported, which is inconvenient for
users to interpret. Therefore, an extension of the structure
"rte_dev_reg_info" and a new API rte_eth_dev_get_reg_info_ext is added
to support the capability of exporting the name of the corresponding
register and filtering by module names.

The hns3 driver and telemetry are examples for that.

Jie Hai (8):
  ethdev: support report register names and filter
  ethdev: add telemetry cmd for registers
  net/hns3: remove some basic address dump
  net/hns3: fix dump counter of registers
  net/hns3: remove separators between register module
  net/hns3: refactor register dump
  net/hns3: support report names of registers
  net/hns3: support filter registers by module names

 doc/guides/rel_notes/release_24_11.rst |7 +
 drivers/net/hns3/hns3_regs.c   | 1394 +++-
 lib/ethdev/ethdev_trace.h  |2 +
 lib/ethdev/rte_dev_info.h  |   11 +
 lib/ethdev/rte_ethdev.c|   38 +
 lib/ethdev/rte_ethdev.h|   29 +
 lib/ethdev/rte_ethdev_telemetry.c  |  128 +++
 lib/ethdev/version.map |3 +
 8 files changed, 1346 insertions(+), 266 deletions(-)
 mode change 100644 => 100755 doc/guides/rel_notes/release_24_11.rst

-- 
2.22.0

[RESEND v6 3/8] net/hns3: remove some basic address dump

For security reasons, some address registers are not suitable
to be exposed, remove them.

Cc: sta...@dpdk.org

Signed-off-by: Jie Hai 
Acked-by: Huisong Li
---
 drivers/net/hns3/hns3_regs.c | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index be1be6a89c..53d829a4fc 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -17,13 +17,9 @@
 
 static int hns3_get_dfx_reg_line(struct hns3_hw *hw, uint32_t *lines);
 
-static const uint32_t cmdq_reg_addrs[] = {HNS3_CMDQ_TX_ADDR_L_REG,
- HNS3_CMDQ_TX_ADDR_H_REG,
- HNS3_CMDQ_TX_DEPTH_REG,
+static const uint32_t cmdq_reg_addrs[] = {HNS3_CMDQ_TX_DEPTH_REG,
  HNS3_CMDQ_TX_TAIL_REG,
  HNS3_CMDQ_TX_HEAD_REG,
- HNS3_CMDQ_RX_ADDR_L_REG,
- HNS3_CMDQ_RX_ADDR_H_REG,
  HNS3_CMDQ_RX_DEPTH_REG,
  HNS3_CMDQ_RX_TAIL_REG,
  HNS3_CMDQ_RX_HEAD_REG,
@@ -44,9 +40,7 @@ static const uint32_t common_vf_reg_addrs[] = 
{HNS3_MISC_VECTOR_REG_BASE,
   HNS3_FUN_RST_ING,
   HNS3_GRO_EN_REG};
 
-static const uint32_t ring_reg_addrs[] = {HNS3_RING_RX_BASEADDR_L_REG,
- HNS3_RING_RX_BASEADDR_H_REG,
- HNS3_RING_RX_BD_NUM_REG,
+static const uint32_t ring_reg_addrs[] = {HNS3_RING_RX_BD_NUM_REG,
  HNS3_RING_RX_BD_LEN_REG,
  HNS3_RING_RX_EN_REG,
  HNS3_RING_RX_MERGE_EN_REG,
@@ -57,8 +51,6 @@ static const uint32_t ring_reg_addrs[] = 
{HNS3_RING_RX_BASEADDR_L_REG,
  HNS3_RING_RX_FBD_OFFSET_REG,
  HNS3_RING_RX_STASH_REG,
  HNS3_RING_RX_BD_ERR_REG,
- HNS3_RING_TX_BASEADDR_L_REG,
- HNS3_RING_TX_BASEADDR_H_REG,
  HNS3_RING_TX_BD_NUM_REG,
  HNS3_RING_TX_EN_REG,
  HNS3_RING_TX_PRIORITY_REG,
-- 
2.22.0

[RESEND v6 2/8] ethdev: add telemetry cmd for registers

This patch adds a telemetry command for registers dump,
and supports obtaining the registers of a specified module.

In one way, the number of registers that can be exported
is limited by the number of elements carried by dict and
container. In another way, the length of the string
exported by telemetry is limited by MAX_OUTPUT_LEN.
Therefore, when the number of registers to be exported
exceeds, some information will be lost. Warn on the former
case.

An example usage is shown below:
--> /ethdev/regs,0,ring
{
  "/ethdev/regs": {
"registers_length": 318,
"registers_width": 4,
"register_offset": "0x0",
"version": "0x1140011",
"group_0": {
  "Q0_ring_rx_bd_num": "0x0",
  "Q0_ring_rx_bd_len": "0x0",
  ...
  },
"group_1": {
...
},
...
}

Signed-off-by: Jie Hai 
---
 lib/ethdev/rte_ethdev_telemetry.c | 128 ++
 1 file changed, 128 insertions(+)

diff --git a/lib/ethdev/rte_ethdev_telemetry.c 
b/lib/ethdev/rte_ethdev_telemetry.c
index 6b873e7abe..1d59c69388 100644
--- a/lib/ethdev/rte_ethdev_telemetry.c
+++ b/lib/ethdev/rte_ethdev_telemetry.c
@@ -1395,6 +1395,132 @@ eth_dev_handle_port_tm_node_caps(const char *cmd 
__rte_unused,
return ret;
 }
 
+static void
+eth_dev_add_reg_data(struct rte_tel_data *d, struct rte_dev_reg_info *reg_info,
+uint32_t idx)
+{
+   if (reg_info->width == sizeof(uint32_t))
+   rte_tel_data_add_dict_uint_hex(d, reg_info->names[idx].name,
+   *((uint32_t *)reg_info->data + idx), 0);
+   else
+   rte_tel_data_add_dict_uint_hex(d, reg_info->names[idx].name,
+   *((uint64_t *)reg_info->data + idx), 0);
+}
+
+static int
+eth_dev_store_regs(struct rte_tel_data *d, struct rte_dev_reg_info *reg_info)
+{
+   struct rte_tel_data *groups[RTE_TEL_MAX_DICT_ENTRIES];
+   char group_name[RTE_TEL_MAX_STRING_LEN] = {0};
+   struct rte_tel_data *group = NULL;
+   uint32_t grp_num = 0;
+   uint32_t i;
+   int ret;
+
+   rte_tel_data_start_dict(d);
+   rte_tel_data_add_dict_uint(d, "register_length", reg_info->length);
+   rte_tel_data_add_dict_uint(d, "register_width", reg_info->width);
+   rte_tel_data_add_dict_uint_hex(d, "register_offset", reg_info->offset, 
0);
+   rte_tel_data_add_dict_uint_hex(d, "version", reg_info->version, 0);
+
+   for (i = 0; i < reg_info->length; i++) {
+   if (i % RTE_TEL_MAX_DICT_ENTRIES != 0) {
+   eth_dev_add_reg_data(group, reg_info, i);
+   continue;
+   }
+
+   group = rte_tel_data_alloc();
+   if (group == NULL) {
+   ret = -ENOMEM;
+   RTE_ETHDEV_LOG_LINE(WARNING, "No enough memory for 
group data");
+   goto out;
+   }
+   groups[grp_num++] = group;
+   rte_tel_data_start_dict(group);
+   eth_dev_add_reg_data(group, reg_info, i);
+   }
+
+   for (i = 0; i < grp_num; i++) {
+   snprintf(group_name, RTE_TEL_MAX_STRING_LEN, "group_%u", i);
+   ret = rte_tel_data_add_dict_container(d, group_name, groups[i], 
0);
+   if (ret == -ENOSPC) {
+   RTE_ETHDEV_LOG_LINE(WARNING,
+   "Reduce register number to be displayed from %u 
to %u due to limited capacity of telemetry",
+   reg_info->length, i * RTE_TEL_MAX_DICT_ENTRIES);
+   break;
+   }
+   }
+   return 0;
+out:
+   for (i = 0; i < grp_num; i++)
+   rte_tel_data_free(groups[i]);
+
+   return ret;
+}
+
+static int
+eth_dev_get_port_regs(int port_id, struct rte_tel_data *d, char *filter)
+{
+   struct rte_dev_reg_info reg_info;
+   int ret;
+
+   memset(®_info, 0, sizeof(reg_info));
+   reg_info.filter = filter;
+
+   ret = rte_eth_dev_get_reg_info_ext(port_id, ®_info);
+   if (ret != 0) {
+   RTE_ETHDEV_LOG_LINE(ERR, "Error getting device reg info: %d", 
ret);
+   return ret;
+   }
+
+   reg_info.data = calloc(reg_info.length, reg_info.width);
+   if (reg_info.data == NULL) {
+   RTE_ETHDEV_LOG_LINE(ERR, "Fail to allocate memory for 
reg_info.data");
+   return -ENOMEM;
+   }
+
+   reg_info.names = calloc(reg_info.length, sizeof(struct 
rte_eth_reg_name));
+   if (reg_info.names == NULL) {
+   RTE_ETHDEV_LOG_LINE(ERR, "Fail to allocate memory for 
reg_info.names");
+   free(reg_info.data);
+   return -ENOMEM;
+   }
+
+   ret = rte_eth_dev_get_reg_info_ext(port_id, ®_info);
+   if (ret != 0) {
+   RTE_ETHDEV_LOG_LINE(ERR, "Error getting regs from device: %d", 
ret);
+   ret = -EINVAL;
+   goto out;
+   }
+
+   ret = eth_dev_store_regs(d, ®_info);

[RESEND v6 1/8] ethdev: support report register names and filter

This patch adds "filter" and "names" fields to "rte_dev_reg_info"
structure. Names of registers in data fields can be reported and
the registers can be filtered by their module names.

The new API rte_eth_dev_get_reg_info_ext() is added to support
reporting names and filtering by modules. And the original API
rte_eth_dev_get_reg_info() does not use the names and filter fields.
A local variable is used in rte_eth_dev_get_reg_info for
compatibility. If the drivers does not report the names, set them
to "index_XXX", which means the location in the register table.

Signed-off-by: Jie Hai 
Acked-by: Huisong Li 
Acked-by: Chengwen Feng 
---
 doc/guides/rel_notes/release_24_11.rst |  7 +
 lib/ethdev/ethdev_trace.h  |  2 ++
 lib/ethdev/rte_dev_info.h  | 11 
 lib/ethdev/rte_ethdev.c| 38 ++
 lib/ethdev/rte_ethdev.h| 29 
 lib/ethdev/version.map |  3 ++
 6 files changed, 90 insertions(+)
 mode change 100644 => 100755 doc/guides/rel_notes/release_24_11.rst

diff --git a/doc/guides/rel_notes/release_24_11.rst 
b/doc/guides/rel_notes/release_24_11.rst
old mode 100644
new mode 100755
index 0ff70d9057..acec1c60a6
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -54,6 +54,11 @@ New Features
  This section is a comment. Do not overwrite or remove it.
  Also, make sure to start the actual text at the margin.
  ===
+* **Added support for dumping registers with names and filtering by modules.**
+
+  * Added new API functions ``rte_eth_dev_get_reg_info_ext()`` to filter the
+registers by module names and get the information (names, values and other
+attributes) of the filtered registers.
 
 
 Removed Items
@@ -100,6 +105,8 @@ ABI Changes
Also, make sure to start the actual text at the margin.
===
 
+* ethdev: Added ``filter`` and ``names`` fields to ``rte_dev_reg_info``
+  structure for filtering by modules and reporting names of registers.
 
 Known Issues
 
diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h
index 3bec87bfdb..0c4780a09e 100644
--- a/lib/ethdev/ethdev_trace.h
+++ b/lib/ethdev/ethdev_trace.h
@@ -1152,6 +1152,8 @@ RTE_TRACE_POINT(
rte_trace_point_emit_u32(info->length);
rte_trace_point_emit_u32(info->width);
rte_trace_point_emit_u32(info->version);
+   rte_trace_point_emit_ptr(info->names);
+   rte_trace_point_emit_ptr(info->filter);
rte_trace_point_emit_int(ret);
 )
 
diff --git a/lib/ethdev/rte_dev_info.h b/lib/ethdev/rte_dev_info.h
index 67cf0ae526..26b777f983 100644
--- a/lib/ethdev/rte_dev_info.h
+++ b/lib/ethdev/rte_dev_info.h
@@ -11,6 +11,11 @@ extern "C" {
 
 #include 
 
+#define RTE_ETH_REG_NAME_SIZE 64
+struct rte_eth_reg_name {
+   char name[RTE_ETH_REG_NAME_SIZE];
+};
+
 /*
  * Placeholder for accessing device registers
  */
@@ -20,6 +25,12 @@ struct rte_dev_reg_info {
uint32_t length; /**< Number of registers to fetch */
uint32_t width; /**< Size of device register */
uint32_t version; /**< Device version */
+   /**
+* Name of target module, filter for target subset of registers.
+* This field could affects register selection for data/length/names.
+*/
+   const char *filter;
+   struct rte_eth_reg_name *names; /**< Registers name saver */
 };
 
 /*
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index f1c658f49e..30ca4a0043 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -6388,8 +6388,37 @@ rte_eth_read_clock(uint16_t port_id, uint64_t *clock)
 
 int
 rte_eth_dev_get_reg_info(uint16_t port_id, struct rte_dev_reg_info *info)
+{
+   struct rte_dev_reg_info reg_info = { 0 };
+   int ret;
+
+   if (info == NULL) {
+   RTE_ETHDEV_LOG_LINE(ERR,
+   "Cannot get ethdev port %u register info to NULL",
+   port_id);
+   return -EINVAL;
+   }
+
+   reg_info.length = info->length;
+   reg_info.data = info->data;
+
+   ret = rte_eth_dev_get_reg_info_ext(port_id, ®_info);
+   if (ret != 0)
+   return ret;
+
+   info->length = reg_info.length;
+   info->width = reg_info.width;
+   info->version = reg_info.version;
+   info->offset = reg_info.offset;
+
+   return 0;
+}
+
+int
+rte_eth_dev_get_reg_info_ext(uint16_t port_id, struct rte_dev_reg_info *info)
 {
struct rte_eth_dev *dev;
+   uint32_t i;
int ret;
 
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -6402,12 +6431,21 @@ rte_eth_dev_get_reg_info(uint16_t port_id, struct 
rte_dev_reg_info *info)
return -EINVAL;
}
 
+   if (info->names != NULL && info->length != 0)
+   memset(info->names, 0, sizeof(stru

[RESEND v6 4/8] net/hns3: fix dump counter of registers

Since the driver dumps the queue interrupt registers according
to the intr_tqps_num, the counter should be the same.

Fixes: acb3260fac5c ("net/hns3: fix dump register out of range")
Fixes: 936eda25e8da ("net/hns3: support dump register")
Cc: sta...@dpdk.org

Signed-off-by: Jie Hai 
Acked-by: Huisong Li 
Acked-by: Chengwen Feng 
---
 drivers/net/hns3/hns3_regs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index 53d829a4fc..d9c546470d 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -127,7 +127,7 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
tqp_intr_lines = sizeof(tqp_intr_reg_addrs) / REG_LEN_PER_LINE + 1;
 
len = (cmdq_lines + common_lines + ring_lines * hw->tqps_num +
- tqp_intr_lines * hw->num_msi) * REG_NUM_PER_LINE;
+ tqp_intr_lines * hw->intr_tqps_num) * REG_NUM_PER_LINE;
 
if (!hns->is_vf) {
ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
-- 
2.22.0

[RESEND v6 6/8] net/hns3: refactor register dump

This patch refactors codes dumping registers from firmware.

Signed-off-by: Jie Hai 
---
 drivers/net/hns3/hns3_regs.c | 203 ---
 1 file changed, 115 insertions(+), 88 deletions(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index c8e3fb118e..89858c2b1c 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -104,12 +104,93 @@ hns3_get_regs_num(struct hns3_hw *hw, uint32_t 
*regs_num_32_bit,
return 0;
 }
 
+static int
+hns3_get_32_64_regs_cnt(struct hns3_hw *hw, uint32_t *count)
+{
+   uint32_t regs_num_32_bit, regs_num_64_bit;
+   int ret;
+
+   ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
+   if (ret) {
+   hns3_err(hw, "fail to get the number of registers, "
+"ret = %d.", ret);
+   return ret;
+   }
+
+   *count += regs_num_32_bit + regs_num_64_bit * 
HNS3_64_BIT_REG_OUTPUT_SIZE;
+   return 0;
+}
+
+static int
+hns3_get_dfx_reg_bd_num(struct hns3_hw *hw, uint32_t *bd_num_list,
+   uint32_t list_size)
+{
+#define HNS3_GET_DFX_REG_BD_NUM_SIZE   4
+   struct hns3_cmd_desc desc[HNS3_GET_DFX_REG_BD_NUM_SIZE];
+   uint32_t index, desc_index;
+   uint32_t bd_num;
+   uint32_t i;
+   int ret;
+
+   for (i = 0; i < HNS3_GET_DFX_REG_BD_NUM_SIZE - 1; i++) {
+   hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_DFX_BD_NUM, true);
+   desc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT);
+   }
+   /* The last BD does not need a next flag */
+   hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_DFX_BD_NUM, true);
+
+   ret = hns3_cmd_send(hw, desc, HNS3_GET_DFX_REG_BD_NUM_SIZE);
+   if (ret) {
+   hns3_err(hw, "fail to get dfx bd num, ret = %d.\n", ret);
+   return ret;
+   }
+
+   /* The first data in the first BD is a reserved field */
+   for (i = 1; i <= list_size; i++) {
+   desc_index = i / HNS3_CMD_DESC_DATA_NUM;
+   index = i % HNS3_CMD_DESC_DATA_NUM;
+   bd_num = rte_le_to_cpu_32(desc[desc_index].data[index]);
+   bd_num_list[i - 1] = bd_num;
+   }
+
+   return 0;
+}
+
+static int
+hns3_get_dfx_reg_cnt(struct hns3_hw *hw, uint32_t *count)
+{
+   int opcode_num = RTE_DIM(hns3_dfx_reg_opcode_list);
+   uint32_t bd_num_list[opcode_num];
+   int ret;
+   int i;
+
+   ret = hns3_get_dfx_reg_bd_num(hw, bd_num_list, opcode_num);
+   if (ret)
+   return ret;
+
+   for (i = 0; i < opcode_num; i++)
+   *count += bd_num_list[i] * HNS3_CMD_DESC_DATA_NUM;
+
+   return 0;
+}
+
+static int
+hns3_get_firmware_reg_cnt(struct hns3_hw *hw, uint32_t *count)
+{
+   int ret;
+
+   ret = hns3_get_32_64_regs_cnt(hw, count);
+   if (ret < 0)
+   return ret;
+
+   return hns3_get_dfx_reg_cnt(hw, count);
+}
+
 static int
 hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
 {
struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
-   uint32_t regs_num_32_bit, regs_num_64_bit;
-   uint32_t dfx_reg_cnt;
+   uint32_t dfx_reg_cnt = 0;
uint32_t common_cnt;
uint32_t len;
int ret;
@@ -125,16 +206,7 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
len /= sizeof(uint32_t);
 
if (!hns->is_vf) {
-   ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
-   if (ret) {
-   hns3_err(hw, "fail to get the number of registers, "
-"ret = %d.", ret);
-   return ret;
-   }
-   dfx_reg_cnt = regs_num_32_bit +
- regs_num_64_bit * HNS3_64_BIT_REG_OUTPUT_SIZE;
-
-   ret = hns3_get_dfx_reg_cnt(hw, &dfx_reg_cnt);
+   ret = hns3_get_firmware_reg_cnt(hw, &dfx_reg_cnt);
if (ret) {
hns3_err(hw, "fail to get the number of dfx registers, "
 "ret = %d.", ret);
@@ -304,41 +376,6 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
return data - origin_data_ptr;
 }
 
-static int
-hns3_get_dfx_reg_bd_num(struct hns3_hw *hw, uint32_t *bd_num_list,
-   uint32_t list_size)
-{
-#define HNS3_GET_DFX_REG_BD_NUM_SIZE   4
-   struct hns3_cmd_desc desc[HNS3_GET_DFX_REG_BD_NUM_SIZE];
-   uint32_t index, desc_index;
-   uint32_t bd_num;
-   uint32_t i;
-   int ret;
-
-   for (i = 0; i < HNS3_GET_DFX_REG_BD_NUM_SIZE - 1; i++) {
-   hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_DFX_BD_NUM, true);
-   desc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT);
-   }
-   /* The last BD does not need a next flag */
-   hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_DFX_BD_NUM, true);
-
-   ret = hns3_cmd_send(hw, desc, HNS3_GET_DFX_REG_BD_NUM

[RESEND v6 5/8] net/hns3: remove separators between register module

Since the driver is going to support reporting names of
all registers, remove the counter and insert of separators
between different register modules.

Signed-off-by: Jie Hai 
Reviewed-by: Huisong Li 
Acked-by: Chengwen Feng 
---
 drivers/net/hns3/hns3_regs.c | 68 ++--
 1 file changed, 18 insertions(+), 50 deletions(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index d9c546470d..c8e3fb118e 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -10,12 +10,9 @@
 #include "hns3_rxtx.h"
 #include "hns3_regs.h"
 
-#define MAX_SEPARATE_NUM   4
-#define SEPARATOR_VALUE0x
-#define REG_NUM_PER_LINE   4
-#define REG_LEN_PER_LINE   (REG_NUM_PER_LINE * sizeof(uint32_t))
+#define HNS3_64_BIT_REG_OUTPUT_SIZE (sizeof(uint64_t) / sizeof(uint32_t))
 
-static int hns3_get_dfx_reg_line(struct hns3_hw *hw, uint32_t *lines);
+static int hns3_get_dfx_reg_cnt(struct hns3_hw *hw, uint32_t *count);
 
 static const uint32_t cmdq_reg_addrs[] = {HNS3_CMDQ_TX_DEPTH_REG,
  HNS3_CMDQ_TX_TAIL_REG,
@@ -111,23 +108,21 @@ static int
 hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
 {
struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
-   uint32_t cmdq_lines, common_lines, ring_lines, tqp_intr_lines;
uint32_t regs_num_32_bit, regs_num_64_bit;
-   uint32_t dfx_reg_lines;
+   uint32_t dfx_reg_cnt;
+   uint32_t common_cnt;
uint32_t len;
int ret;
 
-   cmdq_lines = sizeof(cmdq_reg_addrs) / REG_LEN_PER_LINE + 1;
if (hns->is_vf)
-   common_lines =
-   sizeof(common_vf_reg_addrs) / REG_LEN_PER_LINE + 1;
+   common_cnt = sizeof(common_vf_reg_addrs);
else
-   common_lines = sizeof(common_reg_addrs) / REG_LEN_PER_LINE + 1;
-   ring_lines = sizeof(ring_reg_addrs) / REG_LEN_PER_LINE + 1;
-   tqp_intr_lines = sizeof(tqp_intr_reg_addrs) / REG_LEN_PER_LINE + 1;
+   common_cnt = sizeof(common_reg_addrs);
 
-   len = (cmdq_lines + common_lines + ring_lines * hw->tqps_num +
- tqp_intr_lines * hw->intr_tqps_num) * REG_NUM_PER_LINE;
+   len = sizeof(cmdq_reg_addrs) + common_cnt +
+   sizeof(ring_reg_addrs) * hw->tqps_num +
+   sizeof(tqp_intr_reg_addrs) * hw->intr_tqps_num;
+   len /= sizeof(uint32_t);
 
if (!hns->is_vf) {
ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
@@ -136,18 +131,16 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
 "ret = %d.", ret);
return ret;
}
-   dfx_reg_lines = regs_num_32_bit * sizeof(uint32_t) /
-   REG_LEN_PER_LINE + 1;
-   dfx_reg_lines += regs_num_64_bit * sizeof(uint64_t) /
-   REG_LEN_PER_LINE + 1;
+   dfx_reg_cnt = regs_num_32_bit +
+ regs_num_64_bit * HNS3_64_BIT_REG_OUTPUT_SIZE;
 
-   ret = hns3_get_dfx_reg_line(hw, &dfx_reg_lines);
+   ret = hns3_get_dfx_reg_cnt(hw, &dfx_reg_cnt);
if (ret) {
hns3_err(hw, "fail to get the number of dfx registers, "
 "ret = %d.", ret);
return ret;
}
-   len += dfx_reg_lines * REG_NUM_PER_LINE;
+   len += dfx_reg_cnt;
}
 
*length = len;
@@ -268,18 +261,6 @@ hns3_get_64_bit_regs(struct hns3_hw *hw, uint32_t 
regs_num, void *data)
return 0;
 }
 
-static int
-hns3_insert_reg_separator(int reg_num, uint32_t *data)
-{
-   int separator_num;
-   int i;
-
-   separator_num = MAX_SEPARATE_NUM - reg_num % REG_NUM_PER_LINE;
-   for (i = 0; i < separator_num; i++)
-   *data++ = SEPARATOR_VALUE;
-   return separator_num;
-}
-
 static int
 hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
 {
@@ -294,7 +275,6 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
reg_num = sizeof(cmdq_reg_addrs) / sizeof(uint32_t);
for (i = 0; i < reg_num; i++)
*data++ = hns3_read_dev(hw, cmdq_reg_addrs[i]);
-   data += hns3_insert_reg_separator(reg_num, data);
 
if (hns->is_vf)
reg_num = sizeof(common_vf_reg_addrs) / sizeof(uint32_t);
@@ -305,7 +285,6 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
*data++ = hns3_read_dev(hw, common_vf_reg_addrs[i]);
else
*data++ = hns3_read_dev(hw, common_reg_addrs[i]);
-   data += hns3_insert_reg_separator(reg_num, data);
 
reg_num = sizeof(ring_reg_addrs) / sizeof(uint32_t);
for (j = 0; j < hw->tqps_num; j++) {
@@ -313,7 +292,6 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *

[RESEND v6 8/8] net/hns3: support filter registers by module names

This patch support dumping registers which name contains the
`filter` string. The module names are in lower case and so is
the `filter`. Available module names are cmdq, common_pf,
common_vf, ring, tqp_intr, 32_bit_dfx, 64_bit_dfx, bios, igu_egu,
ssu, ppp, rpu, ncsi, rtc, rcb, etc.

Signed-off-by: Jie Hai 
---
 drivers/net/hns3/hns3_regs.c | 309 ---
 1 file changed, 180 insertions(+), 129 deletions(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index 622d2e1c3d..265d9b4336 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -12,8 +12,6 @@
 
 #define HNS3_64_BIT_REG_OUTPUT_SIZE (sizeof(uint64_t) / sizeof(uint32_t))
 
-static int hns3_get_dfx_reg_cnt(struct hns3_hw *hw, uint32_t *count);
-
 struct hns3_dirt_reg_entry {
const char *name;
uint32_t addr;
@@ -795,33 +793,77 @@ enum hns3_reg_modules {
HNS3_64_BIT_DFX,
 };
 
+#define HNS3_MODULE_MASK(x) RTE_BIT32(x)
+#define HNS3_VF_MODULES (HNS3_MODULE_MASK(HNS3_CMDQ) | 
HNS3_MODULE_MASK(HNS3_COMMON_VF) | \
+HNS3_MODULE_MASK(HNS3_RING) | 
HNS3_MODULE_MASK(HNS3_TQP_INTR))
+#define HNS3_VF_ONLY_MODULES HNS3_MODULE_MASK(HNS3_COMMON_VF)
+
 struct hns3_reg_list {
const void *reg_list;
uint32_t entry_num;
+   const char *module;
 };
 
 static struct hns3_reg_list hns3_reg_lists[] = {
-   [HNS3_BIOS_COMMON]  = { dfx_bios_common_reg_list,   
RTE_DIM(dfx_bios_common_reg_list)},
-   [HNS3_SSU_0]= { dfx_ssu_reg_0_list, 
RTE_DIM(dfx_ssu_reg_0_list)},
-   [HNS3_SSU_1]= { dfx_ssu_reg_1_list, 
RTE_DIM(dfx_ssu_reg_1_list)},
-   [HNS3_IGU_EGU]  = { dfx_igu_egu_reg_list,   
RTE_DIM(dfx_igu_egu_reg_list)},
-   [HNS3_RPU_0]= { dfx_rpu_reg_0_list, 
RTE_DIM(dfx_rpu_reg_0_list)},
-   [HNS3_RPU_1]= { dfx_rpu_reg_1_list, 
RTE_DIM(dfx_rpu_reg_1_list)},
-   [HNS3_NCSI] = { dfx_ncsi_reg_list,  
RTE_DIM(dfx_ncsi_reg_list)},
-   [HNS3_RTC]  = { dfx_rtc_reg_list,   
RTE_DIM(dfx_rtc_reg_list)},
-   [HNS3_PPP]  = { dfx_ppp_reg_list,   
RTE_DIM(dfx_ppp_reg_list)},
-   [HNS3_RCB]  = { dfx_rcb_reg_list,   
RTE_DIM(dfx_rcb_reg_list)},
-   [HNS3_TQP]  = { dfx_tqp_reg_list,   
RTE_DIM(dfx_tqp_reg_list)},
-   [HNS3_SSU_2]= { dfx_ssu_reg_2_list, 
RTE_DIM(dfx_ssu_reg_2_list)},
-
-   [HNS3_CMDQ] = { cmdq_reg_list,  
RTE_DIM(cmdq_reg_list)},
-   [HNS3_COMMON_PF]= { common_reg_list,
RTE_DIM(common_reg_list)},
-   [HNS3_COMMON_VF]= { common_vf_reg_list, 
RTE_DIM(common_vf_reg_list)},
-   [HNS3_RING] = { ring_reg_list,  
RTE_DIM(ring_reg_list)},
-   [HNS3_TQP_INTR] = { tqp_intr_reg_list,  
RTE_DIM(tqp_intr_reg_list)},
-
-   [HNS3_32_BIT_DFX]   = { regs_32_bit_list,   
RTE_DIM(regs_32_bit_list)},
-   [HNS3_64_BIT_DFX]   = { regs_64_bit_list,   
RTE_DIM(regs_64_bit_list)},
+   [HNS3_BIOS_COMMON] = {
+   dfx_bios_common_reg_list,   
RTE_DIM(dfx_bios_common_reg_list),  "bios"
+   },
+   [HNS3_SSU_0] = {
+   dfx_ssu_reg_0_list, RTE_DIM(dfx_ssu_reg_0_list),
"ssu"
+   },
+   [HNS3_SSU_1] = {
+   dfx_ssu_reg_1_list, RTE_DIM(dfx_ssu_reg_1_list),
"ssu"
+   },
+   [HNS3_IGU_EGU] = {
+   dfx_igu_egu_reg_list,   RTE_DIM(dfx_igu_egu_reg_list),  
"igu_egu"
+   },
+   [HNS3_RPU_0] = {
+   dfx_rpu_reg_0_list, RTE_DIM(dfx_rpu_reg_0_list),
"rpu"
+   },
+   [HNS3_RPU_1] = {
+   dfx_rpu_reg_1_list, RTE_DIM(dfx_rpu_reg_1_list),
"rpu"
+   },
+   [HNS3_NCSI] = {
+   dfx_ncsi_reg_list,  RTE_DIM(dfx_ncsi_reg_list), 
"ncsi"
+   },
+   [HNS3_RTC] = {
+   dfx_rtc_reg_list,   RTE_DIM(dfx_rtc_reg_list),  
"rtc"
+   },
+   [HNS3_PPP] = {
+   dfx_ppp_reg_list,   RTE_DIM(dfx_ppp_reg_list),  
"ppp"
+   },
+   [HNS3_RCB] = {
+   dfx_rcb_reg_list,   RTE_DIM(dfx_rcb_reg_list),  
"rcb"
+   },
+   [HNS3_TQP] = {
+   dfx_tqp_reg_list,   RTE_DIM(dfx_tqp_reg_list),  
"tqp"
+   },
+   [HNS3_SSU_2] = {
+   dfx_ssu_reg_2_list, RTE_DIM(dfx_ssu_reg_2_list),
"ssu"
+   },
+
+   [HNS3_CMDQ] = {
+   cmdq_reg_list,  RTE_DIM(cmdq_reg_list), 
"cmdq"
+   },
+   [HNS3_COMMON_PF] = {
+   common_reg_list,RTE_DIM(common_reg_list),

[RESEND v6 7/8] net/hns3: support report names of registers

This patch adds names for register lists, and support report
names of registers. Some registers has different names on
different platform, use names of HIP08 as default names.

Signed-off-by: Jie Hai 
---
 drivers/net/hns3/hns3_regs.c | 1090 +-
 1 file changed, 957 insertions(+), 133 deletions(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index 89858c2b1c..622d2e1c3d 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -14,73 +14,829 @@
 
 static int hns3_get_dfx_reg_cnt(struct hns3_hw *hw, uint32_t *count);
 
-static const uint32_t cmdq_reg_addrs[] = {HNS3_CMDQ_TX_DEPTH_REG,
- HNS3_CMDQ_TX_TAIL_REG,
- HNS3_CMDQ_TX_HEAD_REG,
- HNS3_CMDQ_RX_DEPTH_REG,
- HNS3_CMDQ_RX_TAIL_REG,
- HNS3_CMDQ_RX_HEAD_REG,
- HNS3_VECTOR0_CMDQ_SRC_REG,
- HNS3_CMDQ_INTR_STS_REG,
- HNS3_CMDQ_INTR_EN_REG,
- HNS3_CMDQ_INTR_GEN_REG};
-
-static const uint32_t common_reg_addrs[] = {HNS3_MISC_VECTOR_REG_BASE,
-   HNS3_VECTOR0_OTER_EN_REG,
-   HNS3_MISC_RESET_STS_REG,
-   HNS3_VECTOR0_OTHER_INT_STS_REG,
-   HNS3_GLOBAL_RESET_REG,
-   HNS3_FUN_RST_ING,
-   HNS3_GRO_EN_REG};
-
-static const uint32_t common_vf_reg_addrs[] = {HNS3_MISC_VECTOR_REG_BASE,
-  HNS3_FUN_RST_ING,
-  HNS3_GRO_EN_REG};
-
-static const uint32_t ring_reg_addrs[] = {HNS3_RING_RX_BD_NUM_REG,
- HNS3_RING_RX_BD_LEN_REG,
- HNS3_RING_RX_EN_REG,
- HNS3_RING_RX_MERGE_EN_REG,
- HNS3_RING_RX_TAIL_REG,
- HNS3_RING_RX_HEAD_REG,
- HNS3_RING_RX_FBDNUM_REG,
- HNS3_RING_RX_OFFSET_REG,
- HNS3_RING_RX_FBD_OFFSET_REG,
- HNS3_RING_RX_STASH_REG,
- HNS3_RING_RX_BD_ERR_REG,
- HNS3_RING_TX_BD_NUM_REG,
- HNS3_RING_TX_EN_REG,
- HNS3_RING_TX_PRIORITY_REG,
- HNS3_RING_TX_TC_REG,
- HNS3_RING_TX_MERGE_EN_REG,
- HNS3_RING_TX_TAIL_REG,
- HNS3_RING_TX_HEAD_REG,
- HNS3_RING_TX_FBDNUM_REG,
- HNS3_RING_TX_OFFSET_REG,
- HNS3_RING_TX_EBD_NUM_REG,
- HNS3_RING_TX_EBD_OFFSET_REG,
- HNS3_RING_TX_BD_ERR_REG,
- HNS3_RING_EN_REG};
-
-static const uint32_t tqp_intr_reg_addrs[] = {HNS3_TQP_INTR_CTRL_REG,
- HNS3_TQP_INTR_GL0_REG,
- HNS3_TQP_INTR_GL1_REG,
- HNS3_TQP_INTR_GL2_REG,
- HNS3_TQP_INTR_RL_REG};
+struct hns3_dirt_reg_entry {
+   const char *name;
+   uint32_t addr;
+};
+
+static const struct hns3_dirt_reg_entry cmdq_reg_list[] = {
+   {"cmdq_tx_depth",   HNS3_CMDQ_TX_DEPTH_REG},
+   {"cmdq_tx_tail",HNS3_CMDQ_TX_TAIL_REG},
+   {"cmdq_tx_head",HNS3_CMDQ_TX_HEAD_REG},
+   {"cmdq_rx_depth",   HNS3_CMDQ_RX_DEPTH_REG},
+   {"cmdq_rx_tail",HNS3_CMDQ_RX_TAIL_REG},
+   {"cmdq_rx_head",HNS3_CMDQ_RX_HEAD_REG},
+   {"vector0_cmdq_src",HNS3_VECTOR0_CMDQ_SRC_REG},
+   {"cmdq_intr_sts",   HNS3_CMDQ_INTR_STS_REG},
+   {"cmdq_intr_en",HNS3_CMDQ_INTR_EN_REG},
+   {"cmdq_intr_gen",   HNS3_CMDQ_INTR_GEN_REG},
+};
+
+static const struct hns3_dirt_reg_entry common_reg_list[] = {
+   {"misc_vector_reg_base",HNS3_MISC_VECTOR_REG_BASE},
+   {"vector0_oter_en", HNS3_VECTOR0_OTER_EN_REG},
+   {"misc_reset_sts",  HNS3_MISC_RESET_STS_REG},
+   {"vector0_other_int_sts",

[PATCH 0/4] clean code for dmadev and hns3

This patch set make clean codes.

Chengwen Feng (4):
  ethdev: verify queue ID when Tx done cleanup
  net/hns3: verify reset type from firmware
  dmadev: fix potential null pointer access
  dmadev: clean code for verify parameter

 drivers/net/hns3/hns3_intr.c |  6 ++
 lib/dmadev/rte_dmadev.c  | 32 +---
 lib/ethdev/rte_ethdev.c  |  4 
 3 files changed, 31 insertions(+), 11 deletions(-)

-- 
2.22.0

[PATCH 1/4] ethdev: verify queue ID when Tx done cleanup

From: Chengwen Feng 

Verify queue_id for rte_eth_tx_done_cleanup API.

Fixes: 44a718c457b5 ("ethdev: add API to free consumed buffers in Tx ring")
Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
---
 lib/ethdev/rte_ethdev.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index f1c658f49e80..998deb5ab101 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -2823,6 +2823,10 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t 
queue_id, uint32_t free_cnt)
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
dev = &rte_eth_devices[port_id];
 
+   ret = eth_dev_validate_tx_queue(dev, queue_id);
+   if (ret != 0)
+   return ret;
+
if (*dev->dev_ops->tx_done_cleanup == NULL)
return -ENOTSUP;
 
-- 
2.22.0

[PATCH 2/4] net/hns3: verify reset type from firmware

From: Chengwen Feng 

Verify reset-type which get from firmware.

Fixes: 1c1eb759e9d7 ("net/hns3: support RAS process in Kunpeng 930")
Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
---
 drivers/net/hns3/hns3_intr.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c
index 26fa2eb951bc..86c44f7cc3bc 100644
--- a/drivers/net/hns3/hns3_intr.c
+++ b/drivers/net/hns3/hns3_intr.c
@@ -2252,6 +2252,12 @@ hns3_handle_module_error_data(struct hns3_hw *hw, 
uint32_t *buf,
sum_err_info = (struct hns3_sum_err_info *)&buf[offset++];
mod_num = sum_err_info->mod_num;
reset_type = sum_err_info->reset_type;
+
+   if (reset_type >= HNS3_MAX_RESET) {
+   hns3_err(hw, "invalid reset type = %u", reset_type);
+   return;
+   }
+
if (reset_type && reset_type != HNS3_NONE_RESET)
hns3_atomic_set_bit(reset_type, &hw->reset.request);
 
-- 
2.22.0

[PATCH 3/4] dmadev: fix potential null pointer access

From: Chengwen Feng 

When rte_dma_vchan_status(dev_id, vchan, NULL) is called, a null pointer
access is triggered.
This patch adds the null pointer checker.

Fixes: 5e0f85912754 ("dmadev: add channel status check for testing use")
Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
---
 lib/dmadev/rte_dmadev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
index 845727210fab..60c3d8ebf68e 100644
--- a/lib/dmadev/rte_dmadev.c
+++ b/lib/dmadev/rte_dmadev.c
@@ -741,7 +741,7 @@ rte_dma_vchan_status(int16_t dev_id, uint16_t vchan, enum 
rte_dma_vchan_status *
 {
struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
 
-   if (!rte_dma_is_valid(dev_id))
+   if (!rte_dma_is_valid(dev_id) || status == NULL)
return -EINVAL;
 
if (vchan >= dev->data->dev_conf.nb_vchans) {
-- 
2.22.0

[PATCH 4/4] dmadev: clean code for verify parameter

From: Chengwen Feng 

Make sure to verify the 'dev_id' parameter before using them.
Note: there is no actual problem with the current code, but it is
recommended to clean it up.

Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
---
 lib/dmadev/rte_dmadev.c | 30 --
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
index 60c3d8ebf68e..4ba3b9380c5f 100644
--- a/lib/dmadev/rte_dmadev.c
+++ b/lib/dmadev/rte_dmadev.c
@@ -436,11 +436,12 @@ rte_dma_count_avail(void)
 int
 rte_dma_info_get(int16_t dev_id, struct rte_dma_info *dev_info)
 {
-   const struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+   const struct rte_dma_dev *dev;
int ret;
 
if (!rte_dma_is_valid(dev_id) || dev_info == NULL)
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
if (*dev->dev_ops->dev_info_get == NULL)
return -ENOTSUP;
@@ -462,12 +463,13 @@ rte_dma_info_get(int16_t dev_id, struct rte_dma_info 
*dev_info)
 int
 rte_dma_configure(int16_t dev_id, const struct rte_dma_conf *dev_conf)
 {
-   struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
struct rte_dma_info dev_info;
+   struct rte_dma_dev *dev;
int ret;
 
if (!rte_dma_is_valid(dev_id) || dev_conf == NULL)
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
if (dev->data->dev_started != 0) {
RTE_DMA_LOG(ERR,
@@ -513,11 +515,12 @@ rte_dma_configure(int16_t dev_id, const struct 
rte_dma_conf *dev_conf)
 int
 rte_dma_start(int16_t dev_id)
 {
-   struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+   struct rte_dma_dev *dev;
int ret;
 
if (!rte_dma_is_valid(dev_id))
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
if (dev->data->dev_conf.nb_vchans == 0) {
RTE_DMA_LOG(ERR, "Device %d must be configured first", dev_id);
@@ -545,11 +548,12 @@ rte_dma_start(int16_t dev_id)
 int
 rte_dma_stop(int16_t dev_id)
 {
-   struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+   struct rte_dma_dev *dev;
int ret;
 
if (!rte_dma_is_valid(dev_id))
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
if (dev->data->dev_started == 0) {
RTE_DMA_LOG(WARNING, "Device %d already stopped", dev_id);
@@ -572,11 +576,12 @@ rte_dma_stop(int16_t dev_id)
 int
 rte_dma_close(int16_t dev_id)
 {
-   struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+   struct rte_dma_dev *dev;
int ret;
 
if (!rte_dma_is_valid(dev_id))
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
/* Device must be stopped before it can be closed */
if (dev->data->dev_started == 1) {
@@ -600,13 +605,14 @@ int
 rte_dma_vchan_setup(int16_t dev_id, uint16_t vchan,
const struct rte_dma_vchan_conf *conf)
 {
-   struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
struct rte_dma_info dev_info;
bool src_is_dev, dst_is_dev;
+   struct rte_dma_dev *dev;
int ret;
 
if (!rte_dma_is_valid(dev_id) || conf == NULL)
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
if (dev->data->dev_started != 0) {
RTE_DMA_LOG(ERR,
@@ -693,10 +699,11 @@ rte_dma_vchan_setup(int16_t dev_id, uint16_t vchan,
 int
 rte_dma_stats_get(int16_t dev_id, uint16_t vchan, struct rte_dma_stats *stats)
 {
-   const struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+   const struct rte_dma_dev *dev;
 
if (!rte_dma_is_valid(dev_id) || stats == NULL)
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
if (vchan >= dev->data->dev_conf.nb_vchans &&
vchan != RTE_DMA_ALL_VCHAN) {
@@ -715,11 +722,12 @@ rte_dma_stats_get(int16_t dev_id, uint16_t vchan, struct 
rte_dma_stats *stats)
 int
 rte_dma_stats_reset(int16_t dev_id, uint16_t vchan)
 {
-   struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+   struct rte_dma_dev *dev;
int ret;
 
if (!rte_dma_is_valid(dev_id))
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
if (vchan >= dev->data->dev_conf.nb_vchans &&
vchan != RTE_DMA_ALL_VCHAN) {
@@ -739,10 +747,11 @@ rte_dma_stats_reset(int16_t dev_id, uint16_t vchan)
 int
 rte_dma_vchan_status(int16_t dev_id, uint16_t vchan, enum rte_dma_vchan_status 
*status)
 {
-   struct rte_dma_dev *dev = &rte_dma_devices[dev_id];
+   struct rte_dma_dev *dev;
 
if (!rte_dma_is_valid(dev_id) || status == NULL)
return -EINVAL;
+   dev = &rte_dma_devices[dev_id];
 
if (vchan >= dev->data->dev_conf.nb_vchans) {
RTE_DMA_LOG(ERR, "Device %u vchan %u out of range", dev_id, 
vchan);
@@ -804,12 +813,13 @@ dma_dump_capability(FILE *f, uint64_t dev_capa)
 int
 rte_dma_dump(int16_t dev_id, FILE *f)

[PATCH] net/hns3: dump queue head and tail pointer info