[PATCH] Revert "doc: extension of crypto event callback announced"

[Srujana Challa]

The previously planned update to the `rte_cryptodev_cb_fn` function
prototype is being reverted. The introduction of the
`rte_cryptodev_queue_pair_event_error_query` API provides a means for
applications to retrieve the queue pair ID that encountered an error
interrupt. This makes the addition of the `qp_id` parameter to the
`rte_cryptodev_cb_fn` function unnecessary, and as such, the proposed
extension is no longer required.

Signed-off-by: Srujana Challa 
---
 doc/guides/rel_notes/deprecation.rst | 5 -
 1 file changed, 5 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst 
b/doc/guides/rel_notes/deprecation.rst
index 6948641ff6..107e6a58ef 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -115,11 +115,6 @@ Deprecation Notices
   The legacy actions should be removed
   once ``MODIFY_FIELD`` alternative is implemented in drivers.
 
-* cryptodev: The function ``rte_cryptodev_cb_fn`` will be updated
-  to have another parameter ``qp_id`` to return the queue pair ID
-  which got error interrupt to the application,
-  so that application can reset that particular queue pair.
-
 * cryptodev: The Intel IPsec Multi-Buffer version will be bumped
   to a minimum version of v1.4.
   This will effect the KASUMI, SNOW3G, ZUC, AESNI GCM, AESNI MB and CHACHAPOLY
-- 
2.25.1

[PATCH v1] Revert "doc: extension of crypto event callback announced"

[Srujana Challa]

The previously planned update to the `rte_cryptodev_cb_fn` function
prototype is being reverted. The introduction of the
`rte_cryptodev_queue_pair_event_error_query` API provides a means for
applications to retrieve the queue pair ID that encountered an error
interrupt. This makes the addition of the `qp_id` parameter to the
`rte_cryptodev_cb_fn` function unnecessary, and as such, the proposed
extension is no longer required.

Signed-off-by: Srujana Challa 
---
 doc/guides/rel_notes/deprecation.rst | 5 -
 1 file changed, 5 deletions(-)

diff --git a/doc/guides/rel_notes/deprecation.rst 
b/doc/guides/rel_notes/deprecation.rst
index 211f59fdc9..4dd592c371 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -169,11 +169,6 @@ Deprecation Notices
 * fib: A new flag field will be introduced in ``rte_fib_conf`` structure
   in DPDK 24.11. This field will be used to pass extra configuration settings.
 
-* cryptodev: The function ``rte_cryptodev_cb_fn`` will be updated
-  to have another parameter ``qp_id`` to return the queue pair ID
-  which got error interrupt to the application,
-  so that application can reset that particular queue pair.
-
 * cryptodev: The structure ``rte_cryptodev_qp_conf`` will be updated
   to have a new parameter to set priority of that particular queue pair.
 
-- 
2.25.1

QoS Schedule sample app: question about latency

[Long Le]

Hello, I am testing the QoS Schedule sample app with a traffic generator and I 
notice that the latency of high priority traffic class (TC 0, for example) 
increases when the load of the NIC increase. With that being said, may I ask is 
there anyway to maintain the latency of high priority traffic low, when still 
have high throughput on other traffic classes?

 

For more information, I am testing the QoS app with 512 streams generated from 
a traffic generator (16 queues x 32 pipes), the traffic of TC 0, pipe 0 is 
generated with low packet rate, all other streams are at high packet rate, 100% 
line rate is used in total.

 

My expectation is:

Pipe 0:

tc 0:   low rate --> low latency

tc 1:   high rate --> high latency

.

.

.

tc 12: high rate --> high latency

 

Best regards

Long Le

Re: [PATCH v2 1/1] dts: add text parser for testpmd verbose output

[Luca Vizzarro]

Great work Jeremy! Just a couple of minor passable improvement points.

On 30/07/2024 14:34, jspew...@iol.unh.edu wrote:


+@dataclass
+class TestPmdVerbosePacket(TextParser):
+"""Packet information provided by verbose output in Testpmd.
+
+The "receive/sent queue" information is not included in this dataclass 
because this value is
+captured on the outer layer of input found in 
:class:`TestPmdVerboseOutput`.
+"""
+
+#:
+src_mac: str = 
field(metadata=TextParser.find(r"src=({})".format(REGEX_FOR_MAC_ADDRESS)))

Just a(n optional) nit: TextParser.find(f"src=({REGEX_FOR_MAC_ADDRESS})")
The raw string is only needed to prevent escaping, which we don't do here.

+#:
+dst_mac: str = 
field(metadata=TextParser.find(r"dst=({})".format(REGEX_FOR_MAC_ADDRESS)))

As above.

+#: Memory pool the packet was handled on.
+pool: str = field(metadata=TextParser.find(r"pool=(\S+)"))
+#: Packet type in hex.
+p_type: int = field(metadata=TextParser.find_int(r"type=(0x[a-fA-F\d]+)"))
+#:





+@staticmethod
+def extract_verbose_output(output: str) -> list[TestPmdVerboseOutput]:
+"""Extract the verbose information present in given testpmd output.
+
+This method extracts sections of verbose output that begin with the 
line
+"port X/queue Y: sent/received Z packets" and end with the ol_flags of 
a packet.
+
+Args:
+output: Testpmd output that contains verbose information
+
+Returns:
+List of parsed packet information gathered from verbose 
information in `output`.
+"""
+iter = re.finditer(r"(port \d+/queue \d+:.*?(?=port \d+/queue 
\d+|$))", output, re.S)


How about using a regex that matches what you described? ;) Keeping re.S:

   (port \d+/queue \d+.+?ol_flags: [\w ]+)

Would spare you from using complex lookahead constructs and 4.6x less 
steps. Maybe it doesn't work with every scenario? Looks like it works 
well with the sample output I have. Let me know if it works for you.


Best,
Luca

Re: [PATCH v2 1/1] dts: add text parser for testpmd verbose output

[Luca Vizzarro]

On 30/07/2024 22:33, Jeremy Spewock wrote:

On Tue, Jul 30, 2024 at 9:37 AM  wrote:


+class VerboseOLFlag(Flag):
+"""Flag representing the OL flags of a packet from Testpmd verbose 
output."""
+
+#:
+RTE_MBUF_F_RX_RSS_HASH = auto()
+
+#:
+RTE_MBUF_F_RX_L4_CKSUM_GOOD = auto()
+#:
+RTE_MBUF_F_RX_L4_CKSUM_BAD = auto()
+#:
+RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN = auto()
+
+#:
+RTE_MBUF_F_RX_IP_CKSUM_GOOD = auto()
+#:
+RTE_MBUF_F_RX_IP_CKSUM_BAD = auto()
+#:
+RTE_MBUF_F_RX_IP_CKSUM_UNKNOWN = auto()
+
+#:
+RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD = auto()
+#:
+RTE_MBUF_F_RX_OUTER_L4_CKSUM_BAD = auto()
+#:
+RTE_MBUF_F_RX_OUTER_L4_CKSUM_UNKNOWN = auto()
+

After reading more of the API and using this patch to write a test
suite, I believe there is more expansion of these OL flags that should
take place. For starters, there are the Tx OL flags that, while not
seeming to be very useful for the current test suites we are writing,
wouldn't hurt to also include as they seem to be fairly different.
Additionally, there are some other less common RX OL flags that should
be included here just to cover all options. I will work on adding
these into the next version.


If you wanted to cover even more, hw_ptype and sw_ptype look like they 
could use a data structure. I reckon a flag like the above would also work.

[PATCH v1] net/ice: updated 24.07 recommended matching list

[hailinx]

Signed-off-by: hailinx 
---
 doc/guides/nics/ice.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index ae975d19ad..59ed8e6808 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -79,6 +79,8 @@ are listed in the Tested Platforms section of the Release 
Notes for each release

+---+---+-+---+--+---+
|24.03  | 1.13.7|  1.3.35 |  1.3.45   |1.3.13|  
  4.4|

+---+---+-+---+--+---+
+   |24.07  | 1.14.11   |  1.3.36 |  1.3.46   |1.3.14|  
  4.5|
+   
+---+---+-+---+--+---+
 
 Configuration
 -
-- 
2.25.1

[PATCH v1] net/i40e: updated 24.07 recommended matching list

[hailinx]

Signed-off-by: hailinx 
---
 doc/guides/nics/i40e.rst | 4 
 1 file changed, 4 insertions(+)

diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index ca6caa0cff..d4c9790d47 100644
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -104,6 +104,8 @@ For X710/XL710/XXV710,
+--+---+--+
| DPDK version | Kernel driver version | Firmware version |
+==+===+==+
+   |24.07 | 2.25.9|   9.50   |
+   +--+---+--+
|24.03 | 2.24.6|   9.40   |
+--+---+--+
|23.11 | 2.23.17   |   9.30   |
@@ -171,6 +173,8 @@ For X722,
+--+---+--+
| DPDK version | Kernel driver version | Firmware version |
+==+===+==+
+   |24.07 | 2.25.9|   6.50   |
+   +--+---+--+
|24.03 | 2.24.6|   6.20   |
+--+---+--+
|23.11 | 2.23.17   |   6.20   |
-- 
2.25.1

[PATCH v9 0/5] dts: API docs generation

[Juraj Linkeš]

The generation is done with Sphinx, which DPDK already uses, with
slightly modified configuration of the sidebar present in an if block.

Dependencies are installed using Poetry from the dts directory:

poetry install --with docs

After installing, enter the Poetry shell:

poetry shell

And then run the build:
ninja -C  dts-doc

Python3.10 is required to build the DTS API docs.

The patchset contains the .rst sources which Sphinx uses to generate the
html pages. These were first generated with the sphinx-apidoc utility
and modified to provide a better look. The documentation just doesn't
look that good without the modifications and there isn't enough
configuration options to achieve that without manual changes to the .rst
files. This introduces extra maintenance which involves adding new .rst
files when a new Python module is added or changing the .rst structure
if the Python directory/file structure is changed (moved, renamed
files). This small maintenance burden is outweighed by the flexibility
afforded by the ability to make manual changes to the .rst files.

v2:
Removed the use of sphinx-apidoc from meson in favor of adding the files
generated by it directly to the repository (and modifying them).

v3:
Rebase.

v4:
Rebase.

v5:
Another rebase, but this time the rebase needed the addition of .rst
corresponding to newly added files as well as fixing a few documentation
problems in said files.

v6:
Documentation formatting adjustments.

v7:
Now with the actual doc changes.

v8:
Split the last commit into non-DTS and DTS changes.

v9:
Rebase.

Juraj Linkeš (5):
  dts: update params and parser docstrings
  dts: add doc generation dependencies
  dts: add API doc sources
  doc: guides and API meson improvements
  dts: add API doc generation

 buildtools/call-sphinx-build.py   |  35 +-
 doc/api/doxy-api-index.md |   3 +
 doc/api/doxy-api.conf.in  |   2 +
 doc/api/meson.build   |  11 +-
 doc/guides/conf.py|  39 +-
 doc/guides/meson.build|   1 +
 doc/guides/tools/dts.rst  |  34 +-
 dts/doc/conf_yaml_schema.json |   1 +
 dts/doc/framework.config.rst  |  12 +
 dts/doc/framework.config.types.rst|   6 +
 dts/doc/framework.exception.rst   |   6 +
 dts/doc/framework.logger.rst  |   6 +
 dts/doc/framework.params.eal.rst  |   6 +
 dts/doc/framework.params.rst  |  14 +
 dts/doc/framework.params.testpmd.rst  |   6 +
 dts/doc/framework.params.types.rst|   6 +
 dts/doc/framework.parser.rst  |   6 +
 .../framework.remote_session.dpdk_shell.rst   |   6 +
 ...ote_session.interactive_remote_session.rst |   6 +
 ...ework.remote_session.interactive_shell.rst |   6 +
 .../framework.remote_session.python_shell.rst |   6 +
 ...ramework.remote_session.remote_session.rst |   6 +
 dts/doc/framework.remote_session.rst  |  18 +
 .../framework.remote_session.ssh_session.rst  |   6 +
 ...framework.remote_session.testpmd_shell.rst |   6 +
 dts/doc/framework.runner.rst  |   6 +
 dts/doc/framework.settings.rst|   6 +
 dts/doc/framework.test_result.rst |   6 +
 dts/doc/framework.test_suite.rst  |   6 +
 dts/doc/framework.testbed_model.cpu.rst   |   6 +
 .../framework.testbed_model.linux_session.rst |   6 +
 dts/doc/framework.testbed_model.node.rst  |   6 +
 .../framework.testbed_model.os_session.rst|   6 +
 dts/doc/framework.testbed_model.port.rst  |   6 +
 .../framework.testbed_model.posix_session.rst |   6 +
 dts/doc/framework.testbed_model.rst   |  26 +
 dts/doc/framework.testbed_model.sut_node.rst  |   6 +
 dts/doc/framework.testbed_model.tg_node.rst   |   6 +
 ..._generator.capturing_traffic_generator.rst |   6 +
 ...mework.testbed_model.traffic_generator.rst |  14 +
 testbed_model.traffic_generator.scapy.rst |   6 +
 ...el.traffic_generator.traffic_generator.rst |   6 +
 ...framework.testbed_model.virtual_device.rst |   6 +
 dts/doc/framework.utils.rst   |   6 +
 dts/doc/index.rst |  43 ++
 dts/doc/meson.build   |  27 +
 dts/framework/params/__init__.py  |   4 +-
 dts/framework/params/eal.py   |   7 +-
 dts/framework/params/types.py |   3 +-
 dts/framework/parser.py   |   4 +-
 dts/meson.build   |  16 +
 dts/poetry.lock   | 510 +-
 dts/pyproject.toml|   7 +
 meson.build   |   1 +
 54 files changed, 979 insertions(+), 39 deletions(-)
 create mode 12 dts/doc/conf_yaml_schema.json
 create mode 100644 dts/doc/framework.config.rst
 create mode 100644 dts/doc/framework.config.types.rst
 create mode 100644 dts/do

[PATCH v9 1/5] dts: update params and parser docstrings

[Juraj Linkeš]

Address a few errors reported by Sphinx when generating documentation:
framework/params/__init__.py:docstring of framework.params.modify_str:3:
WARNING: Inline interpreted text or phrase reference start-string
without end-string.
framework/params/eal.py:docstring of framework.params.eal.EalParams:35:
WARNING: Definition list ends without a blank line; unexpected
unindent.
framework/params/types.py:docstring of framework.params.types:8:
WARNING: Inline strong start-string without end-string.
framework/params/types.py:docstring of framework.params.types:9:
WARNING: Inline strong start-string without end-string.
framework/parser.py:docstring of framework.parser.TextParser:33: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser:43: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser:49: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser.wrap:8:
ERROR: Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser.wrap:9:
WARNING: Block quote ends without a blank line; unexpected unindent.

Fixes: 87ba4cdc0dbb ("dts: use Unpack for type checking and hinting")
Fixes: d70159cb62f5 ("dts: add params manipulation module")
Fixes: 967fc62b0a43 ("dts: refactor EAL parameters class")
Fixes: 818fe14e3422 ("dts: add parsing utility module")
Cc: luca.vizza...@arm.com

Signed-off-by: Juraj Linkeš 
---
 dts/framework/params/__init__.py | 4 ++--
 dts/framework/params/eal.py  | 7 +--
 dts/framework/params/types.py| 3 ++-
 dts/framework/parser.py  | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dts/framework/params/__init__.py b/dts/framework/params/__init__.py
index 5a6fd93053..1ae227d7b4 100644
--- a/dts/framework/params/__init__.py
+++ b/dts/framework/params/__init__.py
@@ -53,9 +53,9 @@ def reduced_fn(value):
 
 
 def modify_str(*funcs: FnPtr) -> Callable[[T], T]:
-"""Class decorator modifying the ``__str__`` method with a function 
created from its arguments.
+r"""Class decorator modifying the ``__str__`` method with a function 
created from its arguments.
 
-The :attr:`FnPtr`s fed to the decorator are executed from left to right in 
the arguments list
+The :attr:`FnPtr`\s fed to the decorator are executed from left to right 
in the arguments list
 order.
 
 Args:
diff --git a/dts/framework/params/eal.py b/dts/framework/params/eal.py
index 8d7766fefc..cf1594353a 100644
--- a/dts/framework/params/eal.py
+++ b/dts/framework/params/eal.py
@@ -26,13 +26,16 @@ class EalParams(Params):
 prefix: Set the file prefix string with which to start DPDK, e.g.: 
``prefix="vf"``.
 no_pci: Switch to disable PCI bus, e.g.: ``no_pci=True``.
 vdevs: Virtual devices, e.g.::
+
 vdevs=[
 VirtualDevice('net_ring0'),
 VirtualDevice('net_ring1')
 ]
+
 ports: The list of ports to allow.
-other_eal_param: user defined DPDK EAL parameters, e.g.:
-``other_eal_param='--single-file-segments'``
+other_eal_param: user defined DPDK EAL parameters, e.g.::
+
+``other_eal_param='--single-file-segments'``
 """
 
 lcore_list: LogicalCoreList | None = field(default=None, 
metadata=Params.short("l"))
diff --git a/dts/framework/params/types.py b/dts/framework/params/types.py
index e668f658d8..d77c4625fb 100644
--- a/dts/framework/params/types.py
+++ b/dts/framework/params/types.py
@@ -6,7 +6,8 @@
 TypedDicts can be used in conjunction with Unpack and kwargs for type hinting 
on function calls.
 
 Example:
-..code:: python
+.. code:: python
+
 def create_testpmd(**kwargs: Unpack[TestPmdParamsDict]):
 params = TestPmdParams(**kwargs)
 """
diff --git a/dts/framework/parser.py b/dts/framework/parser.py
index 741dfff821..7254c75b71 100644
--- a/dts/framework/parser.py
+++ b/dts/framework/parser.py
@@ -46,7 +46,7 @@ class TextParser(ABC):
 Example:
 The following example makes use of and demonstrates every parser 
function available:
 
-..code:: python
+.. code:: python
 
 from dataclasses import dataclass, field
 from enum import Enum
@@ -90,7 +90,7 @@ def wrap(parser_fn: ParserFn, wrapper_fn: Callable) -> 
ParserFn:
 """Makes a wrapped parser function.
 
 `parser_fn` is called and if a non-None value is returned, 
`wrapper_function` is called with
-it. Otherwise the function returns early with None. In pseudo-code:
+it. Otherwise the function returns early with None. In pseudo-code::
 
 intermediate_value := parser_fn(input)
 if intermediary_value is None then
-- 
2.34.1

[PATCH v9 2/5] dts: add doc generation dependencies

[Juraj Linkeš]

Sphinx imports every Python module when generating documentation from
docstrings, meaning all DTS dependencies, including Python version,
must be satisfied.
By adding Sphinx to DTS dependencies we provide a convenient way to
generate the DTS API docs which satisfies all dependencies.

Signed-off-by: Juraj Linkeš 
Reviewed-by: Luca Vizzarro 
Reviewed-by: Jeremy Spewock 
Tested-by: Luca Vizzarro 
---
 dts/poetry.lock| 510 +++--
 dts/pyproject.toml |   7 +
 2 files changed, 505 insertions(+), 12 deletions(-)

diff --git a/dts/poetry.lock b/dts/poetry.lock
index 5f8fa03933..b6e27f8f38 100644
--- a/dts/poetry.lock
+++ b/dts/poetry.lock
@@ -1,5 +1,16 @@
 # This file is automatically @generated by Poetry 1.8.2 and should not be 
changed by hand.
 
+[[package]]
+name = "alabaster"
+version = "0.7.13"
+description = "A configurable sidebar-enabled Sphinx theme"
+optional = false
+python-versions = ">=3.6"
+files = [
+{file = "alabaster-0.7.13-py3-none-any.whl", hash = 
"sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
+{file = "alabaster-0.7.13.tar.gz", hash = 
"sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
+]
+
 [[package]]
 name = "attrs"
 version = "23.1.0"
@@ -18,6 +29,23 @@ docs = ["furo", "myst-parser", "sphinx", 
"sphinx-notfound-page", "sphinxcontrib-
 tests = ["attrs[tests-no-zope]", "zope-interface"]
 tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", 
"pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
 
+[[package]]
+name = "babel"
+version = "2.13.1"
+description = "Internationalization utilities"
+optional = false
+python-versions = ">=3.7"
+files = [
+{file = "Babel-2.13.1-py3-none-any.whl", hash = 
"sha256:7077a4984b02b6727ac10f1f7294484f737443d7e2e66c5e4380e41a3ae0b4ed"},
+{file = "Babel-2.13.1.tar.gz", hash = 
"sha256:33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900"},
+]
+
+[package.dependencies]
+setuptools = {version = "*", markers = "python_version >= \"3.12\""}
+
+[package.extras]
+dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"]
+
 [[package]]
 name = "bcrypt"
 version = "4.0.1"
@@ -86,6 +114,17 @@ d = ["aiohttp (>=3.7.4)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
+[[package]]
+name = "certifi"
+version = "2023.7.22"
+description = "Python package for providing Mozilla's CA Bundle."
+optional = false
+python-versions = ">=3.6"
+files = [
+{file = "certifi-2023.7.22-py3-none-any.whl", hash = 
"sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
+{file = "certifi-2023.7.22.tar.gz", hash = 
"sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
+]
+
 [[package]]
 name = "cffi"
 version = "1.15.1"
@@ -162,6 +201,105 @@ files = [
 [package.dependencies]
 pycparser = "*"
 
+[[package]]
+name = "charset-normalizer"
+version = "3.3.2"
+description = "The Real First Universal Charset Detector. Open, modern and 
actively maintained alternative to Chardet."
+optional = false
+python-versions = ">=3.7.0"
+files = [
+{file = "charset-normalizer-3.3.2.tar.gz", hash = 
"sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", 
hash = 
"sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", 
hash = 
"sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash 
= "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl",
 hash = 
"sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
 hash = 
"sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl",
 hash = 
"sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
 hash = 
"sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl",
 hash = 
"sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", 
hash = 
"sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", 
hash = 
"sha256:e06

[PATCH v9 3/5] dts: add API doc sources

[Juraj Linkeš]

These sources could be generated with the sphinx-apidoc utility, but
that doesn't give us enough flexibility, such as sorting the order of
modules or changing the headers of the modules.

The sources included in this patch were in fact generated by said
utility, but modified to improve the look of the documentation. The
improvements are mainly in toctree definitions and the titles of the
modules/packages. These were made with specific Sphinx config options in
mind.

Signed-off-by: Juraj Linkeš 
Reviewed-by: Luca Vizzarro 
Reviewed-by: Jeremy Spewock 
Tested-by: Luca Vizzarro 
---
 dts/doc/conf_yaml_schema.json |  1 +
 dts/doc/framework.config.rst  | 12 ++
 dts/doc/framework.config.types.rst|  6 +++
 dts/doc/framework.exception.rst   |  6 +++
 dts/doc/framework.logger.rst  |  6 +++
 dts/doc/framework.params.eal.rst  |  6 +++
 dts/doc/framework.params.rst  | 14 ++
 dts/doc/framework.params.testpmd.rst  |  6 +++
 dts/doc/framework.params.types.rst|  6 +++
 dts/doc/framework.parser.rst  |  6 +++
 .../framework.remote_session.dpdk_shell.rst   |  6 +++
 ...ote_session.interactive_remote_session.rst |  6 +++
 ...ework.remote_session.interactive_shell.rst |  6 +++
 .../framework.remote_session.python_shell.rst |  6 +++
 ...ramework.remote_session.remote_session.rst |  6 +++
 dts/doc/framework.remote_session.rst  | 18 
 .../framework.remote_session.ssh_session.rst  |  6 +++
 ...framework.remote_session.testpmd_shell.rst |  6 +++
 dts/doc/framework.runner.rst  |  6 +++
 dts/doc/framework.settings.rst|  6 +++
 dts/doc/framework.test_result.rst |  6 +++
 dts/doc/framework.test_suite.rst  |  6 +++
 dts/doc/framework.testbed_model.cpu.rst   |  6 +++
 .../framework.testbed_model.linux_session.rst |  6 +++
 dts/doc/framework.testbed_model.node.rst  |  6 +++
 .../framework.testbed_model.os_session.rst|  6 +++
 dts/doc/framework.testbed_model.port.rst  |  6 +++
 .../framework.testbed_model.posix_session.rst |  6 +++
 dts/doc/framework.testbed_model.rst   | 26 +++
 dts/doc/framework.testbed_model.sut_node.rst  |  6 +++
 dts/doc/framework.testbed_model.tg_node.rst   |  6 +++
 ..._generator.capturing_traffic_generator.rst |  6 +++
 ...mework.testbed_model.traffic_generator.rst | 14 ++
 testbed_model.traffic_generator.scapy.rst |  6 +++
 ...el.traffic_generator.traffic_generator.rst |  6 +++
 ...framework.testbed_model.virtual_device.rst |  6 +++
 dts/doc/framework.utils.rst   |  6 +++
 dts/doc/index.rst | 43 +++
 38 files changed, 314 insertions(+)
 create mode 12 dts/doc/conf_yaml_schema.json
 create mode 100644 dts/doc/framework.config.rst
 create mode 100644 dts/doc/framework.config.types.rst
 create mode 100644 dts/doc/framework.exception.rst
 create mode 100644 dts/doc/framework.logger.rst
 create mode 100644 dts/doc/framework.params.eal.rst
 create mode 100644 dts/doc/framework.params.rst
 create mode 100644 dts/doc/framework.params.testpmd.rst
 create mode 100644 dts/doc/framework.params.types.rst
 create mode 100644 dts/doc/framework.parser.rst
 create mode 100644 dts/doc/framework.remote_session.dpdk_shell.rst
 create mode 100644 
dts/doc/framework.remote_session.interactive_remote_session.rst
 create mode 100644 dts/doc/framework.remote_session.interactive_shell.rst
 create mode 100644 dts/doc/framework.remote_session.python_shell.rst
 create mode 100644 dts/doc/framework.remote_session.remote_session.rst
 create mode 100644 dts/doc/framework.remote_session.rst
 create mode 100644 dts/doc/framework.remote_session.ssh_session.rst
 create mode 100644 dts/doc/framework.remote_session.testpmd_shell.rst
 create mode 100644 dts/doc/framework.runner.rst
 create mode 100644 dts/doc/framework.settings.rst
 create mode 100644 dts/doc/framework.test_result.rst
 create mode 100644 dts/doc/framework.test_suite.rst
 create mode 100644 dts/doc/framework.testbed_model.cpu.rst
 create mode 100644 dts/doc/framework.testbed_model.linux_session.rst
 create mode 100644 dts/doc/framework.testbed_model.node.rst
 create mode 100644 dts/doc/framework.testbed_model.os_session.rst
 create mode 100644 dts/doc/framework.testbed_model.port.rst
 create mode 100644 dts/doc/framework.testbed_model.posix_session.rst
 create mode 100644 dts/doc/framework.testbed_model.rst
 create mode 100644 dts/doc/framework.testbed_model.sut_node.rst
 create mode 100644 dts/doc/framework.testbed_model.tg_node.rst
 create mode 100644 
dts/doc/framework.testbed_model.traffic_generator.capturing_traffic_generator.rst
 create mode 100644 dts/doc/framework.testbed_model.traffic_generator.rst
 create mode 100644 dts/doc/framework.testbed_model.traffic_generator.scapy.rst
 create mode 100644 
dts/doc/framework.testbed_model.traffic_generator.traffic_generator

[PATCH v9 4/5] doc: guides and API meson improvements

[Juraj Linkeš]

The Sphinx script argument parsing improvement gives us more
flexibility going forward, such as the ability to add non-positional
arguments.

Signed-off-by: Juraj Linkeš 
Reviewed-by: Luca Vizzarro 
Reviewed-by: Jeremy Spewock 
Acked-by: Bruce Richardson 
Tested-by: Luca Vizzarro 
Tested-by: Nicholas Pratte 
---
 buildtools/call-sphinx-build.py | 32 +---
 doc/api/meson.build |  7 ---
 doc/guides/conf.py  |  6 ++
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py
index 623e7363ee..2034160049 100755
--- a/buildtools/call-sphinx-build.py
+++ b/buildtools/call-sphinx-build.py
@@ -3,6 +3,7 @@
 # Copyright(c) 2019 Intel Corporation
 #
 
+import argparse
 import filecmp
 import shutil
 import sys
@@ -10,32 +11,41 @@
 from os.path import join
 from subprocess import run
 
-# assign parameters to variables
-(sphinx, version, src, dst, *extra_args) = sys.argv[1:]
+parser = argparse.ArgumentParser()
+parser.add_argument('sphinx')
+parser.add_argument('version')
+parser.add_argument('src')
+parser.add_argument('dst')
+args, extra_args = parser.parse_known_args()
 
 # set the version in environment for sphinx to pick up
-os.environ['DPDK_VERSION'] = version
+os.environ['DPDK_VERSION'] = args.version
 
-sphinx_cmd = [sphinx] + extra_args
+sphinx_cmd = [args.sphinx] + extra_args
 
 # find all the files sphinx will process so we can write them as dependencies
 srcfiles = []
-for root, dirs, files in os.walk(src):
+for root, dirs, files in os.walk(args.src):
 srcfiles.extend([join(root, f) for f in files])
 
+if not os.path.exists(args.dst):
+os.makedirs(args.dst)
+
 # run sphinx, putting the html output in a "html" directory
-with open(join(dst, 'sphinx_html.out'), 'w') as out:
-process = run(sphinx_cmd + ['-b', 'html', src, join(dst, 'html')],
-  stdout=out)
+with open(join(args.dst, 'sphinx_html.out'), 'w') as out:
+process = run(
+sphinx_cmd + ['-b', 'html', args.src, join(args.dst, 'html')],
+stdout=out
+)
 
 # create a gcc format .d file giving all the dependencies of this doc build
-with open(join(dst, '.html.d'), 'w') as d:
+with open(join(args.dst, '.html.d'), 'w') as d:
 d.write('html: ' + ' '.join(srcfiles) + '\n')
 
 # copy custom CSS file
 css = 'custom.css'
-src_css = join(src, css)
-dst_css = join(dst, 'html', '_static', 'css', css)
+src_css = join(args.src, css)
+dst_css = join(args.dst, 'html', '_static', 'css', css)
 if not os.path.exists(dst_css) or not filecmp.cmp(src_css, dst_css):
 os.makedirs(os.path.dirname(dst_css), exist_ok=True)
 shutil.copyfile(src_css, dst_css)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 5b50692df9..b828b1ed66 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi 
 
+doc_api_build_dir = meson.current_build_dir()
 doxygen = find_program('doxygen', required: get_option('enable_docs'))
 
 if not doxygen.found()
@@ -32,10 +33,10 @@ example = custom_target('examples.dox',
 # set up common Doxygen configuration
 cdata = configuration_data()
 cdata.set('VERSION', meson.project_version())
-cdata.set('API_EXAMPLES', join_paths(dpdk_build_root, 'doc', 'api', 
'examples.dox'))
-cdata.set('OUTPUT', join_paths(dpdk_build_root, 'doc', 'api'))
+cdata.set('API_EXAMPLES', join_paths(doc_api_build_dir, 'examples.dox'))
+cdata.set('OUTPUT', doc_api_build_dir)
 cdata.set('TOPDIR', dpdk_source_root)
-cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, 
join_paths(dpdk_build_root, 'doc', 'api')]))
+cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, doc_api_build_dir]))
 cdata.set('WARN_AS_ERROR', 'NO')
 if get_option('werror')
 cdata.set('WARN_AS_ERROR', 'YES')
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index 0f7ff5282d..8b440fb2a9 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -7,8 +7,7 @@
 from sphinx import __version__ as sphinx_version
 from os import listdir
 from os import environ
-from os.path import basename
-from os.path import dirname
+from os.path import basename, dirname
 from os.path import join as path_join
 from sys import argv, stderr
 
@@ -35,8 +34,7 @@
 html_show_copyright = False
 highlight_language = 'none'
 
-release = environ.setdefault('DPDK_VERSION', "None")
-version = release
+version = environ.setdefault('DPDK_VERSION', "None")
 
 master_doc = 'index'
 
-- 
2.34.1

[PATCH v9 5/5] dts: add API doc generation

[Juraj Linkeš]

The tool used to generate DTS API docs is Sphinx, which is already in
use in DPDK. The same configuration is used to preserve style with one
DTS-specific configuration (so that the DPDK docs are unchanged) that
modifies how the sidebar displays the content.

Sphinx generates the documentation from Python docstrings. The docstring
format is the Google format [0] which requires the sphinx.ext.napoleon
extension. The other extension, sphinx.ext.intersphinx, enables linking
to objects in external documentations, such as the Python documentation.

There are two requirements for building DTS docs:
* The same Python version as DTS or higher, because Sphinx imports the
  code.
* Also the same Python packages as DTS, for the same reason.

[0] https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings

Signed-off-by: Juraj Linkeš 
Reviewed-by: Luca Vizzarro 
Reviewed-by: Jeremy Spewock 
Acked-by: Bruce Richardson 
Tested-by: Luca Vizzarro 
Tested-by: Nicholas Pratte 
---
 buildtools/call-sphinx-build.py |  3 +++
 doc/api/doxy-api-index.md   |  3 +++
 doc/api/doxy-api.conf.in|  2 ++
 doc/api/meson.build |  4 
 doc/guides/conf.py  | 33 +++-
 doc/guides/meson.build  |  1 +
 doc/guides/tools/dts.rst| 34 -
 dts/doc/meson.build | 27 ++
 dts/meson.build | 16 
 meson.build |  1 +
 10 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 dts/doc/meson.build
 create mode 100644 dts/meson.build

diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py
index 2034160049..102f496599 100755
--- a/buildtools/call-sphinx-build.py
+++ b/buildtools/call-sphinx-build.py
@@ -16,10 +16,13 @@
 parser.add_argument('version')
 parser.add_argument('src')
 parser.add_argument('dst')
+parser.add_argument('--dts-root', default=None)
 args, extra_args = parser.parse_known_args()
 
 # set the version in environment for sphinx to pick up
 os.environ['DPDK_VERSION'] = args.version
+if args.dts_root:
+os.environ['DTS_ROOT'] = args.dts_root
 
 sphinx_cmd = [args.sphinx] + extra_args
 
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index f9f0300126..ab223bcdf7 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -245,3 +245,6 @@ The public API headers are grouped by topics:
   [experimental APIs](@ref rte_compat.h),
   [ABI versioning](@ref rte_function_versioning.h),
   [version](@ref rte_version.h)
+
+- **tests**:
+  [**DTS**](@dts_api_main_page)
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index a8823c046f..c94f02d411 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -124,6 +124,8 @@ SEARCHENGINE= YES
 SORT_MEMBER_DOCS= NO
 SOURCE_BROWSER  = YES
 
+ALIASES = "dts_api_main_page=@DTS_API_MAIN_PAGE@"
+
 EXAMPLE_PATH= @TOPDIR@/examples
 EXAMPLE_PATTERNS= *.c
 EXAMPLE_RECURSIVE   = YES
diff --git a/doc/api/meson.build b/doc/api/meson.build
index b828b1ed66..ffc75d7b5a 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -41,6 +41,10 @@ cdata.set('WARN_AS_ERROR', 'NO')
 if get_option('werror')
 cdata.set('WARN_AS_ERROR', 'YES')
 endif
+# A local reference must be relative to the main index.html page
+# The path below can't be taken from the DTS meson file as that would
+# require recursive subdir traversal (doc, dts, then doc again)
+cdata.set('DTS_API_MAIN_PAGE', join_paths('..', 'dts', 'html', 'index.html'))
 
 # configure HTML Doxygen run
 html_cdata = configuration_data()
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index 8b440fb2a9..b442a1f76c 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -9,7 +9,7 @@
 from os import environ
 from os.path import basename, dirname
 from os.path import join as path_join
-from sys import argv, stderr
+from sys import argv, stderr, path
 
 import configparser
 
@@ -23,6 +23,37 @@
   file=stderr)
 pass
 
+# Napoleon enables the Google format of Python doscstrings, used in DTS
+# Intersphinx allows linking to external projects, such as Python docs, also 
used in DTS
+extensions = ['sphinx.ext.napoleon', 'sphinx.ext.intersphinx']
+
+# DTS Python docstring options
+autodoc_default_options = {
+'members': True,
+'member-order': 'bysource',
+'show-inheritance': True,
+}
+autodoc_class_signature = 'separated'
+autodoc_typehints = 'both'
+autodoc_typehints_format = 'short'
+autodoc_typehints_description_target = 'documented'
+napoleon_numpy_docstring = False
+napoleon_attr_annotations = True
+napoleon_preprocess_types = True
+add_module_names = False
+toc_object_entries = True
+toc_object_entries_show_parents = 'hide'
+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
+
+dts_root = environ.get('DTS_ROOT')
+if dts_root:
+path.append(dts_root)

Re: [PATCH v2] dts: add flow rule dataclass to testpmd shell

[Luca Vizzarro]

Hi Dean, thank you for your work! Some minor comments.

On 26/07/2024 15:15, Dean Marx wrote:

add dataclass for passing in flow rule creation arguments, as well as a
__str__ method for converting to a sendable testpmd command. Add
flow_create method to TestPmdShell class for initializing flow rules.

Signed-off-by: Dean Marx 
---
  dts/framework/remote_session/testpmd_shell.py | 58 ++-
  1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/dts/framework/remote_session/testpmd_shell.py 
b/dts/framework/remote_session/testpmd_shell.py
index eda6eb320f..d6c111da0a 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, Optional
  
  from typing_extensions import Self, Unpack
  
@@ -577,6 +577,43 @@ class TestPmdPortStats(TextParser):

  tx_bps: int = field(metadata=TextParser.find_int(r"Tx-bps:\s+(\d+)"))
  
  
+@dataclass

+class flow_func:
Class names should be UpperCamelCase, also should be a suitable name for 
what it's describing. I believe FlowRule should work.

+"""Dataclass for setting flow rule parameters."""
+
+#:
+port_id: int
+#:
+ingress: bool
+#:
+pattern: str
+#:
+actions: str
+
+#:
+group_id: Optional[int] = None
+#:
+priority_level: Optional[int] = None
+#:
+user_id: Optional[int] = None
Optional[..] is an outdated notation. `int | None` is preferred instead. 
See PEP 604[1].

+
+def __str__(self) -> str:
+"""Returns the string representation of a flow_func instance.
+
+In this case, a properly formatted flow create command that can be 
sent to testpmd.
+"""
+ret = []
+ret.append(f"flow create {self.port_id} ")
+ret.append(f"group {self.group_id} " if self.group_id is not None else 
"")
+ret.append(f"priority {self.priority_level} " if self.priority_level is not None 
else "")
+ret.append("ingress " if self.ingress else "egress ")
+ret.append(f"user_id {self.user_id} " if self.user_id is not None else 
"")
+ret.append(f"pattern {self.pattern} ")
+ret.append(" / end actions ")
+ret.append(f"{self.actions} / end")
+return "".join(ret)


Using a list with inline conditional appending is not particularly 
readable. A regular string with conditional appending should do:


   ret = f"flow create {self.port_id} "
   if self.group_id is not None:
    ret += f"group {self.group_id} "
   ...

Also the latest three append lines can all be in one, if you like the 
separation you can just do a multi-line string:


   ret += (
    f"pattern {self.pattern} / end "
    f"actions {self.actions} / end"
   )
   # or actually this may be just fine:
   ret += f"pattern {self.pattern} / end "
   ret += f"actions {self.actions} / end"

I guess the way it's split is more of a game changer.

If you really want to use a list (in a way that is similar to what I've 
described here) then I'd take advantage of it... by omitting leading and 
trailing whitespaces and then use the join to add them in between: " 
".join(ret)



+
+
  class TestPmdShell(DPDKShell):
  """Testpmd interactive shell.
  
@@ -804,6 +841,25 @@ def show_port_stats(self, port_id: int) -> TestPmdPortStats:
  
  return TestPmdPortStats.parse(output)
  
+def flow_create(self, cmd: str, verify: bool = True) -> None:


Not a comment, but a discussion point. Normally we'd want a function to 
be read as an action such as:


   create_flow

But I understand this is basically mirroring the command format... I 
wonder which one would be the best. I am personally inclined in verb 
first. Maybe others can give their opinion.

+"""Creates a flow rule in the testpmd session.
+
+Args:
+cmd: String from flow_func instance to send as a flow rule.
+verify: If :data:`True`, the output of the command is scanned
+to ensure the flow rule was created successfully.
+
+Raises:
+InteractiveCommandExecutionError: If flow rule is invalid.
+"""
+flow_output = self.send_command(cmd)
+if verify:
+if "created" not in flow_output:
+self._logger.debug(f"Failed to create flow 
rule:\n{flow_output}")
+raise InteractiveCommandExecutionError(
+f"Failed to create flow rule:\n{flow_output}"
+)
+
  def _close(self) -> None:
  """Overrides :meth:`~.interactive_shell.close`."""
  self.stop()


[1] https://peps.python.org/pep-0604/

[RFC] ethdev: convert string initialization

[Ferruh Yigit]

gcc 15 experimental [1], with -Wextra flag, gives warning in variable
initialization as string [2].

The warning has a point when initialized variable is intended to use as
string, since assignment is missing the required null terminator for
this case. But warning is useless for our usecase.

I don't know if this behaviour will change in gcc15, as it is still
under development. But if not we may need to update our initialization.

In this patch only updated a few instance to show the issue, there are
many instances to fix, if we prefer to go this way.
Other option is to disable warning but it can be useful for actual
string usecases, so I prefer to keep it.

[1]
gcc (GCC) 15.0.0 20240801 (experimental)

[2]
../lib/ethdev/rte_flow.h:906:36:
  error: initializer-string for array of ‘unsigned char’ is too long
[-Werror=unterminated-string-initialization]
906 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
|^~

../lib/ethdev/rte_flow.h:907:36:
  error: initializer-string for array of ‘unsigned char’ is too long
 [-Werror=unterminated-string-initialization]
907 | .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
|^~

../lib/ethdev/rte_flow.h:1009:25:
  error: initializer-string for array of ‘unsigned char’ is too long
 [-Werror=unterminated-string-initialization]
1009 | "\xff\xff\xff\xff\xff\xff\xff\xff"
 | ^~

../lib/ethdev/rte_flow.h:1012:25:
  error: initializer-string for array of ‘unsigned char’ is too long
 [-Werror=unterminated-string-initialization]
1012 | "\xff\xff\xff\xff\xff\xff\xff\xff"
 | ^~

../lib/ethdev/rte_flow.h:1135:20:
  error: initializer-string for array of ‘unsigned char’ is too long
 [-Werror=unterminated-string-initialization]
1135 | .hdr.vni = "\xff\xff\xff",
 |^~

Signed-off-by: Ferruh Yigit 
---
 lib/ethdev/rte_flow.h | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
index f864578f806b..8b623974cd44 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -903,8 +903,8 @@ struct rte_flow_item_eth {
 /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
 #ifndef __cplusplus
 static const struct rte_flow_item_eth rte_flow_item_eth_mask = {
-   .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
-   .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+   .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+   .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
.hdr.ether_type = RTE_BE16(0x),
 };
 #endif
@@ -1005,12 +1005,10 @@ struct rte_flow_item_ipv6 {
 #ifndef __cplusplus
 static const struct rte_flow_item_ipv6 rte_flow_item_ipv6_mask = {
.hdr = {
-   .src_addr =
-   "\xff\xff\xff\xff\xff\xff\xff\xff"
-   "\xff\xff\xff\xff\xff\xff\xff\xff",
-   .dst_addr =
-   "\xff\xff\xff\xff\xff\xff\xff\xff"
-   "\xff\xff\xff\xff\xff\xff\xff\xff",
+   .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+   .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
},
 };
 #endif
@@ -1132,7 +1130,7 @@ struct rte_flow_item_vxlan {
 /** Default mask for RTE_FLOW_ITEM_TYPE_VXLAN. */
 #ifndef __cplusplus
 static const struct rte_flow_item_vxlan rte_flow_item_vxlan_mask = {
-   .hdr.vni = "\xff\xff\xff",
+   .hdr.vni = { 0xff, 0xff, 0xff },
 };
 #endif
 
-- 
2.43.0

Re: [v24.11 PATCH v1] net/sfc: allow for use of indirect counter in tunnel offload

[Ferruh Yigit]

On 7/29/2024 5:38 PM, Ivan Malov wrote:
> Support the use of indirect counters in so-called SWITCH
> rules (second stage lookup and steering after supposed
> decapsulation) in tunnel offload. An indirect counter
> can either come instead of an inline counter or, when
> the latter is a conntrack-assisted counter, follow it.
> 
> Signed-off-by: Ivan Malov 
> Reviewed-by: Andy Moreton 
>

Applied to dpdk-next-net/main, thanks.

Re: [PATCH] doc: update Arm IPsec-MB dependency version

[Jack Bond-Preston]

On 31/07/2024 22:26, Wathsala Vithanage wrote:

Updates the tag of Arm IPsec-MB library to SECLIB-IPSEC-2024.07.08
in snow3g and zuc documentation.

Signed-off-by: Wathsala Vithanage 
Reviewed-by: Dhruv Tripathi 

Acked-by: Jack Bond-Preston 



---
  .mailmap | 1 +
  doc/guides/cryptodevs/snow3g.rst | 2 +-
  doc/guides/cryptodevs/zuc.rst| 2 +-
  3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 4a508bafad..b924fad56b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -343,6 +343,7 @@ Dexia Li 
  Dexuan Cui 
  Dharmik Thakkar  
  Dheemanth Mallikarjun 
+Dhruv Tripathi 
  Diana Wang 
  Didier Pallard 
  Dilshod Urazov 
diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst
index 923b3fa0ac..6eb8229fb5 100644
--- a/doc/guides/cryptodevs/snow3g.rst
+++ b/doc/guides/cryptodevs/snow3g.rst
@@ -54,7 +54,7 @@ can be downloaded from 
``_. The
-latest version of the library supported by this PMD is tagged as 
SECLIB-IPSEC-2024.03.12.
+latest version of the library supported by this PMD is tagged as 
SECLIB-IPSEC-2024.07.08.
  
  After downloading the library, the user needs to unpack and compile it

  on their system before building DPDK:
diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst
index f51980e1fc..29fe6279aa 100644
--- a/doc/guides/cryptodevs/zuc.rst
+++ b/doc/guides/cryptodevs/zuc.rst
@@ -53,7 +53,7 @@ can be downloaded from 
``_. The
-latest version of the library supported by this PMD is tagged as 
SECLIB-IPSEC-2024.03.12.
+latest version of the library supported by this PMD is tagged as 
SECLIB-IPSEC-2024.07.08.
  
  After downloading the library, the user needs to unpack and compile it

  on their system before building DPDK:

[PATCH v10 0/5] dts: API docs generation

[Juraj Linkeš]

The generation is done with Sphinx, which DPDK already uses, with
slightly modified configuration of the sidebar present in an if block.

Dependencies are installed using Poetry from the dts directory:

poetry install --with docs

After installing, enter the Poetry shell:

poetry shell

And then run the build:
ninja -C  dts-doc

Python3.10 is required to build the DTS API docs.

The patchset contains the .rst sources which Sphinx uses to generate the
html pages. These were first generated with the sphinx-apidoc utility
and modified to provide a better look. The documentation just doesn't
look that good without the modifications and there isn't enough
configuration options to achieve that without manual changes to the .rst
files. This introduces extra maintenance which involves adding new .rst
files when a new Python module is added or changing the .rst structure
if the Python directory/file structure is changed (moved, renamed
files). This small maintenance burden is outweighed by the flexibility
afforded by the ability to make manual changes to the .rst files.

v2:
Removed the use of sphinx-apidoc from meson in favor of adding the files
generated by it directly to the repository (and modifying them).

v3:
Rebase.

v4:
Rebase.

v5:
Another rebase, but this time the rebase needed the addition of .rst
corresponding to newly added files as well as fixing a few documentation
problems in said files.

v6:
Documentation formatting adjustments.

v7:
Now with the actual doc changes.

v8:
Split the last commit into non-DTS and DTS changes.

v9:
Rebase.

v10:
Fix dts doc generation issue: Only copy the custom rss file if it exists.

Juraj Linkeš (5):
  dts: update params and parser docstrings
  dts: add doc generation dependencies
  dts: add API doc sources
  doc: guides and API meson improvements
  dts: add API doc generation

 buildtools/call-sphinx-build.py   |  37 +-
 doc/api/doxy-api-index.md |   3 +
 doc/api/doxy-api.conf.in  |   2 +
 doc/api/meson.build   |  11 +-
 doc/guides/conf.py|  39 +-
 doc/guides/meson.build|   1 +
 doc/guides/tools/dts.rst  |  34 +-
 dts/doc/conf_yaml_schema.json |   1 +
 dts/doc/framework.config.rst  |  12 +
 dts/doc/framework.config.types.rst|   6 +
 dts/doc/framework.exception.rst   |   6 +
 dts/doc/framework.logger.rst  |   6 +
 dts/doc/framework.params.eal.rst  |   6 +
 dts/doc/framework.params.rst  |  14 +
 dts/doc/framework.params.testpmd.rst  |   6 +
 dts/doc/framework.params.types.rst|   6 +
 dts/doc/framework.parser.rst  |   6 +
 .../framework.remote_session.dpdk_shell.rst   |   6 +
 ...ote_session.interactive_remote_session.rst |   6 +
 ...ework.remote_session.interactive_shell.rst |   6 +
 .../framework.remote_session.python_shell.rst |   6 +
 ...ramework.remote_session.remote_session.rst |   6 +
 dts/doc/framework.remote_session.rst  |  18 +
 .../framework.remote_session.ssh_session.rst  |   6 +
 ...framework.remote_session.testpmd_shell.rst |   6 +
 dts/doc/framework.runner.rst  |   6 +
 dts/doc/framework.settings.rst|   6 +
 dts/doc/framework.test_result.rst |   6 +
 dts/doc/framework.test_suite.rst  |   6 +
 dts/doc/framework.testbed_model.cpu.rst   |   6 +
 .../framework.testbed_model.linux_session.rst |   6 +
 dts/doc/framework.testbed_model.node.rst  |   6 +
 .../framework.testbed_model.os_session.rst|   6 +
 dts/doc/framework.testbed_model.port.rst  |   6 +
 .../framework.testbed_model.posix_session.rst |   6 +
 dts/doc/framework.testbed_model.rst   |  26 +
 dts/doc/framework.testbed_model.sut_node.rst  |   6 +
 dts/doc/framework.testbed_model.tg_node.rst   |   6 +
 ..._generator.capturing_traffic_generator.rst |   6 +
 ...mework.testbed_model.traffic_generator.rst |  14 +
 testbed_model.traffic_generator.scapy.rst |   6 +
 ...el.traffic_generator.traffic_generator.rst |   6 +
 ...framework.testbed_model.virtual_device.rst |   6 +
 dts/doc/framework.utils.rst   |   6 +
 dts/doc/index.rst |  43 ++
 dts/doc/meson.build   |  27 +
 dts/framework/params/__init__.py  |   4 +-
 dts/framework/params/eal.py   |   7 +-
 dts/framework/params/types.py |   3 +-
 dts/framework/parser.py   |   4 +-
 dts/meson.build   |  16 +
 dts/poetry.lock   | 510 +-
 dts/pyproject.toml|   7 +
 meson.build   |   1 +
 54 files changed, 980 insertions(+), 40 deletions(-)
 create mode 12 dts/doc/conf_yaml_schema.json
 create mode 100644 dts/doc/framework.config.rst
 

[PATCH v10 1/5] dts: update params and parser docstrings

[Juraj Linkeš]

Address a few errors reported by Sphinx when generating documentation:
framework/params/__init__.py:docstring of framework.params.modify_str:3:
WARNING: Inline interpreted text or phrase reference start-string
without end-string.
framework/params/eal.py:docstring of framework.params.eal.EalParams:35:
WARNING: Definition list ends without a blank line; unexpected
unindent.
framework/params/types.py:docstring of framework.params.types:8:
WARNING: Inline strong start-string without end-string.
framework/params/types.py:docstring of framework.params.types:9:
WARNING: Inline strong start-string without end-string.
framework/parser.py:docstring of framework.parser.TextParser:33: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser:43: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser:49: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser.wrap:8:
ERROR: Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser.wrap:9:
WARNING: Block quote ends without a blank line; unexpected unindent.

Fixes: 87ba4cdc0dbb ("dts: use Unpack for type checking and hinting")
Fixes: d70159cb62f5 ("dts: add params manipulation module")
Fixes: 967fc62b0a43 ("dts: refactor EAL parameters class")
Fixes: 818fe14e3422 ("dts: add parsing utility module")
Cc: luca.vizza...@arm.com

Signed-off-by: Juraj Linkeš 
---
 dts/framework/params/__init__.py | 4 ++--
 dts/framework/params/eal.py  | 7 +--
 dts/framework/params/types.py| 3 ++-
 dts/framework/parser.py  | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dts/framework/params/__init__.py b/dts/framework/params/__init__.py
index 5a6fd93053..1ae227d7b4 100644
--- a/dts/framework/params/__init__.py
+++ b/dts/framework/params/__init__.py
@@ -53,9 +53,9 @@ def reduced_fn(value):
 
 
 def modify_str(*funcs: FnPtr) -> Callable[[T], T]:
-"""Class decorator modifying the ``__str__`` method with a function 
created from its arguments.
+r"""Class decorator modifying the ``__str__`` method with a function 
created from its arguments.
 
-The :attr:`FnPtr`s fed to the decorator are executed from left to right in 
the arguments list
+The :attr:`FnPtr`\s fed to the decorator are executed from left to right 
in the arguments list
 order.
 
 Args:
diff --git a/dts/framework/params/eal.py b/dts/framework/params/eal.py
index 8d7766fefc..cf1594353a 100644
--- a/dts/framework/params/eal.py
+++ b/dts/framework/params/eal.py
@@ -26,13 +26,16 @@ class EalParams(Params):
 prefix: Set the file prefix string with which to start DPDK, e.g.: 
``prefix="vf"``.
 no_pci: Switch to disable PCI bus, e.g.: ``no_pci=True``.
 vdevs: Virtual devices, e.g.::
+
 vdevs=[
 VirtualDevice('net_ring0'),
 VirtualDevice('net_ring1')
 ]
+
 ports: The list of ports to allow.
-other_eal_param: user defined DPDK EAL parameters, e.g.:
-``other_eal_param='--single-file-segments'``
+other_eal_param: user defined DPDK EAL parameters, e.g.::
+
+``other_eal_param='--single-file-segments'``
 """
 
 lcore_list: LogicalCoreList | None = field(default=None, 
metadata=Params.short("l"))
diff --git a/dts/framework/params/types.py b/dts/framework/params/types.py
index e668f658d8..d77c4625fb 100644
--- a/dts/framework/params/types.py
+++ b/dts/framework/params/types.py
@@ -6,7 +6,8 @@
 TypedDicts can be used in conjunction with Unpack and kwargs for type hinting 
on function calls.
 
 Example:
-..code:: python
+.. code:: python
+
 def create_testpmd(**kwargs: Unpack[TestPmdParamsDict]):
 params = TestPmdParams(**kwargs)
 """
diff --git a/dts/framework/parser.py b/dts/framework/parser.py
index 741dfff821..7254c75b71 100644
--- a/dts/framework/parser.py
+++ b/dts/framework/parser.py
@@ -46,7 +46,7 @@ class TextParser(ABC):
 Example:
 The following example makes use of and demonstrates every parser 
function available:
 
-..code:: python
+.. code:: python
 
 from dataclasses import dataclass, field
 from enum import Enum
@@ -90,7 +90,7 @@ def wrap(parser_fn: ParserFn, wrapper_fn: Callable) -> 
ParserFn:
 """Makes a wrapped parser function.
 
 `parser_fn` is called and if a non-None value is returned, 
`wrapper_function` is called with
-it. Otherwise the function returns early with None. In pseudo-code:
+it. Otherwise the function returns early with None. In pseudo-code::
 
 intermediate_value := parser_fn(input)
 if intermediary_value is None then
-- 
2.34.1

[PATCH v10 2/5] dts: add doc generation dependencies

[Juraj Linkeš]

Sphinx imports every Python module when generating documentation from
docstrings, meaning all DTS dependencies, including Python version,
must be satisfied.
By adding Sphinx to DTS dependencies we provide a convenient way to
generate the DTS API docs which satisfies all dependencies.

Signed-off-by: Juraj Linkeš 
Reviewed-by: Luca Vizzarro 
Reviewed-by: Jeremy Spewock 
Tested-by: Luca Vizzarro 
---
 dts/poetry.lock| 510 +++--
 dts/pyproject.toml |   7 +
 2 files changed, 505 insertions(+), 12 deletions(-)

diff --git a/dts/poetry.lock b/dts/poetry.lock
index 5f8fa03933..b6e27f8f38 100644
--- a/dts/poetry.lock
+++ b/dts/poetry.lock
@@ -1,5 +1,16 @@
 # This file is automatically @generated by Poetry 1.8.2 and should not be 
changed by hand.
 
+[[package]]
+name = "alabaster"
+version = "0.7.13"
+description = "A configurable sidebar-enabled Sphinx theme"
+optional = false
+python-versions = ">=3.6"
+files = [
+{file = "alabaster-0.7.13-py3-none-any.whl", hash = 
"sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
+{file = "alabaster-0.7.13.tar.gz", hash = 
"sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
+]
+
 [[package]]
 name = "attrs"
 version = "23.1.0"
@@ -18,6 +29,23 @@ docs = ["furo", "myst-parser", "sphinx", 
"sphinx-notfound-page", "sphinxcontrib-
 tests = ["attrs[tests-no-zope]", "zope-interface"]
 tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", 
"pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
 
+[[package]]
+name = "babel"
+version = "2.13.1"
+description = "Internationalization utilities"
+optional = false
+python-versions = ">=3.7"
+files = [
+{file = "Babel-2.13.1-py3-none-any.whl", hash = 
"sha256:7077a4984b02b6727ac10f1f7294484f737443d7e2e66c5e4380e41a3ae0b4ed"},
+{file = "Babel-2.13.1.tar.gz", hash = 
"sha256:33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900"},
+]
+
+[package.dependencies]
+setuptools = {version = "*", markers = "python_version >= \"3.12\""}
+
+[package.extras]
+dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"]
+
 [[package]]
 name = "bcrypt"
 version = "4.0.1"
@@ -86,6 +114,17 @@ d = ["aiohttp (>=3.7.4)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
+[[package]]
+name = "certifi"
+version = "2023.7.22"
+description = "Python package for providing Mozilla's CA Bundle."
+optional = false
+python-versions = ">=3.6"
+files = [
+{file = "certifi-2023.7.22-py3-none-any.whl", hash = 
"sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
+{file = "certifi-2023.7.22.tar.gz", hash = 
"sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
+]
+
 [[package]]
 name = "cffi"
 version = "1.15.1"
@@ -162,6 +201,105 @@ files = [
 [package.dependencies]
 pycparser = "*"
 
+[[package]]
+name = "charset-normalizer"
+version = "3.3.2"
+description = "The Real First Universal Charset Detector. Open, modern and 
actively maintained alternative to Chardet."
+optional = false
+python-versions = ">=3.7.0"
+files = [
+{file = "charset-normalizer-3.3.2.tar.gz", hash = 
"sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", 
hash = 
"sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", 
hash = 
"sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash 
= "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl",
 hash = 
"sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
 hash = 
"sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl",
 hash = 
"sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
 hash = 
"sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"},
+{file = 
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl",
 hash = 
"sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", 
hash = 
"sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", 
hash = 
"sha256:e06

[PATCH v10 3/5] dts: add API doc sources

[Juraj Linkeš]

These sources could be generated with the sphinx-apidoc utility, but
that doesn't give us enough flexibility, such as sorting the order of
modules or changing the headers of the modules.

The sources included in this patch were in fact generated by said
utility, but modified to improve the look of the documentation. The
improvements are mainly in toctree definitions and the titles of the
modules/packages. These were made with specific Sphinx config options in
mind.

Signed-off-by: Juraj Linkeš 
Reviewed-by: Luca Vizzarro 
Reviewed-by: Jeremy Spewock 
Tested-by: Luca Vizzarro 
---
 dts/doc/conf_yaml_schema.json |  1 +
 dts/doc/framework.config.rst  | 12 ++
 dts/doc/framework.config.types.rst|  6 +++
 dts/doc/framework.exception.rst   |  6 +++
 dts/doc/framework.logger.rst  |  6 +++
 dts/doc/framework.params.eal.rst  |  6 +++
 dts/doc/framework.params.rst  | 14 ++
 dts/doc/framework.params.testpmd.rst  |  6 +++
 dts/doc/framework.params.types.rst|  6 +++
 dts/doc/framework.parser.rst  |  6 +++
 .../framework.remote_session.dpdk_shell.rst   |  6 +++
 ...ote_session.interactive_remote_session.rst |  6 +++
 ...ework.remote_session.interactive_shell.rst |  6 +++
 .../framework.remote_session.python_shell.rst |  6 +++
 ...ramework.remote_session.remote_session.rst |  6 +++
 dts/doc/framework.remote_session.rst  | 18 
 .../framework.remote_session.ssh_session.rst  |  6 +++
 ...framework.remote_session.testpmd_shell.rst |  6 +++
 dts/doc/framework.runner.rst  |  6 +++
 dts/doc/framework.settings.rst|  6 +++
 dts/doc/framework.test_result.rst |  6 +++
 dts/doc/framework.test_suite.rst  |  6 +++
 dts/doc/framework.testbed_model.cpu.rst   |  6 +++
 .../framework.testbed_model.linux_session.rst |  6 +++
 dts/doc/framework.testbed_model.node.rst  |  6 +++
 .../framework.testbed_model.os_session.rst|  6 +++
 dts/doc/framework.testbed_model.port.rst  |  6 +++
 .../framework.testbed_model.posix_session.rst |  6 +++
 dts/doc/framework.testbed_model.rst   | 26 +++
 dts/doc/framework.testbed_model.sut_node.rst  |  6 +++
 dts/doc/framework.testbed_model.tg_node.rst   |  6 +++
 ..._generator.capturing_traffic_generator.rst |  6 +++
 ...mework.testbed_model.traffic_generator.rst | 14 ++
 testbed_model.traffic_generator.scapy.rst |  6 +++
 ...el.traffic_generator.traffic_generator.rst |  6 +++
 ...framework.testbed_model.virtual_device.rst |  6 +++
 dts/doc/framework.utils.rst   |  6 +++
 dts/doc/index.rst | 43 +++
 38 files changed, 314 insertions(+)
 create mode 12 dts/doc/conf_yaml_schema.json
 create mode 100644 dts/doc/framework.config.rst
 create mode 100644 dts/doc/framework.config.types.rst
 create mode 100644 dts/doc/framework.exception.rst
 create mode 100644 dts/doc/framework.logger.rst
 create mode 100644 dts/doc/framework.params.eal.rst
 create mode 100644 dts/doc/framework.params.rst
 create mode 100644 dts/doc/framework.params.testpmd.rst
 create mode 100644 dts/doc/framework.params.types.rst
 create mode 100644 dts/doc/framework.parser.rst
 create mode 100644 dts/doc/framework.remote_session.dpdk_shell.rst
 create mode 100644 
dts/doc/framework.remote_session.interactive_remote_session.rst
 create mode 100644 dts/doc/framework.remote_session.interactive_shell.rst
 create mode 100644 dts/doc/framework.remote_session.python_shell.rst
 create mode 100644 dts/doc/framework.remote_session.remote_session.rst
 create mode 100644 dts/doc/framework.remote_session.rst
 create mode 100644 dts/doc/framework.remote_session.ssh_session.rst
 create mode 100644 dts/doc/framework.remote_session.testpmd_shell.rst
 create mode 100644 dts/doc/framework.runner.rst
 create mode 100644 dts/doc/framework.settings.rst
 create mode 100644 dts/doc/framework.test_result.rst
 create mode 100644 dts/doc/framework.test_suite.rst
 create mode 100644 dts/doc/framework.testbed_model.cpu.rst
 create mode 100644 dts/doc/framework.testbed_model.linux_session.rst
 create mode 100644 dts/doc/framework.testbed_model.node.rst
 create mode 100644 dts/doc/framework.testbed_model.os_session.rst
 create mode 100644 dts/doc/framework.testbed_model.port.rst
 create mode 100644 dts/doc/framework.testbed_model.posix_session.rst
 create mode 100644 dts/doc/framework.testbed_model.rst
 create mode 100644 dts/doc/framework.testbed_model.sut_node.rst
 create mode 100644 dts/doc/framework.testbed_model.tg_node.rst
 create mode 100644 
dts/doc/framework.testbed_model.traffic_generator.capturing_traffic_generator.rst
 create mode 100644 dts/doc/framework.testbed_model.traffic_generator.rst
 create mode 100644 dts/doc/framework.testbed_model.traffic_generator.scapy.rst
 create mode 100644 
dts/doc/framework.testbed_model.traffic_generator.traffic_generator

[PATCH v10 4/5] doc: guides and API meson improvements

[Juraj Linkeš]

The Sphinx script argument parsing improvement gives us more
flexibility going forward, such as the ability to add non-positional
arguments.

Signed-off-by: Juraj Linkeš 
Reviewed-by: Luca Vizzarro 
Reviewed-by: Jeremy Spewock 
Acked-by: Bruce Richardson 
Tested-by: Luca Vizzarro 
Tested-by: Nicholas Pratte 
---
 buildtools/call-sphinx-build.py | 32 +---
 doc/api/meson.build |  7 ---
 doc/guides/conf.py  |  6 ++
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py
index 623e7363ee..2034160049 100755
--- a/buildtools/call-sphinx-build.py
+++ b/buildtools/call-sphinx-build.py
@@ -3,6 +3,7 @@
 # Copyright(c) 2019 Intel Corporation
 #
 
+import argparse
 import filecmp
 import shutil
 import sys
@@ -10,32 +11,41 @@
 from os.path import join
 from subprocess import run
 
-# assign parameters to variables
-(sphinx, version, src, dst, *extra_args) = sys.argv[1:]
+parser = argparse.ArgumentParser()
+parser.add_argument('sphinx')
+parser.add_argument('version')
+parser.add_argument('src')
+parser.add_argument('dst')
+args, extra_args = parser.parse_known_args()
 
 # set the version in environment for sphinx to pick up
-os.environ['DPDK_VERSION'] = version
+os.environ['DPDK_VERSION'] = args.version
 
-sphinx_cmd = [sphinx] + extra_args
+sphinx_cmd = [args.sphinx] + extra_args
 
 # find all the files sphinx will process so we can write them as dependencies
 srcfiles = []
-for root, dirs, files in os.walk(src):
+for root, dirs, files in os.walk(args.src):
 srcfiles.extend([join(root, f) for f in files])
 
+if not os.path.exists(args.dst):
+os.makedirs(args.dst)
+
 # run sphinx, putting the html output in a "html" directory
-with open(join(dst, 'sphinx_html.out'), 'w') as out:
-process = run(sphinx_cmd + ['-b', 'html', src, join(dst, 'html')],
-  stdout=out)
+with open(join(args.dst, 'sphinx_html.out'), 'w') as out:
+process = run(
+sphinx_cmd + ['-b', 'html', args.src, join(args.dst, 'html')],
+stdout=out
+)
 
 # create a gcc format .d file giving all the dependencies of this doc build
-with open(join(dst, '.html.d'), 'w') as d:
+with open(join(args.dst, '.html.d'), 'w') as d:
 d.write('html: ' + ' '.join(srcfiles) + '\n')
 
 # copy custom CSS file
 css = 'custom.css'
-src_css = join(src, css)
-dst_css = join(dst, 'html', '_static', 'css', css)
+src_css = join(args.src, css)
+dst_css = join(args.dst, 'html', '_static', 'css', css)
 if not os.path.exists(dst_css) or not filecmp.cmp(src_css, dst_css):
 os.makedirs(os.path.dirname(dst_css), exist_ok=True)
 shutil.copyfile(src_css, dst_css)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 5b50692df9..b828b1ed66 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi 
 
+doc_api_build_dir = meson.current_build_dir()
 doxygen = find_program('doxygen', required: get_option('enable_docs'))
 
 if not doxygen.found()
@@ -32,10 +33,10 @@ example = custom_target('examples.dox',
 # set up common Doxygen configuration
 cdata = configuration_data()
 cdata.set('VERSION', meson.project_version())
-cdata.set('API_EXAMPLES', join_paths(dpdk_build_root, 'doc', 'api', 
'examples.dox'))
-cdata.set('OUTPUT', join_paths(dpdk_build_root, 'doc', 'api'))
+cdata.set('API_EXAMPLES', join_paths(doc_api_build_dir, 'examples.dox'))
+cdata.set('OUTPUT', doc_api_build_dir)
 cdata.set('TOPDIR', dpdk_source_root)
-cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, 
join_paths(dpdk_build_root, 'doc', 'api')]))
+cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, doc_api_build_dir]))
 cdata.set('WARN_AS_ERROR', 'NO')
 if get_option('werror')
 cdata.set('WARN_AS_ERROR', 'YES')
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index 0f7ff5282d..8b440fb2a9 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -7,8 +7,7 @@
 from sphinx import __version__ as sphinx_version
 from os import listdir
 from os import environ
-from os.path import basename
-from os.path import dirname
+from os.path import basename, dirname
 from os.path import join as path_join
 from sys import argv, stderr
 
@@ -35,8 +34,7 @@
 html_show_copyright = False
 highlight_language = 'none'
 
-release = environ.setdefault('DPDK_VERSION', "None")
-version = release
+version = environ.setdefault('DPDK_VERSION', "None")
 
 master_doc = 'index'
 
-- 
2.34.1

[PATCH v10 5/5] dts: add API doc generation

[Juraj Linkeš]

The tool used to generate DTS API docs is Sphinx, which is already in
use in DPDK. The same configuration is used to preserve style with one
DTS-specific configuration (so that the DPDK docs are unchanged) that
modifies how the sidebar displays the content.

Sphinx generates the documentation from Python docstrings. The docstring
format is the Google format [0] which requires the sphinx.ext.napoleon
extension. The other extension, sphinx.ext.intersphinx, enables linking
to objects in external documentations, such as the Python documentation.

There are two requirements for building DTS docs:
* The same Python version as DTS or higher, because Sphinx imports the
  code.
* Also the same Python packages as DTS, for the same reason.

[0] https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings

Signed-off-by: Juraj Linkeš 
Reviewed-by: Luca Vizzarro 
Reviewed-by: Jeremy Spewock 
Acked-by: Bruce Richardson 
Tested-by: Luca Vizzarro 
Tested-by: Nicholas Pratte 
---
 buildtools/call-sphinx-build.py |  5 -
 doc/api/doxy-api-index.md   |  3 +++
 doc/api/doxy-api.conf.in|  2 ++
 doc/api/meson.build |  4 
 doc/guides/conf.py  | 33 +++-
 doc/guides/meson.build  |  1 +
 doc/guides/tools/dts.rst| 34 -
 dts/doc/meson.build | 27 ++
 dts/meson.build | 16 
 meson.build |  1 +
 10 files changed, 123 insertions(+), 3 deletions(-)
 create mode 100644 dts/doc/meson.build
 create mode 100644 dts/meson.build

diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py
index 2034160049..c55d4f6bc9 100755
--- a/buildtools/call-sphinx-build.py
+++ b/buildtools/call-sphinx-build.py
@@ -16,10 +16,13 @@
 parser.add_argument('version')
 parser.add_argument('src')
 parser.add_argument('dst')
+parser.add_argument('--dts-root', default=None)
 args, extra_args = parser.parse_known_args()
 
 # set the version in environment for sphinx to pick up
 os.environ['DPDK_VERSION'] = args.version
+if args.dts_root:
+os.environ['DTS_ROOT'] = args.dts_root
 
 sphinx_cmd = [args.sphinx] + extra_args
 
@@ -46,7 +49,7 @@
 css = 'custom.css'
 src_css = join(args.src, css)
 dst_css = join(args.dst, 'html', '_static', 'css', css)
-if not os.path.exists(dst_css) or not filecmp.cmp(src_css, dst_css):
+if os.path.exists(src_css) and (not os.path.exists(dst_css) or not 
filecmp.cmp(src_css, dst_css)):
 os.makedirs(os.path.dirname(dst_css), exist_ok=True)
 shutil.copyfile(src_css, dst_css)
 
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index f9f0300126..ab223bcdf7 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -245,3 +245,6 @@ The public API headers are grouped by topics:
   [experimental APIs](@ref rte_compat.h),
   [ABI versioning](@ref rte_function_versioning.h),
   [version](@ref rte_version.h)
+
+- **tests**:
+  [**DTS**](@dts_api_main_page)
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index a8823c046f..c94f02d411 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -124,6 +124,8 @@ SEARCHENGINE= YES
 SORT_MEMBER_DOCS= NO
 SOURCE_BROWSER  = YES
 
+ALIASES = "dts_api_main_page=@DTS_API_MAIN_PAGE@"
+
 EXAMPLE_PATH= @TOPDIR@/examples
 EXAMPLE_PATTERNS= *.c
 EXAMPLE_RECURSIVE   = YES
diff --git a/doc/api/meson.build b/doc/api/meson.build
index b828b1ed66..ffc75d7b5a 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -41,6 +41,10 @@ cdata.set('WARN_AS_ERROR', 'NO')
 if get_option('werror')
 cdata.set('WARN_AS_ERROR', 'YES')
 endif
+# A local reference must be relative to the main index.html page
+# The path below can't be taken from the DTS meson file as that would
+# require recursive subdir traversal (doc, dts, then doc again)
+cdata.set('DTS_API_MAIN_PAGE', join_paths('..', 'dts', 'html', 'index.html'))
 
 # configure HTML Doxygen run
 html_cdata = configuration_data()
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index 8b440fb2a9..b442a1f76c 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -9,7 +9,7 @@
 from os import environ
 from os.path import basename, dirname
 from os.path import join as path_join
-from sys import argv, stderr
+from sys import argv, stderr, path
 
 import configparser
 
@@ -23,6 +23,37 @@
   file=stderr)
 pass
 
+# Napoleon enables the Google format of Python doscstrings, used in DTS
+# Intersphinx allows linking to external projects, such as Python docs, also 
used in DTS
+extensions = ['sphinx.ext.napoleon', 'sphinx.ext.intersphinx']
+
+# DTS Python docstring options
+autodoc_default_options = {
+'members': True,
+'member-order': 'bysource',
+'show-inheritance': True,
+}
+autodoc_class_signature = 'separated'
+autodoc_typehints = 'both'
+autodoc_typehints_format = 'short'
+

[PATCH dpdk] buildtools/cmdline: fix meson error when used as a subproject

[Robin Jarry]

Fix the following error when using dpdk as a subproject:

 subprojects/dpdk/buildtools/subproject/meson.build:28:56:
 ERROR: Unknown function "file".

This was obviously never tested in its submitted form.

Cc: sta...@dpdk.org
Fixes: 7d8c608faa7f ("buildtools/cmdline: allow using script in subproject")

Signed-off-by: Robin Jarry 
---
 buildtools/subproject/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildtools/subproject/meson.build 
b/buildtools/subproject/meson.build
index 9ba94671bd0e..8ae081e1698a 100644
--- a/buildtools/subproject/meson.build
+++ b/buildtools/subproject/meson.build
@@ -25,4 +25,4 @@ endif
 
 libdpdk_dep = dpdk_dep
 
-meson.override_find_program('dpdk-cmdline-gen.py', 
file('../dpdk-cmdline-gen.py'))
+meson.override_find_program('dpdk-cmdline-gen.py', 
files('../dpdk-cmdline-gen.py'))
-- 
2.45.2

Re: [PATCH v8 4/5] doc: guides and API meson improvements

[Juraj Linkeš]

On 30. 7. 2024 15:28, Thomas Monjalon wrote:

12/07/2024 10:57, Juraj Linkeš:

The Sphinx script argument parsing improvement gives us more
flexibility going forward, such as the ability to add non-positional
arguments.


You should describe what is changed and why.



The Sphinx script argument parsing improvement gives us more
flexibility going forward, such as the ability to add non-positional
arguments. What is currently missing is the ability to define an
argument with default value, which is added here.

The other change just cleans up the code a bit, replacing the path:
dpdk_build_root/doc/api
with
meson.current_build_dir(),
which is the same, as it's called in the above dir that was previously
hardcoded.




-release = environ.setdefault('DPDK_VERSION', "None")
-version = release
+version = environ.setdefault('DPDK_VERSION', "None")


I'm quite sure "release" was set for a reason.
Did it change over time with recent Sphinx?




I looked at the docs and it didn't. I didn't realize this was a Sphinx 
setting. I'll revert this.

[PATCH] net/gve: Add support for TSO in DQO RDA

[Tathagat Priyadarshi]

The patch intends on adding support for TSO in DQO RDA format.

Signed-off-by: Tathagat Priyadarshi 
Signed-off-by: Varun Lakkur Ambaji Rao 
---
 drivers/net/gve/gve_tx_dqo.c | 42 --
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
index 579b8d6..e5cdb57 100644
--- a/drivers/net/gve/gve_tx_dqo.c
+++ b/drivers/net/gve/gve_tx_dqo.c
@@ -72,6 +72,17 @@
txq->complq_tail = next;
 }
 
+static inline void
+gve_tx_fill_seg_desc_dqo(volatile union gve_tx_desc_dqo *desc, struct rte_mbuf 
*tx_pkt)
+{
+   uint32_t hlen = tx_pkt->l2_len + tx_pkt->l3_len + tx_pkt->l4_len;
+   desc->tso_ctx.cmd_dtype.dtype = GVE_TX_TSO_CTX_DESC_DTYPE_DQO;
+   desc->tso_ctx.cmd_dtype.tso = 1;
+   desc->tso_ctx.mss = (uint16_t)tx_pkt->tso_segsz;
+   desc->tso_ctx.tso_total_len = tx_pkt->pkt_len - hlen;
+   desc->tso_ctx.header_len = (uint8_t)hlen;
+}
+
 uint16_t
 gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
@@ -89,6 +100,8 @@
uint16_t sw_id;
uint64_t bytes;
uint16_t first_sw_id;
+   uint8_t tso;
+   uint8_t csum;
 
sw_ring = txq->sw_ring;
txr = txq->tx_ring;
@@ -108,12 +121,31 @@
gve_tx_clean_dqo(txq);
}
 
-   if (txq->nb_free < tx_pkt->nb_segs)
-   break;
-
ol_flags = tx_pkt->ol_flags;
nb_used = tx_pkt->nb_segs;
first_sw_id = sw_id;
+
+   if (ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
+   tso = 1;
+   csum = 1;
+   } else if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO) {
+   tso = 0;
+   csum = 1;
+   } else {
+   tso = 0;
+   csum = 0;
+   }
+
+   nb_used += tso;
+   if (txq->nb_free < nb_used)
+   break;
+
+   if (tso) {
+   txd = &txr[tx_id];
+   gve_tx_fill_seg_desc_dqo(txd, tx_pkt);
+   tx_id = (tx_id + 1) & mask;
+   }
+   
do {
if (sw_ring[sw_id] != NULL)
PMD_DRV_LOG(DEBUG, "Overwriting an entry in 
sw_ring");
@@ -127,6 +159,7 @@
txd->pkt.compl_tag = rte_cpu_to_le_16(first_sw_id);
txd->pkt.buf_size = RTE_MIN(tx_pkt->data_len, 
GVE_TX_MAX_BUF_SIZE_DQO);
txd->pkt.end_of_packet = 0;
+   txd->pkt.checksum_offload_enable = csum;
 
/* size of desc_ring and sw_ring could be different */
tx_id = (tx_id + 1) & mask;
@@ -139,9 +172,6 @@
/* fill the last descriptor with End of Packet (EOP) bit */
txd->pkt.end_of_packet = 1;
 
-   if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
-   txd->pkt.checksum_offload_enable = 1;
-
txq->nb_free -= nb_used;
txq->nb_used += nb_used;
}
-- 
1.8.3.1

Re: [PATCH] net/gve : Update EOP bit in txd rte_mbuf chain

[Tathagat Priyadarshi]

Hi Joshua,

We have addressed the checksum offload update for each mbuf in the
following patch (net/gve: Add support for TSO in DQO RDA).
https://patches.dpdk.org/project/dpdk/patch/1722507548-2401507-1-git-send-email-tathagat.d...@gmail.com/

Thanks a lot!


On Thu, Aug 1, 2024 at 2:00 AM Joshua Washington  wrote:
>
> On Wed, Jul 31, 2024, 09:37 Tathagat Priyadarshi
>  wrote:
> >
> > The EOP bit was not set for all the packets in mbuf chain
> > causing packet transmission stalls for packets split across
> > mbuf in chain.
> >
> > Signed-off-by: Tathagat Priyadarshi 
> > Signed-off-by: Varun Lakkur Ambaji Rao 
> >
> > Fixes: 4022f99 ("net/gve: support basic Tx data path for DQO")
> > ---
> >  drivers/net/gve/gve_tx_dqo.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
> > index a65e6aa..579b8d6 100644
> > --- a/drivers/net/gve/gve_tx_dqo.c
> > +++ b/drivers/net/gve/gve_tx_dqo.c
> > @@ -126,6 +126,7 @@
> > txd->pkt.dtype = GVE_TX_PKT_DESC_DTYPE_DQO;
> > txd->pkt.compl_tag = rte_cpu_to_le_16(first_sw_id);
> > txd->pkt.buf_size = RTE_MIN(tx_pkt->data_len, 
> > GVE_TX_MAX_BUF_SIZE_DQO);
> > +   txd->pkt.end_of_packet = 0;
>
> Please also update checksum offload for each mbuf.
> >
> >
> > /* size of desc_ring and sw_ring could be different 
> > */
> > tx_id = (tx_id + 1) & mask;
> > --
> > 1.8.3.1
> >
>
> Thanks for all of the contributions! Let's try to get this applied to
> stable release as well.

Re: [PATCH] net/gve: Add support for TSO in DQO RDA

[Tathagat Priyadarshi]

The following patch depends on
https://patches.dpdk.org/project/dpdk/patch/1722443901-2400194-1-git-send-email-tathagat.d...@gmail.com/
Will retrigger git patch checks post its approved and upstreamed. To
avoid conflicts.

On Thu, Aug 1, 2024 at 3:47 PM Tathagat Priyadarshi
 wrote:
>
> The patch intends on adding support for TSO in DQO RDA format.
>
> Signed-off-by: Tathagat Priyadarshi 
> Signed-off-by: Varun Lakkur Ambaji Rao 
> ---
>  drivers/net/gve/gve_tx_dqo.c | 42 --
>  1 file changed, 36 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
> index 579b8d6..e5cdb57 100644
> --- a/drivers/net/gve/gve_tx_dqo.c
> +++ b/drivers/net/gve/gve_tx_dqo.c
> @@ -72,6 +72,17 @@
> txq->complq_tail = next;
>  }
>
> +static inline void
> +gve_tx_fill_seg_desc_dqo(volatile union gve_tx_desc_dqo *desc, struct 
> rte_mbuf *tx_pkt)
> +{
> +   uint32_t hlen = tx_pkt->l2_len + tx_pkt->l3_len + tx_pkt->l4_len;
> +   desc->tso_ctx.cmd_dtype.dtype = GVE_TX_TSO_CTX_DESC_DTYPE_DQO;
> +   desc->tso_ctx.cmd_dtype.tso = 1;
> +   desc->tso_ctx.mss = (uint16_t)tx_pkt->tso_segsz;
> +   desc->tso_ctx.tso_total_len = tx_pkt->pkt_len - hlen;
> +   desc->tso_ctx.header_len = (uint8_t)hlen;
> +}
> +
>  uint16_t
>  gve_tx_burst_dqo(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
>  {
> @@ -89,6 +100,8 @@
> uint16_t sw_id;
> uint64_t bytes;
> uint16_t first_sw_id;
> +   uint8_t tso;
> +   uint8_t csum;
>
> sw_ring = txq->sw_ring;
> txr = txq->tx_ring;
> @@ -108,12 +121,31 @@
> gve_tx_clean_dqo(txq);
> }
>
> -   if (txq->nb_free < tx_pkt->nb_segs)
> -   break;
> -
> ol_flags = tx_pkt->ol_flags;
> nb_used = tx_pkt->nb_segs;
> first_sw_id = sw_id;
> +
> +   if (ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
> +   tso = 1;
> +   csum = 1;
> +   } else if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO) {
> +   tso = 0;
> +   csum = 1;
> +   } else {
> +   tso = 0;
> +   csum = 0;
> +   }
> +
> +   nb_used += tso;
> +   if (txq->nb_free < nb_used)
> +   break;
> +
> +   if (tso) {
> +   txd = &txr[tx_id];
> +   gve_tx_fill_seg_desc_dqo(txd, tx_pkt);
> +   tx_id = (tx_id + 1) & mask;
> +   }
> +
> do {
> if (sw_ring[sw_id] != NULL)
> PMD_DRV_LOG(DEBUG, "Overwriting an entry in 
> sw_ring");
> @@ -127,6 +159,7 @@
> txd->pkt.compl_tag = rte_cpu_to_le_16(first_sw_id);
> txd->pkt.buf_size = RTE_MIN(tx_pkt->data_len, 
> GVE_TX_MAX_BUF_SIZE_DQO);
> txd->pkt.end_of_packet = 0;
> +   txd->pkt.checksum_offload_enable = csum;
>
> /* size of desc_ring and sw_ring could be different */
> tx_id = (tx_id + 1) & mask;
> @@ -139,9 +172,6 @@
> /* fill the last descriptor with End of Packet (EOP) bit */
> txd->pkt.end_of_packet = 1;
>
> -   if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
> -   txd->pkt.checksum_offload_enable = 1;
> -
> txq->nb_free -= nb_used;
> txq->nb_used += nb_used;
> }
> --
> 1.8.3.1
>

Re: [RFC] ethdev: convert string initialization

[Bruce Richardson]

On Thu, Aug 01, 2024 at 02:27:22AM -0700, Ferruh Yigit wrote:
> gcc 15 experimental [1], with -Wextra flag, gives warning in variable
> initialization as string [2].
> 
> The warning has a point when initialized variable is intended to use as
> string, since assignment is missing the required null terminator for
> this case. But warning is useless for our usecase.
> 
> I don't know if this behaviour will change in gcc15, as it is still
> under development. But if not we may need to update our initialization.
> 
> In this patch only updated a few instance to show the issue, there are
> many instances to fix, if we prefer to go this way.
> Other option is to disable warning but it can be useful for actual
> string usecases, so I prefer to keep it.
> 
> [1]
> gcc (GCC) 15.0.0 20240801 (experimental)
> 
> [2]
> ../lib/ethdev/rte_flow.h:906:36:
>   error: initializer-string for array of ‘unsigned char’ is too long
> [-Werror=unterminated-string-initialization]
> 906 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> |^~
> 
> ../lib/ethdev/rte_flow.h:907:36:
>   error: initializer-string for array of ‘unsigned char’ is too long
>  [-Werror=unterminated-string-initialization]
> 907 | .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> |^~
> 
> ../lib/ethdev/rte_flow.h:1009:25:
>   error: initializer-string for array of ‘unsigned char’ is too long
>  [-Werror=unterminated-string-initialization]
> 1009 | "\xff\xff\xff\xff\xff\xff\xff\xff"
>  | ^~
> 
> ../lib/ethdev/rte_flow.h:1012:25:
>   error: initializer-string for array of ‘unsigned char’ is too long
>  [-Werror=unterminated-string-initialization]
> 1012 | "\xff\xff\xff\xff\xff\xff\xff\xff"
>  | ^~
> 
> ../lib/ethdev/rte_flow.h:1135:20:
>   error: initializer-string for array of ‘unsigned char’ is too long
>  [-Werror=unterminated-string-initialization]
> 1135 | .hdr.vni = "\xff\xff\xff",
>  |^~
> 
> Signed-off-by: Ferruh Yigit 
> ---
>  lib/ethdev/rte_flow.h | 16 +++-
>  1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
> index f864578f806b..8b623974cd44 100644
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> @@ -903,8 +903,8 @@ struct rte_flow_item_eth {
>  /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
>  #ifndef __cplusplus
>  static const struct rte_flow_item_eth rte_flow_item_eth_mask = {
> - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> - .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
> + .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
>   .hdr.ether_type = RTE_BE16(0x),
>  };
>  #endif
> @@ -1005,12 +1005,10 @@ struct rte_flow_item_ipv6 {
>  #ifndef __cplusplus
>  static const struct rte_flow_item_ipv6 rte_flow_item_ipv6_mask = {
>   .hdr = {
> - .src_addr =
> - "\xff\xff\xff\xff\xff\xff\xff\xff"
> - "\xff\xff\xff\xff\xff\xff\xff\xff",
> - .dst_addr =
> - "\xff\xff\xff\xff\xff\xff\xff\xff"
> - "\xff\xff\xff\xff\xff\xff\xff\xff",
> + .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
> +   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
> + .dst_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
> +   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
>   },
>  };
>  #endif
> @@ -1132,7 +1130,7 @@ struct rte_flow_item_vxlan {
>  /** Default mask for RTE_FLOW_ITEM_TYPE_VXLAN. */
>  #ifndef __cplusplus
>  static const struct rte_flow_item_vxlan rte_flow_item_vxlan_mask = {
> - .hdr.vni = "\xff\xff\xff",
> + .hdr.vni = { 0xff, 0xff, 0xff },
>  };
>  #endif

This solution LGTM.

Acked-by: Bruce Richardson 

[PATCH 00/17] NXP DPAA ETH driver enhancement and fixes

[Hemant Agrawal]

This series adds several enhancement to the NXP DPAA Ethernet driver.

Primarily:
1. timestamp and IEEE 1588 support
2. OH and ONIC based virtual port config in DPAA
3. frame display and debugging infra

Gagandeep Singh (3):
  bus/dpaa: fix PFDRs leaks due to FQRNIs
  net/dpaa: support mempool debug
  net/dpaa: improve the dpaa port cleanup

Hemant Agrawal (4):
  bus/dpaa: fix VSP for 1G fm1-mac9 and 10
  bus/dpaa: add port buffer manager stats
  net/dpaa: implement detailed packet parsing
  net/dpaa: enhance DPAA frame display

Jun Yang (2):
  net/dpaa: share MAC FMC scheme and CC parse
  net/dpaa: improve dpaa errata A010022 handling

Rohit Raj (3):
  net/dpaa: fix typecasting ch ID to u32
  bus/dpaa: add OH port mode for dpaa eth
  bus/dpaa: add ONIC port mode for the DPAA eth

Vanshika Shukla (4):
  net/dpaa: support Tx confirmation to enable PTP
  net/dpaa: add support to separate Tx conf queues
  net/dpaa: support Rx/Tx timestamp read
  net/dpaa: support IEEE 1588 PTP

Vinod Pullabhatla (1):
  net/dpaa: add Tx rate limiting DPAA PMD API

 .mailmap  |   1 +
 doc/guides/nics/dpaa.rst  |   9 +
 drivers/bus/dpaa/base/fman/fman.c | 583 +++---
 drivers/bus/dpaa/base/fman/fman_hw.c  |  97 +++-
 drivers/bus/dpaa/base/fman/netcfg_layer.c |  19 +-
 drivers/bus/dpaa/base/qbman/qman.c|  46 +-
 drivers/bus/dpaa/dpaa_bus.c   |  31 +-
 drivers/bus/dpaa/include/fman.h   | 112 -
 drivers/bus/dpaa/include/fsl_fman.h   |  12 +
 drivers/bus/dpaa/include/fsl_qman.h   |   4 +-
 drivers/bus/dpaa/version.map  |   4 +
 drivers/net/dpaa/dpaa_ethdev.c| 378 +++---
 drivers/net/dpaa/dpaa_ethdev.h|  67 ++-
 drivers/net/dpaa/dpaa_flow.c  | 150 --
 drivers/net/dpaa/dpaa_fmc.c   | 421 ++--
 drivers/net/dpaa/dpaa_ptp.c   | 119 +
 drivers/net/dpaa/dpaa_rxtx.c  | 386 --
 drivers/net/dpaa/dpaa_rxtx.h  | 152 +++---
 drivers/net/dpaa/fmlib/fm_lib.c   |  32 +-
 drivers/net/dpaa/fmlib/fm_port_ext.h  |   2 +-
 drivers/net/dpaa/meson.build  |   1 +
 drivers/net/dpaa/rte_pmd_dpaa.h   |  25 +-
 drivers/net/dpaa/version.map  |   7 +
 23 files changed, 2150 insertions(+), 508 deletions(-)
 create mode 100644 drivers/net/dpaa/dpaa_ptp.c

-- 
2.25.1

[PATCH 01/17] bus/dpaa: fix PFDRs leaks due to FQRNIs

[Hemant Agrawal]

From: Gagandeep Singh 

When a Retire FQ command is executed on a FQ in the
Tentatively Scheduled or Parked states, in that case FQ
is retired immediately and a FQRNI (Frame Queue Retirement
Notification Immediate) message is generated. Software
must read this message from MR and consume it to free
the memory used by it.

Although it is not mentioned about which memory to be used
by FQRNIs in the RM but through experiments it is proven
that it can use PFDRs. So if these messages are allowed to
build up indefinitely then PFDR resources can become exhausted
and cause enqueues to stall. Therefore software must consume
these MR messages on a regular basis to avoid depleting
the available PFDR resources.

This is the PFDRs leak issue which user can experienace while
using the DPDK crypto driver and creating and destroying the
sessions multiple times. On a session destroy, DPDK calls the
qman_retire_fq() for each FQ used by the session, but it does
not handle the FQRNIs generated and allowed them to build up
indefinitely in MR.

This patch fixes this issue by consuming the FQRNIs received
from MR immediately after FQ retire by calling drain_mr_fqrni().

Please note that this drain_mr_fqrni() only look for
FQRNI type messages to consume. If there are other type of messages
like FQRN, FQRL, FQPN, ERN etc. also coming on MR then those
messages need to be handled separately.

Fixes: c47ff048b99a ("bus/dpaa: add QMAN driver core routines")
Cc: sta...@dpdk.org

Signed-off-by: Gagandeep Singh 
---
 drivers/bus/dpaa/base/qbman/qman.c | 46 --
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/drivers/bus/dpaa/base/qbman/qman.c 
b/drivers/bus/dpaa/base/qbman/qman.c
index 301057723e..9c90ee25a6 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -292,10 +292,32 @@ static inline void qman_stop_dequeues_ex(struct 
qman_portal *p)
qm_dqrr_set_maxfill(&p->p, 0);
 }
 
+static inline void qm_mr_pvb_update(struct qm_portal *portal)
+{
+   register struct qm_mr *mr = &portal->mr;
+   const struct qm_mr_entry *res = qm_cl(mr->ring, mr->pi);
+
+#ifdef RTE_LIBRTE_DPAA_HWDEBUG
+   DPAA_ASSERT(mr->pmode == qm_mr_pvb);
+#endif
+   /* when accessing 'verb', use __raw_readb() to ensure that compiler
+* inlining doesn't try to optimise out "excess reads".
+*/
+   if ((__raw_readb(&res->ern.verb) & QM_MR_VERB_VBIT) == mr->vbit) {
+   mr->pi = (mr->pi + 1) & (QM_MR_SIZE - 1);
+   if (!mr->pi)
+   mr->vbit ^= QM_MR_VERB_VBIT;
+   mr->fill++;
+   res = MR_INC(res);
+   }
+   dcbit_ro(res);
+}
+
 static int drain_mr_fqrni(struct qm_portal *p)
 {
const struct qm_mr_entry *msg;
 loop:
+   qm_mr_pvb_update(p);
msg = qm_mr_current(p);
if (!msg) {
/*
@@ -317,6 +339,7 @@ static int drain_mr_fqrni(struct qm_portal *p)
do {
now = mfatb();
} while ((then + 1) > now);
+   qm_mr_pvb_update(p);
msg = qm_mr_current(p);
if (!msg)
return 0;
@@ -479,27 +502,6 @@ static inline int qm_mr_init(struct qm_portal *portal,
return 0;
 }
 
-static inline void qm_mr_pvb_update(struct qm_portal *portal)
-{
-   register struct qm_mr *mr = &portal->mr;
-   const struct qm_mr_entry *res = qm_cl(mr->ring, mr->pi);
-
-#ifdef RTE_LIBRTE_DPAA_HWDEBUG
-   DPAA_ASSERT(mr->pmode == qm_mr_pvb);
-#endif
-   /* when accessing 'verb', use __raw_readb() to ensure that compiler
-* inlining doesn't try to optimise out "excess reads".
-*/
-   if ((__raw_readb(&res->ern.verb) & QM_MR_VERB_VBIT) == mr->vbit) {
-   mr->pi = (mr->pi + 1) & (QM_MR_SIZE - 1);
-   if (!mr->pi)
-   mr->vbit ^= QM_MR_VERB_VBIT;
-   mr->fill++;
-   res = MR_INC(res);
-   }
-   dcbit_ro(res);
-}
-
 struct qman_portal *
 qman_init_portal(struct qman_portal *portal,
   const struct qm_portal_config *c,
@@ -1794,6 +1796,8 @@ int qman_retire_fq(struct qman_fq *fq, u32 *flags)
}
 out:
FQUNLOCK(fq);
+   /* Draining FQRNIs, if any */
+   drain_mr_fqrni(&p->p);
return rval;
 }
 
-- 
2.25.1

[PATCH 02/17] net/dpaa: fix typecasting ch ID to u32

[Hemant Agrawal]

From: Rohit Raj 

Avoid typecasting ch_id to u32 and passing it to another API since it
can corrupt other data. Instead, create new u32 variable and typecase
it back to u16 after it gets updated by the API.
NXP CID: 27996293

Fixes: 0c504f6950b6 ("net/dpaa: support push mode")
Cc: hemant.agra...@nxp.com
Cc: sta...@dpdk.org

Signed-off-by: Rohit Raj 
---
 drivers/net/dpaa/dpaa_ethdev.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 060b8c678f..1a2de5240f 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -972,7 +972,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, 
uint16_t queue_idx,
struct fman_if *fif = dev->process_private;
struct qman_fq *rxq = &dpaa_intf->rx_queues[queue_idx];
struct qm_mcc_initfq opts = {0};
-   u32 flags = 0;
+   u32 ch_id, flags = 0;
int ret;
u32 buffsz = rte_pktmbuf_data_room_size(mp) - RTE_PKTMBUF_HEADROOM;
uint32_t max_rx_pktlen;
@@ -1096,7 +1096,9 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, 
uint16_t queue_idx,
DPAA_IF_RX_CONTEXT_STASH;
 
/*Create a channel and associate given queue with the channel*/
-   qman_alloc_pool_range((u32 *)&rxq->ch_id, 1, 1, 0);
+   qman_alloc_pool_range(&ch_id, 1, 1, 0);
+   rxq->ch_id = (u16)ch_id;
+
opts.we_mask = opts.we_mask | QM_INITFQ_WE_DESTWQ;
opts.fqd.dest.channel = rxq->ch_id;
opts.fqd.dest.wq = DPAA_IF_RX_PRIORITY;
-- 
2.25.1

[PATCH 03/17] bus/dpaa: fix VSP for 1G fm1-mac9 and 10

[Hemant Agrawal]

No need to classify interface separately for 1G and 10G

Fixes: e0718bb2ca95 ("bus/dpaa: add virtual storage profile port init")
Cc: sta...@dpdk.org

Signed-off-by: Hemant Agrawal 
---
 drivers/bus/dpaa/base/fman/fman.c | 29 +++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/dpaa/base/fman/fman.c 
b/drivers/bus/dpaa/base/fman/fman.c
index 41195eb0a7..beeb03dbf2 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -153,7 +153,7 @@ static void fman_if_vsp_init(struct __fman_if *__if)
size_t lenp;
const uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1};
 
-   if (__if->__if.mac_type == fman_mac_1g) {
+   if (__if->__if.mac_idx <= 8) {
for_each_compatible_node(dev, NULL,
"fsl,fman-port-1g-rx-extended-args") {
prop = of_get_property(dev, "cell-index", &lenp);
@@ -176,7 +176,32 @@ static void fman_if_vsp_init(struct __fman_if *__if)
}
}
}
-   } else if (__if->__if.mac_type == fman_mac_10g) {
+
+   for_each_compatible_node(dev, NULL,
+"fsl,fman-port-op-extended-args") {
+   prop = of_get_property(dev, "cell-index", &lenp);
+
+   if (prop) {
+   cell_index = of_read_number(&prop[0],
+   lenp / sizeof(phandle));
+
+   if (cell_index == __if->__if.mac_idx) {
+   prop = of_get_property(dev,
+  "vsp-window",
+  &lenp);
+
+   if (prop) {
+   __if->__if.num_profiles =
+   of_read_number(&prop[0],
+  1);
+   __if->__if.base_profile_id =
+   of_read_number(&prop[1],
+  1);
+   }
+   }
+   }
+   }
+   } else {
for_each_compatible_node(dev, NULL,
"fsl,fman-port-10g-rx-extended-args") {
prop = of_get_property(dev, "cell-index", &lenp);
-- 
2.25.1

[PATCH 04/17] bus/dpaa: add port buffer manager stats

[Hemant Agrawal]

Add BMI statistics and improving the existing extended
statistics

Signed-off-by: Hemant Agrawal 
Signed-off-by: Gagandeep Singh 
---
 drivers/bus/dpaa/base/fman/fman_hw.c | 65 +++-
 drivers/bus/dpaa/include/fman.h  |  4 +-
 drivers/bus/dpaa/include/fsl_fman.h  | 12 +
 drivers/bus/dpaa/version.map |  4 ++
 drivers/net/dpaa/dpaa_ethdev.c   | 46 +---
 drivers/net/dpaa/dpaa_ethdev.h   | 12 +
 6 files changed, 134 insertions(+), 9 deletions(-)

diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c 
b/drivers/bus/dpaa/base/fman/fman_hw.c
index 24a99f7235..27b39a4975 100644
--- a/drivers/bus/dpaa/base/fman/fman_hw.c
+++ b/drivers/bus/dpaa/base/fman/fman_hw.c
@@ -244,8 +244,8 @@ fman_if_stats_get_all(struct fman_if *p, uint64_t *value, 
int n)
uint64_t base_offset = offsetof(struct memac_regs, reoct_l);
 
for (i = 0; i < n; i++)
-   value[i] = (((u64)in_be32((char *)regs + base_offset + 8 * i) |
-   (u64)in_be32((char *)regs + base_offset +
+   value[i] = ((u64)in_be32((char *)regs + base_offset + 8 * i) |
+   ((u64)in_be32((char *)regs + base_offset +
8 * i + 4)) << 32);
 }
 
@@ -266,6 +266,67 @@ fman_if_stats_reset(struct fman_if *p)
;
 }
 
+void
+fman_if_bmi_stats_enable(struct fman_if *p)
+{
+   struct __fman_if *m = container_of(p, struct __fman_if, __if);
+   struct rx_bmi_regs *regs = (struct rx_bmi_regs *)m->bmi_map;
+   uint32_t tmp;
+
+   tmp = in_be32(®s->fmbm_rstc);
+
+   tmp |= FMAN_BMI_COUNTERS_EN;
+
+   out_be32(®s->fmbm_rstc, tmp);
+}
+
+void
+fman_if_bmi_stats_disable(struct fman_if *p)
+{
+   struct __fman_if *m = container_of(p, struct __fman_if, __if);
+   struct rx_bmi_regs *regs = (struct rx_bmi_regs *)m->bmi_map;
+   uint32_t tmp;
+
+   tmp = in_be32(®s->fmbm_rstc);
+
+   tmp &= ~FMAN_BMI_COUNTERS_EN;
+
+   out_be32(®s->fmbm_rstc, tmp);
+}
+
+void
+fman_if_bmi_stats_get_all(struct fman_if *p, uint64_t *value)
+{
+   struct __fman_if *m = container_of(p, struct __fman_if, __if);
+   struct rx_bmi_regs *regs = (struct rx_bmi_regs *)m->bmi_map;
+   int i = 0;
+
+   value[i++] = (u32)in_be32(®s->fmbm_rfrc);
+   value[i++] = (u32)in_be32(®s->fmbm_rfbc);
+   value[i++] = (u32)in_be32(®s->fmbm_rlfc);
+   value[i++] = (u32)in_be32(®s->fmbm_rffc);
+   value[i++] = (u32)in_be32(®s->fmbm_rfdc);
+   value[i++] = (u32)in_be32(®s->fmbm_rfldec);
+   value[i++] = (u32)in_be32(®s->fmbm_rodc);
+   value[i++] = (u32)in_be32(®s->fmbm_rbdc);
+}
+
+void
+fman_if_bmi_stats_reset(struct fman_if *p)
+{
+   struct __fman_if *m = container_of(p, struct __fman_if, __if);
+   struct rx_bmi_regs *regs = (struct rx_bmi_regs *)m->bmi_map;
+
+   out_be32(®s->fmbm_rfrc, 0);
+   out_be32(®s->fmbm_rfbc, 0);
+   out_be32(®s->fmbm_rlfc, 0);
+   out_be32(®s->fmbm_rffc, 0);
+   out_be32(®s->fmbm_rfdc, 0);
+   out_be32(®s->fmbm_rfldec, 0);
+   out_be32(®s->fmbm_rodc, 0);
+   out_be32(®s->fmbm_rbdc, 0);
+}
+
 void
 fman_if_promiscuous_enable(struct fman_if *p)
 {
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index 3a6dd555a7..60681068ea 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -56,6 +56,8 @@
 #define FMAN_PORT_BMI_FIFO_UNITS   0x100
 #define FMAN_PORT_IC_OFFSET_UNITS  0x10
 
+#define FMAN_BMI_COUNTERS_EN 0x8000
+
 #define FMAN_ENABLE_BPOOL_DEPLETION0xF0F0
 
 #define HASH_CTRL_MCAST_EN 0x0100
@@ -260,7 +262,7 @@ struct rx_bmi_regs {
/**< Buffer Manager pool Information-*/
uint32_t fmbm_acnt[FMAN_PORT_MAX_EXT_POOLS_NUM];
/**< Allocate Counter-*/
-   uint32_t reserved0130[8];
+   uint32_t reserved0120[16];
/**< 0x130/0x140 - 0x15F reserved -*/
uint32_t fmbm_rcgm[FMAN_PORT_CG_MAP_NUM];
/**< Congestion Group Map*/
diff --git a/drivers/bus/dpaa/include/fsl_fman.h 
b/drivers/bus/dpaa/include/fsl_fman.h
index 20690f8329..5a9750ad0c 100644
--- a/drivers/bus/dpaa/include/fsl_fman.h
+++ b/drivers/bus/dpaa/include/fsl_fman.h
@@ -60,6 +60,18 @@ void fman_if_stats_reset(struct fman_if *p);
 __rte_internal
 void fman_if_stats_get_all(struct fman_if *p, uint64_t *value, int n);
 
+__rte_internal
+void fman_if_bmi_stats_enable(struct fman_if *p);
+
+__rte_internal
+void fman_if_bmi_stats_disable(struct fman_if *p);
+
+__rte_internal
+void fman_if_bmi_stats_get_all(struct fman_if *p, uint64_t *value);
+
+__rte_internal
+void fman_if_bmi_stats_reset(struct fman_if *p);
+
 /* Set ignore pause option for a specific interface */
 void fman_if_set_rx_ignore_pause_frames(struct fman_if *p, bool enable);
 
diff --git a/drivers/bus/dpaa/ve

[PATCH 05/17] net/dpaa: support Tx confirmation to enable PTP

[Hemant Agrawal]

From: Vanshika Shukla 

TX confirmation provides dedicated confirmation
queues for transmitted packets. These queues are
used by software to get the status and release
transmitted packets buffers.

Signed-off-by: Vanshika Shukla 
Acked-by: Hemant Agrawal 
---
 drivers/net/dpaa/dpaa_ethdev.c | 45 ++---
 drivers/net/dpaa/dpaa_ethdev.h |  3 +-
 drivers/net/dpaa/dpaa_rxtx.c   | 52 ++
 drivers/net/dpaa/dpaa_rxtx.h   |  2 ++
 4 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 90b34e42f2..9ffb8c578c 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1826,9 +1826,15 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
opts.fqd.dest.wq = DPAA_IF_TX_PRIORITY;
opts.fqd.fq_ctrl = QM_FQCTRL_PREFERINCACHE;
opts.fqd.context_b = 0;
+#if defined(RTE_LIBRTE_IEEE1588)
+   opts.fqd.context_a.lo = 0;
+   opts.fqd.context_a.hi = fman_dealloc_bufs_mask_hi;
+#else
/* no tx-confirmation */
-   opts.fqd.context_a.hi = 0x8000 | fman_dealloc_bufs_mask_hi;
opts.fqd.context_a.lo = 0 | fman_dealloc_bufs_mask_lo;
+   opts.fqd.context_a.hi = 0x8000 | fman_dealloc_bufs_mask_hi;
+#endif
+
if (fman_ip_rev >= FMAN_V3) {
/* Set B0V bit in contextA to set ASPID to 0 */
opts.fqd.context_a.hi |= 0x0400;
@@ -1861,9 +1867,11 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
return ret;
 }
 
-#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
-/* Initialise a DEBUG FQ ([rt]x_error, rx_default). */
-static int dpaa_debug_queue_init(struct qman_fq *fq, uint32_t fqid)
+#if defined(RTE_LIBRTE_DPAA_DEBUG_DRIVER) || defined(RTE_LIBRTE_IEEE1588)
+/* Initialise a DEBUG FQ ([rt]x_error, rx_default) and DPAA TX CONFIRM queue
+ * to support PTP
+ */
+static int dpaa_def_queue_init(struct qman_fq *fq, uint32_t fqid)
 {
struct qm_mcc_initfq opts = {0};
int ret;
@@ -1872,15 +1880,15 @@ static int dpaa_debug_queue_init(struct qman_fq *fq, 
uint32_t fqid)
 
ret = qman_reserve_fqid(fqid);
if (ret) {
-   DPAA_PMD_ERR("Reserve debug fqid %d failed with ret: %d",
+   DPAA_PMD_ERR("Reserve fqid %d failed with ret: %d",
fqid, ret);
return -EINVAL;
}
/* "map" this Rx FQ to one of the interfaces Tx FQID */
-   DPAA_PMD_DEBUG("Creating debug fq %p, fqid %d", fq, fqid);
+   DPAA_PMD_DEBUG("Creating fq %p, fqid %d", fq, fqid);
ret = qman_create_fq(fqid, QMAN_FQ_FLAG_NO_ENQUEUE, fq);
if (ret) {
-   DPAA_PMD_ERR("create debug fqid %d failed with ret: %d",
+   DPAA_PMD_ERR("create fqid %d failed with ret: %d",
fqid, ret);
return ret;
}
@@ -1888,7 +1896,7 @@ static int dpaa_debug_queue_init(struct qman_fq *fq, 
uint32_t fqid)
opts.fqd.dest.wq = DPAA_IF_DEBUG_PRIORITY;
ret = qman_init_fq(fq, 0, &opts);
if (ret)
-   DPAA_PMD_ERR("init debug fqid %d failed with ret: %d",
+   DPAA_PMD_ERR("init fqid %d failed with ret: %d",
fqid, ret);
return ret;
 }
@@ -2079,6 +2087,14 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
goto free_rx;
}
 
+   dpaa_intf->tx_conf_queues = rte_zmalloc(NULL, sizeof(struct qman_fq) *
+   MAX_DPAA_CORES, MAX_CACHELINE);
+   if (!dpaa_intf->tx_conf_queues) {
+   DPAA_PMD_ERR("Failed to alloc mem for TX conf queues\n");
+   ret = -ENOMEM;
+   goto free_rx;
+   }
+
/* If congestion control is enabled globally*/
if (td_tx_threshold) {
dpaa_intf->cgr_tx = rte_zmalloc(NULL,
@@ -2115,21 +2131,28 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
}
dpaa_intf->nb_tx_queues = MAX_DPAA_CORES;
 
-#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
-   ret = dpaa_debug_queue_init(&dpaa_intf->debug_queues
+#if defined(RTE_LIBRTE_DPAA_DEBUG_DRIVER) || defined(RTE_LIBRTE_IEEE1588)
+   ret = dpaa_def_queue_init(&dpaa_intf->debug_queues
[DPAA_DEBUG_FQ_RX_ERROR], fman_intf->fqid_rx_err);
if (ret) {
DPAA_PMD_ERR("DPAA RX ERROR queue init failed!");
goto free_tx;
}
dpaa_intf->debug_queues[DPAA_DEBUG_FQ_RX_ERROR].dpaa_intf = dpaa_intf;
-   ret = dpaa_debug_queue_init(&dpaa_intf->debug_queues
+   ret = dpaa_def_queue_init(&dpaa_intf->debug_queues
[DPAA_DEBUG_FQ_TX_ERROR], fman_intf->fqid_tx_err);
if (ret) {
DPAA_PMD_ERR("DPAA TX ERROR queue init failed!");
goto free_tx;
}
dpaa_intf->debug_queues[DPAA_DEBUG_FQ_TX_ERROR].dpaa_intf = dpaa_intf;
+   ret = dpaa_def_queue_init(dpaa_intf->tx_conf_queues,
+   fman_intf->fqid_tx_

[PATCH 06/17] net/dpaa: add support to separate Tx conf queues

[Hemant Agrawal]

From: Vanshika Shukla 

This patch separates Tx confirmation queues for kernel
and DPDK so as to support the VSP case.

Signed-off-by: Vanshika Shukla 
Acked-by: Hemant Agrawal 
---
 drivers/bus/dpaa/include/fsl_qman.h |  4 ++-
 drivers/net/dpaa/dpaa_ethdev.c  | 47 +
 drivers/net/dpaa/dpaa_rxtx.c|  2 +-
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/drivers/bus/dpaa/include/fsl_qman.h 
b/drivers/bus/dpaa/include/fsl_qman.h
index c0677976e8..db14dfb839 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
  *
  * Copyright 2008-2012 Freescale Semiconductor, Inc.
- * Copyright 2019 NXP
+ * Copyright 2019-2022 NXP
  *
  */
 
@@ -1237,6 +1237,8 @@ struct qman_fq {
 
/* DPDK Interface */
void *dpaa_intf;
+   /*to store tx_conf_queue corresponding to tx_queue*/
+   struct qman_fq *tx_conf_queue;
 
struct rte_event ev;
/* affined portal in case of static queue */
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 9ffb8c578c..17058d762c 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1867,10 +1867,33 @@ static int dpaa_tx_queue_init(struct qman_fq *fq,
return ret;
 }
 
-#if defined(RTE_LIBRTE_DPAA_DEBUG_DRIVER) || defined(RTE_LIBRTE_IEEE1588)
-/* Initialise a DEBUG FQ ([rt]x_error, rx_default) and DPAA TX CONFIRM queue
- * to support PTP
- */
+#if defined(RTE_LIBRTE_IEEE1588)
+static int
+dpaa_tx_conf_queue_init(struct qman_fq *fq)
+{
+   struct qm_mcc_initfq opts = {0};
+   int ret;
+
+   PMD_INIT_FUNC_TRACE();
+
+   ret = qman_create_fq(0, QMAN_FQ_FLAG_DYNAMIC_FQID, fq);
+   if (ret) {
+   DPAA_PMD_ERR("create Tx_conf failed with ret: %d", ret);
+   return ret;
+   }
+
+   opts.we_mask = QM_INITFQ_WE_DESTWQ | QM_INITFQ_WE_FQCTRL;
+   opts.fqd.dest.wq = DPAA_IF_DEBUG_PRIORITY;
+   ret = qman_init_fq(fq, 0, &opts);
+   if (ret)
+   DPAA_PMD_ERR("init Tx_conf fqid %d failed with ret: %d",
+   fq->fqid, ret);
+   return ret;
+}
+#endif
+
+#if defined(RTE_LIBRTE_DPAA_DEBUG_DRIVER)
+/* Initialise a DEBUG FQ ([rt]x_error, rx_default) */
 static int dpaa_def_queue_init(struct qman_fq *fq, uint32_t fqid)
 {
struct qm_mcc_initfq opts = {0};
@@ -2128,6 +2151,14 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
if (ret)
goto free_tx;
dpaa_intf->tx_queues[loop].dpaa_intf = dpaa_intf;
+
+#if defined(RTE_LIBRTE_IEEE1588)
+   ret = dpaa_tx_conf_queue_init(&dpaa_intf->tx_conf_queues[loop]);
+   if (ret)
+   goto free_tx;
+   dpaa_intf->tx_conf_queues[loop].dpaa_intf = dpaa_intf;
+   dpaa_intf->tx_queues[loop].tx_conf_queue = 
&dpaa_intf->tx_conf_queues[loop];
+#endif
}
dpaa_intf->nb_tx_queues = MAX_DPAA_CORES;
 
@@ -2145,14 +2176,6 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
DPAA_PMD_ERR("DPAA TX ERROR queue init failed!");
goto free_tx;
}
-   dpaa_intf->debug_queues[DPAA_DEBUG_FQ_TX_ERROR].dpaa_intf = dpaa_intf;
-   ret = dpaa_def_queue_init(dpaa_intf->tx_conf_queues,
-   fman_intf->fqid_tx_confirm);
-   if (ret) {
-   DPAA_PMD_ERR("DPAA TX CONFIRM queue init failed!");
-   goto free_tx;
-   }
-   dpaa_intf->tx_conf_queues->dpaa_intf = dpaa_intf;
 #endif
 
DPAA_PMD_DEBUG("All frame queues created");
diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 189af748e9..c15538116d 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -1085,7 +1085,7 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, 
uint16_t nb_bufs)
 #if defined(RTE_LIBRTE_IEEE1588)
struct qman_fq *fq = q;
struct dpaa_if *dpaa_intf = fq->dpaa_intf;
-   struct qman_fq *fq_txconf = dpaa_intf->tx_conf_queues;
+   struct qman_fq *fq_txconf = fq->tx_conf_queue;
 #endif
 
if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
-- 
2.25.1

[PATCH 07/17] net/dpaa: share MAC FMC scheme and CC parse

[Hemant Agrawal]

From: Jun Yang 

For Shared MAC:
1) Allocate RXQ from VSP scheme.
2) Allocate RXQ from CC directed to VSP.
2) Remove RXQ allocated which is reconfigured without VSP.
3) Don't alloc default queue and err queues.

Signed-off-by: Jun Yang 
Acked-by: Hemant Agrawal 
---
 drivers/bus/dpaa/base/fman/fman.c |   2 +-
 drivers/bus/dpaa/include/fman.h   |   3 +-
 drivers/net/dpaa/dpaa_ethdev.c|  53 ++--
 drivers/net/dpaa/dpaa_ethdev.h|  13 +-
 drivers/net/dpaa/dpaa_flow.c  |   8 +-
 drivers/net/dpaa/dpaa_fmc.c   | 421 +++---
 drivers/net/dpaa/dpaa_rxtx.c  |  20 +-
 7 files changed, 345 insertions(+), 175 deletions(-)

diff --git a/drivers/bus/dpaa/base/fman/fman.c 
b/drivers/bus/dpaa/base/fman/fman.c
index beeb03dbf2..bf41a3ed96 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -42,7 +42,7 @@ if_destructor(struct __fman_if *__if)
if (!__if)
return;
 
-   if (__if->__if.mac_type == fman_offline)
+   if (__if->__if.mac_type == fman_offline_internal)
goto cleanup;
 
list_for_each_entry_safe(bp, tmpbp, &__if->__if.bpool_list, node) {
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index 60681068ea..3642b43be7 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -72,10 +72,11 @@ TAILQ_HEAD(rte_fman_if_list, __fman_if);
 
 /* Represents the different flavour of network interface */
 enum fman_mac_type {
-   fman_offline = 0,
+   fman_offline_internal = 0,
fman_mac_1g,
fman_mac_10g,
fman_mac_2_5g,
+   fman_onic,
 };
 
 struct mac_addr {
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 17058d762c..e3cb15cad5 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -252,7 +252,6 @@ dpaa_eth_dev_configure(struct rte_eth_dev *dev)
DPAA_PMD_ERR("Cannot open IF socket");
return -errno;
}
-
strncpy(ifr.ifr_name, dpaa_intf->name, IFNAMSIZ - 1);
 
if (ioctl(socket_fd, SIOCGIFMTU, &ifr) < 0) {
@@ -1958,6 +1957,41 @@ dpaa_dev_init_secondary(struct rte_eth_dev *eth_dev)
return 0;
 }
 
+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
+static int
+dpaa_error_queue_init(struct dpaa_if *dpaa_intf,
+   struct fman_if *fman_intf)
+{
+   int i, ret;
+   struct qman_fq *err_queues = dpaa_intf->debug_queues;
+   uint32_t err_fqid = 0;
+
+   if (fman_intf->is_shared_mac) {
+   DPAA_PMD_DEBUG("Shared MAC's err queues are handled in kernel");
+   return 0;
+   }
+
+   for (i = 0; i < DPAA_DEBUG_FQ_MAX_NUM; i++) {
+   if (i == DPAA_DEBUG_FQ_RX_ERROR)
+   err_fqid = fman_intf->fqid_rx_err;
+   else if (i == DPAA_DEBUG_FQ_TX_ERROR)
+   err_fqid = fman_intf->fqid_tx_err;
+   else
+   continue;
+   ret = dpaa_def_queue_init(&err_queues[i], err_fqid);
+   if (ret) {
+   DPAA_PMD_ERR("DPAA %s ERROR queue init failed!",
+   i == DPAA_DEBUG_FQ_RX_ERROR ?
+   "RX" : "TX");
+   return ret;
+   }
+   err_queues[i].dpaa_intf = dpaa_intf;
+   }
+
+   return 0;
+}
+#endif
+
 /* Initialise a network interface */
 static int
 dpaa_dev_init(struct rte_eth_dev *eth_dev)
@@ -2162,22 +2196,11 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
}
dpaa_intf->nb_tx_queues = MAX_DPAA_CORES;
 
-#if defined(RTE_LIBRTE_DPAA_DEBUG_DRIVER) || defined(RTE_LIBRTE_IEEE1588)
-   ret = dpaa_def_queue_init(&dpaa_intf->debug_queues
-   [DPAA_DEBUG_FQ_RX_ERROR], fman_intf->fqid_rx_err);
-   if (ret) {
-   DPAA_PMD_ERR("DPAA RX ERROR queue init failed!");
-   goto free_tx;
-   }
-   dpaa_intf->debug_queues[DPAA_DEBUG_FQ_RX_ERROR].dpaa_intf = dpaa_intf;
-   ret = dpaa_def_queue_init(&dpaa_intf->debug_queues
-   [DPAA_DEBUG_FQ_TX_ERROR], fman_intf->fqid_tx_err);
-   if (ret) {
-   DPAA_PMD_ERR("DPAA TX ERROR queue init failed!");
+#if defined(RTE_LIBRTE_DPAA_DEBUG_DRIVER)
+   ret = dpaa_error_queue_init(dpaa_intf, fman_intf);
+   if (ret)
goto free_tx;
-   }
 #endif
-
DPAA_PMD_DEBUG("All frame queues created");
 
/* Get the initial configuration for flow control */
diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index 6aced9d5e9..df179b18e8 100644
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -78,8 +78,11 @@
 #define DPAA_IF_RX_CONTEXT_STASH   0
 
 /* Each "debug" FQ is represented by one of these */
-#define DPAA_DEBUG_FQ_RX_ERROR   0
-#define DPAA_DEBUG_FQ_TX_ERROR   1
+enum {
+ 

[PATCH 08/17] net/dpaa: support Rx/Tx timestamp read

[Hemant Agrawal]

From: Vanshika Shukla 

This patch implements Rx/Tx timestamp read operations
for DPAA1 platform.

Signed-off-by: Vanshika Shukla 
---
 drivers/bus/dpaa/base/fman/fman.c| 21 +++-
 drivers/bus/dpaa/base/fman/fman_hw.c |  6 ++-
 drivers/bus/dpaa/include/fman.h  | 18 ++-
 drivers/net/dpaa/dpaa_ethdev.c   |  6 ++-
 drivers/net/dpaa/dpaa_ethdev.h   | 19 ++-
 drivers/net/dpaa/dpaa_ptp.c  | 43 +++
 drivers/net/dpaa/dpaa_rxtx.c | 79 +++-
 drivers/net/dpaa/dpaa_rxtx.h |  4 +-
 drivers/net/dpaa/meson.build |  1 +
 9 files changed, 178 insertions(+), 19 deletions(-)
 create mode 100644 drivers/net/dpaa/dpaa_ptp.c

diff --git a/drivers/bus/dpaa/base/fman/fman.c 
b/drivers/bus/dpaa/base/fman/fman.c
index bf41a3ed96..89786636d9 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
  *
  * Copyright 2010-2016 Freescale Semiconductor Inc.
- * Copyright 2017-2020 NXP
+ * Copyright 2017-2024 NXP
  *
  */
 
@@ -520,6 +520,25 @@ fman_if_init(const struct device_node *dpa_node)
goto err;
}
 
+   regs_addr = of_get_address(tx_node, 0, &__if->regs_size, NULL);
+   if (!regs_addr) {
+   FMAN_ERR(-EINVAL, "of_get_address(%s)\n", mname);
+   goto err;
+   }
+   phys_addr = of_translate_address(tx_node, regs_addr);
+   if (!phys_addr) {
+   FMAN_ERR(-EINVAL, "of_translate_address(%s, %p)\n",
+   mname, regs_addr);
+   goto err;
+   }
+   __if->tx_bmi_map = mmap(NULL, __if->regs_size,
+   PROT_READ | PROT_WRITE, MAP_SHARED,
+   fman_ccsr_map_fd, phys_addr);
+   if (__if->tx_bmi_map == MAP_FAILED) {
+   FMAN_ERR(-errno, "mmap(0x%"PRIx64")\n", phys_addr);
+   goto err;
+   }
+
/* No channel ID for MAC-less */
assert(lenp == sizeof(*tx_channel_id));
na = of_n_addr_cells(mac_node);
diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c 
b/drivers/bus/dpaa/base/fman/fman_hw.c
index 27b39a4975..466709bfc9 100644
--- a/drivers/bus/dpaa/base/fman/fman_hw.c
+++ b/drivers/bus/dpaa/base/fman/fman_hw.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright 2017,2020 NXP
+ * Copyright 2017,2020,2022 NXP
  *
  */
 
@@ -564,6 +564,10 @@ fman_if_set_ic_params(struct fman_if *fm_if,
&((struct rx_bmi_regs *)__if->bmi_map)->fmbm_ricp;
out_be32(fmbm_ricp, val);
 
+   unsigned int *fmbm_ticp =
+   &((struct tx_bmi_regs *)__if->tx_bmi_map)->fmbm_ticp;
+   out_be32(fmbm_ticp, val);
+
return 0;
 }
 
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index 3642b43be7..857eef3d2f 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -2,7 +2,7 @@
  *
  * Copyright 2010-2012 Freescale Semiconductor, Inc.
  * All rights reserved.
- * Copyright 2019-2021 NXP
+ * Copyright 2019-2022 NXP
  *
  */
 
@@ -292,6 +292,21 @@ struct rx_bmi_regs {
uint32_t fmbm_rdbg; /**< Rx Debug-*/
 };
 
+struct tx_bmi_regs {
+   uint32_t fmbm_tcfg; /**< Tx Configuration*/
+   uint32_t fmbm_tst;  /**< Tx Status*/
+   uint32_t fmbm_tda;  /**< Tx DMA attributes*/
+   uint32_t fmbm_tfp;  /**< Tx FIFO Parameters*/
+   uint32_t fmbm_tfed; /**< Tx Frame End Data*/
+   uint32_t fmbm_ticp; /**< Tx Internal Context Parameters*/
+   uint32_t fmbm_tfdne;/**< Tx Frame Dequeue Next Engine*/
+   uint32_t fmbm_tfca; /**< Tx Frame Attributes*/
+   uint32_t fmbm_tcfqid;   /**< Tx Confirmation Frame Queue ID*/
+   uint32_t fmbm_tefqid;   /**< Tx Error Frame Queue ID*/
+   uint32_t fmbm_tfene;/**< Tx Frame Enqueue Next Engine*/
+   uint32_t fmbm_trlmts;   /**< Tx Rate Limiter Scale*/
+   uint32_t fmbm_trlmt;/**< Tx Rate Limiter*/
+};
 struct fman_port_qmi_regs {
uint32_t fmqm_pnc;  /**< PortID n Configuration Register */
uint32_t fmqm_pns;  /**< PortID n Status Register */
@@ -380,6 +395,7 @@ struct __fman_if {
uint64_t regs_size;
void *ccsr_map;
void *bmi_map;
+   void *tx_bmi_map;
void *qmi_map;
struct list_head node;
 };
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index e3cb15cad5..f7cd7c0d33 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2017-2020 NXP
+ *   Copyright 2017-2020,2022 NXP
  *
  */
 /* System headers */
@@ -1670,6 +1670,10 @@ static 

[PATCH 09/17] net/dpaa: support IEEE 1588 PTP

[Hemant Agrawal]

From: Vanshika Shukla 

This patch adds the support for the ethdev APIs
to enable/disable and read/write/adjust IEEE1588
PTP timestamps for DPAA platform.

Signed-off-by: Vanshika Shukla 
---
 doc/guides/nics/dpaa.rst  |  1 +
 drivers/bus/dpaa/base/fman/fman.c | 15 ++
 drivers/bus/dpaa/include/fman.h   | 45 +
 drivers/net/dpaa/dpaa_ethdev.c|  5 ++
 drivers/net/dpaa/dpaa_ethdev.h| 16 +++
 drivers/net/dpaa/dpaa_ptp.c   | 80 ++-
 6 files changed, 160 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst
index e8402dff52..580edd9327 100644
--- a/doc/guides/nics/dpaa.rst
+++ b/doc/guides/nics/dpaa.rst
@@ -148,6 +148,7 @@ Features
   - Packet type information
   - Checksum offload
   - Promiscuous mode
+  - IEEE1588 PTP
 
 DPAA Mempool Driver
 ~~~
diff --git a/drivers/bus/dpaa/base/fman/fman.c 
b/drivers/bus/dpaa/base/fman/fman.c
index 89786636d9..a79b0b75dd 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -28,6 +28,7 @@ u32 fman_dealloc_bufs_mask_lo;
 
 int fman_ccsr_map_fd = -1;
 static COMPAT_LIST_HEAD(__ifs);
+void *rtc_map;
 
 /* This is the (const) global variable that callers have read-only access to.
  * Internally, we have read-write access directly to __ifs.
@@ -539,6 +540,20 @@ fman_if_init(const struct device_node *dpa_node)
goto err;
}
 
+   if (!rtc_map) {
+   __if->rtc_map = mmap(NULL, FMAN_IEEE_1588_SIZE,
+   PROT_READ | PROT_WRITE, MAP_SHARED,
+   fman_ccsr_map_fd, FMAN_IEEE_1588_OFFSET);
+   if (__if->rtc_map == MAP_FAILED) {
+   pr_err("Can not map FMan RTC regs base\n");
+   _errno = -EINVAL;
+   goto err;
+   }
+   rtc_map = __if->rtc_map;
+   } else {
+   __if->rtc_map = rtc_map;
+   }
+
/* No channel ID for MAC-less */
assert(lenp == sizeof(*tx_channel_id));
na = of_n_addr_cells(mac_node);
diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h
index 857eef3d2f..109c1a4a22 100644
--- a/drivers/bus/dpaa/include/fman.h
+++ b/drivers/bus/dpaa/include/fman.h
@@ -64,6 +64,12 @@
 #define GROUP_ADDRESS  0x0100LL
 #define HASH_CTRL_ADDR_MASK0x003F
 
+#define FMAN_RTC_MAX_NUM_OF_ALARMS 3
+#define FMAN_RTC_MAX_NUM_OF_PERIODIC_PULSES4
+#define FMAN_RTC_MAX_NUM_OF_EXT_TRIGGERS   3
+#define FMAN_IEEE_1588_OFFSET  0X1AFE000
+#define FMAN_IEEE_1588_SIZE4096
+
 /* Pre definitions of FMAN interface and Bpool structures */
 struct __fman_if;
 struct fman_if_bpool;
@@ -307,6 +313,44 @@ struct tx_bmi_regs {
uint32_t fmbm_trlmts;   /**< Tx Rate Limiter Scale*/
uint32_t fmbm_trlmt;/**< Tx Rate Limiter*/
 };
+
+/* Description FM RTC timer alarm */
+struct t_tmr_alarm {
+   uint32_t tmr_alarm_h;
+   uint32_t tmr_alarm_l;
+};
+
+/* Description FM RTC timer Ex trigger */
+struct t_tmr_ext_trigger {
+   uint32_t tmr_etts_h;
+   uint32_t tmr_etts_l;
+};
+
+struct rtc_regs {
+   uint32_t tmr_id;/* 0x000 Module ID register */
+   uint32_t tmr_id2;   /* 0x004 Controller ID register */
+   uint32_t reserved0008[30];
+   uint32_t tmr_ctrl;  /* 0x0080 timer control register */
+   uint32_t tmr_tevent;/* 0x0084 timer event register */
+   uint32_t tmr_temask;/* 0x0088 timer event mask register */
+   uint32_t reserved008c[3];
+   uint32_t tmr_cnt_h; /* 0x0098 timer counter high register */
+   uint32_t tmr_cnt_l; /* 0x009c timer counter low register */
+   uint32_t tmr_add;   /* 0x00a0 timer drift compensation addend 
register */
+   uint32_t tmr_acc;   /* 0x00a4 timer accumulator register */
+   uint32_t tmr_prsc;  /* 0x00a8 timer prescale */
+   uint32_t reserved00ac;
+   uint32_t tmr_off_h; /* 0x00b0 timer offset high */
+   uint32_t tmr_off_l; /* 0x00b4 timer offset low  */
+   struct t_tmr_alarm tmr_alarm[FMAN_RTC_MAX_NUM_OF_ALARMS];
+   /* 0x00b8 timer alarm */
+   uint32_t tmr_fiper[FMAN_RTC_MAX_NUM_OF_PERIODIC_PULSES];
+   /* 0x00d0 timer fixed period interval */
+   struct t_tmr_ext_trigger tmr_etts[FMAN_RTC_MAX_NUM_OF_EXT_TRIGGERS];
+   /* 0x00e0 time stamp general purpose external */
+   uint32_t reserved00f0[4];
+};
+
 struct fman_port_qmi_regs {
uint32_t fmqm_pnc;  /**< PortID n Configuration Register */
uint32_t fmqm_pns;  /**< PortID n Status Register */
@@ -396,6 +440,7 @@ struct __fman_if {
void *ccsr_map;
void *bmi_map;
void *tx_bmi_map;
+   void *rtc_map;
void *qmi_ma

[PATCH 10/17] net/dpaa: implement detailed packet parsing

[Hemant Agrawal]

This patch implements the detailed packet parsing using
the annotation info from the hardware.

decode parser to set RX muf packet type by dpaa_slow_parsing.
Support to identify the IPSec ESP, GRE and SCTP packets.

Signed-off-by: Jun Yang 
Signed-off-by: Hemant Agrawal 
---
 drivers/net/dpaa/dpaa_rxtx.c |  35 -
 drivers/net/dpaa/dpaa_rxtx.h | 143 +++
 2 files changed, 92 insertions(+), 86 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 44d9bc1adb..588a78a50c 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -110,11 +110,38 @@ static void dpaa_display_frame_info(const struct qm_fd 
*fd,
 #define dpaa_display_frame_info(a, b, c)
 #endif
 
-static inline void dpaa_slow_parsing(struct rte_mbuf *m __rte_unused,
-uint64_t prs __rte_unused)
+static inline void
+dpaa_slow_parsing(struct rte_mbuf *m,
+   const struct annotations_t *annot)
 {
+   const struct dpaa_eth_parse_results_t *parse;
+
DPAA_DP_LOG(DEBUG, "Slow parsing");
-   /*TBD:XXX: to be implemented*/
+   parse = &annot->parse;
+
+   if (parse->ethernet)
+   m->packet_type |= RTE_PTYPE_L2_ETHER;
+   if (parse->vlan)
+   m->packet_type |= RTE_PTYPE_L2_ETHER_VLAN;
+   if (parse->first_ipv4)
+   m->packet_type |= RTE_PTYPE_L3_IPV4;
+   if (parse->first_ipv6)
+   m->packet_type |= RTE_PTYPE_L3_IPV6;
+   if (parse->gre)
+   m->packet_type |= RTE_PTYPE_TUNNEL_GRE;
+   if (parse->last_ipv4)
+   m->packet_type |= RTE_PTYPE_L3_IPV4_EXT;
+   if (parse->last_ipv6)
+   m->packet_type |= RTE_PTYPE_L3_IPV6_EXT;
+   if (parse->l4_type == DPAA_PR_L4_TCP_TYPE)
+   m->packet_type |= RTE_PTYPE_L4_TCP;
+   else if (parse->l4_type == DPAA_PR_L4_UDP_TYPE)
+   m->packet_type |= RTE_PTYPE_L4_UDP;
+   else if (parse->l4_type == DPAA_PR_L4_IPSEC_TYPE &&
+   !parse->l4_info_err && parse->esp_sum)
+   m->packet_type |= RTE_PTYPE_TUNNEL_ESP;
+   else if (parse->l4_type == DPAA_PR_L4_SCTP_TYPE)
+   m->packet_type |= RTE_PTYPE_L4_SCTP;
 }
 
 static inline void dpaa_eth_packet_info(struct rte_mbuf *m, void *fd_virt_addr)
@@ -229,7 +256,7 @@ static inline void dpaa_eth_packet_info(struct rte_mbuf *m, 
void *fd_virt_addr)
break;
/* More switch cases can be added */
default:
-   dpaa_slow_parsing(m, prs);
+   dpaa_slow_parsing(m, annot);
}
 
m->tx_offload = annot->parse.ip_off[0];
diff --git a/drivers/net/dpaa/dpaa_rxtx.h b/drivers/net/dpaa/dpaa_rxtx.h
index 1048e86d41..215bdeaf7f 100644
--- a/drivers/net/dpaa/dpaa_rxtx.h
+++ b/drivers/net/dpaa/dpaa_rxtx.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2017,2020-2022 NXP
+ *   Copyright 2017,2020-2024 NXP
  *
  */
 
@@ -162,98 +162,77 @@
 
 #define DPAA_PKT_L3_LEN_SHIFT  7
 
+enum dpaa_parse_result_l4_type {
+   DPAA_PR_L4_TCP_TYPE = 1,
+   DPAA_PR_L4_UDP_TYPE = 2,
+   DPAA_PR_L4_IPSEC_TYPE = 3,
+   DPAA_PR_L4_SCTP_TYPE = 4,
+   DPAA_PR_L4_DCCP_TYPE = 5
+};
+
 /**
  * FMan parse result array
  */
 struct dpaa_eth_parse_results_t {
-uint8_t lpid;   /**< Logical port id */
-uint8_t shimr;  /**< Shim header result  */
-union {
-   uint16_t  l2r;  /**< Layer 2 result */
+   uint8_t lpid; /**< Logical port id */
+   uint8_t shimr; /**< Shim header result  */
+   union {
+   uint16_t l2r; /**< Layer 2 result */
struct {
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-   uint16_t  ethernet:1;
-   uint16_t  vlan:1;
-   uint16_t  llc_snap:1;
-   uint16_t  mpls:1;
-   uint16_t  ppoe_ppp:1;
-   uint16_t  unused_1:3;
-   uint16_t  unknown_eth_proto:1;
-   uint16_t  eth_frame_type:2;
-   uint16_t  l2r_err:5;
+   uint16_t unused_1:3;
+   uint16_t ppoe_ppp:1;
+   uint16_t mpls:1;
+   uint16_t llc_snap:1;
+   uint16_t vlan:1;
+   uint16_t ethernet:1;
+
+   uint16_t l2r_err:5;
+   uint16_t eth_frame_type:2;
/*00-unicast, 01-multicast, 11-broadcast*/
-#else
-   uint16_t  l2r_err:5;
-   uint16_t  eth_frame_type:2;
-   uint16_t  unknown_eth_proto:1;
-   uint16_t  unused_1:3;
-   uint16

[PATCH 11/17] net/dpaa: enhance DPAA frame display

[Hemant Agrawal]

This patch enhances the received packet debugging capability.
This help displaying the full packet parsing output.

Signed-off-by: Jun Yang 
Signed-off-by: Hemant Agrawal 
---
 doc/guides/nics/dpaa.rst   |   5 ++
 drivers/net/dpaa/dpaa_ethdev.c |   6 ++
 drivers/net/dpaa/dpaa_rxtx.c   | 138 +++--
 drivers/net/dpaa/dpaa_rxtx.h   |   5 ++
 4 files changed, 130 insertions(+), 24 deletions(-)

diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst
index 580edd9327..448607e9ac 100644
--- a/doc/guides/nics/dpaa.rst
+++ b/doc/guides/nics/dpaa.rst
@@ -227,6 +227,11 @@ state during application initialization:
   application want to use eventdev with DPAA device.
   Currently these queues are not used for LS1023/LS1043 platform by default.
 
+- ``DPAA_DISPLAY_FRAME_AND_PARSER_RESULT`` (default 0)
+
+  This defines the debug flag, whether to dump the detailed frame and packet
+  parsing result for the incoming packets.
+
 
 Driver compilation and testing
 --
diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index e92f1c25b2..979220a700 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -2094,6 +2094,12 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
td_tx_threshold = CGR_RX_PERFQ_THRESH;
}
 
+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
+   penv = getenv("DPAA_DISPLAY_FRAME_AND_PARSER_RESULT");
+   if (penv)
+   dpaa_force_display_frame_set(atoi(penv));
+#endif
+
/* If congestion control is enabled globally*/
if (num_rx_fqs > 0 && td_threshold) {
dpaa_intf->cgr_rx = rte_zmalloc(NULL,
diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 588a78a50c..56b4ce1056 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -47,6 +47,10 @@
 #include 
 #include 
 
+#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
+static int s_force_display_frm;
+#endif
+
 #define DPAA_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid) \
do { \
(_fd)->opaque_addr = 0; \
@@ -58,37 +62,122 @@
} while (0)
 
 #ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER
+void
+dpaa_force_display_frame_set(int set)
+{
+   s_force_display_frm = set;
+}
+
 #define DISPLAY_PRINT printf
-static void dpaa_display_frame_info(const struct qm_fd *fd,
-   uint32_t fqid, bool rx)
+static void
+dpaa_display_frame_info(const struct qm_fd *fd,
+   uint32_t fqid, bool rx)
 {
-   int ii;
-   char *ptr;
+   int pos, offset = 0;
+   char *ptr, info[1024];
struct annotations_t *annot = rte_dpaa_mem_ptov(fd->addr);
uint8_t format;
+   const struct dpaa_eth_parse_results_t *psr;
 
-   if (!fd->status) {
-   /* Do not display correct packets.*/
+   if (!fd->status && !s_force_display_frm) {
+   /* Do not display correct packets unless force display.*/
return;
}
+   psr = &annot->parse;
 
-   format = (fd->opaque & DPAA_FD_FORMAT_MASK) >>
-   DPAA_FD_FORMAT_SHIFT;
-
-   DISPLAY_PRINT("fqid %d bpid %d addr 0x%lx, format %d\r\n",
- fqid, fd->bpid, (unsigned long)fd->addr, fd->format);
-   DISPLAY_PRINT("off %d, len %d stat 0x%x\r\n",
- fd->offset, fd->length20, fd->status);
+   format = (fd->opaque & DPAA_FD_FORMAT_MASK) >> DPAA_FD_FORMAT_SHIFT;
+   if (format == qm_fd_contig)
+   sprintf(info, "simple");
+   else if (format == qm_fd_sg)
+   sprintf(info, "sg");
+   else
+   sprintf(info, "unknown format(%d)", format);
+
+   DISPLAY_PRINT("%s: fqid=%08x, bpid=%d, phy addr=0x%lx ",
+   rx ? "RX" : "TX", fqid, fd->bpid, (unsigned long)fd->addr);
+   DISPLAY_PRINT("format=%s offset=%d, len=%d, stat=0x%x\r\n",
+   info, fd->offset, fd->length20, fd->status);
if (rx) {
-   ptr = (char *)&annot->parse;
-   DISPLAY_PRINT("RX parser result:\r\n");
-   for (ii = 0; ii < (int)sizeof(struct dpaa_eth_parse_results_t);
-   ii++) {
-   DISPLAY_PRINT("%02x ", ptr[ii]);
-   if (((ii + 1) % 16) == 0)
-   DISPLAY_PRINT("\n");
+   DISPLAY_PRINT("Display usual RX parser result:\r\n");
+   if (psr->eth_frame_type == 0)
+   offset += sprintf(&info[offset], "unicast");
+   else if (psr->eth_frame_type == 1)
+   offset += sprintf(&info[offset], "multicast");
+   else if (psr->eth_frame_type == 3)
+   offset += sprintf(&info[offset], "broadcast");
+   else
+   offset += sprintf(&info[offset], "unknown eth type(%d)",
+   psr->eth_frame_type);
+   if (psr->l2r_err) {
+

[PATCH 12/17] net/dpaa: support mempool debug

[Hemant Agrawal]

From: Gagandeep Singh 

This patch adds support to compile time debug the mempool
corruptions in dpaa driver.

Signed-off-by: Gagandeep Singh 
---
 drivers/net/dpaa/dpaa_rxtx.c | 40 
 1 file changed, 40 insertions(+)

diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 56b4ce1056..84fd0c57a4 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -496,6 +496,10 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
first_seg->data_len = sg_temp->length;
first_seg->pkt_len = sg_temp->length;
rte_mbuf_refcnt_set(first_seg, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   rte_mempool_check_cookies(rte_mempool_from_obj((void *)first_seg),
+   (void **)&first_seg, 1, 1);
+#endif
 
first_seg->port = ifid;
first_seg->nb_segs = 1;
@@ -513,6 +517,10 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
first_seg->pkt_len += sg_temp->length;
first_seg->nb_segs += 1;
rte_mbuf_refcnt_set(cur_seg, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   rte_mempool_check_cookies(rte_mempool_from_obj((void *)cur_seg),
+   (void **)&cur_seg, 1, 1);
+#endif
prev_seg->next = cur_seg;
if (sg_temp->final) {
cur_seg->next = NULL;
@@ -524,6 +532,10 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
first_seg->pkt_len, first_seg->nb_segs);
 
dpaa_eth_packet_info(first_seg, vaddr);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp),
+   (void **)&temp, 1, 1);
+#endif
rte_pktmbuf_free_seg(temp);
 
return first_seg;
@@ -564,6 +576,10 @@ dpaa_eth_fd_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
mbuf->ol_flags = 0;
mbuf->next = NULL;
rte_mbuf_refcnt_set(mbuf, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   rte_mempool_check_cookies(rte_mempool_from_obj((void *)mbuf),
+   (void **)&mbuf, 1, 1);
+#endif
dpaa_eth_packet_info(mbuf, mbuf->buf_addr);
 
return mbuf;
@@ -680,6 +696,10 @@ dpaa_rx_cb_no_prefetch(struct qman_fq **fq, struct 
qm_dqrr_entry **dqrr,
mbuf->ol_flags = 0;
mbuf->next = NULL;
rte_mbuf_refcnt_set(mbuf, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   rte_mempool_check_cookies(rte_mempool_from_obj((void *)mbuf),
+   (void **)&mbuf, 1, 1);
+#endif
dpaa_eth_packet_info(mbuf, mbuf->buf_addr);
dpaa_display_frame_info(fd, fq[0]->fqid, true);
 #if defined(RTE_LIBRTE_IEEE1588)
@@ -727,6 +747,10 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry 
**dqrr,
mbuf->ol_flags = 0;
mbuf->next = NULL;
rte_mbuf_refcnt_set(mbuf, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   rte_mempool_check_cookies(rte_mempool_from_obj((void *)mbuf),
+   (void **)&mbuf, 1, 1);
+#endif
dpaa_eth_packet_info(mbuf, mbuf->buf_addr);
dpaa_display_frame_info(fd, fq[0]->fqid, true);
 #if defined(RTE_LIBRTE_IEEE1588)
@@ -978,6 +1002,10 @@ dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
return -1;
}
 
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp),
+   (void **)&temp, 1, 0);
+#endif
fd->cmd = 0;
fd->opaque_addr = 0;
 
@@ -1023,6 +1051,10 @@ dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
} else {
sg_temp->bpid =
DPAA_MEMPOOL_TO_BPID(cur_seg->pool);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   
rte_mempool_check_cookies(rte_mempool_from_obj((void *)cur_seg),
+   (void **)&cur_seg, 1, 0);
+#endif
}
} else if (RTE_MBUF_HAS_EXTBUF(cur_seg)) {
free_buf[*free_count].seg = cur_seg;
@@ -1080,6 +1112,10 @@ tx_on_dpaa_pool_unsegmented(struct rte_mbuf *mbuf,
 * released by BMAN.
 */
DPAA_MBUF_TO_CONTIG_FD(mbuf, fd_arr, bp_info->bpid);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+   rte_mempool_check_cookies(rte_mempool_from_obj((void 
*)mbuf),
+   (void **)&mbuf, 1, 0);
+#endif
}
} else if (RTE_MBUF_HAS_EXTBUF(mbuf)) {
buf_to_free[*free_count].seg = mbuf;
@@ -1310,6 +1346,10 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, 
uint16_t nb_bufs)
DPAA_TX_CKSUM_OFFLOAD_MASK)
dpaa_unsegmented_checksum(mbuf,

[PATCH 13/17] net/dpaa: add Tx rate limiting DPAA PMD API

[Hemant Agrawal]

From: Vinod Pullabhatla 

Add support to set Tx rate on DPAA platform through PMD APIs

Signed-off-by: Vinod Pullabhatla 
Signed-off-by: Rohit Raj 
---
 .mailmap |  1 +
 drivers/net/dpaa/dpaa_flow.c | 95 +---
 drivers/net/dpaa/fmlib/fm_lib.c  | 32 +-
 drivers/net/dpaa/fmlib/fm_port_ext.h |  2 +-
 drivers/net/dpaa/rte_pmd_dpaa.h  | 25 +++-
 drivers/net/dpaa/version.map |  7 ++
 6 files changed, 151 insertions(+), 11 deletions(-)

diff --git a/.mailmap b/.mailmap
index 4a508bafad..cb0fd52404 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1562,6 +1562,7 @@ Vincent Jardin 
 Vincent Li 
 Vincent S. Cojot 
 Vinh Tran 
+Vinod Pullabhatla 
 Vipin Padmam Ramesh 
 Vipin Varghese  
 Vipul Ashri 
diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c
index 082bd5d014..dfc81e4e43 100644
--- a/drivers/net/dpaa/dpaa_flow.c
+++ b/drivers/net/dpaa/dpaa_flow.c
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define DPAA_MAX_NUM_ETH_DEV   8
 
@@ -29,6 +30,11 @@ return 
&scheme_params->param.key_ext_and_hash.extract_array[hdr_idx];
 #define SCH_EXT_FULL_FLD(scheme_params, hdr_idx) \
SCH_EXT_HDR(scheme_params, hdr_idx).extract_by_hdr_type.full_field
 
+/* FMAN mac indexes mappings (0 is unused, first 8 are for 1G, next for 10G
+ * ports).
+ */
+const uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1};
+
 /* FM global info */
 struct dpaa_fm_info {
t_handle fman_handle;
@@ -649,7 +655,7 @@ static inline int set_pcd_netenv_scheme(struct dpaa_if 
*dpaa_intf,
 }
 
 
-static inline int get_port_type(struct fman_if *fif)
+static inline int get_rx_port_type(struct fman_if *fif)
 {
/* For 1G fm-mac9 and fm-mac10 ports, configure the VSP as 10G
 * ports so that kernel can configure correct port.
@@ -668,6 +674,19 @@ static inline int get_port_type(struct fman_if *fif)
return -1;
 }
 
+static inline int get_tx_port_type(struct fman_if *fif)
+{
+   if (fif->mac_type == fman_mac_1g)
+   return e_FM_PORT_TYPE_TX;
+   else if (fif->mac_type == fman_mac_2_5g)
+   return e_FM_PORT_TYPE_TX_2_5G;
+   else if (fif->mac_type == fman_mac_10g)
+   return e_FM_PORT_TYPE_TX_10G;
+
+   DPAA_PMD_ERR("MAC type unsupported");
+   return -1;
+}
+
 static inline int set_fm_port_handle(struct dpaa_if *dpaa_intf,
 uint64_t req_dist_set,
 struct fman_if *fif)
@@ -676,17 +695,12 @@ static inline int set_fm_port_handle(struct dpaa_if 
*dpaa_intf,
ioc_fm_pcd_net_env_params_t dist_units;
PMD_INIT_FUNC_TRACE();
 
-   /* FMAN mac indexes mappings (0 is unused,
-* first 8 are for 1G, next for 10G ports
-*/
-   uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1};
-
/* Memset FM port params */
memset(&fm_port_params, 0, sizeof(fm_port_params));
 
/* Set FM port params */
fm_port_params.h_fm = fm_info.fman_handle;
-   fm_port_params.port_type = get_port_type(fif);
+   fm_port_params.port_type = get_rx_port_type(fif);
fm_port_params.port_id = mac_idx[fif->mac_idx];
 
/* FM PORT Open */
@@ -949,7 +963,6 @@ static int dpaa_port_vsp_configure(struct dpaa_if 
*dpaa_intf,
 {
t_fm_vsp_params vsp_params;
t_fm_buffer_prefix_content buf_prefix_cont;
-   uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1};
uint8_t idx = mac_idx[fif->mac_idx];
int ret;
 
@@ -1079,3 +1092,69 @@ int dpaa_port_vsp_cleanup(struct dpaa_if *dpaa_intf, 
struct fman_if *fif)
 
return E_OK;
 }
+
+int rte_pmd_dpaa_port_set_rate_limit(uint16_t port_id, uint16_t burst,
+uint32_t rate)
+{
+   t_fm_port_rate_limit port_rate_limit;
+   bool port_handle_exists = true;
+   void *handle;
+   uint32_t ret;
+   struct rte_eth_dev *dev;
+   struct dpaa_if *dpaa_intf;
+   struct fman_if *fif;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+   dev = &rte_eth_devices[port_id];
+   dpaa_intf = dev->data->dev_private;
+   fif = dev->process_private;
+
+   memset(&port_rate_limit, 0, sizeof(port_rate_limit));
+   port_rate_limit.max_burst_size = burst;
+   port_rate_limit.rate_limit = rate;
+
+   DPAA_PMD_DEBUG("Setting Rate Limiter for port:%s  Max Burst =%u Max 
Rate =%u\n",
+  dpaa_intf->name, burst, rate);
+
+   if (!dpaa_intf->port_handle) {
+   t_fm_port_params fm_port_params;
+
+   /* Memset FM port params */
+   memset(&fm_port_params, 0, sizeof(fm_port_params));
+
+   /* Set FM port params */
+   fm_port_params.h_fm = fm_open(0);
+   fm_port_params.port_type = get_tx_port_type(fif);
+   fm_port_params.port_id = mac_idx[fif->mac_idx];
+
+   /* FM PORT Open */
+   

[PATCH 14/17] bus/dpaa: add OH port mode for dpaa eth

[Hemant Agrawal]

From: Rohit Raj 

NXP DPAA architecture supports the concept of DPAA
port as Offline Port - meaning - not connected to an actual MAC.
This is an virtual port to be used by application for exchanging data.

This property is completely driven by the device-tree. During the
DPAA bus scan, based on the platform device properties as in
device-tree, the port can be classified as OH port.

This patch add support in the driver to use dpaa eth port
in OH mode as well with DPDK applications.

Signed-off-by: Rohit Raj 
---
 drivers/bus/dpaa/base/fman/fman.c | 261 ++
 drivers/bus/dpaa/base/fman/fman_hw.c  |  24 +-
 drivers/bus/dpaa/base/fman/netcfg_layer.c |  19 +-
 drivers/bus/dpaa/dpaa_bus.c   |  23 +-
 drivers/bus/dpaa/include/fman.h   |  33 ++-
 drivers/net/dpaa/dpaa_ethdev.c|  87 ++--
 drivers/net/dpaa/dpaa_ethdev.h|   8 +-
 drivers/net/dpaa/dpaa_flow.c  |  39 ++--
 drivers/net/dpaa/dpaa_fmc.c   |   3 +-
 9 files changed, 353 insertions(+), 144 deletions(-)

diff --git a/drivers/bus/dpaa/base/fman/fman.c 
b/drivers/bus/dpaa/base/fman/fman.c
index a79b0b75dd..f817305ab7 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -43,7 +43,7 @@ if_destructor(struct __fman_if *__if)
if (!__if)
return;
 
-   if (__if->__if.mac_type == fman_offline_internal)
+   if (__if->__if.mac_type == fman_offline)
goto cleanup;
 
list_for_each_entry_safe(bp, tmpbp, &__if->__if.bpool_list, node) {
@@ -246,26 +246,34 @@ fman_if_init(const struct device_node *dpa_node)
uint64_t port_cell_idx_val = 0;
uint64_t ext_args_cell_idx_val = 0;
 
-   const struct device_node *mac_node = NULL, *tx_node, *ext_args_node;
-   const struct device_node *pool_node, *fman_node, *rx_node;
+   const struct device_node *mac_node = NULL, *ext_args_node;
+   const struct device_node *pool_node, *fman_node;
+   const struct device_node *rx_node = NULL, *tx_node = NULL;
+   const struct device_node *oh_node = NULL;
const uint32_t *regs_addr = NULL;
const char *mname, *fname;
const char *dname = dpa_node->full_name;
size_t lenp;
-   int _errno, is_shared = 0;
+   int _errno, is_shared = 0, is_offline = 0;
const char *char_prop;
uint32_t na;
 
if (of_device_is_available(dpa_node) == false)
return 0;
 
-   if (!of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-init") &&
-   !of_device_is_compatible(dpa_node, "fsl,dpa-ethernet")) {
+   if (of_device_is_compatible(dpa_node, "fsl,dpa-oh"))
+   is_offline = 1;
+
+   if (!of_device_is_compatible(dpa_node, "fsl,dpa-oh") &&
+   !of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-init") &&
+   !of_device_is_compatible(dpa_node, "fsl,dpa-ethernet")) {
return 0;
}
 
-   rprop = "fsl,qman-frame-queues-rx";
-   mprop = "fsl,fman-mac";
+   rprop = is_offline ? "fsl,qman-frame-queues-oh" :
+"fsl,qman-frame-queues-rx";
+   mprop = is_offline ? "fsl,fman-oh-port" :
+"fsl,fman-mac";
 
/* Obtain the MAC node used by this interface except macless */
mac_phandle = of_get_property(dpa_node, mprop, &lenp);
@@ -281,27 +289,43 @@ fman_if_init(const struct device_node *dpa_node)
}
mname = mac_node->full_name;
 
-   /* Extract the Rx and Tx ports */
-   ports_phandle = of_get_property(mac_node, "fsl,port-handles",
-   &lenp);
-   if (!ports_phandle)
-   ports_phandle = of_get_property(mac_node, "fsl,fman-ports",
+   if (!is_offline) {
+   /* Extract the Rx and Tx ports */
+   ports_phandle = of_get_property(mac_node, "fsl,port-handles",
&lenp);
-   if (!ports_phandle) {
-   FMAN_ERR(-EINVAL, "%s: no fsl,port-handles",
-mname);
-   return -EINVAL;
-   }
-   assert(lenp == (2 * sizeof(phandle)));
-   rx_node = of_find_node_by_phandle(ports_phandle[0]);
-   if (!rx_node) {
-   FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[0]", mname);
-   return -ENXIO;
-   }
-   tx_node = of_find_node_by_phandle(ports_phandle[1]);
-   if (!tx_node) {
-   FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[1]", mname);
-   return -ENXIO;
+   if (!ports_phandle)
+   ports_phandle = of_get_property(mac_node, 
"fsl,fman-ports",
+   &lenp);
+   if (!ports_phandle) {
+   FMAN_ERR(-EINVAL, "%s: no fsl,port-handles",
+mname);
+   return -EINVAL;
+   }
+   

[PATCH 15/17] bus/dpaa: add ONIC port mode for the DPAA eth

[Hemant Agrawal]

From: Rohit Raj 

The OH ports can also be used by two application, processing contexts
to communicate to each other.
This patch enables this mode for dpaa-eth OH port as ONIC port,
so that application can use the dpaa-eth to communicate to each
other on the same SoC.

Again,this properties is driven by the system device-tree variables.

Signed-off-by: Rohit Raj 
---
 doc/guides/nics/dpaa.rst  |   3 +
 drivers/bus/dpaa/base/fman/fman.c | 299 +-
 drivers/bus/dpaa/base/fman/fman_hw.c  |  20 +-
 drivers/bus/dpaa/base/fman/netcfg_layer.c |   4 +-
 drivers/bus/dpaa/dpaa_bus.c   |  10 +-
 drivers/bus/dpaa/include/fman.h   |  15 +-
 drivers/net/dpaa/dpaa_ethdev.c| 114 +++--
 drivers/net/dpaa/dpaa_flow.c  |  28 +-
 drivers/net/dpaa/dpaa_fmc.c   |   3 +-
 9 files changed, 439 insertions(+), 57 deletions(-)

diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst
index 448607e9ac..4bd95398ca 100644
--- a/doc/guides/nics/dpaa.rst
+++ b/doc/guides/nics/dpaa.rst
@@ -136,6 +136,8 @@ RTE framework and DPAA internal components/drivers.
   The Ethernet driver is bound to a FMAN port and implements the interfaces
   needed to connect the DPAA network interface to the network stack.
   Each FMAN Port corresponds to a DPDK network interface.
+- PMD also support OH/ONIC mode, where the port works as a HW assisted
+  virtual port without actually connecting to a Physical MAC.
 
 
 Features
@@ -149,6 +151,7 @@ Features
   - Checksum offload
   - Promiscuous mode
   - IEEE1588 PTP
+  - OH/ONIC virtual port support
 
 DPAA Mempool Driver
 ~~~
diff --git a/drivers/bus/dpaa/base/fman/fman.c 
b/drivers/bus/dpaa/base/fman/fman.c
index f817305ab7..efe6eab4a9 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -43,7 +43,7 @@ if_destructor(struct __fman_if *__if)
if (!__if)
return;
 
-   if (__if->__if.mac_type == fman_offline)
+   if (__if->__if.mac_type == fman_offline_internal)
goto cleanup;
 
list_for_each_entry_safe(bp, tmpbp, &__if->__if.bpool_list, node) {
@@ -465,7 +465,7 @@ fman_if_init(const struct device_node *dpa_node)
__if->__if.is_memac = 0;
 
if (is_offline)
-   __if->__if.mac_type = fman_offline;
+   __if->__if.mac_type = fman_offline_internal;
else if (of_device_is_compatible(mac_node, "fsl,fman-1g-mac"))
__if->__if.mac_type = fman_mac_1g;
else if (of_device_is_compatible(mac_node, "fsl,fman-10g-mac"))
@@ -791,6 +791,292 @@ fman_if_init(const struct device_node *dpa_node)
dname, __if->__if.tx_channel_id, __if->__if.fman_idx,
__if->__if.mac_idx);
 
+   /* Don't add OH port to the port list since they will be used by ONIC
+* ports.
+*/
+   if (!is_offline)
+   list_add_tail(&__if->__if.node, &__ifs);
+
+   return 0;
+err:
+   if_destructor(__if);
+   return _errno;
+}
+
+static int fman_if_init_onic(const struct device_node *dpa_node)
+{
+   struct __fman_if *__if;
+   struct fman_if_bpool *bpool;
+   const phandle *tx_pools_phandle;
+   const phandle *tx_channel_id, *mac_addr, *cell_idx;
+   const phandle *rx_phandle;
+   const struct device_node *pool_node;
+   size_t lenp;
+   int _errno;
+   const phandle *p_onic_oh_nodes = NULL;
+   const struct device_node *rx_oh_node = NULL;
+   const struct device_node *tx_oh_node = NULL;
+   const phandle *p_fman_rx_oh_node = NULL, *p_fman_tx_oh_node = NULL;
+   const struct device_node *fman_rx_oh_node = NULL;
+   const struct device_node *fman_tx_oh_node = NULL;
+   const struct device_node *fman_node;
+   uint32_t na = OF_DEFAULT_NA;
+   uint64_t rx_phandle_host[4] = {0};
+   uint64_t cell_idx_host = 0;
+
+   if (of_device_is_available(dpa_node) == false)
+   return 0;
+
+   if (!of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-generic"))
+   return 0;
+
+   /* Allocate an object for this network interface */
+   __if = rte_malloc(NULL, sizeof(*__if), RTE_CACHE_LINE_SIZE);
+   if (!__if) {
+   FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*__if));
+   goto err;
+   }
+   memset(__if, 0, sizeof(*__if));
+
+   INIT_LIST_HEAD(&__if->__if.bpool_list);
+
+   strlcpy(__if->node_name, dpa_node->name, IF_NAME_MAX_LEN - 1);
+   __if->node_name[IF_NAME_MAX_LEN - 1] = '\0';
+
+   strlcpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1);
+   __if->node_path[PATH_MAX - 1] = '\0';
+
+   /* Mac node is onic */
+   __if->__if.is_memac = 0;
+   __if->__if.mac_type = fman_onic;
+
+   /* Extract the MAC address for linux peer */
+   mac_addr = of_get_property(dpa_node, "local-mac-address", &lenp);
+   if (!mac_addr) {
+   

[PATCH 16/17] net/dpaa: improve the dpaa port cleanup

[Hemant Agrawal]

From: Gagandeep Singh 

During DPAA cleanup in FMCLESS mode, application can
see segmentation fault in device close API and in DPAA
destructor execution.
Segmentation fault in device close is because driver
reducing the number of queues initialised during
device configuration without releasing the actual queues.

And segmentation fault in DPAA destruction is because
it is trying to access RTE* devices whose memory has
been released in rte_eal_cleanup() call by the application.

This patch improves the behavior.

Signed-off-by: Gagandeep Singh 
---
 drivers/net/dpaa/dpaa_ethdev.c | 35 --
 drivers/net/dpaa/dpaa_flow.c   |  8 
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 56607034a9..863c1155c8 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2017-2020,2022 NXP
+ *   Copyright 2017-2020,2022-2023 NXP
  *
  */
 /* System headers */
@@ -557,10 +557,10 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev)
if (dpaa_intf->cgr_rx) {
for (loop = 0; loop < dpaa_intf->nb_rx_queues; loop++)
qman_delete_cgr(&dpaa_intf->cgr_rx[loop]);
+   rte_free(dpaa_intf->cgr_rx);
+   dpaa_intf->cgr_rx = NULL;
}
 
-   rte_free(dpaa_intf->cgr_rx);
-   dpaa_intf->cgr_rx = NULL;
/* Release TX congestion Groups */
if (dpaa_intf->cgr_tx) {
for (loop = 0; loop < MAX_DPAA_CORES; loop++)
@@ -574,6 +574,15 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev)
 
rte_free(dpaa_intf->tx_queues);
dpaa_intf->tx_queues = NULL;
+   if (dpaa_intf->port_handle) {
+   if (dpaa_fm_deconfig(dpaa_intf, fif))
+   DPAA_PMD_WARN("DPAA FM "
+   "deconfig failed\n");
+   }
+   if (fif->num_profiles) {
+   if (dpaa_port_vsp_cleanup(dpaa_intf, fif))
+   DPAA_PMD_WARN("DPAA FM vsp cleanup failed\n");
+   }
 
return ret;
 }
@@ -2563,26 +2572,6 @@ static void __attribute__((destructor(102))) 
dpaa_finish(void)
return;
 
if (!(default_q || fmc_q)) {
-   unsigned int i;
-
-   for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
-   if (rte_eth_devices[i].dev_ops == &dpaa_devops) {
-   struct rte_eth_dev *dev = &rte_eth_devices[i];
-   struct dpaa_if *dpaa_intf =
-   dev->data->dev_private;
-   struct fman_if *fif =
-   dev->process_private;
-   if (dpaa_intf->port_handle)
-   if (dpaa_fm_deconfig(dpaa_intf, fif))
-   DPAA_PMD_WARN("DPAA FM "
-   "deconfig failed");
-   if (fif->num_profiles) {
-   if (dpaa_port_vsp_cleanup(dpaa_intf,
- fif))
-   DPAA_PMD_WARN("DPAA FM vsp 
cleanup failed");
-   }
-   }
-   }
if (is_global_init)
if (dpaa_fm_term())
DPAA_PMD_WARN("DPAA FM term failed");
diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c
index 810b187405..2240f8d27c 100644
--- a/drivers/net/dpaa/dpaa_flow.c
+++ b/drivers/net/dpaa/dpaa_flow.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2017-2019,2021 NXP
+ * Copyright 2017-2019,2021-2023 NXP
  */
 
 /* System headers */
@@ -812,8 +812,6 @@ int dpaa_fm_config(struct rte_eth_dev *dev, uint64_t 
req_dist_set)
return -1;
}
 
-   dpaa_intf->nb_rx_queues = dev->data->nb_rx_queues;
-
/* Open FM Port and set it in port info */
ret = set_fm_port_handle(dpaa_intf, req_dist_set, fif);
if (ret) {
@@ -822,7 +820,7 @@ int dpaa_fm_config(struct rte_eth_dev *dev, uint64_t 
req_dist_set)
}
 
if (fif->num_profiles) {
-   for (i = 0; i < dpaa_intf->nb_rx_queues; i++)
+   for (i = 0; i < dev->data->nb_rx_queues; i++)
dpaa_intf->rx_queues[i].vsp_id =
fm_default_vsp_id(fif);
 
@@ -1147,6 +1145,8 @@ int rte_pmd_dpaa_port_set_rate_limit(uint16_t port_id, 
uint16_t burst,
 
if (ret) {
DPAA_PMD_ERR("Failed to set rate limit ret = %#x\n", -ret);
+   if (!port_handle_exists)
+

[PATCH 17/17] net/dpaa: improve dpaa errata A010022 handling

[Hemant Agrawal]

From: Jun Yang 

This patch improves the errata handling for
"RTE_LIBRTE_DPAA_ERRATA_LS1043_A010022"

Signed-off-by: Jun Yang 
---
 drivers/net/dpaa/dpaa_rxtx.c | 40 
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 84fd0c57a4..325785480a 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -1264,6 +1264,35 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf 
*mbuf)
return new_mbufs[0];
 }
 
+#ifdef RTE_LIBRTE_DPAA_ERRATA_LS1043_A010022
+/* In case the data offset is not multiple of 16,
+ * FMAN can stall because of an errata. So reallocate
+ * the buffer in such case.
+ */
+static inline int
+dpaa_eth_ls1043a_mbuf_realloc(struct rte_mbuf *mbuf)
+{
+   uint64_t len, offset;
+
+   if (dpaa_svr_family != SVR_LS1043A_FAMILY)
+   return 0;
+
+   while (mbuf) {
+   len = mbuf->data_len;
+   offset = mbuf->data_off;
+   if ((mbuf->next &&
+   !rte_is_aligned((void *)len, 16)) ||
+   !rte_is_aligned((void *)offset, 16)) {
+   DPAA_PMD_DEBUG("Errata condition hit");
+
+   return 1;
+   }
+   mbuf = mbuf->next;
+   }
+   return 0;
+}
+#endif
+
 uint16_t
 dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 {
@@ -1304,20 +1333,15 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, 
uint16_t nb_bufs)
DPAA_TX_BURST_SIZE : nb_bufs;
for (loop = 0; loop < frames_to_send; loop++) {
mbuf = *(bufs++);
-   /* In case the data offset is not multiple of 16,
-* FMAN can stall because of an errata. So reallocate
-* the buffer in such case.
-*/
-   if (dpaa_svr_family == SVR_LS1043A_FAMILY &&
-   (mbuf->data_off & 0x7F) != 0x0)
-   realloc_mbuf = 1;
-
fd_arr[loop].cmd = 0;
 #if defined(RTE_LIBRTE_IEEE1588)
fd_arr[loop].cmd |= DPAA_FD_CMD_FCO |
qman_fq_fqid(fq_txconf);
fd_arr[loop].cmd |= DPAA_FD_CMD_RPD |
DPAA_FD_CMD_UPD;
+#endif
+#ifdef RTE_LIBRTE_DPAA_ERRATA_LS1043_A010022
+   realloc_mbuf = dpaa_eth_ls1043a_mbuf_realloc(mbuf);
 #endif
seqn = *dpaa_seqn(mbuf);
if (seqn != DPAA_INVALID_MBUF_SEQN) {
-- 
2.25.1

[PATCH] examples/eventdev: fix segment fault with generic pipeline

[Chengwen Feng]

There was a segmentation fault when executing eventdev_pipeline with
command [1] with ConnectX-5 NIC card:

0x0079208c in rte_eth_tx_buffer (tx_pkt=0x16f8ed300, buffer=0x100, 
queue_id=11, port_id=0) at ../lib/ethdev/rte_ethdev.h:6636
txa_service_tx (txa=0x17b19d080, ev=0xe500, n=4) at 
../lib/eventdev/rte_event_eth_tx_adapter.c:631
0x00792234 in txa_service_func (args=0x17b19d080) at 
../lib/eventdev/rte_event_eth_tx_adapter.c:666
0x008b0784 in service_runner_do_callback (s=0x17fffe100, 
cs=0x17ffb5f80, service_idx=2) at ../lib/eal/common/rte_service.c:405
0x008b0ad8 in service_run (i=2, cs=0x17ffb5f80, 
service_mask=18446744073709551615, s=0x17fffe100, serialize_mt_unsafe=0)
at ../lib/eal/common/rte_service.c:441
0x008b0c68 in rte_service_run_iter_on_app_lcore (id=2, 
serialize_mt_unsafe=0) at ../lib/eal/common/rte_service.c:477
0x0057bcc4 in schedule_devices (lcore_id=0) at 
../examples/eventdev_pipeline/pipeline_common.h:138
0x0057ca94 in worker_generic_burst (arg=0x17b131e80) at 
../examples/eventdev_pipeline/pipeline_worker_generic.c:83
0x005794a8 in main (argc=11, argv=0xf470) at 
../examples/eventdev_pipeline/main.c:449

The root cause is that the queue_id (11) is invalid, the queue_id comes
from mbuf.hash.txadapter.txq which may pre-write by NIC driver when
receiving packets (e.g. pre-write mbuf.hash.fdir.hi field).

Because this example only enabled one ethdev queue, so fixes it by reset
txq to zero in the first worker stage.

[1] dpdk-eventdev_pipeline -l 0-48 --vdev event_sw0 -- -r1 -t1 -e1 -w ff0 -s5 
-n0 -c32 -W1000 -D
When launch eventdev_pipeline with command [1],  event_sw

Fixes: 81fb40f95c82 ("examples/eventdev: add generic worker pipeline")
Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
Reported-by: Chenxingyu Wang 
---
 examples/eventdev_pipeline/pipeline_worker_generic.c | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/examples/eventdev_pipeline/pipeline_worker_generic.c 
b/examples/eventdev_pipeline/pipeline_worker_generic.c
index 783f68c91e..831d7fd53d 100644
--- a/examples/eventdev_pipeline/pipeline_worker_generic.c
+++ b/examples/eventdev_pipeline/pipeline_worker_generic.c
@@ -38,10 +38,12 @@ worker_generic(void *arg)
}
received++;
 
-   /* The first worker stage does classification */
-   if (ev.queue_id == cdata.qid[0])
+   /* The first worker stage does classification and sets txq. */
+   if (ev.queue_id == cdata.qid[0]) {
ev.flow_id = ev.mbuf->hash.rss
% cdata.num_fids;
+   rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0);
+   }
 
ev.queue_id = cdata.next_qid[ev.queue_id];
ev.op = RTE_EVENT_OP_FORWARD;
@@ -96,10 +98,12 @@ worker_generic_burst(void *arg)
 
for (i = 0; i < nb_rx; i++) {
 
-   /* The first worker stage does classification */
-   if (events[i].queue_id == cdata.qid[0])
+   /* The first worker stage does classification and sets 
txq. */
+   if (events[i].queue_id == cdata.qid[0]) {
events[i].flow_id = events[i].mbuf->hash.rss
% cdata.num_fids;
+   
rte_event_eth_tx_adapter_txq_set(events[i].mbuf, 0);
+   }
 
events[i].queue_id = cdata.next_qid[events[i].queue_id];
events[i].op = RTE_EVENT_OP_FORWARD;
-- 
2.17.1

Re: [PATCH] net/gve : Update EOP bit in txd rte_mbuf chain

[Ferruh Yigit]

On 7/31/2024 5:38 PM, Tathagat Priyadarshi wrote:
> The EOP bit was not set for all the packets in mbuf chain
> causing packet transmission stalls for packets split across
> mbuf in chain.
> 
> Signed-off-by: Tathagat Priyadarshi 
> Signed-off-by: Varun Lakkur Ambaji Rao 
> 
> Fixes: 4022f99 ("net/gve: support basic Tx data path for DQO")
>

Hi Tathagat,

Can you please address issues reported from
'./devtools/check-git-log.sh' script?



And there is a request to backport to stable trees, please include
following tag:
Cc: sta...@dpdk.org

And please use following order/syntax in commit log:
```


Fixes: 4022f99 ("net/gve: support basic Tx data path for DQO")
Cc: sta...@dpdk.org

Signed-off-by: Tathagat Priyadarshi 
Signed-off-by: Varun Lakkur Ambaji Rao 
```

RE: [RFC] ethdev: convert string initialization

[Morten Brørup]

> From: Ferruh Yigit [mailto:ferruh.yi...@amd.com]
> Sent: Thursday, 1 August 2024 11.27
> 
> gcc 15 experimental [1], with -Wextra flag, gives warning in variable
> initialization as string [2].
> 
> The warning has a point when initialized variable is intended to use as
> string, since assignment is missing the required null terminator for
> this case. But warning is useless for our usecase.
> 
> I don't know if this behaviour will change in gcc15, as it is still
> under development. But if not we may need to update our initialization.
> 
> In this patch only updated a few instance to show the issue, there are
> many instances to fix, if we prefer to go this way.
> Other option is to disable warning but it can be useful for actual
> string usecases, so I prefer to keep it.

Compiler warnings are here to help, so +1 for fixing the code.

> 
> [1]
> gcc (GCC) 15.0.0 20240801 (experimental)
> 
> [2]
> ../lib/ethdev/rte_flow.h:906:36:
>   error: initializer-string for array of ‘unsigned char’ is too long
> [-Werror=unterminated-string-initialization]
> 906 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> |^~
> 
> ../lib/ethdev/rte_flow.h:907:36:
>   error: initializer-string for array of ‘unsigned char’ is too long
>  [-Werror=unterminated-string-initialization]
> 907 | .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> |^~
> 
> ../lib/ethdev/rte_flow.h:1009:25:
>   error: initializer-string for array of ‘unsigned char’ is too long
>  [-Werror=unterminated-string-initialization]
> 1009 | "\xff\xff\xff\xff\xff\xff\xff\xff"
>  | ^~
> 
> ../lib/ethdev/rte_flow.h:1012:25:
>   error: initializer-string for array of ‘unsigned char’ is too long
>  [-Werror=unterminated-string-initialization]
> 1012 | "\xff\xff\xff\xff\xff\xff\xff\xff"
>  | ^~
> 
> ../lib/ethdev/rte_flow.h:1135:20:
>   error: initializer-string for array of ‘unsigned char’ is too long
>  [-Werror=unterminated-string-initialization]
> 1135 | .hdr.vni = "\xff\xff\xff",
>  |^~
> 
> Signed-off-by: Ferruh Yigit 
> ---
>  lib/ethdev/rte_flow.h | 16 +++-
>  1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
> index f864578f806b..8b623974cd44 100644
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> @@ -903,8 +903,8 @@ struct rte_flow_item_eth {
>  /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
>  #ifndef __cplusplus
>  static const struct rte_flow_item_eth rte_flow_item_eth_mask = {
> - .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> - .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> + .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
> + .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },

Please define and use an RTE_ETHER_ADDR() macro like RTE_IPV4() [1]:

/** Create Ethernet address */
#define RTE_ETHER_ADDR(a, b, c, d, e, f) \
(struct rte_ether_addr){{a, b, c, d, e, f}}

Or even better, also add and use an RTE_ETHER_ADDR_BROADCAST definition like 
RTE_IPV4_BROADCAST [2]:

#define RTE_ETHER_ADDR_BROADCAST RTE_ETHER_ADDR(0xff, 0xff, 0xff, 0xff, 0xff, 
0xff)

Then the above code could become:
+   .hdr.dst_addr = RTE_ETHER_ADDR_BROADCAST,
+   .hdr.src_addr = RTE_ETHER_ADDR_BROADCAST,

On the other hand, if they are address masks, maybe using RTE_ETHER_ADDR(0xff, 
0xff, 0xff, 0xff, 0xff, 0xff) would be more appropriate.

[1]: https://elixir.bootlin.com/dpdk/v24.07/source/lib/net/rte_ip.h#L67
[2]: https://elixir.bootlin.com/dpdk/v24.07/source/lib/net/rte_ip.h#L111

>   .hdr.ether_type = RTE_BE16(0x),
>  };
>  #endif
> @@ -1005,12 +1005,10 @@ struct rte_flow_item_ipv6 {
>  #ifndef __cplusplus
>  static const struct rte_flow_item_ipv6 rte_flow_item_ipv6_mask = {
>   .hdr = {
> - .src_addr =
> - "\xff\xff\xff\xff\xff\xff\xff\xff"
> - "\xff\xff\xff\xff\xff\xff\xff\xff",
> - .dst_addr =
> - "\xff\xff\xff\xff\xff\xff\xff\xff"
> - "\xff\xff\xff\xff\xff\xff\xff\xff",
> + .src_addr = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
> 0xff,
> +   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff

[PATCH v2] net/gve : Update EOP bit in txd rte_mbuf chain

[Tathagat Priyadarshi]

The EOP bit was not set for all the packets in mbuf chain
causing packet transmission stalls for packets split across
mbuf in chain.

Fixes: 4022f99 ("net/gve: support basic Tx data path for DQO")
Cc: sta...@dpdk.org

Signed-off-by: Tathagat Priyadarshi 
Signed-off-by: Varun Lakkur Ambaji Rao 
---
 drivers/net/gve/gve_tx_dqo.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
index a65e6aa..579b8d6 100644
--- a/drivers/net/gve/gve_tx_dqo.c
+++ b/drivers/net/gve/gve_tx_dqo.c
@@ -126,6 +126,7 @@
txd->pkt.dtype = GVE_TX_PKT_DESC_DTYPE_DQO;
txd->pkt.compl_tag = rte_cpu_to_le_16(first_sw_id);
txd->pkt.buf_size = RTE_MIN(tx_pkt->data_len, 
GVE_TX_MAX_BUF_SIZE_DQO);
+   txd->pkt.end_of_packet = 0;
 
/* size of desc_ring and sw_ring could be different */
tx_id = (tx_id + 1) & mask;
-- 
1.8.3.1

Re: 22.11.6 patches review and test

[Luca Boccassi]

On Wed, 31 Jul 2024 at 20:37,  wrote:
>
> Hi all,
>
> Here is a list of patches targeted for stable release 22.11.6.
>
> The planned date for the final release is August 20th.
>
> Please help with testing and validation of your use cases and report
> any issues/results with reply-all to this mail. For the final release
> the fixes and reported validations will be added to the release notes.
>
> A release candidate tarball can be found at:
>
> https://dpdk.org/browse/dpdk-stable/tag/?id=v22.11.6-rc1
>
> These patches are located at branch 22.11 of dpdk-stable repo:
> https://dpdk.org/browse/dpdk-stable/

John, a lot of the Intel emails are bouncing back, could you please
double check that this notification has reached your validation team?
Thanks

RE: Issue in testpmd when using RSS Flows with Mellanox NICs

[Dariusz Sosnowski]

Hi,

> -Original Message-
> From: Thomas Monjalon 
> Sent: Wednesday, July 31, 2024 15:02
> To: Alex Chapman 
> Cc: dev@dpdk.org; luca.vizza...@arm.com; paul.szczepa...@arm.com; Dariusz
> Sosnowski ; Slava Ovsiienko
> ; Bing Zhao ; Ori Kam
> ; Suanming Mou ; Matan Azrad
> 
> 
> Hello,
> 
> 31/07/2024 14:55, Alex Chapman:
> > Hello maintainers,
> 
> Do not hesitate to read the file MAINTAINERS to place the appropriate Cc list.
> Adding mlx5 maintainers.
> 
> 
> > I am currently facing issues when creating RSS flows using testpmd.
> > When using the following flow on an intel NIC, it works as expected,
> > using the reta table to redirect ipv4-udp packets to the correct queue.
> >
> > flow create 0 ingress pattern eth / ipv4 / udp / end actions
> > rss types ipv4-udp end queues end func toeplitz / end
> >
> > However when executing the same command on a Mellanox NIC, the
> > following error occurs.
> >
> >  Caught PMD error type 15 (action configuration): No queues
> > configured: Invalid argument
> >
> > This error can be resolved by manually specifying the queues used:
> >
> >  flow create 0 ingress pattern eth / ipv4 / udp / end actions rss
> > types ipv4-udp end queues 0 1 2 3 4 5 6 7 8 end func toeplitz / end
> >
> > However the packets are not placed into their expected queues using
> > the reta table.

Currently mlx5 PMD requires that array of Rx queues is provided with RSS flow 
action.
There's no support right now for default set of queues on mlx5 PMD side.

"queues" parameter of RSS flow action takes Rx queue indices directly, not 
redirection table indices,
so when RSS hash is calculated during processing of that action,
then the queue is selected as:

queues[hash % nb_of_queues]

> >
> > When looking through the Generic flow API guide under RSS
> > (https://doc.dpdk.org/guides/prog_guide/rte_flow.html), the attribute
> > queues does not exist.
> >  From my understanding this seems to be a mistake, as the attribute
> > "queue" does exist with the definition "queue indices to use"
> > However when attempting to use this attribute I get the error "Bad
> > arguments"

Yes, that's a mistake and we should fix that.

> > If anyone is able to shed some light on the use of RSS in flows, that
> > would be greatly appreciated.
> >
> > Thanks,
> > Alex
> 
> 

Best regards,
Dariusz Sosnowski

Re: dts: add multicast set function to shell

[Luca Vizzarro]

Hi Dean, thank you for your work.

On 08/07/2024 20:08, Dean Marx wrote:

+def set_multicast_all(self, on: bool, verify: bool = True):
+"""Turns multicast mode on/off for the specified port.
+
+Args:
+on: If :data:`True`, turns multicast mode on, otherwise turns off.
+verify: If :data:`True` an additional command will be sent to 
verify
+that multicast mode is properly set. Defaults to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and 
multicast
+mode is not properly set.
+"""
+multicast_output = self.send_command(f"set allmulti all {'on' if on else 
'off'}")
+if verify:
+stats0 = self.show_port_info(port_id=0)
+stats1 = self.show_port_info(port_id=1)
This assumes that we have port 0 and 1, but *technically* we shouldn't 
be making assumptions about the environment in the framework. I'd rather 
use show_port_info_all and sample from there what's available.

+if on ^ (stats0.is_allmulticast_mode_enabled and 
stats1.is_allmulticast_mode_enabled):
+self._logger.debug(
+f"Failed to set multicast mode on all ports.: 
\n{multicast_output}"
+)
+raise InteractiveCommandExecutionError(
+"Testpmd failed to set multicast mode on all ports."
+)

Re: [RFC] ethdev: convert string initialization

[Ferruh Yigit]

On 8/1/2024 12:29 PM, Morten Brørup wrote:
>> From: Ferruh Yigit [mailto:ferruh.yi...@amd.com]
>> Sent: Thursday, 1 August 2024 11.27
>>
>> gcc 15 experimental [1], with -Wextra flag, gives warning in variable
>> initialization as string [2].
>>
>> The warning has a point when initialized variable is intended to use as
>> string, since assignment is missing the required null terminator for
>> this case. But warning is useless for our usecase.
>>
>> I don't know if this behaviour will change in gcc15, as it is still
>> under development. But if not we may need to update our initialization.
>>
>> In this patch only updated a few instance to show the issue, there are
>> many instances to fix, if we prefer to go this way.
>> Other option is to disable warning but it can be useful for actual
>> string usecases, so I prefer to keep it.
> 
> Compiler warnings are here to help, so +1 for fixing the code.
> 
>>
>> [1]
>> gcc (GCC) 15.0.0 20240801 (experimental)
>>
>> [2]
>> ../lib/ethdev/rte_flow.h:906:36:
>>   error: initializer-string for array of ‘unsigned char’ is too long
>> [-Werror=unterminated-string-initialization]
>> 906 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
>> |^~
>>
>> ../lib/ethdev/rte_flow.h:907:36:
>>   error: initializer-string for array of ‘unsigned char’ is too long
>>  [-Werror=unterminated-string-initialization]
>> 907 | .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
>> |^~
>>
>> ../lib/ethdev/rte_flow.h:1009:25:
>>   error: initializer-string for array of ‘unsigned char’ is too long
>>  [-Werror=unterminated-string-initialization]
>> 1009 | "\xff\xff\xff\xff\xff\xff\xff\xff"
>>  | ^~
>>
>> ../lib/ethdev/rte_flow.h:1012:25:
>>   error: initializer-string for array of ‘unsigned char’ is too long
>>  [-Werror=unterminated-string-initialization]
>> 1012 | "\xff\xff\xff\xff\xff\xff\xff\xff"
>>  | ^~
>>
>> ../lib/ethdev/rte_flow.h:1135:20:
>>   error: initializer-string for array of ‘unsigned char’ is too long
>>  [-Werror=unterminated-string-initialization]
>> 1135 | .hdr.vni = "\xff\xff\xff",
>>  |^~
>>
>> Signed-off-by: Ferruh Yigit 
>> ---
>>  lib/ethdev/rte_flow.h | 16 +++-
>>  1 file changed, 7 insertions(+), 9 deletions(-)
>>
>> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
>> index f864578f806b..8b623974cd44 100644
>> --- a/lib/ethdev/rte_flow.h
>> +++ b/lib/ethdev/rte_flow.h
>> @@ -903,8 +903,8 @@ struct rte_flow_item_eth {
>>  /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
>>  #ifndef __cplusplus
>>  static const struct rte_flow_item_eth rte_flow_item_eth_mask = {
>> -.hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
>> -.hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
>> +.hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
>> +.hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
> 
> Please define and use an RTE_ETHER_ADDR() macro like RTE_IPV4() [1]:
> 
> /** Create Ethernet address */
> #define RTE_ETHER_ADDR(a, b, c, d, e, f) \
>   (struct rte_ether_addr){{a, b, c, d, e, f}}
> 
> Or even better, also add and use an RTE_ETHER_ADDR_BROADCAST definition like 
> RTE_IPV4_BROADCAST [2]:
> 
> #define RTE_ETHER_ADDR_BROADCAST RTE_ETHER_ADDR(0xff, 0xff, 0xff, 0xff, 0xff, 
> 0xff)
> 
> Then the above code could become:
> + .hdr.dst_addr = RTE_ETHER_ADDR_BROADCAST,
> + .hdr.src_addr = RTE_ETHER_ADDR_BROADCAST,
> 
> On the other hand, if they are address masks, maybe using 
> RTE_ETHER_ADDR(0xff, 0xff, 0xff, 0xff, 0xff, 0xff) would be more appropriate.
> 

Hi Morten,

These are all masks used for flow API, and as mentioned in the commit
log there are bunch of them, not just the ones in the patch, I am not
sure about creating a macro for each is necessary.


> [1]: https://elixir.bootlin.com/dpdk/v24.07/source/lib/net/rte_ip.h#L67
> [2]: https://elixir.bootlin.com/dpdk/v24.07/source/lib/net/rte_ip.h#L111
> 
>>  .hdr.ether_type = RTE_BE16(0x),
>>  };
>>  #endif
>> @@ -1005,12 +1005,10 @@ 

Re: [PATCH] examples/eventdev: fix segment fault with generic pipeline

[Van Haaren, Harry]

> From: Chengwen Feng 
> Sent: Thursday, August 1, 2024 12:11 PM
> To: tho...@monjalon.net ; dev@dpdk.org 
> Cc: Van Haaren, Harry ; wangchenxin...@huawei.com 
> 
> Subject: [PATCH] examples/eventdev: fix segment fault with generic pipeline
>
> There was a segmentation fault when executing eventdev_pipeline with
> command [1] with ConnectX-5 NIC card:
>
> 0x0079208c in rte_eth_tx_buffer (tx_pkt=0x16f8ed300, buffer=0x100, 
> queue_id=11, port_id=0) at ../lib/ethdev/rte_ethdev.h:6636
> txa_service_tx (txa=0x17b19d080, ev=0xe500, n=4) at 
> ../lib/eventdev/rte_event_eth_tx_adapter.c:631
> 0x00792234 in txa_service_func (args=0x17b19d080) at 
> ../lib/eventdev/rte_event_eth_tx_adapter.c:666
> 0x008b0784 in service_runner_do_callback (s=0x17fffe100, 
> cs=0x17ffb5f80, service_idx=2) at ../lib/eal/common/rte_service.c:405
> 0x008b0ad8 in service_run (i=2, cs=0x17ffb5f80, 
> service_mask=18446744073709551615, s=0x17fffe100, serialize_mt_unsafe=0)
> at ../lib/eal/common/rte_service.c:441
> 0x008b0c68 in rte_service_run_iter_on_app_lcore (id=2, 
> serialize_mt_unsafe=0) at ../lib/eal/common/rte_service.c:477
> 0x0057bcc4 in schedule_devices (lcore_id=0) at 
> ../examples/eventdev_pipeline/pipeline_common.h:138
> 0x0057ca94 in worker_generic_burst (arg=0x17b131e80) at 
> ../examples/eventdev_pipeline/pipeline_worker_generic.c:83
> 0x005794a8 in main (argc=11, argv=0xf470) at 
> ../examples/eventdev_pipeline/main.c:449
>
> The root cause is that the queue_id (11) is invalid, the queue_id comes
> from mbuf.hash.txadapter.txq which may pre-write by NIC driver when
> receiving packets (e.g. pre-write mbuf.hash.fdir.hi field).

Good bug report, thanks for the detailed info on hash.fdir.hi union-ed with 
txadapter fields.
I don't have the specific HW to test, so code review only.

I don't recall the TXQ quantities etc (been a number of years since I worked on 
this code...!)
so I'll +CC Pavan who reworked the logic around generic workers & eventdev 
stages, and might recall?

> Because this example only enabled one ethdev queue, so fixes it by reset
> txq to zero in the first worker stage.
>
> [1] dpdk-eventdev_pipeline -l 0-48 --vdev event_sw0 -- -r1 -t1 -e1 -w ff0 -s5 
> -n0 -c32 -W1000 -D
> When launch eventdev_pipeline with command [1],  event_sw
>
> Fixes: 81fb40f95c82 ("examples/eventdev: add generic worker pipeline")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Chengwen Feng 
> Reported-by: Chenxingyu Wang 

Generally the change looks fine - I'll wait a few days for Pavan's input, and 
otherwise review & Ack assuming no issues found.

Thanks for the patch! -Harry

Re: dts: add toggle option to send and capture

[Luca Vizzarro]

Hi Dean,

this patch is awfully identical to Nicholas' older patch:

http://inbox.dpdk.org/dev/20240702192422.2480-3-npra...@iol.unh.edu/

Can you explain what's going on here? As it's all very confusing. It 
seems that maybe Nicholas dropped it in his late versions.


Best,
Luca

Re: dts: dynamic config test suite

[Luca Vizzarro]

Can you please rebase this on the latest changes, as the code will look 
different for sure?


Three comments in the meantime:

 * Is there a reason for sleeping for 6 seconds? If so could you please
   explain it?
 * Please follow naming standards consistently, variables should be in
   snake_case, referring to isPromisc -> is_promisc
 * Please follow contributing guidelines when writing your commit
   subject and body[1]
 o Example I can spot are capitalisation of wording and the
   non-imperative subject

Thanks,

Luca

[1] 
https://doc.dpdk.org/guides/contributing/patches.html#commit-messages-subject-line

Re: dts: dynamic config conf schema

[Luca Vizzarro]

Similar to the previous commit, please follow contributing guidelines:

https://doc.dpdk.org/guides/contributing/patches.html#commit-messages-subject-line

Is there a reason to split this from the test suite commit?

Re: [PATCH v8 5/5] dts: add API doc generation

[Juraj Linkeš]

On 30. 7. 2024 15:51, Thomas Monjalon wrote:

12/07/2024 10:57, Juraj Linkeš:

The tool used to generate DTS API docs is Sphinx, which is already in
use in DPDK. The same configuration is used to preserve style with one
DTS-specific configuration (so that the DPDK docs are unchanged) that
modifies how the sidebar displays the content.


What is changed in the sidebar?



These are the two changes:
html_theme_options = {
'collapse_navigation': False,
'navigation_depth': -1,
}

The first allows you to explore the structure without needing to enter 
any specific section - it puts the + at each section so everything is 
expandable.
The second just means that each section can be fully expanded (there's 
no limit).





--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -244,3 +244,6 @@ The public API headers are grouped by topics:
[experimental APIs](@ref rte_compat.h),
[ABI versioning](@ref rte_function_versioning.h),
[version](@ref rte_version.h)
+
+- **tests**:
+  [**DTS**](@dts_api_main_page)


OK looks good



--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -124,6 +124,8 @@ SEARCHENGINE= YES
  SORT_MEMBER_DOCS= NO
  SOURCE_BROWSER  = YES
  
+ALIASES = "dts_api_main_page=@DTS_API_MAIN_PAGE@"


Why is it needed?
That's the only way to reference it in doxy-api-index.md?
Would be nice to explain in the commit log.



I can add something to the commit log. The questions are answered below, 
in your other related comment.



--- a/doc/api/meson.build
+++ b/doc/api/meson.build
+# A local reference must be relative to the main index.html page
+# The path below can't be taken from the DTS meson file as that would
+# require recursive subdir traversal (doc, dts, then doc again)


This comment is really obscure.



I guess it is. I just wanted to explain that there's not way to do this 
without spelling out the path this way. At least I didn't find a way.

Should I remove the comment or reword it?


+cdata.set('DTS_API_MAIN_PAGE', join_paths('..', 'dts', 'html', 'index.html'))


Oh I think I get it:
- DTS_API_MAIN_PAGE is the Meson variable
- dts_api_main_page is the Doxygen variable



Yes, this is a way to make it work. Maybe there's something else (I'm 
not that familiar with Doxygen), but from what I can tell, there wasn't 
a command line option that would set a variable (passing the path form 
Meson to Doxygen) and nothing else I found worked.


Is this solution ok? If we want to explore something else, is there 
someone with more experience with Doxygen who could help?





+# Napoleon enables the Google format of Python doscstrings, used in DTS
+# Intersphinx allows linking to external projects, such as Python docs, also 
used in DTS


Close sentences with a dot, it is easier to read.



Ack.


+extensions = ['sphinx.ext.napoleon', 'sphinx.ext.intersphinx']
+
+# DTS Python docstring options
+autodoc_default_options = {
+'members': True,
+'member-order': 'bysource',
+'show-inheritance': True,
+}
+autodoc_class_signature = 'separated'
+autodoc_typehints = 'both'
+autodoc_typehints_format = 'short'
+autodoc_typehints_description_target = 'documented'
+napoleon_numpy_docstring = False
+napoleon_attr_annotations = True
+napoleon_preprocess_types = True
+add_module_names = False
+toc_object_entries = True
+toc_object_entries_show_parents = 'hide'
+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
+
+dts_root = environ.get('DTS_ROOT')


Why does it need to be passed as an environment variable?
Isn't it a fixed absolute path?



The path to DTS needs to be passed in some way (and added to sys.path) 
so that Sphinx knows where the sources are in order to import them.


Do you want us to not pass the path, but just hardcode it here? I didn't 
really think about that, maybe that could work.



+if dts_root:
+path.append(dts_root)
+# DTS Sidebar config
+html_theme_options = {
+'collapse_navigation': False,
+'navigation_depth': -1,
+}


[...]


+To build DTS API docs, install the dependencies with Poetry, then enter its 
shell:


I don't plan to use Poetry on my machine.
Can we simply describe the dependencies even if the versions are not specified?



The reason we don't list the dependencies anywhere is that doing it with 
Poetry is much easier (and a bit safer, as Poetry is going to install 
tested versions).


But I can add references to the two relevant sections of 
dts/pyproject.toml which contain the dependencies with a note that they 
can be installed with pip (and I guess that would be another 
dependency), but at that point it's that not much different than using 
Poetry.



+
+.. code-block:: console
+
+   poetry install --no-root --with docs
+   poetry shell
+
+The documentation is built using the standard DPDK build system.
+After executing the meson command and entering Poetry's shell, build the 
documentation with:
+
+.. code-bloc

Re: dts: dynamic config test suite implementation

[Luca Vizzarro]

Hi Dean,

I've just realised that you sent a new version but it was sent a 
separate thread. Sorry about that! I'll try to send a review to that 
one. Can you please make sure to reply to the original thread starting 
email when you send new versions as per contributing guidelines[1]?


Thank you,
Luca

[1] https://core.dpdk.org/contribute/

On 08/07/2024 20:08, Dean Marx wrote:

Dynamic Configuration test suite for ensuring Poll Mode Driver's ability
to enable/disable promiscuous and allmulticast mode, and verify the
expected behavior in the following four test cases:

1. Default mode - verifies that promiscuous mode is enabled by default,
and packets with any destination MAC address are received and forwarded.
2. Disable promisc - turns off promiscuous mode and verifies that
packets with a destination MAC address matching that of the Rx port are
forwarded, while unknown MAC addresses are dropped.
3. Disable promisc broadcast - turns off promiscuous mode and verifies
that packets with a matching or broadcast destination MAC address are
forwarded.
4. Disable promisc multicast - turns off promiscuous mode and verifies
that packets with a multicast destination MAC address are dropped when
allmulticast mode is turned off, and forwarded when it is turned on.

Dean Marx (4):
   dts: add multicast set function to shell
   dts: add toggle option to send and capture
   dts: dynamic config test suite
   dts: dynamic config conf schema

  dts/framework/config/conf_yaml_schema.json|   3 +-
  dts/framework/remote_session/testpmd_shell.py |  46 ++
  dts/framework/test_suite.py   |   7 +-
  dts/tests/TestSuite_dynamic_config.py | 149 ++
  4 files changed, 203 insertions(+), 2 deletions(-)
  create mode 100644 dts/tests/TestSuite_dynamic_config.py

RE: [RFC] ethdev: convert string initialization

[Morten Brørup]

> From: Ferruh Yigit [mailto:ferruh.yi...@amd.com]
> Sent: Thursday, 1 August 2024 14.43
> 
> On 8/1/2024 12:29 PM, Morten Brørup wrote:
> >> From: Ferruh Yigit [mailto:ferruh.yi...@amd.com]
> >> Sent: Thursday, 1 August 2024 11.27
> >>
> >> gcc 15 experimental [1], with -Wextra flag, gives warning in variable
> >> initialization as string [2].
> >>
> >> The warning has a point when initialized variable is intended to use
> as
> >> string, since assignment is missing the required null terminator for
> >> this case. But warning is useless for our usecase.
> >>
> >> I don't know if this behaviour will change in gcc15, as it is still
> >> under development. But if not we may need to update our
> initialization.
> >>
> >> In this patch only updated a few instance to show the issue, there
> are
> >> many instances to fix, if we prefer to go this way.
> >> Other option is to disable warning but it can be useful for actual
> >> string usecases, so I prefer to keep it.
> >
> > Compiler warnings are here to help, so +1 for fixing the code.
> >
> >>
> >> [1]
> >> gcc (GCC) 15.0.0 20240801 (experimental)
> >>
> >> [2]
> >> ../lib/ethdev/rte_flow.h:906:36:
> >>   error: initializer-string for array of ‘unsigned char’ is too long
> >> [-Werror=unterminated-string-initialization]
> >> 906 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> >> |^~
> >>
> >> ../lib/ethdev/rte_flow.h:907:36:
> >>   error: initializer-string for array of ‘unsigned char’ is too long
> >>  [-Werror=unterminated-string-initialization]
> >> 907 | .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> >> |^~
> >>
> >> ../lib/ethdev/rte_flow.h:1009:25:
> >>   error: initializer-string for array of ‘unsigned char’ is too long
> >>  [-Werror=unterminated-string-initialization]
> >> 1009 | "\xff\xff\xff\xff\xff\xff\xff\xff"
> >>  | ^~
> >>
> >> ../lib/ethdev/rte_flow.h:1012:25:
> >>   error: initializer-string for array of ‘unsigned char’ is too long
> >>  [-Werror=unterminated-string-initialization]
> >> 1012 | "\xff\xff\xff\xff\xff\xff\xff\xff"
> >>  | ^~
> >>
> >> ../lib/ethdev/rte_flow.h:1135:20:
> >>   error: initializer-string for array of ‘unsigned char’ is too long
> >>  [-Werror=unterminated-string-initialization]
> >> 1135 | .hdr.vni = "\xff\xff\xff",
> >>  |^~
> >>
> >> Signed-off-by: Ferruh Yigit 
> >> ---
> >>  lib/ethdev/rte_flow.h | 16 +++-
> >>  1 file changed, 7 insertions(+), 9 deletions(-)
> >>
> >> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
> >> index f864578f806b..8b623974cd44 100644
> >> --- a/lib/ethdev/rte_flow.h
> >> +++ b/lib/ethdev/rte_flow.h
> >> @@ -903,8 +903,8 @@ struct rte_flow_item_eth {
> >>  /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
> >>  #ifndef __cplusplus
> >>  static const struct rte_flow_item_eth rte_flow_item_eth_mask = {
> >> -  .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> >> -  .hdr.src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> >> +  .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
> >> +  .hdr.src_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
> >
> > Please define and use an RTE_ETHER_ADDR() macro like RTE_IPV4() [1]:
> >
> > /** Create Ethernet address */
> > #define RTE_ETHER_ADDR(a, b, c, d, e, f) \
> > (struct rte_ether_addr){{a, b, c, d, e, f}}
> >
> > Or even better, also add and use an RTE_ETHER_ADDR_BROADCAST
> definition like RTE_IPV4_BROADCAST [2]:
> >
> > #define RTE_ETHER_ADDR_BROADCAST RTE_ETHER_ADDR(0xff, 0xff, 0xff,
> 0xff, 0xff, 0xff)
> >
> > Then the above code could become:
> > +   .hdr.dst_addr = RTE_ETHER_ADDR_BROADCAST,
> > +   .hdr.src_addr = RTE_ETHER_ADDR_BROADCAST,
> >
> > On the other hand, if they are address masks, maybe using
> RTE_ETHER_ADDR(0xff, 0xff, 0xff, 0xff, 0xff,

Re: [PATCH v8 5/5] dts: add API doc generation

[Thomas Monjalon]

01/08/2024 15:03, Juraj Linkeš:
> On 30. 7. 2024 15:51, Thomas Monjalon wrote:
> > 12/07/2024 10:57, Juraj Linkeš:
> >> The tool used to generate DTS API docs is Sphinx, which is already in
> >> use in DPDK. The same configuration is used to preserve style with one
> >> DTS-specific configuration (so that the DPDK docs are unchanged) that
> >> modifies how the sidebar displays the content.
> > 
> > What is changed in the sidebar?
> > 
> 
> These are the two changes:
> html_theme_options = {
>  'collapse_navigation': False,
>  'navigation_depth': -1,
> }
> 
> The first allows you to explore the structure without needing to enter 
> any specific section - it puts the + at each section so everything is 
> expandable.
> The second just means that each section can be fully expanded (there's 
> no limit).

OK interesting, you may add a comment # unlimited depth


> >> +# A local reference must be relative to the main index.html page
> >> +# The path below can't be taken from the DTS meson file as that would
> >> +# require recursive subdir traversal (doc, dts, then doc again)
> > 
> > This comment is really obscure.
> 
> I guess it is. I just wanted to explain that there's not way to do this 
> without spelling out the path this way. At least I didn't find a way.
> Should I remove the comment or reword it?

May be removed I think.

> >> +cdata.set('DTS_API_MAIN_PAGE', join_paths('..', 'dts', 'html', 
> >> 'index.html'))
> > 
> > Oh I think I get it:
> > - DTS_API_MAIN_PAGE is the Meson variable
> > - dts_api_main_page is the Doxygen variable
> > 
> 
> Yes, this is a way to make it work. Maybe there's something else (I'm 
> not that familiar with Doxygen), but from what I can tell, there wasn't 
> a command line option that would set a variable (passing the path form 
> Meson to Doxygen) and nothing else I found worked.
> 
> Is this solution ok? If we want to explore something else, is there 
> someone with more experience with Doxygen who could help?

Yes it's OK like that.


> >> +dts_root = environ.get('DTS_ROOT')
> > 
> > Why does it need to be passed as an environment variable?
> > Isn't it a fixed absolute path?
> 
> The path to DTS needs to be passed in some way (and added to sys.path) 
> so that Sphinx knows where the sources are in order to import them.
> 
> Do you want us to not pass the path, but just hardcode it here? I didn't 
> really think about that, maybe that could work.

I think hardcode is better here.


> >> +To build DTS API docs, install the dependencies with Poetry, then enter 
> >> its shell:
> > 
> > I don't plan to use Poetry on my machine.
> > Can we simply describe the dependencies even if the versions are not 
> > specified?
> 
> The reason we don't list the dependencies anywhere is that doing it with 
> Poetry is much easier (and a bit safer, as Poetry is going to install 
> tested versions).
> 
> But I can add references to the two relevant sections of 
> dts/pyproject.toml which contain the dependencies with a note that they 
> can be installed with pip (and I guess that would be another 
> dependency), but at that point it's that not much different than using 
> Poetry.

I want to use my system package manager.
I am from this old school thinking we should have a single package manager in a 
system.

> >> +.. code-block:: console
> >> +
> >> +   poetry install --no-root --with docs
> >> +   poetry shell
> >> +
> >> +The documentation is built using the standard DPDK build system.
> >> +After executing the meson command and entering Poetry's shell, build the 
> >> documentation with:
> >> +
> >> +.. code-block:: console
> >> +
> >> +   ninja -C build dts-doc
> > 
> > Don't we rely on the Meson option "enable_docs"?
> 
> I had a discussion about this with Bruce, but I can't find it anywhere, 
> so here's what I remember:
> 1. We didn't want to tie the dts api doc build to dpdk doc build because 
> of the dependencies.

Sure
But we could just skip if dependencies are not met?

> 2. There's a way to build docs without the enable_docs option (running 
> ninja with the target), which is what we added for dts. This doesn't tie 
> the dts api doc build to the dpdk doc build.

Yes

> 3. We had an "enable_dts_docs" Meson option in the past (to keep it 
> separate from dpdk doc build), but decided to drop it. My memory is hazy 
> on this, but I think it was, again, because of the additional steps 
> needed to bring up the dependency (poetry shell) - at that point, 
> supporting just the ninja build way is sufficient. Bruce may shed more 
> light on this.


> >> +   Make sure to fix any Sphinx warnings when adding or updating 
> >> docstrings,
> >> +   and also run the ``devtools/dts-check-format.sh`` script and address 
> >> any issues it finds.
> > 
> > It looks like something to write in the contributing guide.
> > 
> 
> I could add it there, where is the right place? In patches.rst, section 
> "Checking the Patches"?

Yes

[PATCH v6] lib/hash: add siphash

[Stephen Hemminger]

The existing hash functions in DPDK are not cryptographically
secure and can be subject to carefully crafted packets causing
DoS attack.

Add SipHash which is a fast and cryptographicly sound hash
created by Jean-Philippe Aumasson and Daniel J. Bernstein.
Siphash is widely used by Linux, FreeBSD, OpenBSD and other
projects because it is fast and resistant to DoS attacks.
This version is designed to be useful as alternative hash
with cuckoo hash in DPDK.

Implementation is based of the public domain and Creative
Common license reference version as well as some optimizations
from the GPL-2 or BSD-3 licensed version in Linux.

Signed-off-by: Stephen Hemminger 
---
v6 - rebase to 24.07

 app/test/test_hash_functions.c |  75 +-
 lib/hash/meson.build   |   2 +
 lib/hash/rte_siphash.c | 176 +
 lib/hash/rte_siphash.h |  87 
 lib/hash/version.map   |   4 +
 5 files changed, 340 insertions(+), 4 deletions(-)
 create mode 100644 lib/hash/rte_siphash.c
 create mode 100644 lib/hash/rte_siphash.h

diff --git a/app/test/test_hash_functions.c b/app/test/test_hash_functions.c
index 70820d1f19..010839eeb7 100644
--- a/app/test/test_hash_functions.c
+++ b/app/test/test_hash_functions.c
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "test.h"
 
@@ -52,6 +53,42 @@ static uint32_t hash_values_crc[2][12] = {{
 }
 };
 
+static uint32_t hash_values_hsiphash[2][12] = {
+   {
+   0x8e01e473, 0xc41e3669,
+   0x813e4dbd, 0x7ebe2eea,
+   0x33a5c5b7, 0xc910629b,
+   0xba50237f, 0xbbc870c6,
+   0x95124362, 0x850f8e0d,
+   0x192ff266, 0xb41d8206,
+   }, {
+   0x66200aa0, 0x769e7201,
+   0x0e934d03, 0x96d7c892,
+   0xb4643534, 0xcb758913,
+   0x498b66e9, 0x116b4082,
+   0x603030dc, 0x644b608b,
+   0x74b29c27, 0x513f3a9c,
+   }
+};
+
+static uint64_t hash_values_siphash[2][12] = {
+   {
+   0x8b5a0baa49fbc58d, 0x62c3506f27376c25,
+   0xef7bdf3ee24abec8, 0xc72b1c24fc2f7938,
+   0xc902632ed88f897f, 0xab631e00063006f5,
+   0x7b821577565ea3a4, 0x8b19265d1c12cdc7,
+   0x610e7ab6ada60b22, 0x3c6f1970dd62f235,
+   0x4b8db19fd6940031, 0xa43827a530b08989,
+   }, {
+   0x86e1bbae2893aaf1, 0x9c05614a696cda03,
+   0x9ee31847083019c3, 0x600e860c97264e31,
+   0xda8721038e4972bc, 0xfeedeb1b8bfe5d1e,
+   0xb2d6388922af426f, 0x7d05b8e82e38cf30,
+   0x439caa6ecd0b628d, 0x6d4c4ba6f3f2aed5,
+   0x5622bb0da20658ff, 0x409d76de4adcd475,
+   }
+};
+
 
/***
  * Hash function performance test configuration section. Each performance test
  * will be performed HASHTEST_ITERATIONS times.
@@ -61,9 +98,14 @@ static uint32_t hash_values_crc[2][12] = {{
  */
 #define HASHTEST_ITERATIONS 100
 #define MAX_KEYSIZE 64
-static rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc};
-static uint32_t hashtest_initvals[] = {0, 0xdeadbeef};
-static uint32_t hashtest_key_lens[] = {
+static const rte_hash_function hashtest_funcs[] = {rte_jhash, rte_hash_crc, 
rte_hsiphash};
+static const uint32_t hashtest_initvals[] = {0, 0xdeadbeef};
+static const uint64_t hashtest_initkeys[][2] = {
+   { 0, 0, },
+   { UINT64_C(0xfeedc0dedeadbeef), 0 },
+};
+
+static const uint32_t hashtest_key_lens[] = {
1, 2, /* Unusual key sizes */
4, 8, 16, 32, 48, 64, /* standard key sizes */
9,/* IPv4 SRC + DST + protocol, unpadded */
@@ -85,6 +127,9 @@ get_hash_name(rte_hash_function f)
if (f == rte_hash_crc)
return "rte_hash_crc";
 
+   if (f == rte_hsiphash)
+   return "hsiphash";
+
return "UnknownHash";
 }
 
@@ -126,6 +171,7 @@ run_hash_func_perf_tests(void)
printf(" Number of iterations for each test = %d\n",
HASHTEST_ITERATIONS);
printf("Hash Func.  , Key Length (bytes), Initial value, Ticks/Op.\n");
+   fflush(stdout);
 
for (i = 0; i < RTE_DIM(hashtest_initvals); i++) {
for (j = 0; j < RTE_DIM(hashtest_key_lens); j++) {
@@ -147,13 +193,15 @@ verify_precalculated_hash_func_tests(void)
 {
unsigned i, j;
uint8_t key[64];
-   uint32_t hash;
 
for (i = 0; i < 64; i++)
key[i] = (uint8_t) i;
 
for (i = 0; i < RTE_DIM(hashtest_key_lens); i++) {
for (j = 0; j < RTE_DIM(hashtest_initvals); j++) {
+   uint32_t hash;
+   uint64_t shash;
+
hash = rte_jhash(key, hashtest_key_lens[i],
 hashtest_initvals[j]);
if (hash != hash_values_jhas

[PATCH v11 0/7] Remove usage of wording sanity check

[Stephen Hemminger]

Remove use of expression sanity check across DPDK drivers
and documentation.

The term sanity-check is on the Tier 2 word list from the Inclusive
Naming project.
   https://inclusivenaming.org/word-lists/tier-2/sanity-check/

Rationale
This term might be derogatory to neurodiverse people.
Jargon, such as “sanity test”, is difficult to translate and is 
difficult
to understand by readers whose first language is not English.

v10 - rebase and consolidate patches for easier review

Stephen Hemminger (7):
  mbuf: replace term sanity check
  eal: replace use of sanity check in comments and messages
  test: replace use word sanity
  examples: remove term sanity
  lib: replace use of sanity check in comments and messages
  doc: remove sanity
  drivers: remove use of term sanity check

 app/test/test_bitmap.c|  4 +-
 app/test/test_bpf.c   |  6 +-
 app/test/test_common.c|  2 +-
 app/test/test_distributor.c   | 46 ++--
 app/test/test_eal_flags.c | 20 +++---
 app/test/test_hash.c  |  2 +-
 app/test/test_interrupts.c|  9 +--
 app/test/test_link_bonding_mode4.c|  2 +-
 app/test/test_mbuf.c  | 30 
 app/test/test_rawdev.c|  2 +-
 app/test/test_timer.c | 10 +--
 doc/guides/gpus/cuda.rst  |  2 +-
 doc/guides/prog_guide/mbuf_lib.rst|  4 +-
 doc/guides/rel_notes/deprecation.rst  |  3 +
 .../sample_app_ug/eventdev_pipeline.rst   |  2 +-
 doc/guides/tools/testbbdev.rst|  8 +--
 drivers/bus/fslmc/qbman/qbman_sys_decl.h  |  2 +-
 drivers/common/cnxk/roc_nix_tm_ops.c  |  2 +-
 drivers/common/cnxk/roc_npa.c |  6 +-
 drivers/common/dpaax/caamflib/desc.h  |  2 +-
 drivers/common/mlx5/linux/mlx5_common_os.c|  2 +-
 drivers/common/sfc_efx/base/ef10_nvram.c  |  4 +-
 drivers/common/sfc_efx/base/efx_rx.c  |  2 +-
 drivers/crypto/bcmfs/hw/bcmfs4_rm.c   |  6 +-
 drivers/crypto/bcmfs/hw/bcmfs5_rm.c   |  6 +-
 drivers/dma/idxd/idxd_pci.c   |  2 +-
 drivers/event/opdl/opdl_evdev.c   |  2 +-
 drivers/event/opdl/opdl_evdev_init.c  |  2 +-
 drivers/net/ark/ark_ethdev.c  |  8 +--
 drivers/net/ark/ark_ethdev_rx.c   |  2 +-
 drivers/net/avp/avp_ethdev.c  | 18 ++---
 drivers/net/bnx2x/bnx2x.c |  2 +-
 drivers/net/bnx2x/bnx2x_stats.c   |  8 +--
 drivers/net/bnx2x/ecore_sp.c  |  2 +-
 drivers/net/bnx2x/elink.c |  4 +-
 drivers/net/bnxt/bnxt_hwrm.c  |  2 +-
 drivers/net/bnxt/hsi_struct_def_dpdk.h|  2 +-
 drivers/net/bonding/rte_eth_bond_8023ad.c |  2 +-
 drivers/net/cnxk/cnxk_ethdev.c|  4 +-
 drivers/net/cxgbe/cxgbe_ethdev.c  | 10 +--
 drivers/net/cxgbe/cxgbevf_main.c  |  4 +-
 drivers/net/fm10k/fm10k_ethdev.c  |  2 +-
 drivers/net/fm10k/fm10k_rxtx.c|  2 +-
 drivers/net/ixgbe/ixgbe_fdir.c|  2 +-
 drivers/net/ixgbe/ixgbe_ipsec.c   |  2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c|  2 +-
 drivers/net/mlx4/mlx4.c   |  2 +-
 drivers/net/mlx4/mlx4_flow.c  |  6 +-
 drivers/net/mlx5/mlx5_flow_dv.c   |  2 +-
 drivers/net/mlx5/mlx5_flow_hw.c   |  6 +-
 drivers/net/mlx5/mlx5_rxq.c   |  2 +-
 drivers/net/mlx5/mlx5_rxtx_vec.h  |  2 +-
 drivers/net/mvpp2/mrvl_qos.c  |  2 +-
 drivers/net/nfp/flower/nfp_flower_flow.c  |  2 +-
 drivers/net/nfp/nfp_net_flow.c|  2 +-
 drivers/net/qede/qede_rxtx.c  |  6 +-
 drivers/net/ring/rte_eth_ring.c   |  7 +-
 drivers/net/sfc/sfc_dp_rx.h   |  2 +-
 drivers/net/sfc/sfc_ef100_rx.c|  6 +-
 drivers/net/sfc/sfc_ef10_essb_rx.c|  4 +-
 drivers/net/sfc/sfc_ef10_rx.c |  4 +-
 drivers/net/sfc/sfc_rx.c  |  2 +-
 drivers/net/txgbe/txgbe_ipsec.c   |  2 +-
 drivers/net/txgbe/txgbe_rxtx.c|  2 +-
 examples/ipsec-secgw/event_helper.c   |  2 +-
 examples/ipv4_multicast/main.c|  2 +-
 examples/qos_sched/args.c |  2 +-
 lib/eal/common/eal_common_memory.c|  2 +-
 lib/eal/common/eal_common_proc.c  |  3 +-
 lib/eal/common/eal_common_trace.c |  2 +-
 lib/eal/common/eal_memcfg.h   |  2 +-
 lib/eal/common/rte_malloc.c   |  2 +-
 lib/eal/freebsd/eal.c |  2 +-
 lib/eal/linux/eal.c   |  2 +-
 lib/eal/windows/eal.c |  2 +-
 lib/graph/graph.c   

[PATCH v11 1/7] mbuf: replace term sanity check

[Stephen Hemminger]

Replace rte_mbuf_sanity_check() with rte_mbuf_verify()
to match the similar macro RTE_VERIFY() in rte_debug.h

The term sanity check is on the Tier 2 list of words
that should be replaced.

Signed-off-by: Stephen Hemminger 
Acked-by: Andrew Rybchenko 
Acked-by: Morten Brørup 
---
 app/test/test_mbuf.c | 28 +--
 doc/guides/prog_guide/mbuf_lib.rst   |  4 +-
 doc/guides/rel_notes/deprecation.rst |  3 ++
 drivers/net/avp/avp_ethdev.c | 18 +++
 drivers/net/sfc/sfc_ef100_rx.c   |  6 +--
 drivers/net/sfc/sfc_ef10_essb_rx.c   |  4 +-
 drivers/net/sfc/sfc_ef10_rx.c|  4 +-
 drivers/net/sfc/sfc_rx.c |  2 +-
 examples/ipv4_multicast/main.c   |  2 +-
 lib/mbuf/rte_mbuf.c  | 23 +
 lib/mbuf/rte_mbuf.h  | 71 +++-
 lib/mbuf/version.map |  1 +
 12 files changed, 90 insertions(+), 76 deletions(-)

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 17be977f31..3fbb5dea8b 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -262,8 +262,8 @@ test_one_pktmbuf(struct rte_mempool *pktmbuf_pool)
GOTO_FAIL("Buffer should be continuous");
memset(hdr, 0x55, MBUF_TEST_HDR2_LEN);
 
-   rte_mbuf_sanity_check(m, 1);
-   rte_mbuf_sanity_check(m, 0);
+   rte_mbuf_verify(m, 1);
+   rte_mbuf_verify(m, 0);
rte_pktmbuf_dump(stdout, m, 0);
 
/* this prepend should fail */
@@ -1162,7 +1162,7 @@ test_refcnt_mbuf(void)
 
 #ifdef RTE_EXEC_ENV_WINDOWS
 static int
-test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool)
+test_failing_mbuf_verify(struct rte_mempool *pktmbuf_pool)
 {
RTE_SET_USED(pktmbuf_pool);
return TEST_SKIPPED;
@@ -1181,12 +1181,12 @@ mbuf_check_pass(struct rte_mbuf *buf)
 }
 
 static int
-test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool)
+test_failing_mbuf_verify(struct rte_mempool *pktmbuf_pool)
 {
struct rte_mbuf *buf;
struct rte_mbuf badbuf;
 
-   printf("Checking rte_mbuf_sanity_check for failure conditions\n");
+   printf("Checking rte_mbuf_verify for failure conditions\n");
 
/* get a good mbuf to use to make copies */
buf = rte_pktmbuf_alloc(pktmbuf_pool);
@@ -1708,7 +1708,7 @@ test_mbuf_validate_tx_offload(const char *test_name,
GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
if (rte_pktmbuf_pkt_len(m) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
-   rte_mbuf_sanity_check(m, 0);
+   rte_mbuf_verify(m, 0);
m->ol_flags = ol_flags;
m->tso_segsz = segsize;
ret = rte_validate_tx_offload(m);
@@ -1915,7 +1915,7 @@ test_pktmbuf_read(struct rte_mempool *pktmbuf_pool)
GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
if (rte_pktmbuf_pkt_len(m) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
-   rte_mbuf_sanity_check(m, 0);
+   rte_mbuf_verify(m, 0);
 
data = rte_pktmbuf_append(m, MBUF_TEST_DATA_LEN2);
if (data == NULL)
@@ -1964,7 +1964,7 @@ test_pktmbuf_read_from_offset(struct rte_mempool 
*pktmbuf_pool)
 
if (rte_pktmbuf_pkt_len(m) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
-   rte_mbuf_sanity_check(m, 0);
+   rte_mbuf_verify(m, 0);
 
/* prepend an ethernet header */
hdr = (struct ether_hdr *)rte_pktmbuf_prepend(m, hdr_len);
@@ -2109,7 +2109,7 @@ create_packet(struct rte_mempool *pktmbuf_pool,
GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
if (rte_pktmbuf_pkt_len(pkt_seg) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
-   rte_mbuf_sanity_check(pkt_seg, 0);
+   rte_mbuf_verify(pkt_seg, 0);
/* Add header only for the first segment */
if (test_data->flags == MBUF_HEADER && seg == 0) {
hdr_len = sizeof(struct rte_ether_hdr);
@@ -2321,7 +2321,7 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool 
*pktmbuf_pool)
GOTO_FAIL("%s: mbuf allocation failed!\n", __func__);
if (rte_pktmbuf_pkt_len(m) != 0)
GOTO_FAIL("%s: Bad packet length\n", __func__);
-   rte_mbuf_sanity_check(m, 0);
+   rte_mbuf_verify(m, 0);
 
ext_buf_addr = rte_malloc("External buffer", buf_len,
RTE_CACHE_LINE_SIZE);
@@ -2482,8 +2482,8 @@ test_pktmbuf_ext_pinned_buffer(struct rte_mempool 
*std_pool)
GOTO_FAIL("%s: test_pktmbuf_copy(pinned) failed\n",
  __func__);
 
-   if (test_failing_mbuf_sanity_check(pinned_pool) < 0)
-   GOTO_FAIL("%s: test_failing_mbuf_sanity_check(pinned)"
+   if (test_failing_mbuf_verify(pinned_pool) < 0)
+   GOTO_FAIL("%s: test_failing_mbuf_verify(pinned)"
  " failed\n", __func__);
 
if (test_mbuf

[PATCH v11 2/7] eal: replace use of sanity check in comments and messages

[Stephen Hemminger]

Sanity check is on the Tier 2 non-inclusive list.
Replace or remove it.

Signed-off-by: Stephen Hemminger 
Acked-by: Anatoly Burakov 
---
 lib/eal/common/eal_common_memory.c | 2 +-
 lib/eal/common/eal_common_proc.c   | 3 ++-
 lib/eal/common/eal_common_trace.c  | 2 +-
 lib/eal/common/eal_memcfg.h| 2 +-
 lib/eal/common/rte_malloc.c| 2 +-
 lib/eal/freebsd/eal.c  | 2 +-
 lib/eal/linux/eal.c| 2 +-
 lib/eal/windows/eal.c  | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/eal/common/eal_common_memory.c 
b/lib/eal/common/eal_common_memory.c
index 60ddc30580..9f4a8676f1 100644
--- a/lib/eal/common/eal_common_memory.c
+++ b/lib/eal/common/eal_common_memory.c
@@ -562,7 +562,7 @@ check_dma_mask(uint8_t maskbits, bool thread_unsafe)
uint64_t mask;
int ret;
 
-   /* Sanity check. We only check width can be managed with 64 bits
+   /* We only check width can be managed with 64 bits
 * variables. Indeed any higher value is likely wrong. */
if (maskbits > MAX_DMA_MASK_BITS) {
EAL_LOG(ERR, "wrong dma mask size %u (Max: %u)",
diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c
index d24093937c..838602edef 100644
--- a/lib/eal/common/eal_common_proc.c
+++ b/lib/eal/common/eal_common_proc.c
@@ -309,7 +309,8 @@ read_msg(int fd, struct mp_msg_internal *m, struct 
sockaddr_un *s)
break;
}
}
-   /* sanity-check the response */
+
+   /* Check that the response is valid */
if (m->msg.num_fds < 0 || m->msg.num_fds > RTE_MP_MAX_FD_NUM) {
EAL_LOG(ERR, "invalid number of fd's received");
return -1;
diff --git a/lib/eal/common/eal_common_trace.c 
b/lib/eal/common/eal_common_trace.c
index 918f49bf4f..9349f5780d 100644
--- a/lib/eal/common/eal_common_trace.c
+++ b/lib/eal/common/eal_common_trace.c
@@ -468,7 +468,7 @@ __rte_trace_point_register(rte_trace_point_t *handle, const 
char *name,
struct trace_point *tp;
uint16_t sz;
 
-   /* Sanity checks of arguments */
+   /* Check arguments */
if (name == NULL || register_fn == NULL || handle == NULL) {
trace_err("invalid arguments");
rte_errno = EINVAL;
diff --git a/lib/eal/common/eal_memcfg.h b/lib/eal/common/eal_memcfg.h
index 60e2089797..e8a85df355 100644
--- a/lib/eal/common/eal_memcfg.h
+++ b/lib/eal/common/eal_memcfg.h
@@ -18,7 +18,7 @@
  * Memory configuration shared across multiple processes.
  */
 struct rte_mem_config {
-   volatile uint32_t magic;   /**< Magic number - sanity check. */
+   volatile uint32_t magic;   /**< Magic number check. */
uint32_t version;
/**< Prevent secondary processes using different DPDK versions. */
 
diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index 3eed4d4be6..c3a2069010 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -654,7 +654,7 @@ rte_malloc_heap_destroy(const char *heap_name)
ret = -1;
goto unlock;
}
-   /* sanity checks done, now we can destroy the heap */
+   /* checks done, now we can destroy the heap */
rte_spinlock_lock(&heap->lock);
ret = malloc_heap_destroy(heap);
rte_spinlock_unlock(&heap->lock);
diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
index 1229230063..c7cc6fa28b 100644
--- a/lib/eal/freebsd/eal.c
+++ b/lib/eal/freebsd/eal.c
@@ -501,7 +501,7 @@ eal_parse_args(int argc, char **argv)
goto out;
}
 
-   /* sanity checks */
+   /* options checks */
if (eal_check_common_options(internal_conf) != 0) {
eal_usage(prgname);
ret = -1;
diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
index d742cc98e2..254d071d12 100644
--- a/lib/eal/linux/eal.c
+++ b/lib/eal/linux/eal.c
@@ -803,7 +803,7 @@ eal_parse_args(int argc, char **argv)
goto out;
}
 
-   /* sanity checks */
+   /* options checks */
if (eal_check_common_options(internal_conf) != 0) {
eal_usage(prgname);
ret = -1;
diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c
index 28b78a95a6..f6ef5b1470 100644
--- a/lib/eal/windows/eal.c
+++ b/lib/eal/windows/eal.c
@@ -194,7 +194,7 @@ eal_parse_args(int argc, char **argv)
if (eal_adjust_config(internal_conf) != 0)
return -1;
 
-   /* sanity checks */
+   /* options checks */
if (eal_check_common_options(internal_conf) != 0) {
eal_usage(prgname);
return -1;
-- 
2.43.0

[PATCH v11 3/7] test: replace use word sanity

[Stephen Hemminger]

The word "sanity" is on the not-allowed inclusive naming
list. Replace the unnecessary usage in tests.

Signed-off-by: Stephen Hemminger 
---
 app/test/test_bitmap.c |  4 +--
 app/test/test_bpf.c|  6 ++--
 app/test/test_common.c |  2 +-
 app/test/test_distributor.c| 46 +++---
 app/test/test_eal_flags.c  | 20 ++---
 app/test/test_hash.c   |  2 +-
 app/test/test_interrupts.c |  9 +++---
 app/test/test_link_bonding_mode4.c |  2 +-
 app/test/test_mbuf.c   |  2 +-
 app/test/test_rawdev.c |  2 +-
 app/test/test_timer.c  | 10 +++
 11 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/app/test/test_bitmap.c b/app/test/test_bitmap.c
index bab11812c7..a074b64f2e 100644
--- a/app/test/test_bitmap.c
+++ b/app/test/test_bitmap.c
@@ -33,7 +33,7 @@ test_bitmap_scan_operations(struct rte_bitmap *bmp)
}
 
if (slab1_magic != out_slab) {
-   printf("Scan operation sanity failed.\n");
+   printf("Scan operation magic number check failed.\n");
return TEST_FAILED;
}
 
@@ -43,7 +43,7 @@ test_bitmap_scan_operations(struct rte_bitmap *bmp)
}
 
if (slab2_magic != out_slab) {
-   printf("Scan operation sanity failed.\n");
+   printf("Scan operation magic number check failed.\n");
return TEST_FAILED;
}
 
diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index 7819d6aba9..0bbff389bf 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -3343,9 +3343,9 @@ test_bpf_match(pcap_t *pcap, const char *str,
return ret;
 }
 
-/* Basic sanity test can we match a IP packet */
+/* Basic test can we match a IP packet */
 static int
-test_bpf_filter_sanity(pcap_t *pcap)
+test_bpf_filter_match(pcap_t *pcap)
 {
const uint32_t plen = 100;
struct rte_mbuf mb, *m;
@@ -3484,7 +3484,7 @@ test_bpf_convert(void)
return -1;
}
 
-   rc = test_bpf_filter_sanity(pcap);
+   rc = test_bpf_filter_match(pcap);
for (i = 0; i < RTE_DIM(sample_filters); i++)
rc |= test_bpf_filter(pcap, sample_filters[i]);
 
diff --git a/app/test/test_common.c b/app/test/test_common.c
index 21eb2285e1..784cdaf3d6 100644
--- a/app/test/test_common.c
+++ b/app/test/test_common.c
@@ -19,7 +19,7 @@
{printf(x "() test failed!\n");\
return -1;}
 
-/* this is really a sanity check */
+/* this is really a consistency check */
 static int
 test_macros(int __rte_unused unused_parm)
 {
diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
index 60fe96ea82..b32aa78989 100644
--- a/app/test/test_distributor.c
+++ b/app/test/test_distributor.c
@@ -81,7 +81,7 @@ clear_packet_count(void)
rte_memory_order_relaxed);
 }
 
-/* this is the basic worker function for sanity test
+/* this is the basic worker function
  * it does nothing but return packets and count them.
  */
 static int
@@ -106,7 +106,7 @@ handle_work(void *arg)
return 0;
 }
 
-/* do basic sanity testing of the distributor. This test tests the following:
+/* do basic testing of the distributor. This test tests the following:
  * - send 32 packets through distributor with the same tag and ensure they
  *   all go to the one worker
  * - send 32 packets through the distributor with two different tags and
@@ -118,7 +118,7 @@ handle_work(void *arg)
  *   not necessarily in the same order (as different flows).
  */
 static int
-sanity_test(struct worker_params *wp, struct rte_mempool *p)
+basic_test(struct worker_params *wp, struct rte_mempool *p)
 {
struct rte_distributor *db = wp->dist;
struct rte_mbuf *bufs[BURST];
@@ -127,7 +127,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
unsigned int retries;
unsigned int processed;
 
-   printf("=== Basic distributor sanity tests ===\n");
+   printf("=== Basic distributor tests ===\n");
clear_packet_count();
if (rte_mempool_get_bulk(p, (void *)bufs, BURST) != 0) {
printf("line %d: Error getting mbufs from pool\n", __LINE__);
@@ -164,7 +164,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
printf("Worker %u handled %u packets\n", i,

rte_atomic_load_explicit(&worker_stats[i].handled_packets,
rte_memory_order_relaxed));
-   printf("Sanity test with all zero hashes done.\n");
+   printf("Test with all zero hashes done.\n");
 
/* pick two flows and check they go correctly */
if (rte_lcore_count() >= 3) {
@@ -192,7 +192,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
rte_atomic_load_explicit(
&worker_stats[i].handled_packets,
rte_memory_

[PATCH v11 4/7] examples: remove term sanity

[Stephen Hemminger]

Do not use non-inclusive terms.

Signed-off-by: Stephen Hemminger 
---
 examples/ipsec-secgw/event_helper.c | 2 +-
 examples/qos_sched/args.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/ipsec-secgw/event_helper.c 
b/examples/ipsec-secgw/event_helper.c
index 89fb7e62a5..f595b4fe01 100644
--- a/examples/ipsec-secgw/event_helper.c
+++ b/examples/ipsec-secgw/event_helper.c
@@ -2100,7 +2100,7 @@ eh_launch_worker(struct eh_conf *conf, struct 
eh_app_worker_params *app_wrkr,
goto clean_and_exit;
}
 
-   /* Verify sanity of the matched worker */
+   /* Verify validity of the matched worker */
if (eh_verify_match_worker(match_wrkr) != 1) {
EH_LOG_ERR("Failed to validate the matched worker");
goto clean_and_exit;
diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
index 886542b3c1..1e77e8c547 100644
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
@@ -386,7 +386,7 @@ app_parse_args(int argc, char **argv)
return -1;
}
 
-   /* sanity check for cores assignment */
+   /* check for cores assignment */
for(i = 0; i < nb_pfc; i++) {
if (qos_conf[i].rx_core >= RTE_MAX_LCORE) {
RTE_LOG(ERR, APP, "pfc %u: invalid RX lcore index 
%u\n", i + 1,
-- 
2.43.0

[PATCH v11 5/7] lib: replace use of sanity check in comments and messages

[Stephen Hemminger]

Sanity check is on the Tier 2 non-inclusive list.
Replace or remove it.

Signed-off-by: Stephen Hemminger 
---
 lib/graph/graph.c   | 2 +-
 lib/graph/graph_stats.c | 2 +-
 lib/graph/node.c| 2 +-
 lib/jobstats/rte_jobstats.c | 6 +++---
 lib/metrics/rte_metrics.c   | 2 +-
 lib/pcapng/rte_pcapng.c | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index d5b8c9f918..073d3fe7a2 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -389,7 +389,7 @@ rte_graph_create(const char *name, struct rte_graph_param 
*prm)
 
graph_spinlock_lock();
 
-   /* Check arguments sanity */
+   /* Check argument validity */
if (prm == NULL)
SET_ERR_JMP(EINVAL, fail, "Param should not be NULL");
 
diff --git a/lib/graph/graph_stats.c b/lib/graph/graph_stats.c
index d71451a17b..10b7fc11be 100644
--- a/lib/graph/graph_stats.c
+++ b/lib/graph/graph_stats.c
@@ -332,7 +332,7 @@ rte_graph_cluster_stats_create(const struct 
rte_graph_cluster_stats_param *prm)
const char *pattern;
rte_graph_t i;
 
-   /* Sanity checks */
+   /* Validate arguments */
if (!rte_graph_has_stats_feature())
SET_ERR_JMP(EINVAL, fail, "Stats feature is not enabled");
 
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 99a9622779..c238d140ed 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -68,7 +68,7 @@ __rte_node_register(const struct rte_node_register *reg)
 
graph_spinlock_lock();
 
-   /* Check sanity */
+   /* Check argument validity */
if (reg == NULL || reg->process == NULL) {
rte_errno = EINVAL;
goto fail;
diff --git a/lib/jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c
index af565a14ea..1c4b280c95 100644
--- a/lib/jobstats/rte_jobstats.c
+++ b/lib/jobstats/rte_jobstats.c
@@ -124,7 +124,7 @@ rte_jobstats_start(struct rte_jobstats_context *ctx, struct 
rte_jobstats *job)
 {
uint64_t now;
 
-   /* Some sanity check. */
+   /* Check validity of arguments. */
if (unlikely(ctx == NULL || job == NULL || job->context != NULL))
return -EINVAL;
 
@@ -144,7 +144,7 @@ rte_jobstats_abort(struct rte_jobstats *job)
struct rte_jobstats_context *ctx;
uint64_t now, exec_time;
 
-   /* Some sanity check. */
+   /* Check that arguments are valid */
if (unlikely(job == NULL || job->context == NULL))
return -EINVAL;
 
@@ -165,7 +165,7 @@ rte_jobstats_finish(struct rte_jobstats *job, int64_t 
job_value)
uint64_t now, exec_time;
int need_update;
 
-   /* Some sanity check. */
+   /* Check arguments */
if (unlikely(job == NULL || job->context == NULL))
return -EINVAL;
 
diff --git a/lib/metrics/rte_metrics.c b/lib/metrics/rte_metrics.c
index 0ccdbabc04..f60d4f3f6e 100644
--- a/lib/metrics/rte_metrics.c
+++ b/lib/metrics/rte_metrics.c
@@ -120,7 +120,7 @@ rte_metrics_reg_names(const char * const *names, uint16_t 
cnt_names)
uint16_t idx_name;
uint16_t idx_base;
 
-   /* Some sanity checks */
+   /* Some consistency checks */
if (cnt_names < 1 || names == NULL)
return -EINVAL;
for (idx_name = 0; idx_name < cnt_names; idx_name++)
diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c
index 7254defce7..ee065acda6 100644
--- a/lib/pcapng/rte_pcapng.c
+++ b/lib/pcapng/rte_pcapng.c
@@ -620,7 +620,7 @@ rte_pcapng_write_packets(rte_pcapng_t *self,
struct pcapng_enhance_packet_block *epb;
uint64_t cycles, timestamp;
 
-   /* sanity check that is really a pcapng mbuf */
+   /* Check that is really a pcapng mbuf */
epb = rte_pktmbuf_mtod(m, struct pcapng_enhance_packet_block *);
if (unlikely(epb->block_type != PCAPNG_ENHANCED_PACKET_BLOCK ||
 epb->block_length != rte_pktmbuf_data_len(m))) {
-- 
2.43.0

[PATCH v11 6/7] doc: remove sanity

[Stephen Hemminger]

Don't use the word sanity in the documentation

Signed-off-by: Stephen Hemminger 
---
 doc/guides/gpus/cuda.rst   | 2 +-
 doc/guides/sample_app_ug/eventdev_pipeline.rst | 2 +-
 doc/guides/tools/testbbdev.rst | 8 
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/guides/gpus/cuda.rst b/doc/guides/gpus/cuda.rst
index 6520c17c3e..c523da1f3e 100644
--- a/doc/guides/gpus/cuda.rst
+++ b/doc/guides/gpus/cuda.rst
@@ -80,7 +80,7 @@ Similarly to CUDA shared library, if the **libgdrapi.so** 
shared library
 is not installed in default locations (e.g. /usr/local/lib),
 you can use the variable ``GDRCOPY_PATH_L``.
 
-As an example, to enable the CPU map feature sanity check,
+As an example, to enable the CPU map feature check,
 run the ``app/test-gpudev`` application with:
 
 .. code-block:: console
diff --git a/doc/guides/sample_app_ug/eventdev_pipeline.rst 
b/doc/guides/sample_app_ug/eventdev_pipeline.rst
index 19ff53803e..e7787fb266 100644
--- a/doc/guides/sample_app_ug/eventdev_pipeline.rst
+++ b/doc/guides/sample_app_ug/eventdev_pipeline.rst
@@ -50,7 +50,7 @@ these settings is shown below:
 .//examples/dpdk-eventdev_pipeline -l 0,2,8-15 --vdev event_sw0 
\
 -- -r1 -t1 -e4 -w FF00 -s4 -n0 -c32 -W1000 -D
 
-The application has some sanity checking built-in, so if there is a function
+The application has some internal validation, so if there is a function
 (e.g.; the RX core) which doesn't have a cpu core mask assigned, the 
application
 will print an error message:
 
diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst
index ddb8d787be..baaf9d115d 100644
--- a/doc/guides/tools/testbbdev.rst
+++ b/doc/guides/tools/testbbdev.rst
@@ -9,7 +9,7 @@ dpdk-test-bbdev Application
 The ``dpdk-test-bbdev`` tool is a Data Plane Development Kit (DPDK) utility 
that
 allows measuring performance parameters of PMDs available in the bbdev 
framework.
 Tests available for execution are: latency, throughput, validation,
-bler and sanity tests. Execution of tests can be customized using various
+bler and basic functionality. Execution of tests can be customized using 
various
 parameters passed to a python running script.
 
 
@@ -97,8 +97,8 @@ Test Cases
 
 There are 7 main test cases that can be executed using testbbdev tool:
 
-* Sanity checks [-c unittest]
-- Performs sanity checks on BBDEV interface, validating basic functionality
+* Functional checks [-c unittest]
+- Performs checks on BBDEV interface, validating basic functionality
 
 * Validation tests [-c validation]
 - Performs full operation of enqueue and dequeue
@@ -232,7 +232,7 @@ vector name refer more explicitly processing specificity 
such as
 is purely read/written for external DDR, lbrm when limited buffer
 rate matching is expected, or crc_fail when a CRC failure is expected.
 They are chosen to have a good coverage across sizes and processing
-parameters while still keeping their number limited as part of sanity
+parameters while still keeping their number limited as part of functional
 regression.
 
 Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled and output
-- 
2.43.0

[PATCH v11 7/7] drivers: remove use of term sanity check

[Stephen Hemminger]

Don't use term "sanity" because it is considered derogatory.

Signed-off-by: Stephen Hemminger 
Acked-by: Hemant Agrawal 
---
 drivers/bus/fslmc/qbman/qbman_sys_decl.h   |  2 +-
 drivers/common/cnxk/roc_nix_tm_ops.c   |  2 +-
 drivers/common/cnxk/roc_npa.c  |  6 +++---
 drivers/common/dpaax/caamflib/desc.h   |  2 +-
 drivers/common/mlx5/linux/mlx5_common_os.c |  2 +-
 drivers/common/sfc_efx/base/ef10_nvram.c   |  4 ++--
 drivers/common/sfc_efx/base/efx_rx.c   |  2 +-
 drivers/crypto/bcmfs/hw/bcmfs4_rm.c|  6 +++---
 drivers/crypto/bcmfs/hw/bcmfs5_rm.c|  6 +++---
 drivers/dma/idxd/idxd_pci.c|  2 +-
 drivers/event/opdl/opdl_evdev.c|  2 +-
 drivers/event/opdl/opdl_evdev_init.c   |  2 +-
 drivers/net/ark/ark_ethdev.c   |  8 
 drivers/net/ark/ark_ethdev_rx.c|  2 +-
 drivers/net/bnx2x/bnx2x.c  |  2 +-
 drivers/net/bnx2x/bnx2x_stats.c|  8 
 drivers/net/bnx2x/ecore_sp.c   |  2 +-
 drivers/net/bnx2x/elink.c  |  4 ++--
 drivers/net/bnxt/bnxt_hwrm.c   |  2 +-
 drivers/net/bnxt/hsi_struct_def_dpdk.h |  2 +-
 drivers/net/bonding/rte_eth_bond_8023ad.c  |  2 +-
 drivers/net/cnxk/cnxk_ethdev.c |  4 ++--
 drivers/net/cxgbe/cxgbe_ethdev.c   | 10 ++
 drivers/net/cxgbe/cxgbevf_main.c   |  4 ++--
 drivers/net/fm10k/fm10k_ethdev.c   |  2 +-
 drivers/net/fm10k/fm10k_rxtx.c |  2 +-
 drivers/net/ixgbe/ixgbe_fdir.c |  2 +-
 drivers/net/ixgbe/ixgbe_ipsec.c|  2 +-
 drivers/net/ixgbe/ixgbe_rxtx.c |  2 +-
 drivers/net/mlx4/mlx4.c|  2 +-
 drivers/net/mlx4/mlx4_flow.c   |  6 +++---
 drivers/net/mlx5/mlx5_flow_dv.c|  2 +-
 drivers/net/mlx5/mlx5_flow_hw.c|  6 ++
 drivers/net/mlx5/mlx5_rxq.c|  2 +-
 drivers/net/mlx5/mlx5_rxtx_vec.h   |  2 +-
 drivers/net/mvpp2/mrvl_qos.c   |  2 +-
 drivers/net/nfp/flower/nfp_flower_flow.c   |  2 +-
 drivers/net/nfp/nfp_net_flow.c |  2 +-
 drivers/net/qede/qede_rxtx.c   |  6 +++---
 drivers/net/ring/rte_eth_ring.c|  7 ++-
 drivers/net/sfc/sfc_dp_rx.h|  2 +-
 drivers/net/txgbe/txgbe_ipsec.c|  2 +-
 drivers/net/txgbe/txgbe_rxtx.c |  2 +-
 43 files changed, 66 insertions(+), 77 deletions(-)

diff --git a/drivers/bus/fslmc/qbman/qbman_sys_decl.h 
b/drivers/bus/fslmc/qbman/qbman_sys_decl.h
index caaae41777..2b6162d0ce 100644
--- a/drivers/bus/fslmc/qbman/qbman_sys_decl.h
+++ b/drivers/bus/fslmc/qbman/qbman_sys_decl.h
@@ -9,7 +9,7 @@
 #include 
 #include 
 
-/* Sanity check */
+/* Byte order check */
 #if (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__) && \
(__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
 #error "Unknown endianness!"
diff --git a/drivers/common/cnxk/roc_nix_tm_ops.c 
b/drivers/common/cnxk/roc_nix_tm_ops.c
index 9f3870a311..6cf329eee2 100644
--- a/drivers/common/cnxk/roc_nix_tm_ops.c
+++ b/drivers/common/cnxk/roc_nix_tm_ops.c
@@ -528,7 +528,7 @@ roc_nix_tm_hierarchy_disable(struct roc_nix *roc_nix)
node->flags &= ~NIX_TM_NODE_ENABLED;
}
 
-   /* Verify sanity of all tx queues */
+   /* Verify all tx queues */
for (i = 0; i < sq_cnt; i++) {
sq = nix->sqs[i];
if (!sq)
diff --git a/drivers/common/cnxk/roc_npa.c b/drivers/common/cnxk/roc_npa.c
index 6c14c49901..bd8ab1b395 100644
--- a/drivers/common/cnxk/roc_npa.c
+++ b/drivers/common/cnxk/roc_npa.c
@@ -458,7 +458,7 @@ npa_aura_pool_pair_alloc(struct npa_lf *lf, const uint32_t 
block_size,
char name[PLT_MEMZONE_NAMESIZE];
const struct plt_memzone *mz;
 
-   /* Sanity check */
+   /* argument checks */
if (!lf || !block_size || !block_count || !pool || !aura ||
!aura_handle)
return NPA_ERR_PARAM;
@@ -622,7 +622,7 @@ npa_aura_alloc(struct npa_lf *lf, const uint32_t 
block_count, int pool_id,
 {
int rc, aura_id;
 
-   /* Sanity check */
+   /* parameter check */
if (!lf || !aura || !aura_handle)
return NPA_ERR_PARAM;
 
@@ -1096,7 +1096,7 @@ npa_dev_init(struct npa_lf *lf, uintptr_t base, struct 
mbox *mbox)
uint8_t aura_sz;
int rc;
 
-   /* Sanity checks */
+   /* Input checks */
if (!lf || !base || !mbox)
return NPA_ERR_PARAM;
 
diff --git a/drivers/common/dpaax/caamflib/desc.h 
b/drivers/common/dpaax/caamflib/desc.h
index 4a1285c4d4..37c87eebd5 100644
--- a/drivers/common/dpaax/caamflib/desc.h
+++ b/drivers/common/dpaax/caamflib/desc.h
@@ -107,7 +107,7 @@ extern enum rta_sec_era rta_sec_era;
 
 /*
  * ONE - should always be set. Combination of ONE (always
- * set) and ZRO (always clear) forms an endianness sanity check
+ * set) and ZRO (always clear) forms an endianness check
  */
 #define HDR_ONE 

[PATCH v5] virtio: optimize stats counters performance

[Morten Brørup]

Optimized the performance of updating the virtio statistics counters by
reducing the number of branches.

Ordered the packet size comparisons according to the probability with
typical internet traffic mix.

Signed-off-by: Morten Brørup 
---
v5:
* Do not inline the function. (Stephen)
v4:
* Consider multicast/broadcast packets unlikely.
v3:
* Eliminated a local variable.
* Note: Substituted sizeof(uint32_t)*4 by 32UL, using unsigned long type
  to keep optimal offsetting in generated assembler output.
* Removed unnecessary curly braces.
v2:
* Fixed checkpatch warning about line length.
---
 drivers/net/virtio/virtio_rxtx.c | 39 
 drivers/net/virtio/virtio_rxtx.h |  4 ++--
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index f69b9453a2..b67f063b31 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -82,37 +82,26 @@ vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
 }
 
 void
-virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)
+virtio_update_packet_stats(struct virtnet_stats *const stats,
+   const struct rte_mbuf *const mbuf)
 {
uint32_t s = mbuf->pkt_len;
-   struct rte_ether_addr *ea;
+   const struct rte_ether_addr *const ea =
+   rte_pktmbuf_mtod(mbuf, const struct rte_ether_addr *);
 
stats->bytes += s;
 
-   if (s == 64) {
-   stats->size_bins[1]++;
-   } else if (s > 64 && s < 1024) {
-   uint32_t bin;
-
-   /* count zeros, and offset into correct bin */
-   bin = (sizeof(s) * 8) - rte_clz32(s) - 5;
-   stats->size_bins[bin]++;
-   } else {
-   if (s < 64)
-   stats->size_bins[0]++;
-   else if (s < 1519)
-   stats->size_bins[6]++;
-   else
-   stats->size_bins[7]++;
-   }
+   if (s >= 1024)
+   stats->size_bins[6 + (s > 1518)]++;
+   else if (s <= 64)
+   stats->size_bins[s >> 6]++;
+   else
+   stats->size_bins[32UL - rte_clz32(s) - 5]++;
 
-   ea = rte_pktmbuf_mtod(mbuf, struct rte_ether_addr *);
-   if (rte_is_multicast_ether_addr(ea)) {
-   if (rte_is_broadcast_ether_addr(ea))
-   stats->broadcast++;
-   else
-   stats->multicast++;
-   }
+   RTE_BUILD_BUG_ON(offsetof(struct virtnet_stats, broadcast) !=
+   offsetof(struct virtnet_stats, multicast) + 
sizeof(uint64_t));
+   if (unlikely(rte_is_multicast_ether_addr(ea)))
+   (&stats->multicast)[rte_is_broadcast_ether_addr(ea)]++;
 }
 
 static inline void
diff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h
index afc4b74534..68034c914b 100644
--- a/drivers/net/virtio/virtio_rxtx.h
+++ b/drivers/net/virtio/virtio_rxtx.h
@@ -35,7 +35,7 @@ struct virtnet_tx {
 };
 
 int virtio_rxq_vec_setup(struct virtnet_rx *rxvq);
-void virtio_update_packet_stats(struct virtnet_stats *stats,
-   struct rte_mbuf *mbuf);
+void virtio_update_packet_stats(struct virtnet_stats *const stats,
+   const struct rte_mbuf *const mbuf);
 
 #endif /* _VIRTIO_RXTX_H_ */
-- 
2.43.0

Re: [PATCH] net/gve : Update EOP bit in txd rte_mbuf chain

[Joshua Washington]

Hi, can we  try to serialize these patches? Let's fix the multidescriptor
packets issue present in the driver first (ensuring that the entire
descriptor is written each time). The TSO support is an entirely new
feature and should likely not be backported to stable releases.

[PATCH v3] net/gve : Update EOP & csum bit in txd rte_mbuf chain

[Tathagat Priyadarshi]

The EOP and csum bit was not set for all the packets in mbuf chain
causing packet transmission stalls for packets split across
mbuf in chain.

Fixes: 4022f99 ("net/gve: support basic Tx data path for DQO")
Cc: sta...@dpdk.org

Signed-off-by: Tathagat Priyadarshi 
Signed-off-by: Varun Lakkur Ambaji Rao 
---
 drivers/net/gve/gve_tx_dqo.c | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
index a65e6aa..91db037 100644
--- a/drivers/net/gve/gve_tx_dqo.c
+++ b/drivers/net/gve/gve_tx_dqo.c
@@ -89,6 +89,7 @@
uint16_t sw_id;
uint64_t bytes;
uint16_t first_sw_id;
+   uint8_t csum;
 
sw_ring = txq->sw_ring;
txr = txq->tx_ring;
@@ -114,6 +115,12 @@
ol_flags = tx_pkt->ol_flags;
nb_used = tx_pkt->nb_segs;
first_sw_id = sw_id;
+
+   if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
+   csum = 1;
+   else
+   cusm = 0;
+
do {
if (sw_ring[sw_id] != NULL)
PMD_DRV_LOG(DEBUG, "Overwriting an entry in 
sw_ring");
@@ -126,6 +133,8 @@
txd->pkt.dtype = GVE_TX_PKT_DESC_DTYPE_DQO;
txd->pkt.compl_tag = rte_cpu_to_le_16(first_sw_id);
txd->pkt.buf_size = RTE_MIN(tx_pkt->data_len, 
GVE_TX_MAX_BUF_SIZE_DQO);
+   txd->pkt.end_of_packet = 0;
+   txd->pkt.checksum_offload_enable = csum;
 
/* size of desc_ring and sw_ring could be different */
tx_id = (tx_id + 1) & mask;
@@ -138,9 +147,6 @@
/* fill the last descriptor with End of Packet (EOP) bit */
txd->pkt.end_of_packet = 1;
 
-   if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
-   txd->pkt.checksum_offload_enable = 1;
-
txq->nb_free -= nb_used;
txq->nb_used += nb_used;
}
-- 
1.8.3.1

[PATCH v4 0/3] restore lost cfgfile tests

[Stephen Hemminger]

The cfgfile tests did not get built since conversion to meson
and they used an awkward way to manage the test data.

This patchset converts the tests to use a helper to take
text file and make it into a C header. Then use the C header
to generate temporary files as needed.

v4 - add special treatment for temp directory in Windows
 the test obviously never ran before on Windows.

Stephen Hemminger (3):
  buildtools: add helper to convert text file to header
  test: remove unused resource API
  test: restore cfgfile tests

 app/meson.build|   3 +-
 app/test/meson.build   |   8 +-
 app/test/resource.c| 276 -
 app/test/resource.h| 106 ---
 app/test/test_cfgfile.c| 153 ++--
 app/test/test_cfgfiles/meson.build |  19 ++
 app/test/test_resource.c   | 104 ---
 buildtools/gen-header.py   |  36 
 buildtools/meson.build |   2 +-
 9 files changed, 166 insertions(+), 541 deletions(-)
 delete mode 100644 app/test/resource.c
 delete mode 100644 app/test/resource.h
 create mode 100644 app/test/test_cfgfiles/meson.build
 delete mode 100644 app/test/test_resource.c
 create mode 100644 buildtools/gen-header.py

-- 
2.43.0

[PATCH v4 1/3] buildtools: add helper to convert text file to header

[Stephen Hemminger]

Simple script to read a file and make it into a initialized
C string in a header file.

Signed-off-by: Stephen Hemminger 
---
 buildtools/gen-header.py | 36 
 buildtools/meson.build   |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 buildtools/gen-header.py

diff --git a/buildtools/gen-header.py b/buildtools/gen-header.py
new file mode 100644
index 00..06e645863c
--- /dev/null
+++ b/buildtools/gen-header.py
@@ -0,0 +1,36 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2023 Stephen Hemminger 
+
+"""
+Script to read a text file and convert it into a header file.
+"""
+import sys
+import os
+
+
+def main():
+'''program main function'''
+print(f'/* File autogenerated by {sys.argv[0]} */')
+for path in sys.argv[1:]:
+name = os.path.basename(path)
+print()
+print(f'/* generated from {name} */')
+with open(path, "r") as f:
+array = name.replace(".", "_")
+print(f'static const char {array}[] = ' + '{')
+line = f.readline()
+
+# make sure empty string is null terminated
+if not line:
+print('""')
+
+while line:
+s = repr(line)
+print('{}'.format(s.replace("'", '"')))
+line = f.readline()
+print('};')
+
+
+if __name__ == "__main__":
+main()
diff --git a/buildtools/meson.build b/buildtools/meson.build
index 3adf34e1a8..bc818a71d5 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -24,6 +24,7 @@ get_numa_count_cmd = py3 + files('get-numa-count.py')
 get_test_suites_cmd = py3 + files('get-test-suites.py')
 has_hugepages_cmd = py3 + files('has-hugepages.py')
 cmdline_gen_cmd = py3 + files('dpdk-cmdline-gen.py')
+header_gen_cmd = py3 + files('gen-header.py')
 
 # install any build tools that end-users might want also
 install_data([
@@ -48,4 +49,3 @@ else
 pmdinfo += 'ar'
 pmdinfogen += 'elf'
 endif
-
-- 
2.43.0

[PATCH v4 2/3] test: remove unused resource API

[Stephen Hemminger]

This API was used only for cfgfile tests and was never built
after the conversion to meson. Will be replaced by simpler
method of doing cfgfile tests.

Signed-off-by: Stephen Hemminger 
---
 app/test/meson.build |   2 -
 app/test/resource.c  | 276 ---
 app/test/resource.h  | 106 ---
 app/test/test_resource.c | 104 ---
 4 files changed, 488 deletions(-)
 delete mode 100644 app/test/resource.c
 delete mode 100644 app/test/resource.h
 delete mode 100644 app/test/test_resource.c

diff --git a/app/test/meson.build b/app/test/meson.build
index e29258e6ec..62478c0bb6 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -20,7 +20,6 @@ test_cryptodev_deps = ['bus_vdev', 'net', 'cryptodev', 
'security']
 source_file_deps = {
 # The C files providing functionality to other test cases
 'packet_burst_generator.c': packet_burst_generator_deps,
-#'resource.c': [],  # unused currently.
 'sample_packet_forward.c': sample_packet_forward_deps,
 'virtual_pmd.c': virtual_pmd_deps,
 
@@ -154,7 +153,6 @@ source_file_deps = {
 'test_reciprocal_division_perf.c': [],
 'test_red.c': ['sched'],
 'test_reorder.c': ['reorder'],
-#'test_resource.c': [],
 'test_rib.c': ['net', 'rib'],
 'test_rib6.c': ['net', 'rib'],
 'test_ring.c': ['ptr_compress'],
diff --git a/app/test/resource.c b/app/test/resource.c
deleted file mode 100644
index 34465f1668..00
--- a/app/test/resource.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2016 RehiveTech. All rights reserved.
- */
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-#include "resource.h"
-
-struct resource_list resource_list = TAILQ_HEAD_INITIALIZER(resource_list);
-
-size_t resource_size(const struct resource *r)
-{
-   return r->end - r->begin;
-}
-
-const struct resource *resource_find(const char *name)
-{
-   struct resource *r;
-
-   TAILQ_FOREACH(r, &resource_list, next) {
-   RTE_VERIFY(r->name);
-
-   if (!strcmp(r->name, name))
-   return r;
-   }
-
-   return NULL;
-}
-
-int resource_fwrite(const struct resource *r, FILE *f)
-{
-   const size_t goal = resource_size(r);
-   size_t total = 0;
-
-   while (total < goal) {
-   size_t wlen = fwrite(r->begin + total, 1, goal - total, f);
-   if (wlen == 0) {
-   perror(__func__);
-   return -1;
-   }
-
-   total += wlen;
-   }
-
-   return 0;
-}
-
-int resource_fwrite_file(const struct resource *r, const char *fname)
-{
-   FILE *f;
-   int ret;
-
-   f = fopen(fname, "w");
-   if (f == NULL) {
-   perror(__func__);
-   return -1;
-   }
-
-   ret = resource_fwrite(r, f);
-   fclose(f);
-   return ret;
-}
-
-#ifdef RTE_APP_TEST_RESOURCE_TAR
-#include 
-#include 
-
-static int do_copy(struct archive *r, struct archive *w)
-{
-   const void *buf;
-   size_t len;
-#if ARCHIVE_VERSION_NUMBER >= 300
-   int64_t off;
-#else
-   off_t off;
-#endif
-   int ret;
-
-   while (1) {
-   ret = archive_read_data_block(r, &buf, &len, &off);
-   if (ret == ARCHIVE_RETRY)
-   continue;
-
-   if (ret == ARCHIVE_EOF)
-   return 0;
-
-   if (ret != ARCHIVE_OK)
-   return ret;
-
-   do {
-   ret = archive_write_data_block(w, buf, len, off);
-   if (ret != ARCHIVE_OK && ret != ARCHIVE_RETRY)
-   return ret;
-   } while (ret != ARCHIVE_OK);
-   }
-}
-
-int resource_untar(const struct resource *res)
-{
-   struct archive *r;
-   struct archive *w;
-   struct archive_entry *e;
-   void *p;
-   int flags = 0;
-   int ret;
-
-   p = malloc(resource_size(res));
-   if (p == NULL)
-   rte_panic("Failed to malloc %zu B\n", resource_size(res));
-
-   memcpy(p, res->begin, resource_size(res));
-
-   r = archive_read_new();
-   if (r == NULL) {
-   free(p);
-   return -1;
-   }
-
-   archive_read_support_format_all(r);
-   archive_read_support_filter_all(r);
-
-   w = archive_write_disk_new();
-   if (w == NULL) {
-   archive_read_free(r);
-   free(p);
-   return -1;
-   }
-
-   flags |= ARCHIVE_EXTRACT_PERM;
-   flags |= ARCHIVE_EXTRACT_FFLAGS;
-   archive_write_disk_set_options(w, flags);
-   archive_write_disk_set_standard_lookup(w);
-
-   ret = archive_read_open_memory(r, p, resource_size(res));
-   if (ret != ARCHIVE_OK)
-   goto fail;
-
-   while (1) {
-   ret = archive_read_next_header(r, &e);
-   if (ret == ARCHIV

[PATCH v4 3/3] test: restore cfgfile tests

[Stephen Hemminger]

These tests were not built since the conversion to meson.
Instead of using embedded resource functions, put data in include
file and generate temporary file before the test.

Signed-off-by: Stephen Hemminger 
---
 app/meson.build|   3 +-
 app/test/meson.build   |   6 +-
 app/test/test_cfgfile.c| 153 +++--
 app/test/test_cfgfiles/meson.build |  19 
 4 files changed, 129 insertions(+), 52 deletions(-)
 create mode 100644 app/test/test_cfgfiles/meson.build

diff --git a/app/meson.build b/app/meson.build
index 5b2c80c7a1..e2db888ae1 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -55,6 +55,7 @@ foreach app:apps
 build = true
 reason = '' # set if build == false to explain
 sources = []
+resources = []
 includes = []
 cflags = default_cflags
 ldflags = default_ldflags
@@ -115,7 +116,7 @@ foreach app:apps
 endif
 
 exec = executable('dpdk-' + name,
-sources,
+[ sources, resources ],
 c_args: cflags,
 link_args: ldflags,
 link_whole: link_libs,
diff --git a/app/test/meson.build b/app/test/meson.build
index 62478c0bb6..b2bb7c36f6 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -35,7 +35,7 @@ source_file_deps = {
 'test_bitratestats.c': ['metrics', 'bitratestats', 'ethdev'] + 
sample_packet_forward_deps,
 'test_bpf.c': ['bpf', 'net'],
 'test_byteorder.c': [],
-#'test_cfgfile.c': ['cfgfile'],
+'test_cfgfile.c': ['cfgfile'],
 'test_cksum.c': ['net'],
 'test_cksum_perf.c': ['net'],
 'test_cmdline.c': [],
@@ -261,3 +261,7 @@ if not is_windows
 build_by_default: true,
 install: false)
 endif
+
+subdir('test_cfgfiles')
+
+resources += test_cfgfile_h
diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c
index a5e3d8699c..7cfcaf348a 100644
--- a/app/test/test_cfgfile.c
+++ b/app/test/test_cfgfile.c
@@ -5,48 +5,54 @@
 #include 
 #include 
 #include 
-#include 
+#include 
+
+#ifdef RTE_EXEC_ENV_WINDOWS
+#include 
+#endif
 
 #include 
 
 #include "test.h"
-#include "resource.h"
-
-
-#define CFG_FILES_ETC "test_cfgfiles/etc"
 
-REGISTER_LINKED_RESOURCE(test_cfgfiles);
+#include "test_cfgfiles.h"
 
 static int
-test_cfgfile_setup(void)
+make_tmp_file(char *filename, const char *prefix, const char *data)
 {
-   const struct resource *r;
-   int ret;
+   size_t len = strlen(data);
+   size_t count;
+   FILE *f;
 
-   r = resource_find("test_cfgfiles");
-   TEST_ASSERT_NOT_NULL(r, "missing resource test_cfgfiles");
+#ifdef RTE_EXEC_ENV_WINDOWS
+   char tempDirName[MAX_PATH - 14];
 
-   ret = resource_untar(r);
-   TEST_ASSERT_SUCCESS(ret, "failed to untar %s", r->name);
+   if (GetTempPathA(sizeof(tempDirName), tempDirName) == 0)
+   return -1;
 
-   return 0;
-}
+   if (GetTempFileNameA(tempDirName, prefix, 0, filename) == 0)
+   return -1;
 
-static int
-test_cfgfile_cleanup(void)
-{
-   const struct resource *r;
-   int ret;
+   f = fopen(filename, "wt");
+#else
+   snprintf(filename, PATH_MAX, "/tmp/%s_XXX", prefix);
 
-   r = resource_find("test_cfgfiles");
-   TEST_ASSERT_NOT_NULL(r, "missing resource test_cfgfiles");
+   int fd = mkstemp(filename);
+   if (fd < 0)
+   return -1;
 
-   ret = resource_rm_by_tar(r);
-   TEST_ASSERT_SUCCESS(ret, "Failed to delete resource %s", r->name);
+   f = fdopen(fd, "w");
+#endif
+   if (f == NULL)
+   return -1;
 
-   return 0;
+   count = fwrite(data, sizeof(char), len, f);
+   fclose(f);
+
+   return (count == len) ? 0 : -1;
 }
 
+
 static int
 _test_cfgfile_sample(struct rte_cfgfile *cfgfile)
 {
@@ -87,9 +93,13 @@ static int
 test_cfgfile_sample1(void)
 {
struct rte_cfgfile *cfgfile;
+   char filename[PATH_MAX];
int ret;
 
-   cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/sample1.ini", 0);
+   ret = make_tmp_file(filename, "sample1", sample1_ini);
+   TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file");
+
+   cfgfile = rte_cfgfile_load(filename, 0);
TEST_ASSERT_NOT_NULL(cfgfile, "Failed to load config file");
 
ret = _test_cfgfile_sample(cfgfile);
@@ -98,6 +108,8 @@ test_cfgfile_sample1(void)
ret = rte_cfgfile_close(cfgfile);
TEST_ASSERT_SUCCESS(ret, "Failed to close cfgfile");
 
+   remove(filename);
+
return 0;
 }
 
@@ -106,15 +118,18 @@ test_cfgfile_sample2(void)
 {
struct rte_cfgfile_parameters params;
struct rte_cfgfile *cfgfile;
+   char filename[PATH_MAX];
int ret;
 
+   ret = make_tmp_file(filename, "sample2", sample2_ini);
+   TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file");
+
/* override comment character */
memset(¶ms, 0, sizeof(params));
params.comment_character = '#';
 
-   cfgfile = rte_cfgfile_load_with_param

[PATCH v4] net/gve : Update EOP & csum bit in txd rte_mbuf chain

[Tathagat Priyadarshi]

The EOP and csum bit was not set for all the packets in mbuf chain
causing packet transmission stalls for packets split across
mbuf in chain.

Fixes: 4022f99 ("net/gve: support basic Tx data path for DQO")
Cc: sta...@dpdk.org

Signed-off-by: Tathagat Priyadarshi 
Signed-off-by: Varun Lakkur Ambaji Rao 
---
 drivers/net/gve/gve_tx_dqo.c | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
index a65e6aa..1374e1a 100644
--- a/drivers/net/gve/gve_tx_dqo.c
+++ b/drivers/net/gve/gve_tx_dqo.c
@@ -89,6 +89,7 @@
uint16_t sw_id;
uint64_t bytes;
uint16_t first_sw_id;
+   uint8_t csum;
 
sw_ring = txq->sw_ring;
txr = txq->tx_ring;
@@ -114,6 +115,12 @@
ol_flags = tx_pkt->ol_flags;
nb_used = tx_pkt->nb_segs;
first_sw_id = sw_id;
+
+   if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
+   csum = 1;
+   else
+   csum = 0;
+
do {
if (sw_ring[sw_id] != NULL)
PMD_DRV_LOG(DEBUG, "Overwriting an entry in 
sw_ring");
@@ -126,6 +133,8 @@
txd->pkt.dtype = GVE_TX_PKT_DESC_DTYPE_DQO;
txd->pkt.compl_tag = rte_cpu_to_le_16(first_sw_id);
txd->pkt.buf_size = RTE_MIN(tx_pkt->data_len, 
GVE_TX_MAX_BUF_SIZE_DQO);
+   txd->pkt.end_of_packet = 0;
+   txd->pkt.checksum_offload_enable = csum;
 
/* size of desc_ring and sw_ring could be different */
tx_id = (tx_id + 1) & mask;
@@ -138,9 +147,6 @@
/* fill the last descriptor with End of Packet (EOP) bit */
txd->pkt.end_of_packet = 1;
 
-   if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
-   txd->pkt.checksum_offload_enable = 1;
-
txq->nb_free -= nb_used;
txq->nb_used += nb_used;
}
-- 
1.8.3.1

Re: [PATCH] net/gve : Update EOP bit in txd rte_mbuf chain

[Tathagat Priyadarshi]

Hi Josh,

Updated the patch
(https://patches.dpdk.org/project/dpdk/patch/1722534481-2405601-1-git-send-email-tathagat.d...@gmail.com/),
please ACK if it looks good.

Thanks!

On Thu, Aug 1, 2024 at 9:55 PM Joshua Washington  wrote:
>
> Hi, can we  try to serialize these patches? Let's fix the multidescriptor 
> packets issue present in the driver first (ensuring that the entire 
> descriptor is written each time). The TSO support is an entirely new feature 
> and should likely not be backported to stable releases.

Re: [PATCH v3] net/gve : Update EOP & csum bit in txd rte_mbuf chain

[Tathagat Priyadarshi]

Thanks for your suggestion Stephen, I have already updated the patch with
v4 & fixed the typo. Will consider your suggestion in the next version of
the patch.


On Fri, 2 Aug 2024 at 00:24, Stephen Hemminger 
wrote:

> On Thu,  1 Aug 2024 17:27:53 +
> Tathagat Priyadarshi  wrote:
>
> > + if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
> > + csum = 1;
> > + else
> > + cusm = 0;
> > +
>
> Obvious typo, did you do a final test build?
>
> Could also use logical inverse operator instead of if() which will
> generate better code sometimes.
>
> csum = !!(ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO);
>
>

[PATCH v5 0/4] Add network packet dissector

[Stephen Hemminger]

While debugging TAP rte_flow discovered that test pmd verbose output
was confusing and unhelpful. Instead, made a simple dissector that
prints one line per packet like this in test-pmd with verbose level 4.

v5 - breakout the additional ICMP types into header
   - fix some decoding bugs in ARP and ICMP

Stephen Hemminger (4):
  net: add more icmp types
  net: add new packet dissector
  test: add test for packet dissector
  test-pmd: add more packet verbose decode options

 app/test-pmd/cmdline_flow.c |   3 +-
 app/test-pmd/config.c   |  33 +-
 app/test-pmd/testpmd.h  |  11 +
 app/test-pmd/util.c |  77 +++-
 app/test/meson.build|   1 +
 app/test/test_dissect.c | 245 
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |   5 +-
 lib/net/meson.build |   2 +
 lib/net/rte_dissect.c   | 416 
 lib/net/rte_dissect.h   |  42 ++
 lib/net/rte_icmp.h  |  22 +-
 lib/net/version.map |   7 +
 12 files changed, 842 insertions(+), 22 deletions(-)
 create mode 100644 app/test/test_dissect.c
 create mode 100644 lib/net/rte_dissect.c
 create mode 100644 lib/net/rte_dissect.h

-- 
2.43.0

[PATCH v5 1/4] net: add more icmp types

[Stephen Hemminger]

Add more defines for additional defined ICMP types.

Signed-off-by: Stephen Hemminger 
---
 lib/net/rte_icmp.h | 22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/net/rte_icmp.h b/lib/net/rte_icmp.h
index 4bf64d70ad..b51b60a6d2 100644
--- a/lib/net/rte_icmp.h
+++ b/lib/net/rte_icmp.h
@@ -54,10 +54,24 @@ struct rte_icmp_hdr {
 } __rte_packed;
 
 /* ICMP packet types */
-#define RTE_IP_ICMP_ECHO_REPLY   0
-#define RTE_IP_ICMP_ECHO_REQUEST 8
-#define RTE_ICMP6_ECHO_REQUEST 128
-#define RTE_ICMP6_ECHO_REPLY   129
+#define RTE_IP_ICMP_ECHO_REPLY  0
+#define RTE_IP_ICMP_DEST_UNREACH3
+#define RTE_IP_ICMP_SOURCE_QUENCH   4
+#define RTE_IP_ICMP_REDIRECT5
+#define RTE_IP_ICMP_ECHO_REQUEST8
+#define RTE_IP_ICMP_TIME_EXCEEDED  11
+#define RTE_IP_ICMP_PARAMETERPROB  12
+#define RTE_IP_ICMP_TIMESTAMP  13
+#define RTE_IP_ICMP_TIMESTAMPREPLY 14
+#define RTE_IP_ICMP_INFO_REQUEST   15
+#define RTE_IP_ICMP_INFO_REPLY 16
+
+#define RTE_ICMP6_ECHO_REQUEST  128
+#define RTE_ICMP6_ECHO_REPLY129
+#define RTE_ND_ROUTER_SOLICIT   133
+#define RTE_ND_ROUTER_ADVERT134
+#define RTE_ND_NEIGHBOR_SOLICIT 135
+#define RTE_ND_NEIGHBOR_ADVERT  136
 
 #ifdef __cplusplus
 }
-- 
2.43.0

[PATCH v5 2/4] net: add new packet dissector

[Stephen Hemminger]

The function rte_dissect_mbuf is used to decode the contents
of an mbuf into ah uman readable format similar to what tshark uses.

For now, handles IP, IPv6, TCP, UDP, ICMP and ARP.

Signed-off-by: Stephen Hemminger 
---
 lib/net/meson.build   |   2 +
 lib/net/rte_dissect.c | 416 ++
 lib/net/rte_dissect.h |  42 +
 lib/net/version.map   |   7 +
 4 files changed, 467 insertions(+)
 create mode 100644 lib/net/rte_dissect.c
 create mode 100644 lib/net/rte_dissect.h

diff --git a/lib/net/meson.build b/lib/net/meson.build
index 0b69138949..48edf17ea3 100644
--- a/lib/net/meson.build
+++ b/lib/net/meson.build
@@ -2,6 +2,7 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 headers = files(
+'rte_dissect.h',
 'rte_ip.h',
 'rte_tcp.h',
 'rte_udp.h',
@@ -30,6 +31,7 @@ headers = files(
 
 sources = files(
 'rte_arp.c',
+'rte_dissect.c',
 'rte_ether.c',
 'rte_net.c',
 'rte_net_crc.c',
diff --git a/lib/net/rte_dissect.c b/lib/net/rte_dissect.c
new file mode 100644
index 00..ae86f7591e
--- /dev/null
+++ b/lib/net/rte_dissect.c
@@ -0,0 +1,416 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Stephen Hemminger 
+ *
+ * Print packets in format similar to tshark.
+ * Output should be one line per mbuf
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* Forward declaration - Ethernet can be nested */
+static void
+dissect_eth(char *buf, size_t size, const struct rte_mbuf *mb,
+   uint32_t offset, uint32_t dump_len);
+
+/*
+ * Read data from segmented mbuf and put it into buf , but stop if would go 
past max length
+ * See rte_pktmbuf_read()
+ */
+static const void *
+dissect_read(const struct rte_mbuf *m, uint32_t offset, uint32_t len,
+void *buf, uint32_t dump_len)
+{
+   /* If this header would be past the requested length
+* then unwind back to end the string.
+*/
+   if (dump_len > 0 && offset + len > dump_len)
+   return NULL;
+
+   return rte_pktmbuf_read(m, offset, len, buf);
+}
+
+/*
+ * Print to string buffer and adjust result
+ * Returns true on success, false if buffer is exhausted.
+ */
+static __rte_format_printf(3, 4) bool
+dissect_print(char **buf, size_t *sz, const char *fmt, ...)
+{
+   va_list ap;
+   int cnt;
+
+   va_start(ap, fmt);
+   cnt = vsnprintf(*buf, *sz, fmt, ap);
+   va_end(ap);
+
+   /* error or string is full */
+   if (cnt < 0 || cnt >= (int)*sz) {
+   *sz = 0;
+   return false;
+   }
+
+   *buf += cnt;
+   *sz -= cnt;
+   return true;
+}
+
+static void
+dissect_arp(char *buf, size_t size, const struct rte_mbuf *mb, uint32_t 
offset, uint32_t dump_len)
+{
+   const struct rte_arp_hdr *arp;
+   struct rte_arp_hdr _arp;
+   char abuf[64];
+
+   arp = dissect_read(mb, offset, sizeof(_arp), &_arp, dump_len);
+   if (arp == NULL)
+   return;
+   offset += sizeof(_arp);
+
+   uint16_t ar_op = rte_be_to_cpu_16(arp->arp_opcode);
+   switch (ar_op) {
+   case RTE_ARP_OP_REQUEST:
+   inet_ntop(AF_INET, &arp->arp_data.arp_tip, abuf, sizeof(abuf));
+   if (!dissect_print(&buf, &size, "Who has %s? ", abuf))
+   return;
+
+   rte_ether_format_addr(abuf, sizeof(abuf), 
&arp->arp_data.arp_sha);
+   if (!dissect_print(&buf, &size, "Tell %s ", abuf))
+   return;
+
+   break;
+   case RTE_ARP_OP_REPLY:
+   inet_ntop(AF_INET, &arp->arp_data.arp_sip, abuf, sizeof(abuf));
+   if (!dissect_print(&buf, &size, "%s is at", abuf))
+   return;
+
+   rte_ether_format_addr(abuf, sizeof(abuf), 
&arp->arp_data.arp_sha);
+   if (!dissect_print(&buf, &size, "%s ", abuf))
+   return;
+   break;
+   case RTE_ARP_OP_INVREQUEST:
+   rte_ether_format_addr(abuf, sizeof(abuf), 
&arp->arp_data.arp_tha);
+   if (!dissect_print(&buf, &size, "Who is %s? ", abuf))
+   return;
+
+   rte_ether_format_addr(abuf, sizeof(abuf), 
&arp->arp_data.arp_sha);
+   if (!dissect_print(&buf, &size, "Tell %s ", abuf))
+   return;
+   break;
+
+   case RTE_ARP_OP_INVREPLY:
+   rte_ether_format_addr(abuf, sizeof(buf), 
&arp->arp_data.arp_sha);
+   if (!dissect_print(&buf, &size, "%s is at ", abuf))
+   return;
+
+   inet_ntop(AF_INET, &arp->arp_data.arp_sip, abuf, sizeof(abuf));
+   if (!dissect_print(&buf, &size, "%s ", abuf))
+   return;
+   break;
+   default:
+   if (!dissect_print(&buf

[PATCH v5 3/4] test: add test for packet dissector

[Stephen Hemminger]

Some tests for new packet dissector.

Signed-off-by: Stephen Hemminger 
---
 app/test/meson.build|   1 +
 app/test/test_dissect.c | 245 
 2 files changed, 246 insertions(+)
 create mode 100644 app/test/test_dissect.c

diff --git a/app/test/meson.build b/app/test/meson.build
index e29258e6ec..9cd2051320 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -62,6 +62,7 @@ source_file_deps = {
 'test_debug.c': [],
 'test_devargs.c': ['kvargs'],
 'test_dispatcher.c': ['dispatcher'],
+'test_dissect.c': ['net'],
 'test_distributor.c': ['distributor'],
 'test_distributor_perf.c': ['distributor'],
 'test_dmadev.c': ['dmadev', 'bus_vdev'],
diff --git a/app/test/test_dissect.c b/app/test/test_dissect.c
new file mode 100644
index 00..2c79acf766
--- /dev/null
+++ b/app/test/test_dissect.c
@@ -0,0 +1,245 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2024 Stephen Hemminger 
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "test.h"
+
+#ifndef LINE_MAX
+#define LINE_MAX   2048
+#endif
+
+#define TOTAL_PACKETS  100
+#define PACKET_LEN 1000
+#define ETH_IP_UDP_VXLAN_SIZE (sizeof(struct rte_ether_hdr) + \
+  sizeof(struct rte_ipv4_hdr) + \
+  sizeof(struct rte_udp_hdr) + \
+  sizeof(struct rte_vxlan_hdr))
+
+
+static uint16_t port_id;
+static const char null_dev[] = "net_null0";
+
+static void
+add_header(struct rte_mbuf *mb, uint32_t plen,
+  rte_be16_t src_port, rte_be16_t dst_port)
+{
+   struct {
+   struct rte_ether_hdr eth;
+   struct rte_ipv4_hdr ip;
+   struct rte_udp_hdr udp;
+   } pkt = {
+   .eth = {
+   .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+   .ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4),
+   },
+   .ip = {
+   .version_ihl = RTE_IPV4_VHL_DEF,
+   .time_to_live = 1,
+   .next_proto_id = IPPROTO_UDP,
+   .src_addr = rte_cpu_to_be_32(RTE_IPV4_LOOPBACK),
+   .dst_addr = rte_cpu_to_be_32(RTE_IPV4_BROADCAST),
+   },
+   .udp = {
+   .dst_port = dst_port,
+   .src_port = src_port,
+   },
+   };
+
+   rte_eth_random_addr(pkt.eth.src_addr.addr_bytes);
+
+   plen -= sizeof(struct rte_ether_hdr);
+   pkt.ip.total_length = rte_cpu_to_be_16(plen);
+   pkt.ip.hdr_checksum = rte_ipv4_cksum(&pkt.ip);
+
+   plen -= sizeof(struct rte_ipv4_hdr);
+   pkt.udp.src_port = rte_rand();
+   pkt.udp.dgram_len = rte_cpu_to_be_16(plen);
+
+   /* Copy header into mbuf */
+   memcpy(rte_pktmbuf_append(mb, sizeof(pkt)), &pkt, sizeof(pkt));
+}
+
+static void
+add_vxlan(struct rte_mbuf *mb, rte_be32_t vni)
+{
+   struct rte_vxlan_hdr *vxlan;
+
+   vxlan = (struct rte_vxlan_hdr *)rte_pktmbuf_append(mb, sizeof(*vxlan));
+   memset(vxlan, 0, sizeof(*vxlan));
+   vxlan->flag_i = 1;
+   vxlan->vx_vni = vni;
+}
+
+
+static void
+fill_data(struct rte_mbuf *mb, uint32_t len)
+{
+   uint32_t i;
+   char *ptr = rte_pktmbuf_append(mb, len);
+   char c = '!';
+
+   /* traditional barber pole pattern */
+   for (i = 0; i < len; i++) {
+   ptr[i] = c++;
+   if (c == 0x7f)
+   c = '!';
+   }
+}
+
+static void
+mbuf_prep(struct rte_mbuf *mb, uint8_t buf[], uint32_t buf_len)
+{
+   mb->buf_addr = buf;
+   rte_mbuf_iova_set(mb, (uintptr_t)buf);
+   mb->buf_len = buf_len;
+   rte_mbuf_refcnt_set(mb, 1);
+
+   /* set pool pointer to dummy value, test doesn't use it */
+   mb->pool = (void *)buf;
+
+   rte_pktmbuf_reset(mb);
+}
+
+static int
+test_setup(void)
+{
+   port_id = rte_eth_dev_count_avail();
+
+   /* Make a dummy null device to snoop on */
+   if (rte_vdev_init(null_dev, NULL) != 0) {
+   fprintf(stderr, "Failed to create vdev '%s'\n", null_dev);
+   goto fail;
+   }
+   return 0;
+
+fail:
+   rte_vdev_uninit(null_dev);
+   return -1;
+}
+
+static void
+test_cleanup(void)
+{
+   rte_vdev_uninit(null_dev);
+}
+
+
+static int
+test_simple(void)
+{
+   struct rte_mbuf mb;
+   uint8_t buf[RTE_MBUF_DEFAULT_BUF_SIZE];
+   uint32_t data_len = PACKET_LEN;
+   uint16_t src_port = rte_rand();
+   const uint16_t dst_port = rte_cpu_to_be_16(9); /* Discard port */
+   char obuf[LINE_MAX];
+
+   /* make a dummy packet */
+   mbuf_prep(&mb, buf, sizeof(buf));
+   add_header(&mb, data_len, src_port, dst_port);
+   fill_data(&mb, data_len - mb.data_off);
+
+   rte_dissect_mbuf(obuf, 

[PATCH v5 4/4] test-pmd: add more packet verbose decode options

[Stephen Hemminger]

The existing verbose levels 1..3 provide a messy multi-line
output per packet. I found this unhelpful when diagnosing many
types of problems like packet flow.

This patch keeps the previous levels and adds two new levels:
4: one line per packet is printed in a format resembling
   tshark output. With addresses and protocol info.

5: dump packet in hex.
   Useful if the driver is messing up the data.

Signed-off-by: Stephen Hemminger 
---
 app/test-pmd/cmdline_flow.c |  3 +-
 app/test-pmd/config.c   | 33 ++---
 app/test-pmd/testpmd.h  | 11 +++
 app/test-pmd/util.c | 77 +++--
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  5 +-
 5 files changed, 111 insertions(+), 18 deletions(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index d04280eb3e..a010fcf61a 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -14143,7 +14143,8 @@ cmd_set_raw_parsed(const struct buffer *in)
upper_layer = proto;
}
}
-   if (verbose_level & 0x1)
+
+   if (verbose_level > 0)
printf("total data size is %zu\n", (*total_size));
RTE_ASSERT((*total_size) <= ACTION_RAW_ENCAP_MAX_DATA);
memmove(data, (data_tail - (*total_size)), *total_size);
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 6f0beafa27..b5b5f3b464 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -6246,26 +6246,37 @@ configure_rxtx_dump_callbacks(uint16_t verbose)
return;
 #endif
 
-   RTE_ETH_FOREACH_DEV(portid)
-   {
-   if (verbose == 1 || verbose > 2)
+   RTE_ETH_FOREACH_DEV(portid) {
+   switch (verbose) {
+   case VERBOSE_OFF:
+   remove_rx_dump_callbacks(portid);
+   remove_tx_dump_callbacks(portid);
+   break;
+   case VERBOSE_RX:
add_rx_dump_callbacks(portid);
-   else
+   remove_tx_dump_callbacks(portid);
+   break;
+   case VERBOSE_TX:
+   add_tx_dump_callbacks(portid);
remove_rx_dump_callbacks(portid);
-   if (verbose >= 2)
+   break;
+   default:
+   add_rx_dump_callbacks(portid);
add_tx_dump_callbacks(portid);
-   else
-   remove_tx_dump_callbacks(portid);
+   }
}
 }
 
 void
 set_verbose_level(uint16_t vb_level)
 {
-   printf("Change verbose level from %u to %u\n",
-  (unsigned int) verbose_level, (unsigned int) vb_level);
-   verbose_level = vb_level;
-   configure_rxtx_dump_callbacks(verbose_level);
+   if (vb_level < VERBOSE_MAX) {
+   printf("Change verbose level from %u to %u\n", verbose_level, 
vb_level);
+   verbose_level = vb_level;
+   configure_rxtx_dump_callbacks(verbose_level);
+   } else {
+   fprintf(stderr, "Verbose level %u is out of range\n", vb_level);
+   }
 }
 
 void
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 9facd7f281..3d7a2b6dac 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -489,6 +489,17 @@ enum dcb_mode_enable
 
 extern uint8_t xstats_hide_zero; /**< Hide zero values for xstats display */
 
+enum verbose_mode {
+   VERBOSE_OFF = 0,
+   VERBOSE_RX,
+   VERBOSE_TX,
+   VERBOSE_BOTH,
+   VERBOSE_DISSECT,
+   VERBOSE_HEX,
+   VERBOSE_MAX
+};
+
+
 /* globals used for configuration */
 extern uint8_t record_core_cycles; /**< Enables measurement of CPU cycles */
 extern uint8_t record_burst_stats; /**< Enables display of RX and TX bursts */
diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c
index bf9b639d95..f277e7f035 100644
--- a/app/test-pmd/util.c
+++ b/app/test-pmd/util.c
@@ -5,9 +5,11 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -16,6 +18,7 @@
 #include "testpmd.h"
 
 #define MAX_STRING_LEN 8192
+#define MAX_DUMP_LEN   1024
 
 #define MKDUMPSTR(buf, buf_size, cur_len, ...) \
 do { \
@@ -67,9 +70,10 @@ get_timestamp(const struct rte_mbuf *mbuf)
timestamp_dynfield_offset, rte_mbuf_timestamp_t *);
 }
 
-static inline void
-dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
- uint16_t nb_pkts, int is_rx)
+/* More verbose older style packet decode */
+static void
+dump_pkt_verbose(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[],
+uint16_t nb_pkts, int is_rx)
 {
struct rte_mbuf  *mb;
const struct rte_ether_hdr *eth_hdr;
@@ -90,8 +94,6 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct 
rte_mbuf *pkts[],
size_t cur_len = 0;
uint64_t 

DTS WG Meeting Minutes - August 1, 2024

[Patrick Robb]

August 1, 2024

#
Attendees
* Patrick Robb
* Jeremy Spewock
* Nicholas Pratte
* Juraj Linkeš
* Alex Chapman
* Luca Vizzarro

#
Minutes

=
General Announcements
* DPDK 24.07 is released
* DPDK Summit CFP deadline has passed. Luca submitted a talk for
setting up DTS and running testsuites. Patrick submitted a talk for CI
Labs/community update and new CI testing coverage, tools, etc.
available to DPDK developers.
* Draft of DTS 24.11 roadmap:
https://docs.google.com/document/d/1Rcp1-gZWzGGCCSkbEsigrd0-NoQmknv6ZS7V2CPdgFo/edit
* Do we want to add DTS items to release notes?
   * What is the process for building the release notes? Should the
people working on DTS aggregate the updates and submit them? Patrick
Robbshould check the website for the release notes process, or email
the dev mailing list asking.
* Dpdk-next-dts has been set up: https://git.dpdk.org/next/dpdk-next-dts/
   * We should continue to submit patches like normal. Juraj will
apply the patches to next-dts as needed.
   * Once the patches are in next DTS for-main branch, they can be
pulled into DPDK main at any time by Thomas/David
* Some AWS engineers are invited to the CI call for next week.
   * Will talk about reporting publicly using their internal tooling
   * Will talk about reporting using dpdk-test from AWS
   * Will (possibly) talk about DTS at AWS

=
Patch discussions
* Adding support for DTS creating device VFs:
   * Shouldn’t need any additions to the config file.
   * There can be a capability associated with this, i.e. this
testsuite requires VFs, then we run “dpdk-devbind.py -s” and parse out
the output for available VFs.
   * Method for creating the VFs can return the list of VFs which can
be stored in the testsuite object as VF ports
* Ipv4_reassembly: not eth_dev, will not be implemented in new DTS.
   * Patrick Robbneeds to strike through this row, and give Luca edit
access on the spreadsheet
* We need to add more testsuites to the list. Dean Marxand Patrick
Robbshould sync on this to discuss the new list that Dean put
together, and find some more cases.
* We often ship testsuites patches and testpmd shell additions
together, and the testpmd shell addition gets locked up for an
extended period of time as the testsuite gets reviews. If we spit out
the testsuite additions and the framework additions, we can merge the
framework additions quickly into the dts staging branch. For now, we
can ship testsuite patches and their respective framework updates
together, and split them out if we reach the 2nd half of a release
cycle and we need to start moving.

=
Bugzilla discussions
* Looking into submitting a bugzilla ticket for mlx5 NICs not
distinguishing between having a bad checksum and having no checksum in
testpmd verbose output.

=
Any other business
* Next meeting Aug 15, 2024

RE: [PATCH v5] virtio: optimize stats counters performance

[Morten Brørup]

> From: Stephen Hemminger [mailto:step...@networkplumber.org]
> Sent: Thursday, 1 August 2024 18.18
> 
> On Thu,  1 Aug 2024 16:03:12 +
> Morten Brørup  wrote:
> 
> > Optimized the performance of updating the virtio statistics counters
> by
> > reducing the number of branches.
> >
> > Ordered the packet size comparisons according to the probability with
> > typical internet traffic mix.
> >
> > Signed-off-by: Morten Brørup 
> 
> LGTM
> Acked-by: Stephen Hemminger 
> 
> I wonder if other software drivers could use similar counters?

While working on this, I noticed the netvsc driver and vhost lib also have 
size_bins [1], so they are likely candidates.
 
The netvsc's hn_update_packet_stats() function [2] seems like 100 % copy-paste, 
and should be easy to paste over with the new implementation.
The vhost lib's vhost_queue_stats_update() function [3] also looks rather 
similar to the original variant, and could benefit too.

[1]: https://elixir.bootlin.com/dpdk/v24.07/A/ident/size_bins
[2]: 
https://elixir.bootlin.com/dpdk/v24.07/source/drivers/net/netvsc/hn_rxtx.c#L108
[3]: https://elixir.bootlin.com/dpdk/v24.07/source/lib/vhost/virtio_net.c#L56

I'll take a look around and add similar patches for what I find. Thanks for the 
reminder.

Re: [PATCH v4] net/gve : Update EOP & csum bit in txd rte_mbuf chain

[Joshua Washington]

Acked-by: Joshua Washington 

Thanks!

Re: [PATCH v5] virtio: optimize stats counters performance

[lihuisong (C)]

在 2024/8/2 0:03, Morten Brørup 写道:

Optimized the performance of updating the virtio statistics counters by
reducing the number of branches.

Ordered the packet size comparisons according to the probability with
typical internet traffic mix.

Signed-off-by: Morten Brørup 
---
v5:
* Do not inline the function. (Stephen)
v4:
* Consider multicast/broadcast packets unlikely.
v3:
* Eliminated a local variable.
* Note: Substituted sizeof(uint32_t)*4 by 32UL, using unsigned long type
   to keep optimal offsetting in generated assembler output.
* Removed unnecessary curly braces.
v2:
* Fixed checkpatch warning about line length.
---
  drivers/net/virtio/virtio_rxtx.c | 39 
  drivers/net/virtio/virtio_rxtx.h |  4 ++--
  2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index f69b9453a2..b67f063b31 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -82,37 +82,26 @@ vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
  }
  
  void

-virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)
+virtio_update_packet_stats(struct virtnet_stats *const stats,
+   const struct rte_mbuf *const mbuf)

The two const is also for performace?  Is there gain?

  {
uint32_t s = mbuf->pkt_len;
-   struct rte_ether_addr *ea;
+   const struct rte_ether_addr *const ea =
+   rte_pktmbuf_mtod(mbuf, const struct rte_ether_addr *);
  
  	stats->bytes += s;
  
-	if (s == 64) {

-   stats->size_bins[1]++;
-   } else if (s > 64 && s < 1024) {
-   uint32_t bin;
-
-   /* count zeros, and offset into correct bin */
-   bin = (sizeof(s) * 8) - rte_clz32(s) - 5;
-   stats->size_bins[bin]++;
-   } else {
-   if (s < 64)
-   stats->size_bins[0]++;
-   else if (s < 1519)
-   stats->size_bins[6]++;
-   else
-   stats->size_bins[7]++;
-   }
+   if (s >= 1024)
+   stats->size_bins[6 + (s > 1518)]++;
+   else if (s <= 64)
+   stats->size_bins[s >> 6]++;
+   else
+   stats->size_bins[32UL - rte_clz32(s) - 5]++;
  
-	ea = rte_pktmbuf_mtod(mbuf, struct rte_ether_addr *);

-   if (rte_is_multicast_ether_addr(ea)) {
-   if (rte_is_broadcast_ether_addr(ea))
-   stats->broadcast++;
-   else
-   stats->multicast++;
-   }
+   RTE_BUILD_BUG_ON(offsetof(struct virtnet_stats, broadcast) !=
+   offsetof(struct virtnet_stats, multicast) + 
sizeof(uint64_t));
+   if (unlikely(rte_is_multicast_ether_addr(ea)))
+   (&stats->multicast)[rte_is_broadcast_ether_addr(ea)]++;
The "rte_is_broadcast_ether_addr(ea) " will be calculated twice if 
packet is mulitcast.

How about coding like:
-->
is_mulitcast = rte_is_multicast_ether_addr(ea);
if (unlikely(is_mulitcast))
(&stats->multicast)[rte_is_broadcast_ether_addr(ea)]++;

  }
  
  static inline void

diff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h
index afc4b74534..68034c914b 100644
--- a/drivers/net/virtio/virtio_rxtx.h
+++ b/drivers/net/virtio/virtio_rxtx.h
@@ -35,7 +35,7 @@ struct virtnet_tx {
  };
  
  int virtio_rxq_vec_setup(struct virtnet_rx *rxvq);

-void virtio_update_packet_stats(struct virtnet_stats *stats,
-   struct rte_mbuf *mbuf);
+void virtio_update_packet_stats(struct virtnet_stats *const stats,
+   const struct rte_mbuf *const mbuf);
  
  #endif /* _VIRTIO_RXTX_H_ */

Re: [PATCH v5] virtio: optimize stats counters performance

[lihuisong (C)]

在 2024/8/2 10:42, Stephen Hemminger 写道:

On Fri, 2 Aug 2024 10:23:12 +0800
"lihuisong (C)"  wrote:


   void
-virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)
+virtio_update_packet_stats(struct virtnet_stats *const stats,
+   const struct rte_mbuf *const mbuf)

The two const is also for performace?  Is there gain?

If you look at resulting code (ie godbolt.org) the resulting code never
changes when const is added.  The compiler already
knows what is modified. Const is only a programmer and correctness thing.
I know this. Thanks for your clarifying and recommending the site that 
is good to use.😁

This patch is just for optimizing stats counters performance.
And the new added const has nothing to do with this optimization.
But it's ok for me.

.

[PATCH v5] net/gve : Update EOP & csum bit in txd rte_mbuf chain

[Tathagat Priyadarshi]

The EOP and csum bit was not set for all the packets in mbuf chain
causing packet transmission stalls for packets split across
mbuf in chain.

Fixes: 4022f99 ("net/gve: support basic Tx data path for DQO")
Cc: sta...@dpdk.org

Signed-off-by: Tathagat Priyadarshi 
Signed-off-by: Varun Lakkur Ambaji Rao 

Acked-by: Joshua Washington 
---
 drivers/net/gve/gve_tx_dqo.c | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
index a65e6aa..bbaf46d 100644
--- a/drivers/net/gve/gve_tx_dqo.c
+++ b/drivers/net/gve/gve_tx_dqo.c
@@ -89,6 +89,7 @@
uint16_t sw_id;
uint64_t bytes;
uint16_t first_sw_id;
+   uint8_t csum;
 
sw_ring = txq->sw_ring;
txr = txq->tx_ring;
@@ -114,6 +115,9 @@
ol_flags = tx_pkt->ol_flags;
nb_used = tx_pkt->nb_segs;
first_sw_id = sw_id;
+
+   csum = !!(ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO);
+
do {
if (sw_ring[sw_id] != NULL)
PMD_DRV_LOG(DEBUG, "Overwriting an entry in 
sw_ring");
@@ -126,6 +130,8 @@
txd->pkt.dtype = GVE_TX_PKT_DESC_DTYPE_DQO;
txd->pkt.compl_tag = rte_cpu_to_le_16(first_sw_id);
txd->pkt.buf_size = RTE_MIN(tx_pkt->data_len, 
GVE_TX_MAX_BUF_SIZE_DQO);
+   txd->pkt.end_of_packet = 0;
+   txd->pkt.checksum_offload_enable = csum;
 
/* size of desc_ring and sw_ring could be different */
tx_id = (tx_id + 1) & mask;
@@ -138,9 +144,6 @@
/* fill the last descriptor with End of Packet (EOP) bit */
txd->pkt.end_of_packet = 1;
 
-   if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
-   txd->pkt.checksum_offload_enable = 1;
-
txq->nb_free -= nb_used;
txq->nb_used += nb_used;
}
-- 
1.8.3.1

Re: [PATCH v5] net/gve : Update EOP & csum bit in txd rte_mbuf chain

[Tathagat Priyadarshi]

Updated the if-else block with an optimised inverse operator. Thanks
for your suggestion Stephen.

On Fri, Aug 2, 2024 at 10:36 AM Tathagat Priyadarshi
 wrote:
>
> The EOP and csum bit was not set for all the packets in mbuf chain
> causing packet transmission stalls for packets split across
> mbuf in chain.
>
> Fixes: 4022f99 ("net/gve: support basic Tx data path for DQO")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Tathagat Priyadarshi 
> Signed-off-by: Varun Lakkur Ambaji Rao 
>
> Acked-by: Joshua Washington 
> ---
>  drivers/net/gve/gve_tx_dqo.c | 9 ++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/gve/gve_tx_dqo.c b/drivers/net/gve/gve_tx_dqo.c
> index a65e6aa..bbaf46d 100644
> --- a/drivers/net/gve/gve_tx_dqo.c
> +++ b/drivers/net/gve/gve_tx_dqo.c
> @@ -89,6 +89,7 @@
> uint16_t sw_id;
> uint64_t bytes;
> uint16_t first_sw_id;
> +   uint8_t csum;
>
> sw_ring = txq->sw_ring;
> txr = txq->tx_ring;
> @@ -114,6 +115,9 @@
> ol_flags = tx_pkt->ol_flags;
> nb_used = tx_pkt->nb_segs;
> first_sw_id = sw_id;
> +
> +   csum = !!(ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO);
> +
> do {
> if (sw_ring[sw_id] != NULL)
> PMD_DRV_LOG(DEBUG, "Overwriting an entry in 
> sw_ring");
> @@ -126,6 +130,8 @@
> txd->pkt.dtype = GVE_TX_PKT_DESC_DTYPE_DQO;
> txd->pkt.compl_tag = rte_cpu_to_le_16(first_sw_id);
> txd->pkt.buf_size = RTE_MIN(tx_pkt->data_len, 
> GVE_TX_MAX_BUF_SIZE_DQO);
> +   txd->pkt.end_of_packet = 0;
> +   txd->pkt.checksum_offload_enable = csum;
>
> /* size of desc_ring and sw_ring could be different */
> tx_id = (tx_id + 1) & mask;
> @@ -138,9 +144,6 @@
> /* fill the last descriptor with End of Packet (EOP) bit */
> txd->pkt.end_of_packet = 1;
>
> -   if (ol_flags & GVE_TX_CKSUM_OFFLOAD_MASK_DQO)
> -   txd->pkt.checksum_offload_enable = 1;
> -
> txq->nb_free -= nb_used;
> txq->nb_used += nb_used;
> }
> --
> 1.8.3.1
>