Re: [PATCH v8 12/21] dts: interactive remote session docstring update

[Juraj Linkeš]

On Thu, Nov 30, 2023 at 10:50 PM Jeremy Spewock  wrote:
>
>
>
> On Thu, Nov 23, 2023 at 10:14 AM Juraj Linkeš  
> wrote:
>>
>> Format according to the Google format and PEP257, with slight
>> deviations.
>>
>> Signed-off-by: Juraj Linkeš 
>> ---
>>  .../interactive_remote_session.py | 36 +++
>>  .../remote_session/interactive_shell.py   | 99 +++
>>  dts/framework/remote_session/python_shell.py  | 26 -
>>  dts/framework/remote_session/testpmd_shell.py | 58 +--
>>  4 files changed, 149 insertions(+), 70 deletions(-)
>>
>> diff --git a/dts/framework/remote_session/interactive_remote_session.py 
>> b/dts/framework/remote_session/interactive_remote_session.py
>> index 098ded1bb0..1cc82e3377 100644
>> --- a/dts/framework/remote_session/interactive_remote_session.py
>> +++ b/dts/framework/remote_session/interactive_remote_session.py
>> @@ -22,27 +22,23 @@
>>  class InteractiveRemoteSession:
>>  """SSH connection dedicated to interactive applications.
>>
>> -This connection is created using paramiko and is a persistent 
>> connection to the
>> -host. This class defines methods for connecting to the node and 
>> configures this
>> -connection to send "keep alive" packets every 30 seconds. Because 
>> paramiko attempts
>> -to use SSH keys to establish a connection first, providing a password 
>> is optional.
>> -This session is utilized by InteractiveShells and cannot be interacted 
>> with
>> -directly.
>> -
>> -Arguments:
>> -node_config: Configuration class for the node you are connecting to.
>> -_logger: Desired logger for this session to use.
>> +The connection is created using `paramiko 
>> `_
>> +and is a persistent connection to the host. This class defines the 
>> methods for connecting
>> +to the node and configures the connection to send "keep alive" packets 
>> every 30 seconds.
>> +Because paramiko attempts to use SSH keys to establish a connection 
>> first, providing
>> +a password is optional. This session is utilized by InteractiveShells
>> +and cannot be interacted with directly.
>>
>>  Attributes:
>> -hostname: Hostname that will be used to initialize a connection to 
>> the node.
>> -ip: A subsection of hostname that removes the port for the 
>> connection if there
>> +hostname: The hostname that will be used to initialize a connection 
>> to the node.
>> +ip: A subsection of `hostname` that removes the port for the 
>> connection if there
>>  is one. If there is no port, this will be the same as hostname.
>> -port: Port to use for the ssh connection. This will be extracted 
>> from the
>> -hostname if there is a port included, otherwise it will default 
>> to 22.
>> +port: Port to use for the ssh connection. This will be extracted 
>> from `hostname`
>> +if there is a port included, otherwise it will default to 
>> ``22``.
>>  username: User to connect to the node with.
>>  password: Password of the user connecting to the host. This will 
>> default to an
>>  empty string if a password is not provided.
>> -session: Underlying paramiko connection.
>> +session: The underlying paramiko connection.
>>
>>  Raises:
>>  SSHConnectionError: There is an error creating the SSH connection.
>> @@ -58,9 +54,15 @@ class InteractiveRemoteSession:
>>  _node_config: NodeConfiguration
>>  _transport: Transport | None
>>
>> -def __init__(self, node_config: NodeConfiguration, _logger: DTSLOG) -> 
>> None:
>> +def __init__(self, node_config: NodeConfiguration, logger: DTSLOG) -> 
>> None:
>> +"""Connect to the node during initialization.
>> +
>> +Args:
>> +node_config: The test run configuration of the node to connect 
>> to.
>> +logger: The logger instance this session will use.
>> +"""
>>  self._node_config = node_config
>> -self._logger = _logger
>> +self._logger = logger
>>  self.hostname = node_config.hostname
>>  self.username = node_config.user
>>  self.password = node_config.password if node_config.password else ""
>> diff --git a/dts/framework/remote_session/interactive_shell.py 
>> b/dts/framework/remote_session/interactive_shell.py
>> index 4db19fb9b3..b158f963b6 100644
>> --- a/dts/framework/remote_session/interactive_shell.py
>> +++ b/dts/framework/remote_session/interactive_shell.py
>> @@ -3,18 +3,20 @@
>>
>>  """Common functionality for interactive shell handling.
>>
>> -This base class, InteractiveShell, is meant to be extended by other classes 
>> that
>> -contain functionality specific to that shell type. These derived classes 
>> will often
>> -modify things like the prompt to expect or the arguments to pass into the 
>> application,
>> -but still utilize the same method for sending a comman

Re: [PATCH v8 15/21] dts: os session docstring update

[Juraj Linkeš]

>> diff --git a/dts/framework/testbed_model/os_session.py 
>> b/dts/framework/testbed_model/os_session.py
>> index 76e595a518..cfdbd1c4bd 100644
>> --- a/dts/framework/testbed_model/os_session.py
>> +++ b/dts/framework/testbed_model/os_session.py

>> @@ -201,69 +283,119 @@ def build_dpdk(
>>  rebuild: bool = False,
>>  timeout: float = SETTINGS.compile_timeout,
>>  ) -> None:
>> -"""
>> -Build DPDK in the input dir with specified environment variables 
>> and meson
>> -arguments.
>> +"""Build DPDK on the remote node.
>> +
>> +An extracted DPDK tarball must be present on the node. The build 
>> consists of two steps::
>> +
>> +meson setup  remote_dpdk_dir remote_dpdk_build_dir
>> +ninja -C remote_dpdk_build_dir
>> +
>> +The :option:`--compile-timeout` command line argument and the 
>> :envvar:`DTS_COMPILE_TIMEOUT`
>> +environment variable configure the timeout of DPDK build.
>> +
>> +Args:
>> +env_vars: Use these environment variables then building DPDK.
>
>
> I think this is meant to be "when building DPDK" instead.
>

Yes, good catch.

Re: [PATCH v8 18/21] dts: sut and tg nodes docstring update

[Juraj Linkeš]

On Fri, Dec 1, 2023 at 7:06 PM Jeremy Spewock  wrote:
>
>
>
> On Thu, Nov 23, 2023 at 10:14 AM Juraj Linkeš  
> wrote:
>>
>> Format according to the Google format and PEP257, with slight
>> deviations.
>>
>> Signed-off-by: Juraj Linkeš 
>> ---
>>  dts/framework/testbed_model/sut_node.py | 230 
>>  dts/framework/testbed_model/tg_node.py  |  42 +++--
>>  2 files changed, 176 insertions(+), 96 deletions(-)
>>
>> diff --git a/dts/framework/testbed_model/sut_node.py 
>> b/dts/framework/testbed_model/sut_node.py
>> index 5ce9446dba..c4acea38d1 100644
>> --- a/dts/framework/testbed_model/sut_node.py
>> +++ b/dts/framework/testbed_model/sut_node.py
>> @@ -3,6 +3,14 @@
>>  # Copyright(c) 2023 PANTHEON.tech s.r.o.
>>  # Copyright(c) 2023 University of New Hampshire
>>
>> +"""System under test (DPDK + hardware) node.
>> +
>> +A system under test (SUT) is the combination of DPDK
>> +and the hardware we're testing with DPDK (NICs, crypto and other devices).
>> +An SUT node is where this SUT runs.
>> +"""
>
>
> I think this should just be "A SUT node"
>

I always spell it out which is why I used "an" (an es, ju:, ti: node).
>From what I understand, the article is based on how the word is
pronounced. If it's an initialism (it's spelled), we should use "an"
and if it's an abbreviation (pronounced as the whole word), we should
use "a". It always made sense to me as an initialism - I think that's
the common usage.

Re: [PATCH v8 19/21] dts: base traffic generators docstring update

[Juraj Linkeš]

On Fri, Dec 1, 2023 at 7:05 PM Jeremy Spewock  wrote:
>
>
>
> On Thu, Nov 23, 2023 at 10:14 AM Juraj Linkeš  
> wrote:
>>
>> Format according to the Google format and PEP257, with slight
>> deviations.
>>
>> Signed-off-by: Juraj Linkeš 
>> ---
>>  .../traffic_generator/__init__.py | 22 -
>>  .../capturing_traffic_generator.py| 45 +++
>>  .../traffic_generator/traffic_generator.py| 33 --
>>  3 files changed, 67 insertions(+), 33 deletions(-)
>>
>> diff --git a/dts/framework/testbed_model/traffic_generator/__init__.py 
>> b/dts/framework/testbed_model/traffic_generator/__init__.py
>> index 52888d03fa..11e2bd7d97 100644
>> --- a/dts/framework/testbed_model/traffic_generator/__init__.py
>> +++ b/dts/framework/testbed_model/traffic_generator/__init__.py

>> @@ -60,19 +67,17 @@ def send_packets(self, packets: list[Packet], port: 
>> Port) -> None:
>>
>>  @abstractmethod
>>  def _send_packets(self, packets: list[Packet], port: Port) -> None:
>> -"""
>> -The extended classes must implement this method which
>> -sends packets on send_port. The method should block until all 
>> packets
>> -are fully sent.
>> +"""The implementation of :method:`send_packets`.
>> +
>> +The subclasses must implement this method which sends `packets` on 
>> `port`.
>> +The method should block until all `packets` are fully sent.
>> +
>> +What full sent means is defined by the traffic generator.
>>  """
>
>
> I think this should be "what fully sent means"
>

Thanks, Yoan also caught this.

Re: [PATCH v8 20/21] dts: scapy tg docstring update

[Juraj Linkeš]

On Fri, Dec 1, 2023 at 7:18 PM Jeremy Spewock  wrote:
>
>
>
> On Thu, Nov 23, 2023 at 10:14 AM Juraj Linkeš  
> wrote:
>>
>> Format according to the Google format and PEP257, with slight
>> deviations.
>>
>> Signed-off-by: Juraj Linkeš 
>> ---
>>  .../testbed_model/traffic_generator/scapy.py  | 91 +++
>>  1 file changed, 54 insertions(+), 37 deletions(-)
>>
>> diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py 
>> b/dts/framework/testbed_model/traffic_generator/scapy.py
>> index c88cf28369..30ea3914ee 100644
>> --- a/dts/framework/testbed_model/traffic_generator/scapy.py
>> +++ b/dts/framework/testbed_model/traffic_generator/scapy.py
>> @@ -2,14 +2,15 @@
>>  # Copyright(c) 2022 University of New Hampshire
>>  # Copyright(c) 2023 PANTHEON.tech s.r.o.
>>
>> -"""Scapy traffic generator.
>> +"""The Scapy traffic generator.
>>
>> -Traffic generator used for functional testing, implemented using the Scapy 
>> library.
>> +A traffic generator used for functional testing, implemented with
>> +`the Scapy library `_.
>>  The traffic generator uses an XML-RPC server to run Scapy on the remote TG 
>> node.
>>
>> -The XML-RPC server runs in an interactive remote SSH session running Python 
>> console,
>> -where we start the server. The communication with the server is facilitated 
>> with
>> -a local server proxy.
>> +The traffic generator uses the :mod:`xmlrpc.server` module to run an 
>> XML-RPC server
>> +in an interactive remote Python SSH session. The communication with the 
>> server is facilitated
>> +with a local server proxy from the :mod:`xmlrpc.client` module.
>>  """
>>
>>  import inspect
>> @@ -69,20 +70,20 @@ def scapy_send_packets_and_capture(
>>  recv_iface: str,
>>  duration: float,
>>  ) -> list[bytes]:
>> -"""RPC function to send and capture packets.
>> +"""The RPC function to send and capture packets.
>>
>> -The function is meant to be executed on the remote TG node.
>> +The function is meant to be executed on the remote TG node via the 
>> server proxy.
>>
>
> Should this maybe be "This function is meant" instead? I'm not completely 
> sure if it should be, I feel like it might be able to go either way.
>

There is something to this. It's a bit more explicit and as such less
confusing which feels better, so I'll change it in all three
instances.

>>
>>  Args:
>>  xmlrpc_packets: The packets to send. These need to be converted to
>> -xmlrpc.client.Binary before sending to the remote server.
>> +:class:`~xmlrpc.client.Binary` objects before sending to the 
>> remote server.
>>  send_iface: The logical name of the egress interface.
>>  recv_iface: The logical name of the ingress interface.
>>  duration: Capture for this amount of time, in seconds.
>>
>>  Returns:
>>  A list of bytes. Each item in the list represents one packet, which 
>> needs
>> -to be converted back upon transfer from the remote node.
>> +to be converted back upon transfer from the remote node.
>>  """
>>  scapy_packets = [scapy.all.Packet(packet.data) for packet in 
>> xmlrpc_packets]
>>  sniffer = scapy.all.AsyncSniffer(
>> @@ -96,19 +97,15 @@ def scapy_send_packets_and_capture(
>>
>>
>>  def scapy_send_packets(xmlrpc_packets: list[xmlrpc.client.Binary], 
>> send_iface: str) -> None:
>> -"""RPC function to send packets.
>> +"""The RPC function to send packets.
>>
>> -The function is meant to be executed on the remote TG node.
>> -It doesn't return anything, only sends packets.
>> +The function is meant to be executed on the remote TG node via the 
>> server proxy.
>
>
> Same thing here. I don't think it matters that much since you refer to it as 
> being "the RPC function" for sending packets, but it feels like you are 
> referring instead to this specific function on this line.
>
>>
>> +It only sends `xmlrpc_packets`, without capturing them.
>>
>>  Args:
>>  xmlrpc_packets: The packets to send. These need to be converted to
>> -xmlrpc.client.Binary before sending to the remote server.
>> +:class:`~xmlrpc.client.Binary` objects before sending to the 
>> remote server.
>>  send_iface: The logical name of the egress interface.
>> -
>> -Returns:
>> -A list of bytes. Each item in the list represents one packet, which 
>> needs
>> -to be converted back upon transfer from the remote node.
>>  """
>>  scapy_packets = [scapy.all.Packet(packet.data) for packet in 
>> xmlrpc_packets]
>>  scapy.all.sendp(scapy_packets, iface=send_iface, realtime=True, 
>> verbose=True)
>> @@ -128,11 +125,19 @@ def scapy_send_packets(xmlrpc_packets: 
>> list[xmlrpc.client.Binary], send_iface: s
>>
>>
>>  class QuittableXMLRPCServer(SimpleXMLRPCServer):
>> -"""Basic XML-RPC server that may be extended
>> -by functions serializable by the marshal module

[PATCH v4] windows/virt2phys: fix block MDL not updated

[Ric Li]

The virt2phys_translate function previously scanned existing blocks,
returning the physical address from the stored MDL info if present.
This method was problematic when a virtual address pointed to a freed
and reallocated memory segment, potentially changing the physical
address mapping. Yet, virt2phys_translate would consistently return
the originally stored physical address, which could be invalid.

This issue surfaced when allocating a memory region larger than 2MB
using rte_malloc. This action would allocate a new memory segment
and use virt2phy to set the IOVA. The driver would store the MDL
and lock the pages initially. When this region was freed, the memory
segment used as a whole page could be freed, invalidating the virtual
to physical mapping. Before this fix, the driver would only return the
initial physical address, leading to illegal IOVA for some pages when
allocating a new memory region larger than the hugepage size (2MB).

To address this, a function to check block physical address has been
added. If a block with the same base address is detected in the
driver's context, the MDL's physical address is compared with the real
physical address. If they don't match, the block is removed and a new
one is created to store the correct mapping. To make the removal action
clear, the list to store MDL blocks is changed to a double linked list.

Also fix the printing of PVOID type.

Bugzilla ID: 1201
Bugzilla ID: 1213

Signed-off-by: Ric Li 
---
 windows/virt2phys/virt2phys.c   |  7 +--
 windows/virt2phys/virt2phys_logic.c | 70 ++---
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/windows/virt2phys/virt2phys.c b/windows/virt2phys/virt2phys.c
index f4d5298..b64a13d 100644
--- a/windows/virt2phys/virt2phys.c
+++ b/windows/virt2phys/virt2phys.c
@@ -182,7 +182,7 @@ virt2phys_device_EvtIoInCallerContext(WDFDEVICE device, 
WDFREQUEST request)
 {
WDF_REQUEST_PARAMETERS params;
ULONG code;
-   PVOID *virt;
+   PVOID *pvirt, virt;
PHYSICAL_ADDRESS *phys;
size_t size;
NTSTATUS status;
@@ -207,12 +207,13 @@ virt2phys_device_EvtIoInCallerContext(WDFDEVICE device, 
WDFREQUEST request)
}
 
status = WdfRequestRetrieveInputBuffer(
-   request, sizeof(*virt), (PVOID *)&virt, &size);
+   request, sizeof(*pvirt), (PVOID *)&pvirt, &size);
if (!NT_SUCCESS(status)) {
TraceWarning("Retrieving input buffer: %!STATUS!", status);
WdfRequestComplete(request, status);
return;
}
+   virt = *pvirt;
 
status = WdfRequestRetrieveOutputBuffer(
request, sizeof(*phys), (PVOID *)&phys, &size);
@@ -222,7 +223,7 @@ virt2phys_device_EvtIoInCallerContext(WDFDEVICE device, 
WDFREQUEST request)
return;
}
 
-   status = virt2phys_translate(*virt, phys);
+   status = virt2phys_translate(virt, phys);
if (NT_SUCCESS(status))
WdfRequestSetInformation(request, sizeof(*phys));
 
diff --git a/windows/virt2phys/virt2phys_logic.c 
b/windows/virt2phys/virt2phys_logic.c
index e3ff293..175924a 100644
--- a/windows/virt2phys/virt2phys_logic.c
+++ b/windows/virt2phys/virt2phys_logic.c
@@ -12,13 +12,13 @@
 struct virt2phys_process {
HANDLE id;
LIST_ENTRY next;
-   SINGLE_LIST_ENTRY blocks;
+   LIST_ENTRY blocks;
ULONG64 memory;
 };
 
 struct virt2phys_block {
PMDL mdl;
-   SINGLE_LIST_ENTRY next;
+   LIST_ENTRY next;
 };
 
 static struct virt2phys_params g_params;
@@ -69,24 +69,28 @@ virt2phys_process_create(HANDLE process_id)
struct virt2phys_process *process;
 
process = ExAllocatePoolZero(NonPagedPool, sizeof(*process), 'pp2v');
-   if (process != NULL)
+   if (process != NULL) {
process->id = process_id;
+   InitializeListHead(&process->blocks);
+   }
+   
return process;
 }
 
 static void
 virt2phys_process_free(struct virt2phys_process *process, BOOLEAN unmap)
 {
-   PSINGLE_LIST_ENTRY node;
+   PLIST_ENTRY node, next;
struct virt2phys_block *block;
 
TraceInfo("ID = %p, unmap = %!bool!", process->id, unmap);
 
-   node = process->blocks.Next;
-   while (node != NULL) {
+   for (node = process->blocks.Flink; node != &process->blocks; node = 
next) {
+   next = node->Flink;
block = CONTAINING_RECORD(node, struct virt2phys_block, next);
-   node = node->Next;
-   virt2phys_block_free(block, unmap);
+   RemoveEntryList(&block->next);
+
+   virt2phys_block_free(block, TRUE);
}
 
ExFreePool(process);
@@ -109,10 +113,10 @@ virt2phys_process_find(HANDLE process_id)
 static struct virt2phys_block *
 virt2phys_process_find_block(struct virt2phys_process *process, PVOID virt)
 {
-   PSINGLE_LIST_ENTRY node;
+   PLI

RE: [PATCH v7 1/2] vfio: add get device info API

[Ye, MingjinX]

> -Original Message-
> From: Chenbo Xia 
> Sent: Wednesday, November 29, 2023 9:48 AM
> To: Ye, MingjinX 
> Cc: dev@dpdk.org; Yang, Qiming ; Burakov,
> Anatoly 
> Subject: Re: [PATCH v7 1/2] vfio: add get device info API
> 
> On Nov 22, 2023, at 18:22, Mingjin Ye  wrote:
> >
> > External email: Use caution opening links or attachments
> >
> >
> > This patch adds an API to support getting device information.
> >
> > The driver can use the "rte_vfio_get_device_info" helper to get device
> > information from EAL.
> >
> > Signed-off-by: Mingjin Ye 
> > ---
> > lib/eal/include/rte_vfio.h | 29 +
> > lib/eal/linux/eal_vfio.c   | 27 +++
> > lib/eal/version.map|  3 +++
> > 3 files changed, 59 insertions(+)
> >
> 
> Comments not addressed:
> 
> https://mails.dpdk.org/archives/dev/2023-November/282200.html

Sorry for not responding in time.

Experimental API, no CC stable.

This API is used essentially the same as the rte_vfio_setup_device API.
Reference: 
https://patchwork.dpdk.org/project/dpdk/patch/20231122102232.108299-3-mingjinx...@intel.com/

/Mingjin

[PATCH v9 00/21] dts: docstrings update

[Juraj Linkeš]

The first commit makes changes to the code. These code changes mainly
change the structure of the code so that the actual API docs generation
works. There are also some code changes which get reflected in the
documentation, such as making functions/methods/attributes private or
public.

The rest of the commits deal with the actual docstring documentation
(from which the API docs are generated). The format of the docstrings
is the Google format [0] with PEP257 [1] and some guidelines captured
in the last commit of this group covering what the Google format
doesn't.
The docstring updates are split into many commits to make review
possible. When accepted, they may be squashed.
The docstrings have been composed in anticipation of [2], adhering to
maximum line length of 100. We don't have a tool for automatic docstring
formatting, hence the usage of 100 right away to save time.

NOTE: The logger.py module is not fully documented, as it's being
refactored and the refactor will be submitted in the near future.
Documenting it now seems unnecessary.

[0] https://google.github.io/styleguide/pyguide.html#s3.8.4-comments-in-classes
[1] https://peps.python.org/pep-0257/
[2] https://patches.dpdk.org/project/dpdk/list/?series=29844

v7:
Split the series into docstrings and api docs generation and addressed
comments.

v8:
Addressed review comments, all of which were pretty minor - small
gramatical changes, a little bit of rewording to remove confusion here
and there, additional explanations and so on.

v9:
Addressed review comments, again all minor grammar fixes.

Juraj Linkeš (21):
  dts: code adjustments for doc generation
  dts: add docstring checker
  dts: add basic developer docs
  dts: exceptions docstring update
  dts: settings docstring update
  dts: logger and utils docstring update
  dts: dts runner and main docstring update
  dts: test suite docstring update
  dts: test result docstring update
  dts: config docstring update
  dts: remote session docstring update
  dts: interactive remote session docstring update
  dts: port and virtual device docstring update
  dts: cpu docstring update
  dts: os session docstring update
  dts: posix and linux sessions docstring update
  dts: node docstring update
  dts: sut and tg nodes docstring update
  dts: base traffic generators docstring update
  dts: scapy tg docstring update
  dts: test suites docstring update

 doc/guides/tools/dts.rst  |  73 +++
 dts/framework/__init__.py |  12 +-
 dts/framework/config/__init__.py  | 375 +---
 dts/framework/config/types.py | 132 ++
 dts/framework/dts.py  | 162 +--
 dts/framework/exception.py| 156 ---
 dts/framework/logger.py   |  72 ++-
 dts/framework/remote_session/__init__.py  |  80 ++--
 .../interactive_remote_session.py |  36 +-
 .../remote_session/interactive_shell.py   | 150 +++
 dts/framework/remote_session/os_session.py| 284 
 dts/framework/remote_session/python_shell.py  |  32 ++
 .../remote_session/remote/__init__.py |  27 --
 .../remote/interactive_shell.py   | 131 --
 .../remote_session/remote/python_shell.py |  12 -
 .../remote_session/remote/remote_session.py   | 168 ---
 .../remote_session/remote/testpmd_shell.py|  45 --
 .../remote_session/remote_session.py  | 230 ++
 .../{remote => }/ssh_session.py   |  28 +-
 dts/framework/remote_session/testpmd_shell.py |  84 
 dts/framework/settings.py | 188 ++--
 dts/framework/test_result.py  | 301 ++---
 dts/framework/test_suite.py   | 236 +++---
 dts/framework/testbed_model/__init__.py   |  29 +-
 dts/framework/testbed_model/{hw => }/cpu.py   | 209 ++---
 dts/framework/testbed_model/hw/__init__.py|  27 --
 dts/framework/testbed_model/hw/port.py|  60 ---
 .../testbed_model/hw/virtual_device.py|  16 -
 .../linux_session.py  |  70 ++-
 dts/framework/testbed_model/node.py   | 214 ++---
 dts/framework/testbed_model/os_session.py | 422 ++
 dts/framework/testbed_model/port.py   |  93 
 .../posix_session.py  |  85 +++-
 dts/framework/testbed_model/sut_node.py   | 238 ++
 dts/framework/testbed_model/tg_node.py|  69 ++-
 .../traffic_generator/__init__.py |  43 ++
 .../capturing_traffic_generator.py|  49 +-
 .../{ => traffic_generator}/scapy.py  | 110 +++--
 .../traffic_generator.py  |  47 +-
 dts/framework/testbed_model/virtual_device.py |  29 ++
 dts/framework/utils.py| 122 ++---
 dts/main.py   |  19 +-
 dts/poetry.lock   |  12 +-
 dts/pyproject.toml|   6 +-
 dts

[PATCH v9 01/21] dts: code adjustments for doc generation

[Juraj Linkeš]

The standard Python tool for generating API documentation, Sphinx,
imports modules one-by-one when generating the documentation. This
requires code changes:
* properly guarding argument parsing in the if __name__ == '__main__'
  block,
* the logger used by DTS runner underwent the same treatment so that it
  doesn't create log files outside of a DTS run,
* however, DTS uses the arguments to construct an object holding global
  variables. The defaults for the global variables needed to be moved
  from argument parsing elsewhere,
* importing the remote_session module from framework resulted in
  circular imports because of one module trying to import another
  module. This is fixed by reorganizing the code,
* some code reorganization was done because the resulting structure
  makes more sense, improving documentation clarity.

The are some other changes which are documentation related:
* added missing type annotation so they appear in the generated docs,
* reordered arguments in some methods,
* removed superfluous arguments and attributes,
* change private functions/methods/attributes to private and vice-versa.

The above all appear in the generated documentation and the with them,
the documentation is improved.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/config/__init__.py  |  8 +-
 dts/framework/dts.py  | 31 +--
 dts/framework/exception.py| 54 +---
 dts/framework/remote_session/__init__.py  | 41 +
 .../interactive_remote_session.py |  0
 .../{remote => }/interactive_shell.py |  0
 .../{remote => }/python_shell.py  |  0
 .../remote_session/remote/__init__.py | 27 --
 .../{remote => }/remote_session.py|  0
 .../{remote => }/ssh_session.py   | 12 +--
 .../{remote => }/testpmd_shell.py |  0
 dts/framework/settings.py | 85 +++
 dts/framework/test_result.py  |  4 +-
 dts/framework/test_suite.py   |  7 +-
 dts/framework/testbed_model/__init__.py   | 12 +--
 dts/framework/testbed_model/{hw => }/cpu.py   | 13 +++
 dts/framework/testbed_model/hw/__init__.py| 27 --
 .../linux_session.py  |  6 +-
 dts/framework/testbed_model/node.py   | 23 +++--
 .../os_session.py | 22 ++---
 dts/framework/testbed_model/{hw => }/port.py  |  0
 .../posix_session.py  |  4 +-
 dts/framework/testbed_model/sut_node.py   |  8 +-
 dts/framework/testbed_model/tg_node.py| 29 +--
 .../traffic_generator/__init__.py | 23 +
 .../capturing_traffic_generator.py|  4 +-
 .../{ => traffic_generator}/scapy.py  | 19 ++---
 .../traffic_generator.py  | 14 ++-
 .../testbed_model/{hw => }/virtual_device.py  |  0
 dts/framework/utils.py| 40 +++--
 dts/main.py   |  9 +-
 31 files changed, 244 insertions(+), 278 deletions(-)
 rename dts/framework/remote_session/{remote => }/interactive_remote_session.py 
(100%)
 rename dts/framework/remote_session/{remote => }/interactive_shell.py (100%)
 rename dts/framework/remote_session/{remote => }/python_shell.py (100%)
 delete mode 100644 dts/framework/remote_session/remote/__init__.py
 rename dts/framework/remote_session/{remote => }/remote_session.py (100%)
 rename dts/framework/remote_session/{remote => }/ssh_session.py (91%)
 rename dts/framework/remote_session/{remote => }/testpmd_shell.py (100%)
 rename dts/framework/testbed_model/{hw => }/cpu.py (95%)
 delete mode 100644 dts/framework/testbed_model/hw/__init__.py
 rename dts/framework/{remote_session => testbed_model}/linux_session.py (97%)
 rename dts/framework/{remote_session => testbed_model}/os_session.py (95%)
 rename dts/framework/testbed_model/{hw => }/port.py (100%)
 rename dts/framework/{remote_session => testbed_model}/posix_session.py (98%)
 create mode 100644 dts/framework/testbed_model/traffic_generator/__init__.py
 rename dts/framework/testbed_model/{ => 
traffic_generator}/capturing_traffic_generator.py (98%)
 rename dts/framework/testbed_model/{ => traffic_generator}/scapy.py (95%)
 rename dts/framework/testbed_model/{ => 
traffic_generator}/traffic_generator.py (81%)
 rename dts/framework/testbed_model/{hw => }/virtual_device.py (100%)

diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index 9b32cf0532..ef25a463c0 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -17,6 +17,7 @@
 import warlock  # type: ignore[import]
 import yaml
 
+from framework.exception import ConfigurationError
 from framework.settings import SETTINGS
 from framework.utils import StrEnum
 
@@ -89,7 +90,7 @@ class TrafficGeneratorConfig:
 traffic_generator_type: TrafficGeneratorType
 
 @staticmethod
-def from_dict(d: dict):
+def from_dict(d:

[PATCH v9 02/21] dts: add docstring checker

[Juraj Linkeš]

Python docstrings are the in-code way to document the code. The
docstring checker of choice is pydocstyle which we're executing from
Pylama, but the current latest versions are not complatible due to [0],
so pin the pydocstyle version to the latest working version.

[0] https://github.com/klen/pylama/issues/232

Signed-off-by: Juraj Linkeš 
---
 dts/poetry.lock| 12 ++--
 dts/pyproject.toml |  6 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dts/poetry.lock b/dts/poetry.lock
index f7b3b6d602..a734fa71f0 100644
--- a/dts/poetry.lock
+++ b/dts/poetry.lock
@@ -489,20 +489,20 @@ files = [
 
 [[package]]
 name = "pydocstyle"
-version = "6.3.0"
+version = "6.1.1"
 description = "Python docstring style checker"
 optional = false
 python-versions = ">=3.6"
 files = [
-{file = "pydocstyle-6.3.0-py3-none-any.whl", hash = 
"sha256:118762d452a49d6b05e194ef344a55822987a462831ade91ec5c06fd2169d019"},
-{file = "pydocstyle-6.3.0.tar.gz", hash = 
"sha256:7ce43f0c0ac87b07494eb9c0b462c0b73e6ff276807f204d6b53edc72b7e44e1"},
+{file = "pydocstyle-6.1.1-py3-none-any.whl", hash = 
"sha256:6987826d6775056839940041beef5c08cc7e3d71d63149b48e36727f70144dc4"},
+{file = "pydocstyle-6.1.1.tar.gz", hash = 
"sha256:1d41b7c459ba0ee6c345f2eb9ae827cab14a7533a88c5c6f7e94923f72df92dc"},
 ]
 
 [package.dependencies]
-snowballstemmer = ">=2.2.0"
+snowballstemmer = "*"
 
 [package.extras]
-toml = ["tomli (>=1.2.3)"]
+toml = ["toml"]
 
 [[package]]
 name = "pyflakes"
@@ -837,4 +837,4 @@ jsonschema = ">=4,<5"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = 
"0b1e4a1cb8323e17e5ee5951c97e74bde6e60d0413d7b25b1803d5b2bab39639"
+content-hash = 
"3501e97b3dadc19fe8ae179fe21b1edd2488001da9a8e86ff2bca0b86b99b89b"
diff --git a/dts/pyproject.toml b/dts/pyproject.toml
index 980ac3c7db..37a692d655 100644
--- a/dts/pyproject.toml
+++ b/dts/pyproject.toml
@@ -25,6 +25,7 @@ PyYAML = "^6.0"
 types-PyYAML = "^6.0.8"
 fabric = "^2.7.1"
 scapy = "^2.5.0"
+pydocstyle = "6.1.1"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^0.961"
@@ -39,10 +40,13 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.pylama]
-linters = "mccabe,pycodestyle,pyflakes"
+linters = "mccabe,pycodestyle,pydocstyle,pyflakes"
 format = "pylint"
 max_line_length = 100
 
+[tool.pylama.linter.pydocstyle]
+convention = "google"
+
 [tool.mypy]
 python_version = "3.10"
 enable_error_code = ["ignore-without-code"]
-- 
2.34.1

[PATCH v9 03/21] dts: add basic developer docs

[Juraj Linkeš]

Expand the framework contribution guidelines and add how to document the
code with Python docstrings.

Signed-off-by: Juraj Linkeš 
---
 doc/guides/tools/dts.rst | 73 
 1 file changed, 73 insertions(+)

diff --git a/doc/guides/tools/dts.rst b/doc/guides/tools/dts.rst
index 32c18ee472..cd771a428c 100644
--- a/doc/guides/tools/dts.rst
+++ b/doc/guides/tools/dts.rst
@@ -264,6 +264,65 @@ which be changed with the ``--output-dir`` command line 
argument.
 The results contain basic statistics of passed/failed test cases and DPDK 
version.
 
 
+Contributing to DTS
+---
+
+There are two areas of contribution: The DTS framework and DTS test suites.
+
+The framework contains the logic needed to run test cases, such as connecting 
to nodes,
+running DPDK apps and collecting results.
+
+The test cases call APIs from the framework to test their scenarios. Adding 
test cases may
+require adding code to the framework as well.
+
+
+Framework Coding Guidelines
+~~~
+
+When adding code to the DTS framework, pay attention to the rest of the code
+and try not to divert much from it. The :ref:`DTS developer tools 
` will issue
+warnings when some of the basics are not met.
+
+The code must be properly documented with docstrings. The style must conform to
+the `Google style 
`_.
+See an example of the style
+`here 
`_.
+For cases which are not covered by the Google style, refer
+to `PEP 257 `_. There are some cases which 
are not covered by
+the two style guides, where we deviate or where some additional clarification 
is helpful:
+
+   * The __init__() methods of classes are documented separately from the 
docstring of the class
+ itself.
+   * The docstrigs of implemented abstract methods should refer to the 
superclass's definition
+ if there's no deviation.
+   * Instance variables/attributes should be documented in the docstring of 
the class
+ in the ``Attributes:`` section.
+   * The dataclass.dataclass decorator changes how the attributes are 
processed. The dataclass
+ attributes which result in instance variables/attributes should also be 
recorded
+ in the ``Attributes:`` section.
+   * Class variables/attributes, on the other hand, should be documented with 
``#:`` above
+ the type annotated line. The description may be omitted if the meaning is 
obvious.
+   * The Enum and TypedDict also process the attributes in particular ways and 
should be documented
+ with ``#:`` as well. This is mainly so that the autogenerated docs 
contain the assigned value.
+   * When referencing a parameter of a function or a method in their 
docstring, don't use
+ any articles and put the parameter into single backticks. This mimics the 
style of
+ `Python's documentation `_.
+   * When specifying a value, use double backticks::
+
+def foo(greet: bool) -> None:
+"""Demonstration of single and double backticks.
+
+`greet` controls whether ``Hello World`` is printed.
+
+Args:
+   greet: Whether to print the ``Hello World`` message.
+"""
+if greet:
+   print(f"Hello World")
+
+   * The docstring maximum line length is the same as the code maximum line 
length.
+
+
 How To Write a Test Suite
 -
 
@@ -293,6 +352,18 @@ There are four types of methods that comprise a test suite:
| These methods don't need to be implemented if there's no need for them in 
a test suite.
  In that case, nothing will happen when they're is executed.
 
+#. **Configuration, traffic and other logic**
+
+   The ``TestSuite`` class contains a variety of methods for anything that
+   a test suite setup, a teardown, or a test case may need to do.
+
+   The test suites also frequently use a DPDK app, such as testpmd, in 
interactive mode
+   and use the interactive shell instances directly.
+
+   These are the two main ways to call the framework logic in test suites. If 
there's any
+   functionality or logic missing from the framework, it should be implemented 
so that
+   the test suites can use one of these two ways.
+
 #. **Test case verification**
 
Test case verification should be done with the ``verify`` method, which 
records the result.
@@ -308,6 +379,8 @@ There are four types of methods that comprise a test suite:
and used by the test suite via the ``sut_node`` field.
 
 
+.. _dts_dev_tools:
+
 DTS Developer Tools
 ---
 
-- 
2.34.1

[PATCH v9 04/21] dts: exceptions docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/__init__.py  |  12 -
 dts/framework/exception.py | 106 +
 2 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/dts/framework/__init__.py b/dts/framework/__init__.py
index d551ad4bf0..662e6ccad2 100644
--- a/dts/framework/__init__.py
+++ b/dts/framework/__init__.py
@@ -1,3 +1,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2022 PANTHEON.tech s.r.o.
+# Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022 University of New Hampshire
+
+"""Libraries and utilities for running DPDK Test Suite (DTS).
+
+The various modules in the DTS framework offer:
+
+* Connections to nodes, both interactive and non-interactive,
+* A straightforward way to add support for different operating systems of 
remote nodes,
+* Test suite setup, execution and teardown, along with test case setup, 
execution and teardown,
+* Pre-test suite setup and post-test suite teardown.
+"""
diff --git a/dts/framework/exception.py b/dts/framework/exception.py
index 151e4d3aa9..658eee2c38 100644
--- a/dts/framework/exception.py
+++ b/dts/framework/exception.py
@@ -3,8 +3,10 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
-"""
-User-defined exceptions used across the framework.
+"""DTS exceptions.
+
+The exceptions all have different severities expressed as an integer.
+The highest severity of all raised exceptions is used as the exit code of DTS.
 """
 
 from enum import IntEnum, unique
@@ -13,59 +15,79 @@
 
 @unique
 class ErrorSeverity(IntEnum):
-"""
-The severity of errors that occur during DTS execution.
+"""The severity of errors that occur during DTS execution.
+
 All exceptions are caught and the most severe error is used as return code.
 """
 
+#:
 NO_ERR = 0
+#:
 GENERIC_ERR = 1
+#:
 CONFIG_ERR = 2
+#:
 REMOTE_CMD_EXEC_ERR = 3
+#:
 SSH_ERR = 4
+#:
 DPDK_BUILD_ERR = 10
+#:
 TESTCASE_VERIFY_ERR = 20
+#:
 BLOCKING_TESTSUITE_ERR = 25
 
 
 class DTSError(Exception):
-"""
-The base exception from which all DTS exceptions are derived.
-Stores error severity.
+"""The base exception from which all DTS exceptions are subclassed.
+
+Do not use this exception, only use subclassed exceptions.
 """
 
+#:
 severity: ClassVar[ErrorSeverity] = ErrorSeverity.GENERIC_ERR
 
 
 class SSHTimeoutError(DTSError):
-"""
-Command execution timeout.
-"""
+"""The SSH execution of a command timed out."""
 
+#:
 severity: ClassVar[ErrorSeverity] = ErrorSeverity.SSH_ERR
 _command: str
 
 def __init__(self, command: str):
+"""Define the meaning of the first argument.
+
+Args:
+command: The executed command.
+"""
 self._command = command
 
 def __str__(self) -> str:
-return f"TIMEOUT on {self._command}"
+"""Add some context to the string representation."""
+return f"{self._command} execution timed out."
 
 
 class SSHConnectionError(DTSError):
-"""
-SSH connection error.
-"""
+"""An unsuccessful SSH connection."""
 
+#:
 severity: ClassVar[ErrorSeverity] = ErrorSeverity.SSH_ERR
 _host: str
 _errors: list[str]
 
 def __init__(self, host: str, errors: list[str] | None = None):
+"""Define the meaning of the first two arguments.
+
+Args:
+host: The hostname to which we're trying to connect.
+errors: Any errors that occurred during the connection attempt.
+"""
 self._host = host
 self._errors = [] if errors is None else errors
 
 def __str__(self) -> str:
+"""Include the errors in the string representation."""
 message = f"Error trying to connect with {self._host}."
 if self._errors:
 message += f" Errors encountered while retrying: {', 
'.join(self._errors)}"
@@ -74,76 +96,92 @@ def __str__(self) -> str:
 
 
 class SSHSessionDeadError(DTSError):
-"""
-SSH session is not alive.
-It can no longer be used.
-"""
+"""The SSH session is no longer alive."""
 
+#:
 severity: ClassVar[ErrorSeverity] = ErrorSeverity.SSH_ERR
 _host: str
 
 def __init__(self, host: str):
+"""Define the meaning of the first argument.
+
+Args:
+host: The hostname of the disconnected node.
+"""
 self._host = host
 
 def __str__(self) -> str:
-return f"SSH session with {self._host} has died"
+"""Add some context to the string representation."""
+return f"SSH session with {self._host} has died."
 
 
 class ConfigurationError(DTSError):
-"""
-Raised when an invalid configuration is encountered.
-"""
+"""An invalid configuration."""
 
+#:
 severity: ClassVar[ErrorSeverity] = 

[PATCH v9 05/21] dts: settings docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/settings.py | 103 +-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/dts/framework/settings.py b/dts/framework/settings.py
index 25b5dcff22..41f98e8519 100644
--- a/dts/framework/settings.py
+++ b/dts/framework/settings.py
@@ -3,6 +3,72 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022 University of New Hampshire
 
+"""Environment variables and command line arguments parsing.
+
+This is a simple module utilizing the built-in argparse module to parse 
command line arguments,
+augment them with values from environment variables and make them available 
across the framework.
+
+The command line value takes precedence, followed by the environment variable 
value,
+followed by the default value defined in this module.
+
+The command line arguments along with the supported environment variables are:
+
+.. option:: --config-file
+.. envvar:: DTS_CFG_FILE
+
+The path to the YAML test run configuration file.
+
+.. option:: --output-dir, --output
+.. envvar:: DTS_OUTPUT_DIR
+
+The directory where DTS logs and results are saved.
+
+.. option:: --compile-timeout
+.. envvar:: DTS_COMPILE_TIMEOUT
+
+The timeout for compiling DPDK.
+
+.. option:: -t, --timeout
+.. envvar:: DTS_TIMEOUT
+
+The timeout for all DTS operation except for compiling DPDK.
+
+.. option:: -v, --verbose
+.. envvar:: DTS_VERBOSE
+
+Set to any value to enable logging everything to the console.
+
+.. option:: -s, --skip-setup
+.. envvar:: DTS_SKIP_SETUP
+
+Set to any value to skip building DPDK.
+
+.. option:: --tarball, --snapshot, --git-ref
+.. envvar:: DTS_DPDK_TARBALL
+
+The path to a DPDK tarball, git commit ID, tag ID or tree ID to test.
+
+.. option:: --test-cases
+.. envvar:: DTS_TESTCASES
+
+A comma-separated list of test cases to execute. Unknown test cases will 
be silently ignored.
+
+.. option:: --re-run, --re_run
+.. envvar:: DTS_RERUN
+
+Re-run each test case this many times in case of a failure.
+
+The module provides one key module-level variable:
+
+Attributes:
+SETTINGS: The module level variable storing framework-wide DTS settings.
+
+Typical usage example::
+
+  from framework.settings import SETTINGS
+  foo = SETTINGS.foo
+"""
+
 import argparse
 import os
 from collections.abc import Callable, Iterable, Sequence
@@ -16,6 +82,23 @@
 
 
 def _env_arg(env_var: str) -> Any:
+"""A helper method augmenting the argparse Action with environment 
variables.
+
+If the supplied environment variable is defined, then the default value
+of the argument is modified. This satisfies the priority order of
+command line argument > environment variable > default value.
+
+Arguments with no values (flags) should be defined using the const keyword 
argument
+(True or False). When the argument is specified, it will be set to const, 
if not specified,
+the default will be stored (possibly modified by the corresponding 
environment variable).
+
+Other arguments work the same as default argparse arguments, that is using
+the default 'store' action.
+
+Returns:
+  The modified argparse.Action.
+"""
+
 class _EnvironmentArgument(argparse.Action):
 def __init__(
 self,
@@ -68,14 +151,28 @@ def __call__(
 
 @dataclass(slots=True)
 class Settings:
+"""Default framework-wide user settings.
+
+The defaults may be modified at the start of the run.
+"""
+
+#:
 config_file_path: Path = Path(__file__).parent.parent.joinpath("conf.yaml")
+#:
 output_dir: str = "output"
+#:
 timeout: float = 15
+#:
 verbose: bool = False
+#:
 skip_setup: bool = False
+#:
 dpdk_tarball_path: Path | str = "dpdk.tar.xz"
+#:
 compile_timeout: float = 1200
+#:
 test_cases: list[str] = field(default_factory=list)
+#:
 re_run: int = 0
 
 
@@ -166,7 +263,7 @@ def _get_parser() -> argparse.ArgumentParser:
 action=_env_arg("DTS_RERUN"),
 default=SETTINGS.re_run,
 type=int,
-help="[DTS_RERUN] Re-run each test case the specified amount of times "
+help="[DTS_RERUN] Re-run each test case the specified number of times "
 "if a test failure occurs",
 )
 
@@ -174,6 +271,10 @@ def _get_parser() -> argparse.ArgumentParser:
 
 
 def get_settings() -> Settings:
+"""Create new settings with inputs from the user.
+
+The inputs are taken from the command line and from environment variables.
+"""
 parsed_args = _get_parser().parse_args()
 return Settings(
 config_file_path=parsed_args.config_file,
-- 
2.34.1

[PATCH v9 06/21] dts: logger and utils docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/logger.py | 72 ++---
 dts/framework/utils.py  | 88 +
 2 files changed, 113 insertions(+), 47 deletions(-)

diff --git a/dts/framework/logger.py b/dts/framework/logger.py
index bb2991e994..cfa6e8cd72 100644
--- a/dts/framework/logger.py
+++ b/dts/framework/logger.py
@@ -3,9 +3,9 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
-"""
-DTS logger module with several log level. DTS framework and TestSuite logs
-are saved in different log files.
+"""DTS logger module.
+
+DTS framework and TestSuite logs are saved in different log files.
 """
 
 import logging
@@ -18,19 +18,21 @@
 stream_fmt = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
 
 
-class LoggerDictType(TypedDict):
-logger: "DTSLOG"
-name: str
-node: str
-
+class DTSLOG(logging.LoggerAdapter):
+"""DTS logger adapter class for framework and testsuites.
 
-# List for saving all using loggers
-Loggers: list[LoggerDictType] = []
+The :option:`--verbose` command line argument and the 
:envvar:`DTS_VERBOSE` environment
+variable control the verbosity of output. If enabled, all messages will be 
emitted to the
+console.
 
+The :option:`--output` command line argument and the 
:envvar:`DTS_OUTPUT_DIR` environment
+variable modify the directory where the logs will be stored.
 
-class DTSLOG(logging.LoggerAdapter):
-"""
-DTS log class for framework and testsuite.
+Attributes:
+node: The additional identifier. Currently unused.
+sh: The handler which emits logs to console.
+fh: The handler which emits logs to a file.
+verbose_fh: Just as fh, but logs with a different, more verbose, 
format.
 """
 
 _logger: logging.Logger
@@ -40,6 +42,15 @@ class DTSLOG(logging.LoggerAdapter):
 verbose_fh: logging.FileHandler
 
 def __init__(self, logger: logging.Logger, node: str = "suite"):
+"""Extend the constructor with additional handlers.
+
+One handler logs to the console, the other one to a file, with either 
a regular or verbose
+format.
+
+Args:
+logger: The logger from which to create the logger adapter.
+node: An additional identifier. Currently unused.
+"""
 self._logger = logger
 # 1 means log everything, this will be used by file handlers if their 
level
 # is not set
@@ -92,26 +103,43 @@ def __init__(self, logger: logging.Logger, node: str = 
"suite"):
 super(DTSLOG, self).__init__(self._logger, dict(node=self.node))
 
 def logger_exit(self) -> None:
-"""
-Remove stream handler and logfile handler.
-"""
+"""Remove the stream handler and the logfile handler."""
 for handler in (self.sh, self.fh, self.verbose_fh):
 handler.flush()
 self._logger.removeHandler(handler)
 
 
+class _LoggerDictType(TypedDict):
+logger: DTSLOG
+name: str
+node: str
+
+
+# List for saving all loggers in use
+_Loggers: list[_LoggerDictType] = []
+
+
 def getLogger(name: str, node: str = "suite") -> DTSLOG:
+"""Get DTS logger adapter identified by name and node.
+
+An existing logger will be returned if one with the exact name and node 
already exists.
+A new one will be created and stored otherwise.
+
+Args:
+name: The name of the logger.
+node: An additional identifier for the logger.
+
+Returns:
+A logger uniquely identified by both name and node.
 """
-Get logger handler and if there's no handler for specified Node will 
create one.
-"""
-global Loggers
+global _Loggers
 # return saved logger
-logger: LoggerDictType
-for logger in Loggers:
+logger: _LoggerDictType
+for logger in _Loggers:
 if logger["name"] == name and logger["node"] == node:
 return logger["logger"]
 
 # return new logger
 dts_logger: DTSLOG = DTSLOG(logging.getLogger(name), node)
-Loggers.append({"logger": dts_logger, "name": name, "node": node})
+_Loggers.append({"logger": dts_logger, "name": name, "node": node})
 return dts_logger
diff --git a/dts/framework/utils.py b/dts/framework/utils.py
index a0f2173949..cc5e458cc8 100644
--- a/dts/framework/utils.py
+++ b/dts/framework/utils.py
@@ -3,6 +3,16 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
+"""Various utility classes and functions.
+
+These are used in multiple modules across the framework. They're here because
+they provide some non-specific functionality, greatly simplify imports or just 
don't
+fit elsewhere.
+
+Attributes:
+REGEX_FOR_PCI_ADDRESS: The regex representing a PCI address, e.g. 
``:00:08.0``.
+"""
+
 import atexit
 import json
 import os
@@ -1

[PATCH v9 07/21] dts: dts runner and main docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/dts.py | 131 ---
 dts/main.py  |  10 ++--
 2 files changed, 116 insertions(+), 25 deletions(-)

diff --git a/dts/framework/dts.py b/dts/framework/dts.py
index 356368ef10..e16d4578a0 100644
--- a/dts/framework/dts.py
+++ b/dts/framework/dts.py
@@ -3,6 +3,33 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
+r"""Test suite runner module.
+
+A DTS run is split into stages:
+
+#. Execution stage,
+#. Build target stage,
+#. Test suite stage,
+#. Test case stage.
+
+The module is responsible for running tests on testbeds defined in the test 
run configuration.
+Each setup or teardown of each stage is recorded in a 
:class:`~.test_result.DTSResult` or
+one of its subclasses. The test case results are also recorded.
+
+If an error occurs, the current stage is aborted, the error is recorded and 
the run continues in
+the next iteration of the same stage. The return code is the highest 
`severity` of all
+:class:`~.exception.DTSError`\s.
+
+Example:
+An error occurs in a build target setup. The current build target is 
aborted and the run
+continues with the next build target. If the errored build target was the 
last one in the given
+execution, the next execution begins.
+
+Attributes:
+dts_logger: The logger instance used in this module.
+result: The top level result used in the module.
+"""
+
 import sys
 
 from .config import (
@@ -23,9 +50,38 @@
 
 
 def run_all() -> None:
-"""
-The main process of DTS. Runs all build targets in all executions from the 
main
-config file.
+"""Run all build targets in all executions from the test run configuration.
+
+Before running test suites, executions and build targets are first set up.
+The executions and build targets defined in the test run configuration are 
iterated over.
+The executions define which tests to run and where to run them and build 
targets define
+the DPDK build setup.
+
+The tests suites are set up for each execution/build target tuple and each 
scheduled
+test case within the test suite is set up, executed and torn down. After 
all test cases
+have been executed, the test suite is torn down and the next build target 
will be tested.
+
+All the nested steps look like this:
+
+#. Execution setup
+
+#. Build target setup
+
+#. Test suite setup
+
+#. Test case setup
+#. Test case logic
+#. Test case teardown
+
+#. Test suite teardown
+
+#. Build target teardown
+
+#. Execution teardown
+
+The test cases are filtered according to the specification in the test run 
configuration and
+the :option:`--test-cases` command line argument or
+the :envvar:`DTS_TESTCASES` environment variable.
 """
 global dts_logger
 global result
@@ -87,6 +143,8 @@ def run_all() -> None:
 
 
 def _check_dts_python_version() -> None:
+"""Check the required Python version - v3.10."""
+
 def RED(text: str) -> str:
 return f"\u001B[31;1m{str(text)}\u001B[0m"
 
@@ -109,9 +167,16 @@ def _run_execution(
 execution: ExecutionConfiguration,
 result: DTSResult,
 ) -> None:
-"""
-Run the given execution. This involves running the execution setup as well 
as
-running all build targets in the given execution.
+"""Run the given execution.
+
+This involves running the execution setup as well as running all build 
targets
+in the given execution. After that, execution teardown is run.
+
+Args:
+sut_node: The execution's SUT node.
+tg_node: The execution's TG node.
+execution: An execution's test run configuration.
+result: The top level result object.
 """
 dts_logger.info(f"Running execution with SUT 
'{execution.system_under_test_node.name}'.")
 execution_result = result.add_execution(sut_node.config)
@@ -144,8 +209,18 @@ def _run_build_target(
 execution: ExecutionConfiguration,
 execution_result: ExecutionResult,
 ) -> None:
-"""
-Run the given build target.
+"""Run the given build target.
+
+This involves running the build target setup as well as running all test 
suites
+in the given execution the build target is defined in.
+After that, build target teardown is run.
+
+Args:
+sut_node: The execution's SUT node.
+tg_node: The execution's TG node.
+build_target: A build target's test run configuration.
+execution: The build target's execution's test run configuration.
+execution_result: The execution level result object associated with 
the execution.
 """
 dts_logger.info(f"Running build target '{build_target.name}'.")
 build_target_result = execution_

[PATCH v9 08/21] dts: test suite docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/test_suite.py | 231 +++-
 1 file changed, 175 insertions(+), 56 deletions(-)

diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py
index f9e66e814a..dfb391ffbd 100644
--- a/dts/framework/test_suite.py
+++ b/dts/framework/test_suite.py
@@ -2,8 +2,19 @@
 # Copyright(c) 2010-2014 Intel Corporation
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 
-"""
-Base class for creating DTS test cases.
+"""Features common to all test suites.
+
+The module defines the :class:`TestSuite` class which doesn't contain any test 
cases, and as such
+must be extended by subclasses which add test cases. The :class:`TestSuite` 
contains the basics
+needed by subclasses:
+
+* Test suite and test case execution flow,
+* Testbed (SUT, TG) configuration,
+* Packet sending and verification,
+* Test case verification.
+
+The module also defines a function, :func:`get_test_suites`,
+for gathering test suites from a Python module.
 """
 
 import importlib
@@ -11,7 +22,7 @@
 import re
 from ipaddress import IPv4Interface, IPv6Interface, ip_interface
 from types import MethodType
-from typing import Any, Union
+from typing import Any, ClassVar, Union
 
 from scapy.layers.inet import IP  # type: ignore[import]
 from scapy.layers.l2 import Ether  # type: ignore[import]
@@ -31,25 +42,44 @@
 
 
 class TestSuite(object):
-"""
-The base TestSuite class provides methods for handling basic flow of a 
test suite:
-* test case filtering and collection
-* test suite setup/cleanup
-* test setup/cleanup
-* test case execution
-* error handling and results storage
-Test cases are implemented by derived classes. Test cases are all methods
-starting with test_, further divided into performance test cases
-(starting with test_perf_) and functional test cases (all other test 
cases).
-By default, all test cases will be executed. A list of testcase str names
-may be specified in conf.yaml or on the command line
-to filter which test cases to run.
-The methods named [set_up|tear_down]_[suite|test_case] should be overridden
-in derived classes if the appropriate suite/test case fixtures are needed.
+"""The base class with methods for handling the basic flow of a test suite.
+
+* Test case filtering and collection,
+* Test suite setup/cleanup,
+* Test setup/cleanup,
+* Test case execution,
+* Error handling and results storage.
+
+Test cases are implemented by subclasses. Test cases are all methods 
starting with ``test_``,
+further divided into performance test cases (starting with ``test_perf_``)
+and functional test cases (all other test cases).
+
+By default, all test cases will be executed. A list of testcase names may 
be specified
+in the YAML test run configuration file and in the :option:`--test-cases` 
command line argument
+or in the :envvar:`DTS_TESTCASES` environment variable to filter which 
test cases to run.
+The union of both lists will be used. Any unknown test cases from the 
latter lists
+will be silently ignored.
+
+If the :option:`--re-run` command line argument or the :envvar:`DTS_RERUN` 
environment variable
+is set, in case of a test case failure, the test case will be executed 
again until it passes
+or it fails that many times in addition of the first failure.
+
+The methods named ``[set_up|tear_down]_[suite|test_case]`` should be 
overridden in subclasses
+if the appropriate test suite/test case fixtures are needed.
+
+The test suite is aware of the testbed (the SUT and TG) it's running on. 
From this, it can
+properly choose the IP addresses and other configuration that must be 
tailored to the testbed.
+
+Attributes:
+sut_node: The SUT node where the test suite is running.
+tg_node: The TG node where the test suite is running.
 """
 
 sut_node: SutNode
-is_blocking = False
+tg_node: TGNode
+#: Whether the test suite is blocking. A failure of a blocking test suite
+#: will block the execution of all subsequent test suites in the current 
build target.
+is_blocking: ClassVar[bool] = False
 _logger: DTSLOG
 _test_cases_to_run: list[str]
 _func: bool
@@ -72,6 +102,20 @@ def __init__(
 func: bool,
 build_target_result: BuildTargetResult,
 ):
+"""Initialize the test suite testbed information and basic 
configuration.
+
+Process what test cases to run, create the associated
+:class:`~.test_result.TestSuiteResult`, find links between ports
+and set up default IP addresses to be used when configuring them.
+
+Args:
+sut_node: The SUT node where the test suite will run.
+tg_node: The TG node where the test suite will run.
+test_cases: The list of t

[PATCH v9 09/21] dts: test result docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/test_result.py | 297 ---
 1 file changed, 239 insertions(+), 58 deletions(-)

diff --git a/dts/framework/test_result.py b/dts/framework/test_result.py
index 57090feb04..4467749a9d 100644
--- a/dts/framework/test_result.py
+++ b/dts/framework/test_result.py
@@ -2,8 +2,25 @@
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2023 University of New Hampshire
 
-"""
-Generic result container and reporters
+r"""Record and process DTS results.
+
+The results are recorded in a hierarchical manner:
+
+* :class:`DTSResult` contains
+* :class:`ExecutionResult` contains
+* :class:`BuildTargetResult` contains
+* :class:`TestSuiteResult` contains
+* :class:`TestCaseResult`
+
+Each result may contain multiple lower level results, e.g. there are multiple
+:class:`TestSuiteResult`\s in a :class:`BuildTargetResult`.
+The results have common parts, such as setup and teardown results, captured in 
:class:`BaseResult`,
+which also defines some common behaviors in its methods.
+
+Each result class has its own idiosyncrasies which they implement in 
overridden methods.
+
+The :option:`--output` command line argument and the :envvar:`DTS_OUTPUT_DIR` 
environment
+variable modify the directory where the files with results will be stored.
 """
 
 import os.path
@@ -26,26 +43,34 @@
 
 
 class Result(Enum):
-"""
-An Enum defining the possible states that
-a setup, a teardown or a test case may end up in.
-"""
+"""The possible states that a setup, a teardown or a test case may end up 
in."""
 
+#:
 PASS = auto()
+#:
 FAIL = auto()
+#:
 ERROR = auto()
+#:
 SKIP = auto()
 
 def __bool__(self) -> bool:
+"""Only PASS is True."""
 return self is self.PASS
 
 
 class FixtureResult(object):
-"""
-A record that stored the result of a setup or a teardown.
-The default is FAIL because immediately after creating the object
-the setup of the corresponding stage will be executed, which also 
guarantees
-the execution of teardown.
+"""A record that stores the result of a setup or a teardown.
+
+:attr:`~Result.FAIL` is a sensible default since it prevents false 
positives (which could happen
+if the default was :attr:`~Result.PASS`).
+
+Preventing false positives or other false results is preferable since a 
failure
+is mostly likely to be investigated (the other false results may not be 
investigated at all).
+
+Attributes:
+result: The associated result.
+error: The error in case of a failure.
 """
 
 result: Result
@@ -56,21 +81,37 @@ def __init__(
 result: Result = Result.FAIL,
 error: Exception | None = None,
 ):
+"""Initialize the constructor with the fixture result and store a 
possible error.
+
+Args:
+result: The result to store.
+error: The error which happened when a failure occurred.
+"""
 self.result = result
 self.error = error
 
 def __bool__(self) -> bool:
+"""A wrapper around the stored :class:`Result`."""
 return bool(self.result)
 
 
 class Statistics(dict):
-"""
-A helper class used to store the number of test cases by its result
-along a few other basic information.
-Using a dict provides a convenient way to format the data.
+"""How many test cases ended in which result state along some other basic 
information.
+
+Subclassing :class:`dict` provides a convenient way to format the data.
+
+The data are stored in the following keys:
+
+* **PASS RATE** (:class:`int`) -- The FAIL/PASS ratio of all test cases.
+* **DPDK VERSION** (:class:`str`) -- The tested DPDK version.
 """
 
 def __init__(self, dpdk_version: str | None):
+"""Extend the constructor with keys in which the data are stored.
+
+Args:
+dpdk_version: The version of tested DPDK.
+"""
 super(Statistics, self).__init__()
 for result in Result:
 self[result.name] = 0
@@ -78,8 +119,17 @@ def __init__(self, dpdk_version: str | None):
 self["DPDK VERSION"] = dpdk_version
 
 def __iadd__(self, other: Result) -> "Statistics":
-"""
-Add a Result to the final count.
+"""Add a Result to the final count.
+
+Example:
+stats: Statistics = Statistics()  # empty Statistics
+stats += Result.PASS  # add a Result to `stats`
+
+Args:
+other: The Result to add to this statistics object.
+
+Returns:
+The modified statistics object.
 """
 self[other.name] += 1
 self["PASS RATE"] = (
@@ -88,9 +138,7 @@ def __iadd__(self, other: Result) -> "Statistics":
 return self
 
 def __str__(self) -> str:
-"""
-Provide a str

[PATCH v9 10/21] dts: config docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/config/__init__.py | 369 ++-
 dts/framework/config/types.py| 132 +++
 2 files changed, 444 insertions(+), 57 deletions(-)
 create mode 100644 dts/framework/config/types.py

diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py
index ef25a463c0..62eded7f04 100644
--- a/dts/framework/config/__init__.py
+++ b/dts/framework/config/__init__.py
@@ -3,8 +3,34 @@
 # Copyright(c) 2022-2023 University of New Hampshire
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 
-"""
-Yaml config parsing methods
+"""Testbed configuration and test suite specification.
+
+This package offers classes that hold real-time information about the testbed, 
hold test run
+configuration describing the tested testbed and a loader function, 
:func:`load_config`, which loads
+the YAML test run configuration file
+and validates it according to :download:`the schema `.
+
+The YAML test run configuration file is parsed into a dictionary, parts of 
which are used throughout
+this package. The allowed keys and types inside this dictionary are defined in
+the :doc:`types ` module.
+
+The test run configuration has two main sections:
+
+* The :class:`ExecutionConfiguration` which defines what tests are going 
to be run
+  and how DPDK will be built. It also references the testbed where these 
tests and DPDK
+  are going to be run,
+* The nodes of the testbed are defined in the other section,
+  a :class:`list` of :class:`NodeConfiguration` objects.
+
+The real-time information about testbed is supposed to be gathered at runtime.
+
+The classes defined in this package make heavy use of :mod:`dataclasses`.
+All of them use slots and are frozen:
+
+* Slots enables some optimizations, by pre-allocating space for the defined
+  attributes in the underlying data structure,
+* Frozen makes the object immutable. This enables further optimizations,
+  and makes it thread safe should we ever want to move in that direction.
 """
 
 import json
@@ -12,11 +38,20 @@
 import pathlib
 from dataclasses import dataclass
 from enum import auto, unique
-from typing import Any, TypedDict, Union
+from typing import Union
 
 import warlock  # type: ignore[import]
 import yaml
 
+from framework.config.types import (
+BuildTargetConfigDict,
+ConfigurationDict,
+ExecutionConfigDict,
+NodeConfigDict,
+PortConfigDict,
+TestSuiteConfigDict,
+TrafficGeneratorConfigDict,
+)
 from framework.exception import ConfigurationError
 from framework.settings import SETTINGS
 from framework.utils import StrEnum
@@ -24,55 +59,97 @@
 
 @unique
 class Architecture(StrEnum):
+r"""The supported architectures of 
:class:`~framework.testbed_model.node.Node`\s."""
+
+#:
 i686 = auto()
+#:
 x86_64 = auto()
+#:
 x86_32 = auto()
+#:
 arm64 = auto()
+#:
 ppc64le = auto()
 
 
 @unique
 class OS(StrEnum):
+r"""The supported operating systems of 
:class:`~framework.testbed_model.node.Node`\s."""
+
+#:
 linux = auto()
+#:
 freebsd = auto()
+#:
 windows = auto()
 
 
 @unique
 class CPUType(StrEnum):
+r"""The supported CPUs of :class:`~framework.testbed_model.node.Node`\s."""
+
+#:
 native = auto()
+#:
 armv8a = auto()
+#:
 dpaa2 = auto()
+#:
 thunderx = auto()
+#:
 xgene1 = auto()
 
 
 @unique
 class Compiler(StrEnum):
+r"""The supported compilers of 
:class:`~framework.testbed_model.node.Node`\s."""
+
+#:
 gcc = auto()
+#:
 clang = auto()
+#:
 icc = auto()
+#:
 msvc = auto()
 
 
 @unique
 class TrafficGeneratorType(StrEnum):
+"""The supported traffic generators."""
+
+#:
 SCAPY = auto()
 
 
-# Slots enables some optimizations, by pre-allocating space for the defined
-# attributes in the underlying data structure.
-#
-# Frozen makes the object immutable. This enables further optimizations,
-# and makes it thread safe should we every want to move in that direction.
 @dataclass(slots=True, frozen=True)
 class HugepageConfiguration:
+r"""The hugepage configuration of 
:class:`~framework.testbed_model.node.Node`\s.
+
+Attributes:
+amount: The number of hugepages.
+force_first_numa: If :data:`True`, the hugepages will be configured on 
the first NUMA node.
+"""
+
 amount: int
 force_first_numa: bool
 
 
 @dataclass(slots=True, frozen=True)
 class PortConfig:
+r"""The port configuration of 
:class:`~framework.testbed_model.node.Node`\s.
+
+Attributes:
+node: The :class:`~framework.testbed_model.node.Node` where this port 
exists.
+pci: The PCI address of the port.
+os_driver_for_dpdk: The operating system driver name for use with DPDK.
+os_driver: The operating system driver name when the operating system 
controls the port.
+ 

[PATCH v9 11/21] dts: remote session docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/remote_session/__init__.py  |  39 +-
 .../remote_session/remote_session.py  | 130 +-
 dts/framework/remote_session/ssh_session.py   |  16 +--
 3 files changed, 137 insertions(+), 48 deletions(-)

diff --git a/dts/framework/remote_session/__init__.py 
b/dts/framework/remote_session/__init__.py
index 5e7ddb2b05..51a01d6b5e 100644
--- a/dts/framework/remote_session/__init__.py
+++ b/dts/framework/remote_session/__init__.py
@@ -2,12 +2,14 @@
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2023 University of New Hampshire
 
-"""
-The package provides modules for managing remote connections to a remote host 
(node),
-differentiated by OS.
-The package provides a factory function, create_session, that returns the 
appropriate
-remote connection based on the passed configuration. The differences are in the
-underlying transport protocol (e.g. SSH) and remote OS (e.g. Linux).
+"""Remote interactive and non-interactive sessions.
+
+This package provides modules for managing remote connections to a remote host 
(node).
+
+The non-interactive sessions send commands and return their output and exit 
code.
+
+The interactive sessions open an interactive shell which is continuously open,
+allowing it to send and receive data within that particular shell.
 """
 
 # pylama:ignore=W0611
@@ -26,10 +28,35 @@
 def create_remote_session(
 node_config: NodeConfiguration, name: str, logger: DTSLOG
 ) -> RemoteSession:
+"""Factory for non-interactive remote sessions.
+
+The function returns an SSH session, but will be extended if support
+for other protocols is added.
+
+Args:
+node_config: The test run configuration of the node to connect to.
+name: The name of the session.
+logger: The logger instance this session will use.
+
+Returns:
+The SSH remote session.
+"""
 return SSHSession(node_config, name, logger)
 
 
 def create_interactive_session(
 node_config: NodeConfiguration, logger: DTSLOG
 ) -> InteractiveRemoteSession:
+"""Factory for interactive remote sessions.
+
+The function returns an interactive SSH session, but will be extended if 
support
+for other protocols is added.
+
+Args:
+node_config: The test run configuration of the node to connect to.
+logger: The logger instance this session will use.
+
+Returns:
+The interactive SSH remote session.
+"""
 return InteractiveRemoteSession(node_config, logger)
diff --git a/dts/framework/remote_session/remote_session.py 
b/dts/framework/remote_session/remote_session.py
index 719f7d1ef7..2059f9a981 100644
--- a/dts/framework/remote_session/remote_session.py
+++ b/dts/framework/remote_session/remote_session.py
@@ -3,6 +3,13 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
+"""Base remote session.
+
+This module contains the abstract base class for remote sessions and defines
+the structure of the result of a command execution.
+"""
+
+
 import dataclasses
 from abc import ABC, abstractmethod
 from pathlib import PurePath
@@ -15,8 +22,14 @@
 
 @dataclasses.dataclass(slots=True, frozen=True)
 class CommandResult:
-"""
-The result of remote execution of a command.
+"""The result of remote execution of a command.
+
+Attributes:
+name: The name of the session that executed the command.
+command: The executed command.
+stdout: The standard output the command produced.
+stderr: The standard error output the command produced.
+return_code: The return code the command exited with.
 """
 
 name: str
@@ -26,6 +39,7 @@ class CommandResult:
 return_code: int
 
 def __str__(self) -> str:
+"""Format the command outputs."""
 return (
 f"stdout: '{self.stdout}'\n"
 f"stderr: '{self.stderr}'\n"
@@ -34,13 +48,24 @@ def __str__(self) -> str:
 
 
 class RemoteSession(ABC):
-"""
-The base class for defining which methods must be implemented in order to 
connect
-to a remote host (node) and maintain a remote session. The derived classes 
are
-supposed to implement/use some underlying transport protocol (e.g. SSH) to
-implement the methods. On top of that, it provides some basic services 
common to
-all derived classes, such as keeping history and logging what's being 
executed
-on the remote node.
+"""Non-interactive remote session.
+
+The abstract methods must be implemented in order to connect to a remote 
host (node)
+and maintain a remote session.
+The subclasses must use (or implement) some underlying transport protocol 
(e.g. SSH)
+to implement the methods. On top of that, it provides some basic services 
common to all
+subclasses, such as keeping history and logging what's being executed on 
the 

[PATCH v9 12/21] dts: interactive remote session docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 .../interactive_remote_session.py | 36 +++
 .../remote_session/interactive_shell.py   | 99 +++
 dts/framework/remote_session/python_shell.py  | 26 -
 dts/framework/remote_session/testpmd_shell.py | 59 +--
 4 files changed, 150 insertions(+), 70 deletions(-)

diff --git a/dts/framework/remote_session/interactive_remote_session.py 
b/dts/framework/remote_session/interactive_remote_session.py
index 098ded1bb0..1cc82e3377 100644
--- a/dts/framework/remote_session/interactive_remote_session.py
+++ b/dts/framework/remote_session/interactive_remote_session.py
@@ -22,27 +22,23 @@
 class InteractiveRemoteSession:
 """SSH connection dedicated to interactive applications.
 
-This connection is created using paramiko and is a persistent connection 
to the
-host. This class defines methods for connecting to the node and configures 
this
-connection to send "keep alive" packets every 30 seconds. Because paramiko 
attempts
-to use SSH keys to establish a connection first, providing a password is 
optional.
-This session is utilized by InteractiveShells and cannot be interacted with
-directly.
-
-Arguments:
-node_config: Configuration class for the node you are connecting to.
-_logger: Desired logger for this session to use.
+The connection is created using `paramiko 
`_
+and is a persistent connection to the host. This class defines the methods 
for connecting
+to the node and configures the connection to send "keep alive" packets 
every 30 seconds.
+Because paramiko attempts to use SSH keys to establish a connection first, 
providing
+a password is optional. This session is utilized by InteractiveShells
+and cannot be interacted with directly.
 
 Attributes:
-hostname: Hostname that will be used to initialize a connection to the 
node.
-ip: A subsection of hostname that removes the port for the connection 
if there
+hostname: The hostname that will be used to initialize a connection to 
the node.
+ip: A subsection of `hostname` that removes the port for the 
connection if there
 is one. If there is no port, this will be the same as hostname.
-port: Port to use for the ssh connection. This will be extracted from 
the
-hostname if there is a port included, otherwise it will default to 
22.
+port: Port to use for the ssh connection. This will be extracted from 
`hostname`
+if there is a port included, otherwise it will default to ``22``.
 username: User to connect to the node with.
 password: Password of the user connecting to the host. This will 
default to an
 empty string if a password is not provided.
-session: Underlying paramiko connection.
+session: The underlying paramiko connection.
 
 Raises:
 SSHConnectionError: There is an error creating the SSH connection.
@@ -58,9 +54,15 @@ class InteractiveRemoteSession:
 _node_config: NodeConfiguration
 _transport: Transport | None
 
-def __init__(self, node_config: NodeConfiguration, _logger: DTSLOG) -> 
None:
+def __init__(self, node_config: NodeConfiguration, logger: DTSLOG) -> None:
+"""Connect to the node during initialization.
+
+Args:
+node_config: The test run configuration of the node to connect to.
+logger: The logger instance this session will use.
+"""
 self._node_config = node_config
-self._logger = _logger
+self._logger = logger
 self.hostname = node_config.hostname
 self.username = node_config.user
 self.password = node_config.password if node_config.password else ""
diff --git a/dts/framework/remote_session/interactive_shell.py 
b/dts/framework/remote_session/interactive_shell.py
index 4db19fb9b3..b158f963b6 100644
--- a/dts/framework/remote_session/interactive_shell.py
+++ b/dts/framework/remote_session/interactive_shell.py
@@ -3,18 +3,20 @@
 
 """Common functionality for interactive shell handling.
 
-This base class, InteractiveShell, is meant to be extended by other classes 
that
-contain functionality specific to that shell type. These derived classes will 
often
-modify things like the prompt to expect or the arguments to pass into the 
application,
-but still utilize the same method for sending a command and collecting output. 
How
-this output is handled however is often application specific. If an 
application needs
-elevated privileges to start it is expected that the method for gaining those
-privileges is provided when initializing the class.
+The base class, :class:`InteractiveShell`, is meant to be extended by 
subclasses that contain
+functionality specific to that shell type. These subclasses will often modify 
things like
+the p

[PATCH v9 13/21] dts: port and virtual device docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/testbed_model/__init__.py   | 17 --
 dts/framework/testbed_model/port.py   | 53 +++
 dts/framework/testbed_model/virtual_device.py | 17 +-
 3 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/dts/framework/testbed_model/__init__.py 
b/dts/framework/testbed_model/__init__.py
index 8ced05653b..6086512ca2 100644
--- a/dts/framework/testbed_model/__init__.py
+++ b/dts/framework/testbed_model/__init__.py
@@ -2,9 +2,20 @@
 # Copyright(c) 2022-2023 University of New Hampshire
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 
-"""
-This package contains the classes used to model the physical traffic generator,
-system under test and any other components that need to be interacted with.
+"""Testbed modelling.
+
+This package defines the testbed elements DTS works with:
+
+* A system under test node: :class:`~.sut_node.SutNode`,
+* A traffic generator node: :class:`~.tg_node.TGNode`,
+* The ports of network interface cards (NICs) present on nodes: 
:class:`~.port.Port`,
+* The logical cores of CPUs present on nodes: :class:`~.cpu.LogicalCore`,
+* The virtual devices that can be created on nodes: 
:class:`~.virtual_device.VirtualDevice`,
+* The operating systems running on nodes: 
:class:`~.linux_session.LinuxSession`
+  and :class:`~.posix_session.PosixSession`.
+
+DTS needs to be able to connect to nodes and understand some of the hardware 
present on these nodes
+to properly build and test DPDK.
 """
 
 # pylama:ignore=W0611
diff --git a/dts/framework/testbed_model/port.py 
b/dts/framework/testbed_model/port.py
index 680c29bfe3..817405bea4 100644
--- a/dts/framework/testbed_model/port.py
+++ b/dts/framework/testbed_model/port.py
@@ -2,6 +2,13 @@
 # Copyright(c) 2022 University of New Hampshire
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 
+"""NIC port model.
+
+Basic port information, such as location (the port are identified by their PCI 
address on a node),
+drivers and address.
+"""
+
+
 from dataclasses import dataclass
 
 from framework.config import PortConfig
@@ -9,24 +16,35 @@
 
 @dataclass(slots=True, frozen=True)
 class PortIdentifier:
+"""The port identifier.
+
+Attributes:
+node: The node where the port resides.
+pci: The PCI address of the port on `node`.
+"""
+
 node: str
 pci: str
 
 
 @dataclass(slots=True)
 class Port:
-"""
-identifier: The PCI address of the port on a node.
-
-os_driver: The driver used by this port when the OS is controlling it.
-Example: i40e
-os_driver_for_dpdk: The driver the device must be bound to for DPDK to use 
it,
-Example: vfio-pci.
+"""Physical port on a node.
 
-Note: os_driver and os_driver_for_dpdk may be the same thing.
-Example: mlx5_core
+The ports are identified by the node they're on and their PCI addresses. 
The port on the other
+side of the connection is also captured here.
+Each port is serviced by a driver, which may be different for the 
operating system (`os_driver`)
+and for DPDK (`os_driver_for_dpdk`). For some devices, they are the same, 
e.g.: ``mlx5_core``.
 
-peer: The identifier of a port this port is connected with.
+Attributes:
+identifier: The PCI address of the port on a node.
+os_driver: The operating system driver name when the operating system 
controls the port,
+e.g.: ``i40e``.
+os_driver_for_dpdk: The operating system driver name for use with 
DPDK, e.g.: ``vfio-pci``.
+peer: The identifier of a port this port is connected with.
+The `peer` is on a different node.
+mac_address: The MAC address of the port.
+logical_name: The logical name of the port. Must be discovered.
 """
 
 identifier: PortIdentifier
@@ -37,6 +55,12 @@ class Port:
 logical_name: str = ""
 
 def __init__(self, node_name: str, config: PortConfig):
+"""Initialize the port from `node_name` and `config`.
+
+Args:
+node_name: The name of the port's node.
+config: The test run configuration of the port.
+"""
 self.identifier = PortIdentifier(
 node=node_name,
 pci=config.pci,
@@ -47,14 +71,23 @@ def __init__(self, node_name: str, config: PortConfig):
 
 @property
 def node(self) -> str:
+"""The node where the port resides."""
 return self.identifier.node
 
 @property
 def pci(self) -> str:
+"""The PCI address of the port."""
 return self.identifier.pci
 
 
 @dataclass(slots=True, frozen=True)
 class PortLink:
+"""The physical, cabled connection between the ports.
+
+Attributes:
+sut_port: The port on the SUT node connected to `tg_port`.
+tg_port: The port on the TG node connected to `sut_port`.
+"""
+
 sut_port: Port
 tg_port: Port

[PATCH v9 14/21] dts: cpu docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/testbed_model/cpu.py | 196 +
 1 file changed, 144 insertions(+), 52 deletions(-)

diff --git a/dts/framework/testbed_model/cpu.py 
b/dts/framework/testbed_model/cpu.py
index 1b392689f5..9e33b2825d 100644
--- a/dts/framework/testbed_model/cpu.py
+++ b/dts/framework/testbed_model/cpu.py
@@ -1,6 +1,22 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 
+"""CPU core representation and filtering.
+
+This module provides a unified representation of logical CPU cores along
+with filtering capabilities.
+
+When symmetric multiprocessing (SMP or multithreading) is enabled on a server,
+the physical CPU cores are split into logical CPU cores with different IDs.
+
+:class:`LogicalCoreCountFilter` filters by the number of logical cores. It's 
possible to specify
+the socket from which to filter the number of logical cores. It's also 
possible to not use all
+logical CPU cores from each physical core (e.g. only the first logical core of 
each physical core).
+
+:class:`LogicalCoreListFilter` filters by logical core IDs. This mostly checks 
that
+the logical cores are actually present on the server.
+"""
+
 import dataclasses
 from abc import ABC, abstractmethod
 from collections.abc import Iterable, ValuesView
@@ -11,9 +27,17 @@
 
 @dataclass(slots=True, frozen=True)
 class LogicalCore(object):
-"""
-Representation of a CPU core. A physical core is represented in OS
-by multiple logical cores (lcores) if CPU multithreading is enabled.
+"""Representation of a logical CPU core.
+
+A physical core is represented in OS by multiple logical cores (lcores)
+if CPU multithreading is enabled. When multithreading is disabled, their 
IDs are the same.
+
+Attributes:
+lcore: The logical core ID of a CPU core. It's the same as `core` with
+disabled multithreading.
+core: The physical core ID of a CPU core.
+socket: The physical socket ID where the CPU resides.
+node: The NUMA node ID where the CPU resides.
 """
 
 lcore: int
@@ -22,27 +46,36 @@ class LogicalCore(object):
 node: int
 
 def __int__(self) -> int:
+"""The CPU is best represented by the logical core, as that's what we 
configure in EAL."""
 return self.lcore
 
 
 class LogicalCoreList(object):
-"""
-Convert these options into a list of logical core ids.
-lcore_list=[LogicalCore1, LogicalCore2] - a list of LogicalCores
-lcore_list=[0,1,2,3] - a list of int indices
-lcore_list=['0','1','2-3'] - a list of str indices; ranges are supported
-lcore_list='0,1,2-3' - a comma delimited str of indices; ranges are 
supported
-
-The class creates a unified format used across the framework and allows
-the user to use either a str representation (using str(instance) or 
directly
-in f-strings) or a list representation (by accessing instance.lcore_list).
-Empty lcore_list is allowed.
+r"""A unified way to store :class:`LogicalCore`\s.
+
+Create a unified format used across the framework and allow the user to use
+either a :class:`str` representation (using ``str(instance)`` or directly 
in f-strings)
+or a :class:`list` representation (by accessing the `lcore_list` property,
+which stores logical core IDs).
 """
 
 _lcore_list: list[int]
 _lcore_str: str
 
 def __init__(self, lcore_list: list[int] | list[str] | list[LogicalCore] | 
str):
+"""Process `lcore_list`, then sort.
+
+There are four supported logical core list formats::
+
+lcore_list=[LogicalCore1, LogicalCore2]  # a list of LogicalCores
+lcore_list=[0,1,2,3]# a list of int indices
+lcore_list=['0','1','2-3']  # a list of str indices; ranges are 
supported
+lcore_list='0,1,2-3'# a comma delimited str of indices; 
ranges are supported
+
+Args:
+lcore_list: Various ways to represent multiple logical cores.
+Empty `lcore_list` is allowed.
+"""
 self._lcore_list = []
 if isinstance(lcore_list, str):
 lcore_list = lcore_list.split(",")
@@ -58,6 +91,7 @@ def __init__(self, lcore_list: list[int] | list[str] | 
list[LogicalCore] | str):
 
 @property
 def lcore_list(self) -> list[int]:
+"""The logical core IDs."""
 return self._lcore_list
 
 def _get_consecutive_lcores_range(self, lcore_ids_list: list[int]) -> 
list[str]:
@@ -83,28 +117,30 @@ def _get_consecutive_lcores_range(self, lcore_ids_list: 
list[int]) -> list[str]:
 return formatted_core_list
 
 def __str__(self) -> str:
+"""The consecutive ranges of logical core IDs."""
 return self._lcore_str
 
 
 @dataclasses.dataclass(slots=True, frozen=True)
 class LogicalCoreCount(object):
-"""
-Define the number of

[PATCH v9 15/21] dts: os session docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/testbed_model/os_session.py | 272 --
 1 file changed, 205 insertions(+), 67 deletions(-)

diff --git a/dts/framework/testbed_model/os_session.py 
b/dts/framework/testbed_model/os_session.py
index 76e595a518..ac6bb5e112 100644
--- a/dts/framework/testbed_model/os_session.py
+++ b/dts/framework/testbed_model/os_session.py
@@ -2,6 +2,26 @@
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2023 University of New Hampshire
 
+"""OS-aware remote session.
+
+DPDK supports multiple different operating systems, meaning it can run on 
these different operating
+systems. This module defines the common API that OS-unaware layers use and 
translates the API into
+OS-aware calls/utility usage.
+
+Note:
+Running commands with administrative privileges requires OS awareness. 
This is the only layer
+that's aware of OS differences, so this is where non-privileged command 
get converted
+to privileged commands.
+
+Example:
+A user wishes to remove a directory on a remote 
:class:`~.sut_node.SutNode`.
+The :class:`~.sut_node.SutNode` object isn't aware what OS the node is 
running - it delegates
+the OS translation logic to :attr:`~.node.Node.main_session`. The SUT node 
calls
+:meth:`~OSSession.remove_remote_dir` with a generic, OS-unaware path and
+the :attr:`~.node.Node.main_session` translates that to ``rm -rf`` if the 
node's OS is Linux
+and other commands for other OSs. It also translates the path to match the 
underlying OS.
+"""
+
 from abc import ABC, abstractmethod
 from collections.abc import Iterable
 from ipaddress import IPv4Interface, IPv6Interface
@@ -28,10 +48,16 @@
 
 
 class OSSession(ABC):
-"""
-The OS classes create a DTS node remote session and implement OS specific
+"""OS-unaware to OS-aware translation API definition.
+
+The OSSession classes create a remote session to a DTS node and implement 
OS specific
 behavior. There a few control methods implemented by the base class, the 
rest need
-to be implemented by derived classes.
+to be implemented by subclasses.
+
+Attributes:
+name: The name of the session.
+remote_session: The remote session maintaining the connection to the 
node.
+interactive_session: The interactive remote session maintaining the 
connection to the node.
 """
 
 _config: NodeConfiguration
@@ -46,6 +72,15 @@ def __init__(
 name: str,
 logger: DTSLOG,
 ):
+"""Initialize the OS-aware session.
+
+Connect to the node right away and also create an interactive remote 
session.
+
+Args:
+node_config: The test run configuration of the node to connect to.
+name: The name of the session.
+logger: The logger instance this session will use.
+"""
 self._config = node_config
 self.name = name
 self._logger = logger
@@ -53,15 +88,15 @@ def __init__(
 self.interactive_session = create_interactive_session(node_config, 
logger)
 
 def close(self, force: bool = False) -> None:
-"""
-Close the remote session.
+"""Close the underlying remote session.
+
+Args:
+force: Force the closure of the connection.
 """
 self.remote_session.close(force)
 
 def is_alive(self) -> bool:
-"""
-Check whether the remote session is still responding.
-"""
+"""Check whether the underlying remote session is still responding."""
 return self.remote_session.is_alive()
 
 def send_command(
@@ -72,10 +107,23 @@ def send_command(
 verify: bool = False,
 env: dict | None = None,
 ) -> CommandResult:
-"""
-An all-purpose API in case the command to be executed is already
-OS-agnostic, such as when the path to the executed command has been
-constructed beforehand.
+"""An all-purpose API for OS-agnostic commands.
+
+This can be used for an execution of a portable command that's 
executed the same way
+on all operating systems, such as Python.
+
+The :option:`--timeout` command line argument and the 
:envvar:`DTS_TIMEOUT`
+environment variable configure the timeout of command execution.
+
+Args:
+command: The command to execute.
+timeout: Wait at most this long in seconds for `command` execution 
to complete.
+privileged: Whether to run the command with administrative 
privileges.
+verify: If :data:`True`, will check the exit code of the command.
+env: A dictionary with environment variables to be used with the 
command execution.
+
+Raises:
+RemoteCommandExecutionError: If verify is :data:`True` and the 
command failed.
 """
 if privileged:
 command = sel

[PATCH v9 16/21] dts: posix and linux sessions docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/testbed_model/linux_session.py | 64 +++-
 dts/framework/testbed_model/posix_session.py | 81 +---
 2 files changed, 114 insertions(+), 31 deletions(-)

diff --git a/dts/framework/testbed_model/linux_session.py 
b/dts/framework/testbed_model/linux_session.py
index 055765ba2d..0ab59cef85 100644
--- a/dts/framework/testbed_model/linux_session.py
+++ b/dts/framework/testbed_model/linux_session.py
@@ -2,6 +2,13 @@
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2023 University of New Hampshire
 
+"""Linux OS translator.
+
+Translate OS-unaware calls into Linux calls/utilities. Most of Linux 
distributions are mostly
+compliant with POSIX standards, so this module only implements the parts that 
aren't.
+This intermediate module implements the common parts of mostly POSIX compliant 
distributions.
+"""
+
 import json
 from ipaddress import IPv4Interface, IPv6Interface
 from typing import TypedDict, Union
@@ -17,43 +24,52 @@
 
 
 class LshwConfigurationOutput(TypedDict):
+"""The relevant parts of ``lshw``'s ``configuration`` section."""
+
+#:
 link: str
 
 
 class LshwOutput(TypedDict):
-"""
-A model of the relevant information from json lshw output, e.g.:
-{
-...
-"businfo" : "pci@:08:00.0",
-"logicalname" : "enp8s0",
-"version" : "00",
-"serial" : "52:54:00:59:e1:ac",
-...
-"configuration" : {
-  ...
-  "link" : "yes",
-  ...
-},
-...
+"""A model of the relevant information from ``lshw``'s json output.
+
+Example:
+::
+
+{
+...
+"businfo" : "pci@:08:00.0",
+"logicalname" : "enp8s0",
+"version" : "00",
+"serial" : "52:54:00:59:e1:ac",
+...
+"configuration" : {
+  ...
+  "link" : "yes",
+  ...
+},
+...
 """
 
+#:
 businfo: str
+#:
 logicalname: NotRequired[str]
+#:
 serial: NotRequired[str]
+#:
 configuration: LshwConfigurationOutput
 
 
 class LinuxSession(PosixSession):
-"""
-The implementation of non-Posix compliant parts of Linux remote sessions.
-"""
+"""The implementation of non-Posix compliant parts of Linux."""
 
 @staticmethod
 def _get_privileged_command(command: str) -> str:
 return f"sudo -- sh -c '{command}'"
 
 def get_remote_cpus(self, use_first_core: bool) -> list[LogicalCore]:
+"""Overrides :meth:`~.os_session.OSSession.get_remote_cpus`."""
 cpu_info = self.send_command("lscpu -p=CPU,CORE,SOCKET,NODE|grep -v 
\\#").stdout
 lcores = []
 for cpu_line in cpu_info.splitlines():
@@ -65,18 +81,20 @@ def get_remote_cpus(self, use_first_core: bool) -> 
list[LogicalCore]:
 return lcores
 
 def get_dpdk_file_prefix(self, dpdk_prefix: str) -> str:
+"""Overrides :meth:`~.os_session.OSSession.get_dpdk_file_prefix`."""
 return dpdk_prefix
 
-def setup_hugepages(self, hugepage_amount: int, force_first_numa: bool) -> 
None:
+def setup_hugepages(self, hugepage_count: int, force_first_numa: bool) -> 
None:
+"""Overrides :meth:`~.os_session.OSSession.setup_hugepages`."""
 self._logger.info("Getting Hugepage information.")
 hugepage_size = self._get_hugepage_size()
 hugepages_total = self._get_hugepages_total()
 self._numa_nodes = self._get_numa_nodes()
 
-if force_first_numa or hugepages_total != hugepage_amount:
+if force_first_numa or hugepages_total != hugepage_count:
 # when forcing numa, we need to clear existing hugepages regardless
 # of size, so they can be moved to the first numa node
-self._configure_huge_pages(hugepage_amount, hugepage_size, 
force_first_numa)
+self._configure_huge_pages(hugepage_count, hugepage_size, 
force_first_numa)
 else:
 self._logger.info("Hugepages already configured.")
 self._mount_huge_pages()
@@ -132,6 +150,7 @@ def _configure_huge_pages(self, amount: int, size: int, 
force_first_numa: bool)
 self.send_command(f"echo {amount} | tee {hugepage_config_path}", 
privileged=True)
 
 def update_ports(self, ports: list[Port]) -> None:
+"""Overrides :meth:`~.os_session.OSSession.update_ports`."""
 self._logger.debug("Gathering port info.")
 for port in ports:
 assert port.node == self.name, "Attempted to gather port info on 
the wrong node"
@@ -161,6 +180,7 @@ def _update_port_attr(self, port: Port, attr_value: str | 
None, attr_name: str)
 )
 
 def configure_port_state(self, port: Port, enable: bool) -> None:
+"""Overrides :meth:`~.os_session.OSSession.configure_port_state`."""
 state = "up" if enable else "down"
 self.send_com

[PATCH v9 17/21] dts: node docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/testbed_model/node.py | 191 +++-
 1 file changed, 131 insertions(+), 60 deletions(-)

diff --git a/dts/framework/testbed_model/node.py 
b/dts/framework/testbed_model/node.py
index b313b5ad54..1a55fadf78 100644
--- a/dts/framework/testbed_model/node.py
+++ b/dts/framework/testbed_model/node.py
@@ -3,8 +3,13 @@
 # Copyright(c) 2022-2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2022-2023 University of New Hampshire
 
-"""
-A node is a generic host that DTS connects to and manages.
+"""Common functionality for node management.
+
+A node is any host/server DTS connects to.
+
+The base class, :class:`Node`, provides features common to all nodes and is 
supposed
+to be extended by subclasses with features specific to each node type.
+The :func:`~Node.skip_setup` decorator can be used without subclassing.
 """
 
 from abc import ABC
@@ -35,10 +40,22 @@
 
 
 class Node(ABC):
-"""
-Basic class for node management. This class implements methods that
-manage a node, such as information gathering (of CPU/PCI/NIC) and
-environment setup.
+"""The base class for node management.
+
+It shouldn't be instantiated, but rather subclassed.
+It implements common methods to manage any node:
+
+* Connection to the node,
+* Hugepages setup.
+
+Attributes:
+main_session: The primary OS-aware remote session used to communicate 
with the node.
+config: The node configuration.
+name: The name of the node.
+lcores: The list of logical cores that DTS can use on the node.
+It's derived from logical cores present on the node and the test 
run configuration.
+ports: The ports of this node specified in the test run configuration.
+virtual_devices: The virtual devices used on the node.
 """
 
 main_session: OSSession
@@ -52,6 +69,17 @@ class Node(ABC):
 virtual_devices: list[VirtualDevice]
 
 def __init__(self, node_config: NodeConfiguration):
+"""Connect to the node and gather info during initialization.
+
+Extra gathered information:
+
+* The list of available logical CPUs. This is then filtered by
+  the ``lcores`` configuration in the YAML test run configuration file,
+* Information about ports from the YAML test run configuration file.
+
+Args:
+node_config: The node's test run configuration.
+"""
 self.config = node_config
 self.name = node_config.name
 self._logger = getLogger(self.name)
@@ -60,7 +88,7 @@ def __init__(self, node_config: NodeConfiguration):
 self._logger.info(f"Connected to node: {self.name}")
 
 self._get_remote_cpus()
-# filter the node lcores according to user config
+# filter the node lcores according to the test run configuration
 self.lcores = LogicalCoreListFilter(
 self.lcores, LogicalCoreList(self.config.lcores)
 ).filter()
@@ -76,9 +104,14 @@ def _init_ports(self) -> None:
 self.configure_port_state(port)
 
 def set_up_execution(self, execution_config: ExecutionConfiguration) -> 
None:
-"""
-Perform the execution setup that will be done for each execution
-this node is part of.
+"""Execution setup steps.
+
+Configure hugepages and call :meth:`_set_up_execution` where
+the rest of the configuration steps (if any) are implemented.
+
+Args:
+execution_config: The execution test run configuration according 
to which
+the setup steps will be taken.
 """
 self._setup_hugepages()
 self._set_up_execution(execution_config)
@@ -87,54 +120,70 @@ def set_up_execution(self, execution_config: 
ExecutionConfiguration) -> None:
 self.virtual_devices.append(VirtualDevice(vdev))
 
 def _set_up_execution(self, execution_config: ExecutionConfiguration) -> 
None:
-"""
-This method exists to be optionally overwritten by derived classes and
-is not decorated so that the derived class doesn't have to use the 
decorator.
+"""Optional additional execution setup steps for subclasses.
+
+Subclasses should override this if they need to add additional 
execution setup steps.
 """
 
 def tear_down_execution(self) -> None:
-"""
-Perform the execution teardown that will be done after each execution
-this node is part of concludes.
+"""Execution teardown steps.
+
+There are currently no common execution teardown steps common to all 
DTS node types.
 """
 self.virtual_devices = []
 self._tear_down_execution()
 
 def _tear_down_execution(self) -> None:
-"""
-This method exists to be optionally overwritten by derived classes and
-is not decorated so that th

[PATCH v9 18/21] dts: sut and tg nodes docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/framework/testbed_model/sut_node.py | 230 
 dts/framework/testbed_model/tg_node.py  |  42 +++--
 2 files changed, 176 insertions(+), 96 deletions(-)

diff --git a/dts/framework/testbed_model/sut_node.py 
b/dts/framework/testbed_model/sut_node.py
index 5ce9446dba..c4acea38d1 100644
--- a/dts/framework/testbed_model/sut_node.py
+++ b/dts/framework/testbed_model/sut_node.py
@@ -3,6 +3,14 @@
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 # Copyright(c) 2023 University of New Hampshire
 
+"""System under test (DPDK + hardware) node.
+
+A system under test (SUT) is the combination of DPDK
+and the hardware we're testing with DPDK (NICs, crypto and other devices).
+An SUT node is where this SUT runs.
+"""
+
+
 import os
 import tarfile
 import time
@@ -26,6 +34,11 @@
 
 
 class EalParameters(object):
+"""The environment abstraction layer parameters.
+
+The string representation can be created by converting the instance to a 
string.
+"""
+
 def __init__(
 self,
 lcore_list: LogicalCoreList,
@@ -35,21 +48,23 @@ def __init__(
 vdevs: list[VirtualDevice],
 other_eal_param: str,
 ):
-"""
-Generate eal parameters character string;
-:param lcore_list: the list of logical cores to use.
-:param memory_channels: the number of memory channels to use.
-:param prefix: set file prefix string, eg:
-prefix='vf'
-:param no_pci: switch of disable PCI bus eg:
-no_pci=True
-:param vdevs: virtual device list, eg:
-vdevs=[
-VirtualDevice('net_ring0'),
-VirtualDevice('net_ring1')
-]
-:param other_eal_param: user defined DPDK eal parameters, eg:
-other_eal_param='--single-file-segments'
+"""Initialize the parameters according to inputs.
+
+Process the parameters into the format used on the command line.
+
+Args:
+lcore_list: The list of logical cores to use.
+memory_channels: The number of memory channels to use.
+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')
+]
+other_eal_param: user defined DPDK EAL parameters, e.g.:
+``other_eal_param='--single-file-segments'``
 """
 self._lcore_list = f"-l {lcore_list}"
 self._memory_channels = f"-n {memory_channels}"
@@ -61,6 +76,7 @@ def __init__(
 self._other_eal_param = other_eal_param
 
 def __str__(self) -> str:
+"""Create the EAL string."""
 return (
 f"{self._lcore_list} "
 f"{self._memory_channels} "
@@ -72,11 +88,21 @@ def __str__(self) -> str:
 
 
 class SutNode(Node):
-"""
-A class for managing connections to the System under Test, providing
-methods that retrieve the necessary information about the node (such as
-CPU, memory and NIC details) and configuration capabilities.
-Another key capability is building DPDK according to given build target.
+"""The system under test node.
+
+The SUT node extends :class:`Node` with DPDK specific features:
+
+* DPDK build,
+* Gathering of DPDK build info,
+* The running of DPDK apps, interactively or one-time execution,
+* DPDK apps cleanup.
+
+The :option:`--tarball` command line argument and the 
:envvar:`DTS_DPDK_TARBALL`
+environment variable configure the path to the DPDK tarball
+or the git commit ID, tag ID or tree ID to test.
+
+Attributes:
+config: The SUT node configuration
 """
 
 config: SutNodeConfiguration
@@ -94,6 +120,11 @@ class SutNode(Node):
 _path_to_devbind_script: PurePath | None
 
 def __init__(self, node_config: SutNodeConfiguration):
+"""Extend the constructor with SUT node specifics.
+
+Args:
+node_config: The SUT node's test run configuration.
+"""
 super(SutNode, self).__init__(node_config)
 self._dpdk_prefix_list = []
 self._build_target_config = None
@@ -113,6 +144,12 @@ def __init__(self, node_config: SutNodeConfiguration):
 
 @property
 def _remote_dpdk_dir(self) -> PurePath:
+"""The remote DPDK dir.
+
+This internal property should be set after extracting the DPDK 
tarball. If it's not set,
+that implies the DPDK setup step has been skipped, in which case we 
can guess where
+a previous build was located.
+"""
 if self.__remote_dpdk_dir is 

[PATCH v9 19/21] dts: base traffic generators docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 .../traffic_generator/__init__.py | 22 -
 .../capturing_traffic_generator.py| 45 +++
 .../traffic_generator/traffic_generator.py| 33 --
 3 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/dts/framework/testbed_model/traffic_generator/__init__.py 
b/dts/framework/testbed_model/traffic_generator/__init__.py
index 52888d03fa..11e2bd7d97 100644
--- a/dts/framework/testbed_model/traffic_generator/__init__.py
+++ b/dts/framework/testbed_model/traffic_generator/__init__.py
@@ -1,6 +1,19 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 
+"""DTS traffic generators.
+
+A traffic generator is capable of generating traffic and then monitor 
returning traffic.
+All traffic generators must count the number of received packets. Some may 
additionally capture
+individual packets.
+
+A traffic generator may be software running on generic hardware or it could be 
specialized hardware.
+
+The traffic generators that only count the number of received packets are 
suitable only for
+performance testing. In functional testing, we need to be able to dissect each 
arrived packet
+and a capturing traffic generator is required.
+"""
+
 from framework.config import ScapyTrafficGeneratorConfig, TrafficGeneratorType
 from framework.exception import ConfigurationError
 from framework.testbed_model.node import Node
@@ -12,8 +25,15 @@
 def create_traffic_generator(
 tg_node: Node, traffic_generator_config: ScapyTrafficGeneratorConfig
 ) -> CapturingTrafficGenerator:
-"""A factory function for creating traffic generator object from user 
config."""
+"""The factory function for creating traffic generator objects from the 
test run configuration.
+
+Args:
+tg_node: The traffic generator node where the created traffic 
generator will be running.
+traffic_generator_config: The traffic generator config.
 
+Returns:
+A traffic generator capable of capturing received packets.
+"""
 match traffic_generator_config.traffic_generator_type:
 case TrafficGeneratorType.SCAPY:
 return ScapyTrafficGenerator(tg_node, traffic_generator_config)
diff --git 
a/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py 
b/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
index 1fc7f98c05..0246590333 100644
--- 
a/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
+++ 
b/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
@@ -23,19 +23,21 @@
 
 
 def _get_default_capture_name() -> str:
-"""
-This is the function used for the default implementation of capture names.
-"""
 return str(uuid.uuid4())
 
 
 class CapturingTrafficGenerator(TrafficGenerator):
 """Capture packets after sending traffic.
 
-A mixin interface which enables a packet generator to declare that it can 
capture
+The intermediary interface which enables a packet generator to declare 
that it can capture
 packets and return them to the user.
 
+Similarly to :class:`~.traffic_generator.TrafficGenerator`, this class 
exposes
+the public methods specific to capturing traffic generators and defines a 
private method
+that must implement the traffic generation and capturing logic in 
subclasses.
+
 The methods of capturing traffic generators obey the following workflow:
+
 1. send packets
 2. capture packets
 3. write the capture to a .pcap file
@@ -44,6 +46,7 @@ class CapturingTrafficGenerator(TrafficGenerator):
 
 @property
 def is_capturing(self) -> bool:
+"""This traffic generator can capture traffic."""
 return True
 
 def send_packet_and_capture(
@@ -54,11 +57,12 @@ def send_packet_and_capture(
 duration: float,
 capture_name: str = _get_default_capture_name(),
 ) -> list[Packet]:
-"""Send a packet, return received traffic.
+"""Send `packet` and capture received traffic.
+
+Send `packet` on `send_port` and then return all traffic captured
+on `receive_port` for the given `duration`.
 
-Send a packet on the send_port and then return all traffic captured
-on the receive_port for the given duration. Also record the captured 
traffic
-in a pcap file.
+The captured traffic is recorded in the `capture_name`.pcap file.
 
 Args:
 packet: The packet to send.
@@ -68,7 +72,7 @@ def send_packet_and_capture(
 capture_name: The name of the .pcap file where to store the 
capture.
 
 Returns:
- A list of received packets. May be empty if no packets are 
captured.
+ The received packets. May be empty if no packets are captured.
 """
 return self.send_packets_and_captur

[PATCH v9 20/21] dts: scapy tg docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 .../testbed_model/traffic_generator/scapy.py  | 91 +++
 1 file changed, 54 insertions(+), 37 deletions(-)

diff --git a/dts/framework/testbed_model/traffic_generator/scapy.py 
b/dts/framework/testbed_model/traffic_generator/scapy.py
index c88cf28369..5b60f66237 100644
--- a/dts/framework/testbed_model/traffic_generator/scapy.py
+++ b/dts/framework/testbed_model/traffic_generator/scapy.py
@@ -2,14 +2,15 @@
 # Copyright(c) 2022 University of New Hampshire
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 
-"""Scapy traffic generator.
+"""The Scapy traffic generator.
 
-Traffic generator used for functional testing, implemented using the Scapy 
library.
+A traffic generator used for functional testing, implemented with
+`the Scapy library `_.
 The traffic generator uses an XML-RPC server to run Scapy on the remote TG 
node.
 
-The XML-RPC server runs in an interactive remote SSH session running Python 
console,
-where we start the server. The communication with the server is facilitated 
with
-a local server proxy.
+The traffic generator uses the :mod:`xmlrpc.server` module to run an XML-RPC 
server
+in an interactive remote Python SSH session. The communication with the server 
is facilitated
+with a local server proxy from the :mod:`xmlrpc.client` module.
 """
 
 import inspect
@@ -69,20 +70,20 @@ def scapy_send_packets_and_capture(
 recv_iface: str,
 duration: float,
 ) -> list[bytes]:
-"""RPC function to send and capture packets.
+"""The RPC function to send and capture packets.
 
-The function is meant to be executed on the remote TG node.
+This function is meant to be executed on the remote TG node via the server 
proxy.
 
 Args:
 xmlrpc_packets: The packets to send. These need to be converted to
-xmlrpc.client.Binary before sending to the remote server.
+:class:`~xmlrpc.client.Binary` objects before sending to the 
remote server.
 send_iface: The logical name of the egress interface.
 recv_iface: The logical name of the ingress interface.
 duration: Capture for this amount of time, in seconds.
 
 Returns:
 A list of bytes. Each item in the list represents one packet, which 
needs
-to be converted back upon transfer from the remote node.
+to be converted back upon transfer from the remote node.
 """
 scapy_packets = [scapy.all.Packet(packet.data) for packet in 
xmlrpc_packets]
 sniffer = scapy.all.AsyncSniffer(
@@ -96,19 +97,15 @@ def scapy_send_packets_and_capture(
 
 
 def scapy_send_packets(xmlrpc_packets: list[xmlrpc.client.Binary], send_iface: 
str) -> None:
-"""RPC function to send packets.
+"""The RPC function to send packets.
 
-The function is meant to be executed on the remote TG node.
-It doesn't return anything, only sends packets.
+This function is meant to be executed on the remote TG node via the server 
proxy.
+It only sends `xmlrpc_packets`, without capturing them.
 
 Args:
 xmlrpc_packets: The packets to send. These need to be converted to
-xmlrpc.client.Binary before sending to the remote server.
+:class:`~xmlrpc.client.Binary` objects before sending to the 
remote server.
 send_iface: The logical name of the egress interface.
-
-Returns:
-A list of bytes. Each item in the list represents one packet, which 
needs
-to be converted back upon transfer from the remote node.
 """
 scapy_packets = [scapy.all.Packet(packet.data) for packet in 
xmlrpc_packets]
 scapy.all.sendp(scapy_packets, iface=send_iface, realtime=True, 
verbose=True)
@@ -128,11 +125,19 @@ def scapy_send_packets(xmlrpc_packets: 
list[xmlrpc.client.Binary], send_iface: s
 
 
 class QuittableXMLRPCServer(SimpleXMLRPCServer):
-"""Basic XML-RPC server that may be extended
-by functions serializable by the marshal module.
+"""Basic XML-RPC server.
+
+The server may be augmented by functions serializable by the 
:mod:`marshal` module.
 """
 
 def __init__(self, *args, **kwargs):
+"""Extend the XML-RPC server initialization.
+
+Args:
+args: The positional arguments that will be passed to the 
superclass's constructor.
+kwargs: The keyword arguments that will be passed to the 
superclass's constructor.
+The `allow_none` argument will be set to :data:`True`.
+"""
 kwargs["allow_none"] = True
 super().__init__(*args, **kwargs)
 self.register_introspection_functions()
@@ -140,13 +145,12 @@ def __init__(self, *args, **kwargs):
 self.register_function(self.add_rpc_function)
 
 def quit(self) -> None:
+"""Quit the server."""
 self._BaseServer__shutdown_request = True
 return None
 
 def add_rpc_function

[PATCH v9 21/21] dts: test suites docstring update

[Juraj Linkeš]

Format according to the Google format and PEP257, with slight
deviations.

Signed-off-by: Juraj Linkeš 
---
 dts/tests/TestSuite_hello_world.py | 16 +---
 dts/tests/TestSuite_os_udp.py  | 20 ++
 dts/tests/TestSuite_smoke_tests.py | 61 --
 3 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/dts/tests/TestSuite_hello_world.py 
b/dts/tests/TestSuite_hello_world.py
index 768ba1cfa8..fd7ff1534d 100644
--- a/dts/tests/TestSuite_hello_world.py
+++ b/dts/tests/TestSuite_hello_world.py
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2010-2014 Intel Corporation
 
-"""
+"""The DPDK hello world app test suite.
+
 Run the helloworld example app and verify it prints a message for each used 
core.
 No other EAL parameters apart from cores are used.
 """
@@ -15,22 +16,25 @@
 
 
 class TestHelloWorld(TestSuite):
+"""DPDK hello world app test suite."""
+
 def set_up_suite(self) -> None:
-"""
+"""Set up the test suite.
+
 Setup:
 Build the app we're about to test - helloworld.
 """
 self.app_helloworld_path = self.sut_node.build_dpdk_app("helloworld")
 
 def test_hello_world_single_core(self) -> None:
-"""
+"""Single core test case.
+
 Steps:
 Run the helloworld app on the first usable logical core.
 Verify:
 The app prints a message from the used core:
 "hello from core "
 """
-
 # get the first usable core
 lcore_amount = LogicalCoreCount(1, 1, 1)
 lcores = LogicalCoreCountFilter(self.sut_node.lcores, 
lcore_amount).filter()
@@ -42,14 +46,14 @@ def test_hello_world_single_core(self) -> None:
 )
 
 def test_hello_world_all_cores(self) -> None:
-"""
+"""All cores test case.
+
 Steps:
 Run the helloworld app on all usable logical cores.
 Verify:
 The app prints a message from all used cores:
 "hello from core "
 """
-
 # get the maximum logical core number
 eal_para = self.sut_node.create_eal_parameters(
 lcore_filter_specifier=LogicalCoreList(self.sut_node.lcores)
diff --git a/dts/tests/TestSuite_os_udp.py b/dts/tests/TestSuite_os_udp.py
index bf6b93deb5..2cf29d37bb 100644
--- a/dts/tests/TestSuite_os_udp.py
+++ b/dts/tests/TestSuite_os_udp.py
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2023 PANTHEON.tech s.r.o.
 
-"""
+"""Basic IPv4 OS routing test suite.
+
 Configure SUT node to route traffic from if1 to if2.
 Send a packet to the SUT node, verify it comes back on the second port on the 
TG node.
 """
@@ -13,24 +14,26 @@
 
 
 class TestOSUdp(TestSuite):
+"""IPv4 UDP OS routing test suite."""
+
 def set_up_suite(self) -> None:
-"""
+"""Set up the test suite.
+
 Setup:
-Configure SUT ports and SUT to route traffic from if1 to if2.
+Bind the SUT ports to the OS driver, configure the ports and 
configure the SUT
+to route traffic from if1 to if2.
 """
-
-# This test uses kernel drivers
 self.sut_node.bind_ports_to_driver(for_dpdk=False)
 self.configure_testbed_ipv4()
 
 def test_os_udp(self) -> None:
-"""
+"""Basic UDP IPv4 traffic test case.
+
 Steps:
 Send a UDP packet.
 Verify:
 The packet with proper addresses arrives at the other TG port.
 """
-
 packet = Ether() / IP() / UDP()
 
 received_packets = self.send_packet_and_capture(packet)
@@ -40,7 +43,8 @@ def test_os_udp(self) -> None:
 self.verify_packets(expected_packet, received_packets)
 
 def tear_down_suite(self) -> None:
-"""
+"""Tear down the test suite.
+
 Teardown:
 Remove the SUT port configuration configured in setup.
 """
diff --git a/dts/tests/TestSuite_smoke_tests.py 
b/dts/tests/TestSuite_smoke_tests.py
index 8958f58dac..5e2bac14bd 100644
--- a/dts/tests/TestSuite_smoke_tests.py
+++ b/dts/tests/TestSuite_smoke_tests.py
@@ -1,6 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2023 University of New Hampshire
 
+"""Smoke test suite.
+
+Smoke tests are a class of tests which are used for validating a minimal set 
of important features.
+These are the most important features without which (or when they're faulty) 
the software wouldn't
+work properly. Thus, if any failure occurs while testing these features,
+there isn't that much of a reason to continue testing, as the software is 
fundamentally broken.
+
+These tests don't have to include only DPDK tests, as the reason for failures 
could be
+in the infrastructure (a faulty link between NICs or a misconfiguration).
+"""
+
 import re
 
 from framework.config import PortConfig
@@ -11,23 +22,39 @@
 
 
 class SmokeTests(TestSuite):
+"""DPDK and infrastructure smoke test suit

[v2] net/af_xdp: enable a sock path alongside use_cni

[Maryam Tahhan]

With the original 'use_cni' implementation, (using a
hardcoded socket rather than a configurable one),
if a single pod is requesting multiple net devices
and these devices are from different pools, then
the container attempts to mount all the netdev UDSes
in the pod as /tmp/afxdp.sock. Which means that at best
only 1 netdev will handshake correctly with the AF_XDP
DP. This patch addresses this by making the socket
parameter configurable alongside the 'use_cni' param.
Tested with the AF_XDP DP CNI PR 81.

v2:
* Rename sock_path to uds_path.
* Update documentation to reflect when CAP_BPF is needed.
* Fix testpmd arguments in the provided example for Pods.
* Use AF_XDP API to update the xskmap entry.

Signed-off-by: Maryam Tahhan 
---
 doc/guides/howto/af_xdp_cni.rst | 24 ++-
 drivers/net/af_xdp/rte_eth_af_xdp.c | 62 ++---
 2 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/doc/guides/howto/af_xdp_cni.rst b/doc/guides/howto/af_xdp_cni.rst
index a1a6d5b99c..7829526b40 100644
--- a/doc/guides/howto/af_xdp_cni.rst
+++ b/doc/guides/howto/af_xdp_cni.rst
@@ -38,9 +38,10 @@ The XSKMAP is a BPF map of AF_XDP sockets (XSK).
 The client can then proceed with creating an AF_XDP socket
 and inserting that socket into the XSKMAP pointed to by the descriptor.
 
-The EAL vdev argument ``use_cni`` is used to indicate that the user wishes
-to run the PMD in unprivileged mode and to receive the XSKMAP file descriptor
-from the CNI.
+The EAL vdev arguments ``use_cni`` and ``uds_path`` are used to indicate that
+the user wishes to run the PMD in unprivileged mode and to receive the XSKMAP
+file descriptor from the CNI.
+
 When this flag is set,
 the ``XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD`` libbpf flag
 should be used when creating the socket
@@ -49,7 +50,7 @@ Instead the loading is handled by the CNI.
 
 .. note::
 
-   The Unix Domain Socket file path appear in the end user is 
"/tmp/afxdp.sock".
+   The Unix Domain Socket file path appears to the end user at 
"/tmp/afxdp_dp//afxdp.sock".
 
 
 Prerequisites
@@ -223,8 +224,7 @@ Howto run dpdk-testpmd with CNI plugin:
  securityContext:
   capabilities:
  add:
-   - CAP_NET_RAW
-   - CAP_BPF
+   - NET_RAW
  resources:
requests:
  hugepages-2Mi: 2Gi
@@ -239,14 +239,20 @@ Howto run dpdk-testpmd with CNI plugin:
 
   .. _pod.yaml: 
https://github.com/intel/afxdp-plugins-for-kubernetes/blob/v0.0.2/test/e2e/pod-1c1d.yaml
 
+.. note::
+
+   For Kernel versions older than 5.19 `CAP_BPF` is also required in
+   the container capabilities stanza.
+
 * Run DPDK with a command like the following:
 
   .. code-block:: console
 
  kubectl exec -i  --container  -- \
-   //dpdk-testpmd -l 0,1 --no-pci \
-   --vdev=net_af_xdp0,use_cni=1,iface= \
-   -- --no-mlockall --in-memory
+   //dpdk-testpmd -l 0-2 --no-pci --main-lcore=2 \
+   --vdev net_af_xdp0,iface=,use_cni=1,uds_path=/tmp/afxdp_dp//afxdp.sock \
+   --vdev net_af_xdp1,iface=e,use_cni=1,uds_path=/tmp/afxdp_dp//afxdp.sock \
+   -- -i --a --nb-cores=2 --rxq=1 --txq=1 --forward-mode=macswap;
 
 For further reference please use the `e2e`_ test case in `AF_XDP Plugin for 
Kubernetes`_
 
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c 
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 353c8688ec..505ed6cf1e 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -88,7 +88,6 @@ RTE_LOG_REGISTER_DEFAULT(af_xdp_logtype, NOTICE);
 #define UDS_MAX_CMD_LEN64
 #define UDS_MAX_CMD_RESP   128
 #define UDS_XSK_MAP_FD_MSG "/xsk_map_fd"
-#define UDS_SOCK   "/tmp/afxdp.sock"
 #define UDS_CONNECT_MSG"/connect"
 #define UDS_HOST_OK_MSG"/host_ok"
 #define UDS_HOST_NAK_MSG   "/host_nak"
@@ -171,6 +170,7 @@ struct pmd_internals {
bool custom_prog_configured;
bool force_copy;
bool use_cni;
+   char uds_path[PATH_MAX];
struct bpf_map *map;
 
struct rte_ether_addr eth_addr;
@@ -191,6 +191,7 @@ struct pmd_process_private {
 #define ETH_AF_XDP_BUDGET_ARG  "busy_budget"
 #define ETH_AF_XDP_FORCE_COPY_ARG  "force_copy"
 #define ETH_AF_XDP_USE_CNI_ARG "use_cni"
+#define ETH_AF_XDP_USE_CNI_UDS_PATH_ARG"uds_path"
 
 static const char * const valid_arguments[] = {
ETH_AF_XDP_IFACE_ARG,
@@ -201,6 +202,7 @@ static const char * const valid_arguments[] = {
ETH_AF_XDP_BUDGET_ARG,
ETH_AF_XDP_FORCE_COPY_ARG,
ETH_AF_XDP_USE_CNI_ARG,
+   ETH_AF_XDP_USE_CNI_UDS_PATH_ARG,
NULL
 };
 
@@ -1351,7 +1353,7 @@ configure_preferred_busy_poll(struct pkt_rx_queue *rxq)
 }
 
 static int
-init_uds_sock(struct sockaddr_un *server)
+init_uds_sock(struct sockaddr_un *server, const char *uds_path)
 {
 

[PATCH v4] windows/virt2phys: fix block MDL not updated

[Ric Li]

The virt2phys_translate function previously scanned existing blocks,
returning the physical address from the stored MDL info if present.
This method was problematic when a virtual address pointed to a freed
and reallocated memory segment, potentially changing the physical
address mapping. Yet, virt2phys_translate would consistently return
the originally stored physical address, which could be invalid.

This issue surfaced when allocating a memory region larger than 2MB
using rte_malloc. This action would allocate a new memory segment
and use virt2phy to set the IOVA. The driver would store the MDL
and lock the pages initially. When this region was freed, the memory
segment used as a whole page could be freed, invalidating the virtual
to physical mapping. Before this fix, the driver would only return the
initial physical address, leading to illegal IOVA for some pages when
allocating a new memory region larger than the hugepage size (2MB).

To address this, a function to check block physical address has been
added. If a block with the same base address is detected in the
driver's context, the MDL's physical address is compared with the real
physical address. If they don't match, the block is removed and a new
one is created to store the correct mapping. To make the removal action
clear, the list to store MDL blocks is changed to a double linked list.

Also fix the printing of PVOID type.

Bugzilla ID: 1201
Bugzilla ID: 1213

Signed-off-by: Ric Li 
---
 windows/virt2phys/virt2phys.c   |  7 +--
 windows/virt2phys/virt2phys_logic.c | 70 ++---
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/windows/virt2phys/virt2phys.c b/windows/virt2phys/virt2phys.c
index f4d5298..b64a13d 100644
--- a/windows/virt2phys/virt2phys.c
+++ b/windows/virt2phys/virt2phys.c
@@ -182,7 +182,7 @@ virt2phys_device_EvtIoInCallerContext(WDFDEVICE device, 
WDFREQUEST request)
 {
WDF_REQUEST_PARAMETERS params;
ULONG code;
-   PVOID *virt;
+   PVOID *pvirt, virt;
PHYSICAL_ADDRESS *phys;
size_t size;
NTSTATUS status;
@@ -207,12 +207,13 @@ virt2phys_device_EvtIoInCallerContext(WDFDEVICE device, 
WDFREQUEST request)
}
 
status = WdfRequestRetrieveInputBuffer(
-   request, sizeof(*virt), (PVOID *)&virt, &size);
+   request, sizeof(*pvirt), (PVOID *)&pvirt, &size);
if (!NT_SUCCESS(status)) {
TraceWarning("Retrieving input buffer: %!STATUS!", status);
WdfRequestComplete(request, status);
return;
}
+   virt = *pvirt;
 
status = WdfRequestRetrieveOutputBuffer(
request, sizeof(*phys), (PVOID *)&phys, &size);
@@ -222,7 +223,7 @@ virt2phys_device_EvtIoInCallerContext(WDFDEVICE device, 
WDFREQUEST request)
return;
}
 
-   status = virt2phys_translate(*virt, phys);
+   status = virt2phys_translate(virt, phys);
if (NT_SUCCESS(status))
WdfRequestSetInformation(request, sizeof(*phys));
 
diff --git a/windows/virt2phys/virt2phys_logic.c 
b/windows/virt2phys/virt2phys_logic.c
index e3ff293..f867a31 100644
--- a/windows/virt2phys/virt2phys_logic.c
+++ b/windows/virt2phys/virt2phys_logic.c
@@ -12,13 +12,13 @@
 struct virt2phys_process {
HANDLE id;
LIST_ENTRY next;
-   SINGLE_LIST_ENTRY blocks;
+   LIST_ENTRY blocks;
ULONG64 memory;
 };
 
 struct virt2phys_block {
PMDL mdl;
-   SINGLE_LIST_ENTRY next;
+   LIST_ENTRY next;
 };
 
 static struct virt2phys_params g_params;
@@ -69,24 +69,28 @@ virt2phys_process_create(HANDLE process_id)
struct virt2phys_process *process;
 
process = ExAllocatePoolZero(NonPagedPool, sizeof(*process), 'pp2v');
-   if (process != NULL)
+   if (process != NULL) {
process->id = process_id;
+   InitializeListHead(&process->blocks);
+   }
+
return process;
 }
 
 static void
 virt2phys_process_free(struct virt2phys_process *process, BOOLEAN unmap)
 {
-   PSINGLE_LIST_ENTRY node;
+   PLIST_ENTRY node, next;
struct virt2phys_block *block;
 
TraceInfo("ID = %p, unmap = %!bool!", process->id, unmap);
 
-   node = process->blocks.Next;
-   while (node != NULL) {
+   for (node = process->blocks.Flink; node != &process->blocks; node = 
next) {
+   next = node->Flink;
block = CONTAINING_RECORD(node, struct virt2phys_block, next);
-   node = node->Next;
-   virt2phys_block_free(block, unmap);
+   RemoveEntryList(&block->next);
+
+   virt2phys_block_free(block, TRUE);
}
 
ExFreePool(process);
@@ -109,10 +113,10 @@ virt2phys_process_find(HANDLE process_id)
 static struct virt2phys_block *
 virt2phys_process_find_block(struct virt2phys_process *process, PVOID virt)
 {
-   PSINGLE_LIST_ENTRY node;
+   PLIST_ENTRY node;

Re: [PATCH v8 18/21] dts: sut and tg nodes docstring update

[Bruce Richardson]

On Mon, Dec 04, 2023 at 11:02:21AM +0100, Juraj Linkeš wrote:
> On Fri, Dec 1, 2023 at 7:06 PM Jeremy Spewock  wrote:
> >
> >
> >
> > On Thu, Nov 23, 2023 at 10:14 AM Juraj Linkeš  
> > wrote:
> >>
> >> Format according to the Google format and PEP257, with slight
> >> deviations.
> >>
> >> Signed-off-by: Juraj Linkeš 
> >> ---
> >>  dts/framework/testbed_model/sut_node.py | 230 
> >>  dts/framework/testbed_model/tg_node.py  |  42 +++--
> >>  2 files changed, 176 insertions(+), 96 deletions(-)
> >>
> >> diff --git a/dts/framework/testbed_model/sut_node.py 
> >> b/dts/framework/testbed_model/sut_node.py
> >> index 5ce9446dba..c4acea38d1 100644
> >> --- a/dts/framework/testbed_model/sut_node.py
> >> +++ b/dts/framework/testbed_model/sut_node.py
> >> @@ -3,6 +3,14 @@
> >>  # Copyright(c) 2023 PANTHEON.tech s.r.o.
> >>  # Copyright(c) 2023 University of New Hampshire
> >>
> >> +"""System under test (DPDK + hardware) node.
> >> +
> >> +A system under test (SUT) is the combination of DPDK
> >> +and the hardware we're testing with DPDK (NICs, crypto and other devices).
> >> +An SUT node is where this SUT runs.
> >> +"""
> >
> >
> > I think this should just be "A SUT node"
> >
> 
> I always spell it out which is why I used "an" (an es, ju:, ti: node).
> From what I understand, the article is based on how the word is
> pronounced. If it's an initialism (it's spelled), we should use "an"
> and if it's an abbreviation (pronounced as the whole word), we should
> use "a". It always made sense to me as an initialism - I think that's
> the common usage.

+1 for using "an" instead of "a" in front of "SUT".

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

[Konstantin Ananyev]

> > For 'rte_pktmbuf_prefree_seg' function, 'rte_mbuf_refcnt_read(m) == 1'
> > and '__rte_mbuf_refcnt_update(m, -1) == 0' are the same cases where
> > mbuf's refcnt value should be 1. Thus we can simplify the code and
> > remove the redundant part.
> >
> > Furthermore, according to [1], when the mbuf is stored inside the
> > mempool, the m->refcnt value should be 1. And then it is detached
> > from its parent for an indirect mbuf. Thus change the description of
> > 'rte_pktmbuf_prefree_seg' function.
> >
> > [1] https://patches.dpdk.org/project/dpdk/patch/20170404162807.20157-4-
> > olivier.m...@6wind.com/
> >
> > Suggested-by: Ruifeng Wang 
> > Signed-off-by: Feifei Wang 
> > ---
> >  lib/mbuf/rte_mbuf.h | 22 +++---
> >  1 file changed, 3 insertions(+), 19 deletions(-)
> >
> > diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
> > index 286b32b788..42e9b50d51 100644
> > --- a/lib/mbuf/rte_mbuf.h
> > +++ b/lib/mbuf/rte_mbuf.h
> > @@ -1328,7 +1328,7 @@ static inline int
> > __rte_pktmbuf_pinned_extbuf_decref(struct rte_mbuf *m)
> >   *
> >   * This function does the same than a free, except that it does not
> >   * return the segment to its pool.
> > - * It decreases the reference counter, and if it reaches 0, it is
> > + * It decreases the reference counter, and if it reaches 1, it is
> 
> No, the original description is correct.
> However, the reference counter is set to 1 when put back in the pool, as a 
> shortcut so it isn't needed to be set back to 1 when
> allocated from the pool.
> 
> >   * detached from its parent for an indirect mbuf.
> >   *
> >   * @param m
> > @@ -1358,25 +1358,9 @@ rte_pktmbuf_prefree_seg(struct rte_mbuf *m)
> 
> The preceding "if (likely(rte_mbuf_refcnt_read(m) == 1)) {" is only a 
> shortcut for the likely case.
> 
> > m->nb_segs = 1;
> >
> > return m;
> > -
> > -   } else if (__rte_mbuf_refcnt_update(m, -1) == 0) {
> > -
> > -   if (!RTE_MBUF_DIRECT(m)) {
> > -   rte_pktmbuf_detach(m);
> > -   if (RTE_MBUF_HAS_EXTBUF(m) &&
> > -   RTE_MBUF_HAS_PINNED_EXTBUF(m) &&
> > -   __rte_pktmbuf_pinned_extbuf_decref(m))
> > -   return NULL;
> > -   }
> > -
> > -   if (m->next != NULL)
> > -   m->next = NULL;
> > -   if (m->nb_segs != 1)
> > -   m->nb_segs = 1;
> > -   rte_mbuf_refcnt_set(m, 1);
> > -
> > -   return m;
> > }
> > +
> > +   __rte_mbuf_refcnt_update(m, -1);
> > return NULL;
> >  }
> >
> > --
> > 2.25.1
> 
> NAK.
> 
> This patch is not race safe. 

+1, It is a bad idea.

> With the patch:
> 
> This thread:
> if (likely(rte_mbuf_refcnt_read(m) == 1)) { // Assume it's 2.
> 
> The other thread:
> if (likely(rte_mbuf_refcnt_read(m) == 1)) { // It's 2.
> __rte_mbuf_refcnt_update(m, -1); // Now it's 1.
> return NULL;
> 
> This thread:
> __rte_mbuf_refcnt_update(m, -1); // Now it's 0.
> return NULL;
> 
> None of the threads have done the "prefree" work.

Re: [PATCH v2 0/8] fix resource leak problems

[Ferruh Yigit]

On 12/4/2023 1:57 AM, Chaoyong He wrote:
> This patch series fix some resource leak problems in NFP PMD.
> 
> ---
> V2:
> * Add a new commit to change the process private data.
> * Fix the secondary process problem found by reviewer.
> ---
> 
> Chaoyong He (8):
>   net/nfp: modify the process private data
>   net/nfp: fix resource leak for device initialization
>   net/nfp: fix resource leak for CoreNIC firmware
>   net/nfp: fix resource leak for PF initialization
>   net/nfp: fix resource leak for flower firmware
>   net/nfp: fix resource leak for exit of CoreNIC firmware
>   net/nfp: fix resource leak for exit of flower firmware
>   net/nfp: fix resource leak for VF
>

Series applied to dpdk-next-net/main, thanks.

Re: [PATCH v8 0/6] Convert use of RTE_LOGTYPE_USER1 in libraries

[David Marchand]

Hello Stephen,

On Mon, Aug 14, 2023 at 6:31 PM Stephen Hemminger
 wrote:
>
> Libraries in DPDK should be using dynamic logtype instead
> of overloading the static logtype RTE_LOGTYPE_USER1
>
> v8 - rebase and add power library
>
> Stephen Hemminger (6):
>   ip_frag: use a dynamic logtype
>   reorder: use a dynamic logtype
>   latencystats: use dynamic logtype
>   vhost: use logtype instead of RTE_LOGTYPE_USER1
>   ipsec: fix usage of RTE_LOGTYPE_USER1
>   power: use a dynamic logtype for guest channel
>
>  drivers/crypto/ipsec_mb/ipsec_mb_ops.c |  3 ++-
>  lib/ip_frag/ip_frag_common.h   |  5 -
>  lib/ip_frag/rte_ip_frag_common.c   |  8 +---
>  lib/latencystats/rte_latencystats.c|  3 ++-
>  lib/power/guest_channel.c  |  3 ++-
>  lib/reorder/rte_reorder.c  |  6 +++---
>  lib/vhost/fd_man.c |  4 ++--
>  lib/vhost/vhost_crypto.c   | 22 +++---
>  8 files changed, 31 insertions(+), 23 deletions(-)

Series applied, thanks.


-- 
David Marchand

Re: [PATCH v13 00/21] Convert static log types in libraries to dynamic types

[David Marchand]

On Mon, Aug 21, 2023 at 6:09 PM Stephen Hemminger
 wrote:
>
> This patchset removes most of the uses of static LOGTYPE's in DPDK
> libraries. It starts with the easy one and goes on to the more complex ones.
>
> There are several options on how to treat the old static types:
> leave them there, mark as deprecated, or remove them.
> This version removes them since there is no guarantee in current
> DPDK policies that says they can't be removed.
>
> Note: there is one patch in this series that will get
> flagged incorrectly as an ABI change.
>
> v13 - rebase because log now moved.
>
> v12 - rebase and add table and pipeline libraries
>
> v11 - fix include check on arm cross build
>
> v10 - add necessary rte_compat.h in thash_gfni stub for arm
>
> v9 - fix handling of crc32 alg in lib/hash.
>  make it an internal global variable.
>  fix gfni stubs for case where they are not used.
>
> Stephen Hemminger (21):
>   gso: don't log message on non TCP/UDP
>   eal: drop no longer used GSO logtype
>   log: drop unused RTE_LOGTYPE_TIMER
>   efd: convert RTE_LOGTYPE_EFD to dynamic type
>   mbuf: convert RTE_LOGTYPE_MBUF to dynamic type
>   acl: convert RTE_LOGTYPE_ACL to dynamic type
>   examples/power: replace use of RTE_LOGTYPE_POWER
>   examples/l3fwd-power: replace use of RTE_LOGTYPE_POWER
>   power: convert RTE_LOGTYPE_POWER to dynamic type
>   ring: convert RTE_LOGTYPE_RING to dynamic type
>   mempool: convert RTE_LOGTYPE_MEMPOOL to dynamic type
>   lpm: convert RTE_LOGTYPE_LPM to dynamic types
>   sched: convert RTE_LOGTYPE_SCHED to dynamic type
>   examples/ipsec-secgw: replace RTE_LOGTYPE_PORT
>   port: convert RTE_LOGTYPE_PORT to dynamic type
>   hash: move rte_thash_gfni stubs out of header file
>   hash: move rte_hash_set_alg out header
>   hash: convert RTE_LOGTYPE_HASH to dynamic type
>   table: convert RTE_LOGTYPE_TABLE to dynamic type
>   app/test: remove use of RTE_LOGTYPE_PIPELINE
>   pipeline: convert RTE_LOGTYPE_PIPELINE to dynamic type
>

This series needs some rebase.
Thanks.


-- 
David Marchand

Re: [PATCH v2 0/2] app/testpmd: support set RSS hash algorithm

[Ferruh Yigit]

On 12/1/2023 8:52 AM, Jie Hai wrote:
> This patch set supports setting RSS hash algorithm.
> 
> --
> v2:
> 1. fix misspelling and format.
> 2. fix CI compile error.
> 3. add reviewed-by for patch 1.
> --
> 
> Jie Hai (2):
>   ethdev: add new API to get RSS hash algorithm by name
>   app/testpmd: support set RSS hash algorithm
>

Series applied to dpdk-next-net/main, thanks.

Re: [dpdk-dev] [PATCH] net/af_xdp: fix memzone leak in error path

[Ferruh Yigit]

On 12/1/2023 8:03 AM, Yunjian Wang wrote:
> In xdp_umem_configure() allocated memzone for the 'umem', we should
> free it when xsk_umem__create() call fails, otherwise it will lead
> to memory zone leak.
> 
> Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Yunjian Wang 
> ---
>  drivers/net/af_xdp/rte_eth_af_xdp.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c 
> b/drivers/net/af_xdp/rte_eth_af_xdp.c
> index 2a20a6960c..2a1fdafb3c 100644
> --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
> +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
> @@ -1229,6 +1229,7 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals 
> *internals,
>  
>   if (ret) {
>   AF_XDP_LOG(ERR, "Failed to create umem\n");
> + rte_memzone_free(mz);
>

Doesn't 'xdp_umem_destroy()', in the label 'err', already free it?

>   goto err;
>   }
>   umem->mz = mz;

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

[Stephen Hemminger]

On Mon, 4 Dec 2023 07:50:43 +
Chengwen Feng  wrote:

> +   static struct rte_argparse obj = {
> +  .prog_name = "test-demo",
> +  .usage = "[EAL options] -- [optional parameters] [positional 
> parameters]",
> +  .descriptor = NULL,
> +  .epilog = NULL,
> +  .exit_on_error = true,
> +  .callback = argparse_user_callback,
> +  .args = {
> + { "--aaa", "-a", "aaa argument", (void *)&aaa_val, (void *)100, 
> RTE_ARGPARSE_ARG_NO_VALUE   | RTE_ARGPARSE_ARG_VALUE_INT },
> + { "--bbb", "-b", "bbb argument", (void *)&bbb_val, NULL,
> RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
> + { "--ccc", "-c", "ccc argument", (void *)&ccc_val, (void *)200, 
> RTE_ARGPARSE_ARG_OPTIONAL_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
> + { "--ddd", "-d", "ddd argument", NULL, (void *)1,   
> RTE_ARGPARSE_ARG_NO_VALUE   },
> + { "--eee", "-e", "eee argument", NULL, (void *)2,   
> RTE_ARGPARSE_ARG_REQUIRED_VALUE },
> + { "--fff", "-f", "fff argument", NULL, (void *)3,   
> RTE_ARGPARSE_ARG_OPTIONAL_VALUE },
> + { "ooo",   NULL, "ooo argument", (void *)&ooo_val, NULL,
> RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
> + { "ppp",   NULL, "ppp argument", NULL, (void *)300, 
> RTE_ARGPARSE_ARG_REQUIRED_VALUE },
> +  },
> +   };
> +

Could the API be made to work with immutable initializers?
I.e allowing the application to use:
static const struct rte_argparse_obj {

Also better to just skip the NULL elements here, and use field initializers for 
the args.
That way when structure layout changes, the example will still work.
Also, pointers do not have to be cast to void * in C code.

RE: [v2] net/af_xdp: enable a sock path alongside use_cni

[Koikkara Reeny, Shibin]

Hi Maryam,

Apologies for asking this question bit late. 
The UDS sock name will be afxdp.sock only and addition director is created 
between the sock name and the uds filepath (/tmp/afxdp_dp//afxdp.sock).

As per the command " --vdev net_af_xdp0,iface=,use_cni=1,uds_path=/tmp/afxdp_dp//afxdp.sock"
We are already passing the interface name(iface= . So can't we 
create the uds_path inside the program uds_path="/tmp/afxdp_dp/"+ iface + 
"afxdp.sock"


If you check the code afxdp-plugins-for-kubernetes constants.go [1] they still 
have the constants and also they are using these constants to create the path 
[2]

[1] 
https://github.com/intel/afxdp-plugins-for-kubernetes/blob/main/constants/constants.go#L84
 
[2] 
https://github.com/intel/afxdp-plugins-for-kubernetes/blob/main/internal/deviceplugin/poolManager_test.go#L78

If we are able to create path in the program then user won't have to pass along 
argument value.

Regards,
Shibin

> -Original Message-
> From: Maryam Tahhan 
> Sent: Monday, December 4, 2023 10:31 AM
> To: ferruh.yi...@amd.com; step...@networkplumber.org;
> lihuis...@huawei.com; fengcheng...@huawei.com;
> liuyongl...@huawei.com; Koikkara Reeny, Shibin
> 
> Cc: dev@dpdk.org; Tahhan, Maryam 
> Subject: [v2] net/af_xdp: enable a sock path alongside use_cni
> 
> With the original 'use_cni' implementation, (using a hardcoded socket rather
> than a configurable one), if a single pod is requesting multiple net devices
> and these devices are from different pools, then the container attempts to
> mount all the netdev UDSes in the pod as /tmp/afxdp.sock. Which means
> that at best only 1 netdev will handshake correctly with the AF_XDP DP. This
> patch addresses this by making the socket parameter configurable alongside
> the 'use_cni' param.
> Tested with the AF_XDP DP CNI PR 81.
> 
> v2:
> * Rename sock_path to uds_path.
> * Update documentation to reflect when CAP_BPF is needed.
> * Fix testpmd arguments in the provided example for Pods.
> * Use AF_XDP API to update the xskmap entry.
> 
> Signed-off-by: Maryam Tahhan 
> ---
>  doc/guides/howto/af_xdp_cni.rst | 24 ++-
>  drivers/net/af_xdp/rte_eth_af_xdp.c | 62 ++---
>  2 files changed, 54 insertions(+), 32 deletions(-)
> 
> diff --git a/doc/guides/howto/af_xdp_cni.rst
> b/doc/guides/howto/af_xdp_cni.rst index a1a6d5b99c..7829526b40 100644
> --- a/doc/guides/howto/af_xdp_cni.rst
> +++ b/doc/guides/howto/af_xdp_cni.rst
> @@ -38,9 +38,10 @@ The XSKMAP is a BPF map of AF_XDP sockets (XSK).
>  The client can then proceed with creating an AF_XDP socket  and inserting
> that socket into the XSKMAP pointed to by the descriptor.
> 
> -The EAL vdev argument ``use_cni`` is used to indicate that the user wishes -
> to run the PMD in unprivileged mode and to receive the XSKMAP file
> descriptor -from the CNI.
> +The EAL vdev arguments ``use_cni`` and ``uds_path`` are used to
> +indicate that the user wishes to run the PMD in unprivileged mode and
> +to receive the XSKMAP file descriptor from the CNI.
> +
>  When this flag is set,
>  the ``XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD`` libbpf flag  should be
> used when creating the socket @@ -49,7 +50,7 @@ Instead the loading is
> handled by the CNI.
> 
>  .. note::
> 
> -   The Unix Domain Socket file path appear in the end user is
> "/tmp/afxdp.sock".
> +   The Unix Domain Socket file path appears to the end user at
> "/tmp/afxdp_dp//afxdp.sock".
> 
> 
>  Prerequisites
> @@ -223,8 +224,7 @@ Howto run dpdk-testpmd with CNI plugin:
>   securityContext:
>capabilities:
>   add:
> -   - CAP_NET_RAW
> -   - CAP_BPF
> +   - NET_RAW

Need to update the 1.3. Prerequisites.


>   resources:
> requests:
>   hugepages-2Mi: 2Gi
> @@ -239,14 +239,20 @@ Howto run dpdk-testpmd with CNI plugin:
> 
>.. _pod.yaml: https://github.com/intel/afxdp-plugins-for-
> kubernetes/blob/v0.0.2/test/e2e/pod-1c1d.yaml
> 
> +.. note::
> +
> +   For Kernel versions older than 5.19 `CAP_BPF` is also required in
> +   the container capabilities stanza.
> +
>  * Run DPDK with a command like the following:
> 
>.. code-block:: console
> 
>   kubectl exec -i  --container  -- \
> -   //dpdk-testpmd -l 0,1 --no-pci \
> -   --vdev=net_af_xdp0,use_cni=1,iface= \
> -   -- --no-mlockall --in-memory
> +   //dpdk-testpmd -l 0-2 --no-pci --main-lcore=2 \
> +   --vdev net_af_xdp0,iface= name>,use_cni=1,uds_path=/tmp/afxdp_dp//afxdp.sock
> \
> +   --vdev net_af_xdp1,iface=e name>,use_cni=1,uds_path=/tmp/afxdp_dp//afxdp.sock

There is a typo " iface=e \
> +   -- -i --a --nb-cores=2 --rxq=1 --txq=1
> + --forward-mode=macswap;
> 
>  For further reference please use the `e2e`_ test case in `AF_XDP Plugin for
> Kubernetes`_
> 
> diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
> b/drivers/net/af_xdp/rte_eth_af_xdp.c
> index 353c8688ec..505ed6cf1e 100644
> --- a/dr

[PATCH v2 1/3] node: support to add next node to ethdev Rx node

[Rakesh Kudurumalla]

By default all packets received on ethdev_rx node
is forwarded to pkt_cls node.This patch provides
library support to add a new node as next node to
ethdev_rx node and forward packet to new node from
rx node.

Signed-off-by: Rakesh Kudurumalla 
---
V2: Addressed comments 
Splitted patches to add command and usecsase
Updated doc for portforward usecase

 lib/node/ethdev_ctrl.c  | 44 +
 lib/node/rte_node_eth_api.h | 19 
 lib/node/version.map|  1 +
 3 files changed, 64 insertions(+)

diff --git a/lib/node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
index d564b80e37..e057847cb5 100644
--- a/lib/node/ethdev_ctrl.c
+++ b/lib/node/ethdev_ctrl.c
@@ -129,3 +129,47 @@ rte_node_eth_config(struct rte_node_ethdev_config *conf, 
uint16_t nb_confs,
ctrl.nb_graphs = nb_graphs;
return 0;
 }
+
+int
+rte_node_ethdev_rx_next_update(rte_node_t id, const char *edge_name)
+{
+   struct ethdev_rx_node_main *data;
+   ethdev_rx_node_elem_t *elem;
+   char **next_nodes;
+   int rc = -EINVAL;
+   uint32_t count;
+   uint16_t i = 0;
+
+   if (edge_name == NULL)
+   return -ENODATA;
+
+   count = rte_node_edge_get(id, NULL);
+
+   if (count == RTE_NODE_ID_INVALID)
+   return rc;
+
+   next_nodes = malloc(count);
+   if (next_nodes == NULL)
+   return -ENOMEM;
+
+   count = rte_node_edge_get(id, next_nodes);
+
+   while (next_nodes[i] != NULL) {
+   if (strcmp(edge_name, next_nodes[i]) == 0) {
+   data = ethdev_rx_get_node_data_get();
+   elem = data->head;
+   while (elem->next != data->head) {
+   if (elem->nid == id) {
+   elem->ctx.cls_next = i;
+   rc = 0;
+   goto exit;
+   }
+   elem = elem->next;
+   }
+   }
+   i++;
+   }
+exit:
+   free(next_nodes);
+   return rc;
+}
diff --git a/lib/node/rte_node_eth_api.h b/lib/node/rte_node_eth_api.h
index eaae50772d..f99e565b30 100644
--- a/lib/node/rte_node_eth_api.h
+++ b/lib/node/rte_node_eth_api.h
@@ -57,6 +57,25 @@ struct rte_node_ethdev_config {
  */
 int rte_node_eth_config(struct rte_node_ethdev_config *cfg,
uint16_t cnt, uint16_t nb_graphs);
+
+/**
+ * Update ethdev rx next node.
+ *
+ * @param id
+ *   Node id whose edge is to be updated.
+ * @param edge_name
+ *   Name of the next node.
+ *
+ * @return
+ *   RTE_EDGE_ID_INVALID if id is invalid
+ *   ENINVAL: Either of input parameters are invalid
+ *   ENODATA: If edge_name is not found
+ *   ENOMEM: If memory allocation failed
+ *   0 on successful initialization.
+ */
+__rte_experimental
+int rte_node_ethdev_rx_next_update(rte_node_t id, const char *edge_name);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/node/version.map b/lib/node/version.map
index 99ffcdd414..07abc3a79f 100644
--- a/lib/node/version.map
+++ b/lib/node/version.map
@@ -16,6 +16,7 @@ EXPERIMENTAL {
rte_node_ip6_route_add;
 
# added in 23.11
+   rte_node_ethdev_rx_next_update;
rte_node_ip4_reassembly_configure;
rte_node_udp4_dst_port_add;
rte_node_udp4_usr_node_add;
-- 
2.25.1

[PATCH v2 2/3] app/graph: add ethdev forward command

[Rakesh Kudurumalla]

Adds a txport to forward packet for every rxport

Mapping will be used to forward packets to txport
received on rxport

Following commands are exposed:
- ethdev forward  "

Signed-off-by: Rakesh Kudurumalla 
---
 app/graph/cli.c |  1 +
 app/graph/ethdev.c  | 62 +
 app/graph/ethdev.h  |  1 +
 app/graph/ethdev_priv.h |  8 ++
 4 files changed, 72 insertions(+)

diff --git a/app/graph/cli.c b/app/graph/cli.c
index 30b12312d6..76f5b8e670 100644
--- a/app/graph/cli.c
+++ b/app/graph/cli.c
@@ -32,6 +32,7 @@ cmdline_parse_ctx_t modules_ctx[] = {
(cmdline_parse_inst_t *)ðdev_prom_mode_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_ip4_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_ip6_cmd_ctx,
+   (cmdline_parse_inst_t *)ðdev_forward_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_help_cmd_ctx,
(cmdline_parse_inst_t *)ðdev_rx_cmd_ctx,
diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index c9b09168c1..bceee659a2 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -38,6 +38,10 @@ cmd_ethdev_ip4_addr_help[] = "ethdev  ip4 addr 
add  netmask config.tx_port_id = portid_tx;
+   rc = 0;
+   }
+
+   return rc;
+}
+
+static void
+cli_ethdev_forward(void *parsed_result, __rte_unused struct cmdline *cl, void 
*data __rte_unused)
+{
+   struct ethdev_fwd_cmd_tokens *res = parsed_result;
+   int rc = -EINVAL;
+
+   rc = ethdev_forward_config(res->tx_dev, res->rx_dev);
+   if (rc < 0)
+   printf(MSG_CMD_FAIL, res->cmd);
+}
+
+cmdline_parse_token_string_t ethdev_l2_cmd =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, cmd, "ethdev");
+cmdline_parse_token_string_t ethdev_fwd_cmd =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, fwd, "forward");
+cmdline_parse_token_string_t ethdev_tx_device =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, tx_dev, NULL);
+cmdline_parse_token_string_t ethdev_rx_device =
+   TOKEN_STRING_INITIALIZER(struct ethdev_fwd_cmd_tokens, rx_dev, NULL);
+
+cmdline_parse_inst_t ethdev_forward_cmd_ctx = {
+   .f = cli_ethdev_forward,
+   .data = NULL,
+   .help_str = cmd_ethdev_forward_help,
+   .tokens = {
+  (void *)ðdev_l2_cmd,
+  (void *)ðdev_fwd_cmd,
+  (void *)ðdev_tx_device,
+  (void *)ðdev_rx_device,
+  NULL,
+   },
+};
diff --git a/app/graph/ethdev.h b/app/graph/ethdev.h
index 94d3247a2c..836052046b 100644
--- a/app/graph/ethdev.h
+++ b/app/graph/ethdev.h
@@ -15,6 +15,7 @@ extern cmdline_parse_inst_t ethdev_mtu_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_prom_mode_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_ip4_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_ip6_cmd_ctx;
+extern cmdline_parse_inst_t ethdev_forward_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_cmd_ctx;
 extern cmdline_parse_inst_t ethdev_help_cmd_ctx;
 
diff --git a/app/graph/ethdev_priv.h b/app/graph/ethdev_priv.h
index f231f3f3e1..e5e5fbc9ae 100644
--- a/app/graph/ethdev_priv.h
+++ b/app/graph/ethdev_priv.h
@@ -61,6 +61,13 @@ struct ethdev_ip6_cmd_tokens {
cmdline_fixed_string_t mask;
 };
 
+struct ethdev_fwd_cmd_tokens {
+   cmdline_fixed_string_t cmd;
+   cmdline_fixed_string_t fwd;
+   cmdline_fixed_string_t tx_dev;
+   cmdline_fixed_string_t rx_dev;
+};
+
 struct ethdev_cmd_tokens {
cmdline_fixed_string_t cmd;
cmdline_fixed_string_t dev;
@@ -98,6 +105,7 @@ struct ethdev_config {
uint32_t queue_size;
} tx;
 
+   uint16_t tx_port_id;
int promiscuous;
uint32_t mtu;
 };
-- 
2.25.1

[PATCH v2 3/3] app/graph: implement port forward usecase

[Rakesh Kudurumalla]

Added portforward usecase.In this usecase
packets received Rx port is forwarded to
respective Tx port.

Signed-off-by: Rakesh Kudurumalla 
---
 app/graph/ethdev.c   |  12 ++
 app/graph/ethdev.h   |   1 +
 app/graph/examples/l2fwd.cli |  41 +
 app/graph/examples/l2fwd_pcap.cli|  37 +
 app/graph/graph.c|   8 +-
 app/graph/l2fwd.c| 148 +++
 app/graph/l2fwd.h|  11 ++
 app/graph/meson.build|   1 +
 app/graph/module_api.h   |   1 +
 doc/guides/tools/graph.rst   |  27 
 doc/guides/tools/img/graph-usecase-l2fwd.svg |  84 +++
 11 files changed, 370 insertions(+), 1 deletion(-)
 create mode 100644 app/graph/examples/l2fwd.cli
 create mode 100644 app/graph/examples/l2fwd_pcap.cli
 create mode 100644 app/graph/l2fwd.c
 create mode 100644 app/graph/l2fwd.h
 create mode 100644 doc/guides/tools/img/graph-usecase-l2fwd.svg

diff --git a/app/graph/ethdev.c b/app/graph/ethdev.c
index bceee659a2..d048a6 100644
--- a/app/graph/ethdev.c
+++ b/app/graph/ethdev.c
@@ -77,6 +77,18 @@ ethdev_port_by_id(uint16_t port_id)
return NULL;
 }
 
+int16_t
+find_txport_by_rxport(uint16_t portid_rx)
+{
+   int portid = -EINVAL;
+   struct ethdev *port;
+   port = ethdev_port_by_id(portid_rx);
+   if (port)
+   portid = port->config.tx_port_id;
+
+   return portid;
+}
+
 void *
 ethdev_mempool_list_by_portid(uint16_t portid)
 {
diff --git a/app/graph/ethdev.h b/app/graph/ethdev.h
index 836052046b..946e14d801 100644
--- a/app/graph/ethdev.h
+++ b/app/graph/ethdev.h
@@ -33,6 +33,7 @@ extern uint32_t enabled_port_mask;
 
 void ethdev_start(void);
 void ethdev_stop(void);
+int16_t find_txport_by_rxport(uint16_t portid_rx);
 void *ethdev_mempool_list_by_portid(uint16_t portid);
 int16_t ethdev_portid_by_ip4(uint32_t ip, uint32_t mask);
 int16_t ethdev_portid_by_ip6(uint8_t *ip, uint8_t *mask);
diff --git a/app/graph/examples/l2fwd.cli b/app/graph/examples/l2fwd.cli
new file mode 100644
index 00..af24a5836a
--- /dev/null
+++ b/app/graph/examples/l2fwd.cli
@@ -0,0 +1,41 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2023 Marvell.
+
+;
+; Graph configuration for given usecase
+;
+graph l2fwd coremask 0xff bsz 32 tmo 10 model default pcap_enable 1 
num_pcap_pkts 10 pcap_file /tmp/output.pcap
+
+;
+; Mempools to be attached with ethdev
+;
+mempool mempool0 size 8192 buffers 4000 cache 256 numa 0
+
+;
+; DPDK devices and configuration.
+;
+; Note: Customize the parameters below to match your setup.
+;
+ethdev 0002:01:00.1 rxq 1 txq 8 mempool0
+ethdev 0002:01:00.4 rxq 1 txq 8 mempool0
+ethdev 0002:01:00.6 rxq 1 txq 8 mempool0
+ethdev 0002:02:00.0 rxq 1 txq 8 mempool0
+
+;
+; L2 mac forwarding rules
+;
+ethdev forward 0002:01:00.4 0002:02:00.0
+ethdev forward 0002:01:00.1 0002:01:00.6
+
+;
+; Port-Queue-Core mapping for ethdev_rx node
+;
+ethdev_rx map port 0002:02:00.0 queue 0 core 1
+ethdev_rx map port 0002:01:00.6 queue 0 core 2
+
+;
+; Graph start command to create graph.
+;
+; Note: No more command should come after this.
+;
+graph start
diff --git a/app/graph/examples/l2fwd_pcap.cli 
b/app/graph/examples/l2fwd_pcap.cli
new file mode 100644
index 00..718347f568
--- /dev/null
+++ b/app/graph/examples/l2fwd_pcap.cli
@@ -0,0 +1,37 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2023 Marvell.
+
+;
+; Graph configuration for given usecase
+;
+graph l2fwd coremask 0xff bsz 32 tmo 10 model default pcap_enable 1 
num_pcap_pkts 10 pcap_file /tmp/output.pcap
+
+;
+; Mempools to be attached with ethdev
+;
+mempool mempool0 size 8192 buffers 4000 cache 256 numa 0
+
+;
+; DPDK devices and configuration.
+;
+; Note: Customize the parameters below to match your setup.
+;
+ethdev net_pcap0 rxq 1 txq 8 mempool0
+ethdev net_pcap1 rxq 1 txq 8 mempool0
+
+;
+; L2 mac forwarding rules
+;
+ethdev forward net_pcap1 net_pcap0
+
+;
+; Port-Queue-Core mapping for ethdev_rx node
+;
+ethdev_rx map port net_pcap0 queue 0 core 1
+
+;
+; Graph start command to create graph.
+;
+; Note: No more command should come after this.
+;
+graph start
diff --git a/app/graph/graph.c b/app/graph/graph.c
index a65723a196..4e0441f1a7 100644
--- a/app/graph/graph.c
+++ b/app/graph/graph.c
@@ -24,7 +24,7 @@ cmd_graph_help[] = "graph  bsz  tmo  
coremask  "
   "model  pcap_enable <0 | 1> 
num_pcap_pkts "
   "pcap_file ";
 
-static const char * const supported_usecases[] = {"l3fwd"};
+static const char * const supported_usecases[] = {"l3fwd", "l2fwd"};
 struct graph_config graph_config;
 bool graph_started;
 
@@ -273,6 +273,12 @@ cli_graph_start(__rte_unused void *parsed_result, 
__rte_unused struct cmdline *c
break;
}
}
+   if (!strcmp(graph_c

[PATCH 00/14] support new 5760X P7 devices

[Ajit Khaparde]

While some of the patches refactor and improve existing code,
this series adds support for the new 5760X P7 device family.
Follow-on patches will incrementally add more functionality.

Ajit Khaparde (12):
  net/bnxt: refactor epoch setting
  net/bnxt: update HWRM API
  net/bnxt: use the correct COS queue for Tx
  net/bnxt: refactor mem zone allocation
  net/bnxt: add support for p7 device family
  net/bnxt: refactor code to support P7 devices
  net/bnxt: fix array overflow
  net/bnxt: add support for backing store v2
  net/bnxt: modify sending new HWRM commands to firmware
  net/bnxt: retry HWRM ver get if the command fails
  net/bnxt: cap ring resources for P7 devices
  net/bnxt: add support for v3 Rx completion

Kalesh AP (1):
  net/bnxt: log a message when multicast promisc mode changes

Kishore Padmanabha (1):
  net/bnxt: refactor the ulp initialization

 drivers/net/bnxt/bnxt.h|   97 +-
 drivers/net/bnxt/bnxt_cpr.h|5 +-
 drivers/net/bnxt/bnxt_ethdev.c |  316 -
 drivers/net/bnxt/bnxt_flow.c   |2 +-
 drivers/net/bnxt/bnxt_hwrm.c   |  393 +-
 drivers/net/bnxt/bnxt_hwrm.h   |   15 +
 drivers/net/bnxt/bnxt_ring.c   |   15 +-
 drivers/net/bnxt/bnxt_rxq.c|2 +-
 drivers/net/bnxt/bnxt_rxr.c|   93 +-
 drivers/net/bnxt/bnxt_rxr.h|   92 ++
 drivers/net/bnxt/bnxt_util.c   |   10 +
 drivers/net/bnxt/bnxt_util.h   |1 +
 drivers/net/bnxt/bnxt_vnic.c   |   58 +-
 drivers/net/bnxt/bnxt_vnic.h   |1 -
 drivers/net/bnxt/hsi_struct_def_dpdk.h | 1531 ++--
 15 files changed, 2384 insertions(+), 247 deletions(-)

-- 
2.39.2 (Apple Git-143)



smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH 01/14] net/bnxt: refactor epoch setting

[Ajit Khaparde]

Fix epoch bit setting when we ring the doorbell.
Epoch bit needs to toggle alreanately from 0 to 1 everytime the
ring indices wrap.
Currently its value is everything but an alternating 0 and 1.

Remove unnecessary field db_epoch_shift from
bnxt_db_info structure.

Signed-off-by: Ajit Khaparde 
Reviewed-by: Damodharam Ammepalli 
---
 drivers/net/bnxt/bnxt_cpr.h  | 5 ++---
 drivers/net/bnxt/bnxt_ring.c | 9 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h
index 2de154322d..26e81a6a7e 100644
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -53,11 +53,10 @@ struct bnxt_db_info {
booldb_64;
uint32_tdb_ring_mask;
uint32_tdb_epoch_mask;
-   uint32_tdb_epoch_shift;
 };
 
-#define DB_EPOCH(db, idx)  (((idx) & (db)->db_epoch_mask) <<   \
-((db)->db_epoch_shift))
+#define DB_EPOCH(db, idx)  (!!((idx) & (db)->db_epoch_mask) << \
+DBR_EPOCH_SFT)
 #define DB_RING_IDX(db, idx)   (((idx) & (db)->db_ring_mask) | \
 DB_EPOCH(db, idx))
 
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 34b2510d54..6dacb1b37f 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -371,9 +371,10 @@ static void bnxt_set_db(struct bnxt *bp,
db->db_key64 = DBR_PATH_L2;
break;
}
-   if (BNXT_CHIP_SR2(bp)) {
+   if (BNXT_CHIP_P7(bp)) {
db->db_key64 |= DBR_VALID;
db_offset = bp->legacy_db_size;
+   db->db_epoch_mask = ring_mask + 1;
} else if (BNXT_VF(bp)) {
db_offset = DB_VF_OFFSET;
}
@@ -397,12 +398,6 @@ static void bnxt_set_db(struct bnxt *bp,
db->db_64 = false;
}
db->db_ring_mask = ring_mask;
-
-   if (BNXT_CHIP_SR2(bp)) {
-   db->db_epoch_mask = db->db_ring_mask + 1;
-   db->db_epoch_shift = DBR_EPOCH_SFT -
-   rte_log2_u32(db->db_epoch_mask);
-   }
 }
 
 static int bnxt_alloc_cmpl_ring(struct bnxt *bp, int queue_index,
-- 
2.39.2 (Apple Git-143)



smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH 03/14] net/bnxt: log a message when multicast promisc mode changes

[Ajit Khaparde]

From: Kalesh AP 

When the user tries to add more number of Mcast MAC addresses than
supported by the port, driver puts port into Mcast promiscuous mode.
It may be useful to the user to know that Mcast promiscuous mode is
turned on.

Similarly added a log when Mcast promiscuous mode is turned off.

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Reviewed-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt_ethdev.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index acf7e6e46e..999e4f1398 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -2931,12 +2931,18 @@ bnxt_dev_set_mc_addr_list_op(struct rte_eth_dev 
*eth_dev,
bp->nb_mc_addr = nb_mc_addr;
 
if (nb_mc_addr > BNXT_MAX_MC_ADDRS) {
+   PMD_DRV_LOG(INFO, "Number of Mcast MACs added (%d) exceeded Max 
supported (%d)\n",
+   nb_mc_addr, BNXT_MAX_MC_ADDRS);
+   PMD_DRV_LOG(INFO, "Turning on Mcast promiscuous mode\n");
vnic->flags |= BNXT_VNIC_INFO_ALLMULTI;
goto allmulti;
}
 
/* TODO Check for Duplicate mcast addresses */
-   vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI;
+   if (vnic->flags & BNXT_VNIC_INFO_ALLMULTI) {
+   PMD_DRV_LOG(INFO, "Turning off Mcast promiscuous mode\n");
+   vnic->flags &= ~BNXT_VNIC_INFO_ALLMULTI;
+   }
for (i = 0; i < nb_mc_addr; i++)
rte_ether_addr_copy(&mc_addr_set[i], &bp->mcast_addr_list[i]);
 
-- 
2.39.2 (Apple Git-143)



smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH 02/14] net/bnxt: update HWRM API

[Ajit Khaparde]

Update HWRM API to version 1.10.2.158

Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt_hwrm.c   |3 -
 drivers/net/bnxt/hsi_struct_def_dpdk.h | 1531 ++--
 2 files changed, 1429 insertions(+), 105 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 06f196760f..0a31b984e6 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -5175,9 +5175,6 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp,
if (enables &
HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_DST_PORT_MASK)
req.dst_port_mask = rte_cpu_to_le_16(filter->dst_port_mask);
-   if (enables &
-   HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_MIRROR_VNIC_ID)
-   req.mirror_vnic_id = filter->mirror_vnic_id;
 
req.enables = rte_cpu_to_le_32(enables);
 
diff --git a/drivers/net/bnxt/hsi_struct_def_dpdk.h 
b/drivers/net/bnxt/hsi_struct_def_dpdk.h
index 9afdd056ce..65f3f0576b 100644
--- a/drivers/net/bnxt/hsi_struct_def_dpdk.h
+++ b/drivers/net/bnxt/hsi_struct_def_dpdk.h
@@ -1154,8 +1154,8 @@ struct hwrm_err_output {
 #define HWRM_VERSION_MINOR 10
 #define HWRM_VERSION_UPDATE 2
 /* non-zero means beta version */
-#define HWRM_VERSION_RSVD 138
-#define HWRM_VERSION_STR "1.10.2.138"
+#define HWRM_VERSION_RSVD 158
+#define HWRM_VERSION_STR "1.10.2.158"
 
 /
  * hwrm_ver_get *
@@ -6329,19 +6329,14 @@ struct rx_pkt_v3_cmpl_hi {
#define RX_PKT_V3_CMPL_HI_ERRORS_T_PKT_ERROR_T_L3_BAD_TTL \
(UINT32_C(0x5) << 9)
/*
-* Indicates that the IP checksum failed its check in the tunnel
+* Indicates that the physical packet is shorter than that claimed
+* by the tunnel header length. Valid for GTPv1-U packets.
 * header.
 */
-   #define RX_PKT_V3_CMPL_HI_ERRORS_T_PKT_ERROR_T_IP_CS_ERROR \
+   #define RX_PKT_V3_CMPL_HI_ERRORS_T_PKT_ERROR_T_TOTAL_ERROR \
(UINT32_C(0x6) << 9)
-   /*
-* Indicates that the L4 checksum failed its check in the tunnel
-* header.
-*/
-   #define RX_PKT_V3_CMPL_HI_ERRORS_T_PKT_ERROR_T_L4_CS_ERROR \
-   (UINT32_C(0x7) << 9)
#define RX_PKT_V3_CMPL_HI_ERRORS_T_PKT_ERROR_LAST \
-   RX_PKT_V3_CMPL_HI_ERRORS_T_PKT_ERROR_T_L4_CS_ERROR
+   RX_PKT_V3_CMPL_HI_ERRORS_T_PKT_ERROR_T_TOTAL_ERROR
/*
 * This indicates that there was an error in the inner
 * portion of the packet when this
@@ -6406,20 +6401,8 @@ struct rx_pkt_v3_cmpl_hi {
 */
#define RX_PKT_V3_CMPL_HI_ERRORS_PKT_ERROR_L4_BAD_OPT_LEN \
(UINT32_C(0x8) << 12)
-   /*
-* Indicates that the IP checksum failed its check in the
-* inner header.
-*/
-   #define RX_PKT_V3_CMPL_HI_ERRORS_PKT_ERROR_IP_CS_ERROR \
-   (UINT32_C(0x9) << 12)
-   /*
-* Indicates that the L4 checksum failed its check in the
-* inner header.
-*/
-   #define RX_PKT_V3_CMPL_HI_ERRORS_PKT_ERROR_L4_CS_ERROR \
-   (UINT32_C(0xa) << 12)
#define RX_PKT_V3_CMPL_HI_ERRORS_PKT_ERROR_LAST \
-   RX_PKT_V3_CMPL_HI_ERRORS_PKT_ERROR_L4_CS_ERROR
+   RX_PKT_V3_CMPL_HI_ERRORS_PKT_ERROR_L4_BAD_OPT_LEN
/*
 * This is data from the CFA block as indicated by the meta_format
 * field.
@@ -14157,7 +14140,7 @@ struct hwrm_func_qcaps_input {
uint8_t unused_0[6];
 } __rte_packed;
 
-/* hwrm_func_qcaps_output (size:896b/112B) */
+/* hwrm_func_qcaps_output (size:1088b/136B) */
 struct hwrm_func_qcaps_output {
/* The specific error status for the command. */
uint16_terror_code;
@@ -14840,9 +14823,85 @@ struct hwrm_func_qcaps_output {
/*
 * When this bit is '1', it indicates that the hardware based
 * link aggregation group (L2 and RoCE) feature is supported.
+* This LAG feature is only supported on the THOR2 or newer NIC
+* with multiple ports.
 */
#define HWRM_FUNC_QCAPS_OUTPUT_FLAGS_EXT2_HW_LAG_SUPPORTED \
UINT32_C(0x400)
+   /*
+* When this bit is '1', it indicates all contexts can be stored
+* on chip instead of using host based backing store memory.
+*/
+   #define HWRM_FUNC_QCAPS_OUTPUT_FLAGS_EXT2_ON_CHIP_CTX_SUPPORTED \
+   UINT32_C(0x800)
+   /*
+* When this bit is '1', it indicates that the HW supports
+* using a steering tag in the memory transactions targeting
+* L2 or RoCE ring resources.
+* Steering Tags are system-specific values that must follow the
+* encoding requirements of the hardware platform. On devices that
+* support steering to multiple address domains, a value of 0 in
+* bit 0 of the steering tag specifies the address is associated
+* with the SOC address space, and a value of 1 indicates t

[PATCH 04/14] net/bnxt: use the correct COS queue for Tx

[Ajit Khaparde]

Earlier the firmware was configuring single lossy COS profiles for Tx.
But now more than one profiles is possible.
Identify the profile a NIC driver should use based on the profile type
hint provided in queue_cfg_info.

If the firmware does not set the bit to use profile type,
then we will use the older method to pick the COS queue for Tx.

Signed-off-by: Ajit Khaparde 
Reviewed-by: Somnath Kotur 
---
 drivers/net/bnxt/bnxt.h  |  1 +
 drivers/net/bnxt/bnxt_hwrm.c | 56 ++--
 drivers/net/bnxt/bnxt_hwrm.h |  7 +
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 0e01b1d4ba..542ef13f7c 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -311,6 +311,7 @@ struct bnxt_link_info {
 struct bnxt_cos_queue_info {
uint8_t id;
uint8_t profile;
+   uint8_t profile_type;
 };
 
 struct rte_flow {
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 0a31b984e6..fe9e629892 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1544,7 +1544,7 @@ int bnxt_hwrm_port_phy_qcaps(struct bnxt *bp)
return 0;
 }
 
-static bool bnxt_find_lossy_profile(struct bnxt *bp)
+static bool _bnxt_find_lossy_profile(struct bnxt *bp)
 {
int i = 0;
 
@@ -1558,6 +1558,41 @@ static bool bnxt_find_lossy_profile(struct bnxt *bp)
return false;
 }
 
+static bool _bnxt_find_lossy_nic_profile(struct bnxt *bp)
+{
+   int i = 0, j = 0;
+
+   for (i = 0; i < BNXT_COS_QUEUE_COUNT; i++) {
+   for (j = 0; j < BNXT_COS_QUEUE_COUNT; j++) {
+   if (bp->tx_cos_queue[i].profile ==
+   HWRM_QUEUE_SERVICE_PROFILE_LOSSY &&
+   bp->tx_cos_queue[j].profile_type ==
+   HWRM_QUEUE_SERVICE_PROFILE_TYPE_NIC) {
+   bp->tx_cosq_id[0] = bp->tx_cos_queue[i].id;
+   return true;
+   }
+   }
+   }
+   return false;
+}
+
+static bool bnxt_find_lossy_profile(struct bnxt *bp, bool use_prof_type)
+{
+   int i;
+
+   for (i = 0; i < BNXT_COS_QUEUE_COUNT; i++) {
+   PMD_DRV_LOG(DEBUG, "profile %d, profile_id %d, type %d\n",
+   bp->tx_cos_queue[i].profile,
+   bp->tx_cos_queue[i].id,
+   bp->tx_cos_queue[i].profile_type);
+   }
+
+   if (use_prof_type)
+   return _bnxt_find_lossy_nic_profile(bp);
+   else
+   return _bnxt_find_lossy_profile(bp);
+}
+
 static void bnxt_find_first_valid_profile(struct bnxt *bp)
 {
int i = 0;
@@ -1579,6 +1614,7 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp)
struct hwrm_queue_qportcfg_input req = {.req_type = 0 };
struct hwrm_queue_qportcfg_output *resp = bp->hwrm_cmd_resp_addr;
uint32_t dir = HWRM_QUEUE_QPORTCFG_INPUT_FLAGS_PATH_TX;
+   bool use_prof_type = false;
int i;
 
 get_rx_info:
@@ -1590,10 +1626,15 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp)
!(bp->vnic_cap_flags & BNXT_VNIC_CAP_COS_CLASSIFY))
req.drv_qmap_cap =
HWRM_QUEUE_QPORTCFG_INPUT_DRV_QMAP_CAP_ENABLED;
+
rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);
 
HWRM_CHECK_RESULT();
 
+   if (resp->queue_cfg_info &
+   HWRM_QUEUE_QPORTCFG_OUTPUT_QUEUE_CFG_INFO_USE_PROFILE_TYPE)
+   use_prof_type = true;
+
if (dir == HWRM_QUEUE_QPORTCFG_INPUT_FLAGS_PATH_TX) {
GET_TX_QUEUE_INFO(0);
GET_TX_QUEUE_INFO(1);
@@ -1603,6 +1644,16 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp)
GET_TX_QUEUE_INFO(5);
GET_TX_QUEUE_INFO(6);
GET_TX_QUEUE_INFO(7);
+   if (use_prof_type) {
+   GET_TX_QUEUE_TYPE_INFO(0);
+   GET_TX_QUEUE_TYPE_INFO(1);
+   GET_TX_QUEUE_TYPE_INFO(2);
+   GET_TX_QUEUE_TYPE_INFO(3);
+   GET_TX_QUEUE_TYPE_INFO(4);
+   GET_TX_QUEUE_TYPE_INFO(5);
+   GET_TX_QUEUE_TYPE_INFO(6);
+   GET_TX_QUEUE_TYPE_INFO(7);
+   }
} else  {
GET_RX_QUEUE_INFO(0);
GET_RX_QUEUE_INFO(1);
@@ -1636,11 +1687,12 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp)
 * operations, ideally we should look to use LOSSY.
 * If not found, fallback to the first valid profile
 */
-   if (!bnxt_find_lossy_profile(bp))
+   if (!bnxt_find_lossy_profile(bp, use_prof_type))
bnxt_find_first_valid_profile(bp);
 
}
}
+   PMD_DRV_LOG(DEBUG, "Tx COS Queue ID %d\n", bp

[PATCH 05/14] net/bnxt: refactor mem zone allocation

[Ajit Khaparde]

Currently we are allocating memzone for VNIC attributes per VNIC.
In cases where the firmware supports a higher VNIC count, this could
lead to a higher number of memzone segments than supported.

Move the memzone for VNIC attributes per function instead of per
VNIC. Divide the memzone per VNIC as needed.

Signed-off-by: Ajit Khaparde 
Reviewed-by: Somnath Kotur 
Reviewed-by: Kalesh AP 
---
 drivers/net/bnxt/bnxt.h  |  1 +
 drivers/net/bnxt/bnxt_vnic.c | 52 +++-
 drivers/net/bnxt/bnxt_vnic.h |  1 -
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 542ef13f7c..6af668e92f 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -772,6 +772,7 @@ struct bnxt {
 
struct bnxt_vnic_info   *vnic_info;
STAILQ_HEAD(, bnxt_vnic_info)   free_vnic_list;
+   const struct rte_memzone *vnic_rss_mz;
 
struct bnxt_filter_info *filter_info;
STAILQ_HEAD(, bnxt_filter_info) free_filter_list;
diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c
index f86d27fd79..d40daf631e 100644
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -123,13 +123,11 @@ void bnxt_free_vnic_attributes(struct bnxt *bp)
 
for (i = 0; i < bp->max_vnics; i++) {
vnic = &bp->vnic_info[i];
-   if (vnic->rss_mz != NULL) {
-   rte_memzone_free(vnic->rss_mz);
-   vnic->rss_mz = NULL;
-   vnic->rss_hash_key = NULL;
-   vnic->rss_table = NULL;
-   }
+   vnic->rss_hash_key = NULL;
+   vnic->rss_table = NULL;
}
+   rte_memzone_free(bp->vnic_rss_mz);
+   bp->vnic_rss_mz = NULL;
 }
 
 int bnxt_alloc_vnic_attributes(struct bnxt *bp, bool reconfig)
@@ -153,31 +151,35 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp, bool 
reconfig)
 
entry_length = RTE_CACHE_LINE_ROUNDUP(entry_length + rss_table_size);
 
-   for (i = 0; i < bp->max_vnics; i++) {
-   vnic = &bp->vnic_info[i];
-
-   snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
-"bnxt_" PCI_PRI_FMT "_vnicattr_%d", pdev->addr.domain,
-pdev->addr.bus, pdev->addr.devid, pdev->addr.function, 
i);
-   mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
-   mz = rte_memzone_lookup(mz_name);
-   if (mz == NULL) {
-   mz = rte_memzone_reserve(mz_name,
-entry_length,
+   snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
+"bnxt_" PCI_PRI_FMT "_vnicattr", pdev->addr.domain,
+pdev->addr.bus, pdev->addr.devid, pdev->addr.function);
+   mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
+   mz = rte_memzone_lookup(mz_name);
+   if (mz == NULL) {
+   mz = rte_memzone_reserve_aligned(mz_name,
+entry_length * bp->max_vnics,
 bp->eth_dev->device->numa_node,
 RTE_MEMZONE_2MB |
 RTE_MEMZONE_SIZE_HINT_ONLY |
-RTE_MEMZONE_IOVA_CONTIG);
-   if (mz == NULL) {
-   PMD_DRV_LOG(ERR, "Cannot allocate bnxt 
vnic_attributes memory\n");
-   return -ENOMEM;
-   }
+RTE_MEMZONE_IOVA_CONTIG,
+BNXT_PAGE_SIZE);
+   if (mz == NULL) {
+   PMD_DRV_LOG(ERR,
+   "Cannot allocate vnic_attributes memory\n");
+   return -ENOMEM;
}
-   vnic->rss_mz = mz;
-   mz_phys_addr = mz->iova;
+   }
+   bp->vnic_rss_mz = mz;
+   for (i = 0; i < bp->max_vnics; i++) {
+   uint32_t offset = entry_length * i;
+
+   vnic = &bp->vnic_info[i];
+
+   mz_phys_addr = mz->iova + offset;
 
/* Allocate rss table and hash key */
-   vnic->rss_table = (void *)((char *)mz->addr);
+   vnic->rss_table = (void *)((char *)mz->addr + offset);
vnic->rss_table_dma_addr = mz_phys_addr;
memset(vnic->rss_table, -1, entry_length);
 
diff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h
index 4396d95bda..7a6a0aa739 100644
--- a/drivers/net/bnxt/bnxt_vnic.h
+++ b/drivers/net/bnxt/bnxt_vnic.h
@@ -47,7 +47,6 @@ struct bnxt_vnic_info {
uint16_thash_type;
uint8_t hash_mode;
uint8_t prev_hash_mode;
-   const struct rte_memzone *rss_mz;
rte_iova_t  rss_table_dma_addr;
uint16_t*rss_table;

[PATCH 06/14] net/bnxt: add support for p7 device family

[Ajit Khaparde]

Add support for the P7 device family.

Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h| 14 --
 drivers/net/bnxt/bnxt_ethdev.c | 25 +
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 6af668e92f..3a1d8a6ff6 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -72,6 +72,11 @@
 #define BROADCOM_DEV_ID_58814  0xd814
 #define BROADCOM_DEV_ID_58818  0xd818
 #define BROADCOM_DEV_ID_58818_VF   0xd82e
+#define BROADCOM_DEV_ID_57608  0x1760
+#define BROADCOM_DEV_ID_57604  0x1761
+#define BROADCOM_DEV_ID_57602  0x1762
+#define BROADCOM_DEV_ID_57601  0x1763
+#define BROADCOM_DEV_ID_5760X_VF   0x1819
 
 #define BROADCOM_DEV_957508_N2100  0x5208
 #define BROADCOM_DEV_957414_N225   0x4145
@@ -685,6 +690,7 @@ struct bnxt {
 #define BNXT_FLAG_FLOW_XSTATS_EN   BIT(25)
 #define BNXT_FLAG_DFLT_MAC_SET BIT(26)
 #define BNXT_FLAG_GFID_ENABLE  BIT(27)
+#define BNXT_FLAG_CHIP_P7  BIT(30)
 #define BNXT_PF(bp)(!((bp)->flags & BNXT_FLAG_VF))
 #define BNXT_VF(bp)((bp)->flags & BNXT_FLAG_VF)
 #define BNXT_NPAR(bp)  ((bp)->flags & BNXT_FLAG_NPAR_PF)
@@ -694,12 +700,16 @@ struct bnxt {
 #define BNXT_USE_KONG(bp)  ((bp)->flags & BNXT_FLAG_KONG_MB_EN)
 #define BNXT_VF_IS_TRUSTED(bp) ((bp)->flags & BNXT_FLAG_TRUSTED_VF_EN)
 #define BNXT_CHIP_P5(bp)   ((bp)->flags & BNXT_FLAG_CHIP_P5)
+#define BNXT_CHIP_P7(bp)   ((bp)->flags & BNXT_FLAG_CHIP_P7)
+#define BNXT_CHIP_P5_P7(bp)(BNXT_CHIP_P5(bp) || BNXT_CHIP_P7(bp))
 #define BNXT_STINGRAY(bp)  ((bp)->flags & BNXT_FLAG_STINGRAY)
-#define BNXT_HAS_NQ(bp)BNXT_CHIP_P5(bp)
-#define BNXT_HAS_RING_GRPS(bp) (!BNXT_CHIP_P5(bp))
+#define BNXT_HAS_NQ(bp)BNXT_CHIP_P5_P7(bp)
+#define BNXT_HAS_RING_GRPS(bp) (!BNXT_CHIP_P5_P7(bp))
 #define BNXT_FLOW_XSTATS_EN(bp)((bp)->flags & BNXT_FLAG_FLOW_XSTATS_EN)
 #define BNXT_HAS_DFLT_MAC_SET(bp)  ((bp)->flags & BNXT_FLAG_DFLT_MAC_SET)
 #define BNXT_GFID_ENABLED(bp)  ((bp)->flags & BNXT_FLAG_GFID_ENABLE)
+#define BNXT_P7_MAX_NQ_RING_CNT512
+#define BNXT_P7_CQ_MAX_L2_ENT  8192
 
uint32_tflags2;
 #define BNXT_FLAGS2_PTP_TIMESYNC_ENABLED   BIT(0)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 999e4f1398..1e4182071a 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -84,6 +84,11 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58814) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58818) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_58818_VF) },
+   { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57608) },
+   { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57604) },
+   { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57602) },
+   { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57601) },
+   { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_5760X_VF) },
{ .vendor_id = 0, /* sentinel */ },
 };
 
@@ -4681,6 +4686,7 @@ static bool bnxt_vf_pciid(uint16_t device_id)
case BROADCOM_DEV_ID_57500_VF1:
case BROADCOM_DEV_ID_57500_VF2:
case BROADCOM_DEV_ID_58818_VF:
+   case BROADCOM_DEV_ID_5760X_VF:
/* FALLTHROUGH */
return true;
default:
@@ -4706,7 +4712,23 @@ static bool bnxt_p5_device(uint16_t device_id)
case BROADCOM_DEV_ID_58812:
case BROADCOM_DEV_ID_58814:
case BROADCOM_DEV_ID_58818:
+   /* FALLTHROUGH */
+   return true;
+   default:
+   return false;
+   }
+}
+
+/* Phase 7 device */
+static bool bnxt_p7_device(uint16_t device_id)
+{
+   switch (device_id) {
case BROADCOM_DEV_ID_58818_VF:
+   case BROADCOM_DEV_ID_57608:
+   case BROADCOM_DEV_ID_57604:
+   case BROADCOM_DEV_ID_57602:
+   case BROADCOM_DEV_ID_57601:
+   case BROADCOM_DEV_ID_5760X_VF:
/* FALLTHROUGH */
return true;
default:
@@ -5874,6 +5896,9 @@ static int bnxt_drv_init(struct rte_eth_dev *eth_dev)
if (bnxt_p5_device(pci_dev->id.device_id))
bp->flags |= BNXT_FLAG_CHIP_P5;
 
+   if (bnxt_p7_device(pci_dev->id.device_id))
+   bp->flags |= BNXT_FLAG_CHIP_P7;
+
if (pci_dev->id.device_id == BROADCOM_DEV_ID_58802 ||
pci_dev->id.device_id == BROADCOM_DEV_ID_58804 ||
pci_dev->id.device_id == BROADCOM_DEV_ID_58808 ||
-- 
2.39.2 (Apple Git-143)



smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH 07/14] net/bnxt: refactor code to support P7 devices

[Ajit Khaparde]

Refactor code to support the P7 device family.
The changes include support for RSS, VNIC allocation, TPA.
Remove unnecessary check to disable vector mode support for
some device families.

Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h|  6 +++---
 drivers/net/bnxt/bnxt_ethdev.c | 24 +++-
 drivers/net/bnxt/bnxt_flow.c   |  2 +-
 drivers/net/bnxt/bnxt_hwrm.c   | 26 ++
 drivers/net/bnxt/bnxt_ring.c   |  6 +++---
 drivers/net/bnxt/bnxt_rxq.c|  2 +-
 drivers/net/bnxt/bnxt_rxr.c|  6 +++---
 drivers/net/bnxt/bnxt_vnic.c   |  6 +++---
 8 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 3a1d8a6ff6..7439ecf4fa 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -107,11 +107,11 @@
 #define TPA_MAX_SEGS   5 /* 32 segments in log2 units */
 
 #define BNXT_TPA_MAX_AGGS(bp) \
-   (BNXT_CHIP_P5(bp) ? TPA_MAX_AGGS_TH : \
+   (BNXT_CHIP_P5_P7(bp) ? TPA_MAX_AGGS_TH : \
 TPA_MAX_AGGS)
 
 #define BNXT_TPA_MAX_SEGS(bp) \
-   (BNXT_CHIP_P5(bp) ? TPA_MAX_SEGS_TH : \
+   (BNXT_CHIP_P5_P7(bp) ? TPA_MAX_SEGS_TH : \
  TPA_MAX_SEGS)
 
 /*
@@ -938,7 +938,7 @@ inline uint16_t bnxt_max_rings(struct bnxt *bp)
 * RSS table size in P5 is 512.
 * Cap max Rx rings to the same value for RSS.
 */
-   if (BNXT_CHIP_P5(bp))
+   if (BNXT_CHIP_P5_P7(bp))
max_rx_rings = RTE_MIN(max_rx_rings, BNXT_RSS_TBL_SIZE_P5);
 
max_tx_rings = RTE_MIN(max_tx_rings, max_rx_rings);
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 1e4182071a..cab2589cf3 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -212,7 +212,7 @@ uint16_t bnxt_rss_ctxts(const struct bnxt *bp)
unsigned int num_rss_rings = RTE_MIN(bp->rx_nr_rings,
 BNXT_RSS_TBL_SIZE_P5);
 
-   if (!BNXT_CHIP_P5(bp))
+   if (!BNXT_CHIP_P5_P7(bp))
return 1;
 
return RTE_ALIGN_MUL_CEIL(num_rss_rings,
@@ -222,7 +222,7 @@ uint16_t bnxt_rss_ctxts(const struct bnxt *bp)
 
 uint16_t bnxt_rss_hash_tbl_size(const struct bnxt *bp)
 {
-   if (!BNXT_CHIP_P5(bp))
+   if (!BNXT_CHIP_P5_P7(bp))
return HW_HASH_INDEX_SIZE;
 
return bnxt_rss_ctxts(bp) * BNXT_RSS_ENTRIES_PER_CTX_P5;
@@ -765,7 +765,7 @@ static int bnxt_start_nic(struct bnxt *bp)
/* P5 does not support ring groups.
 * But we will use the array to save RSS context IDs.
 */
-   if (BNXT_CHIP_P5(bp))
+   if (BNXT_CHIP_P5_P7(bp))
bp->max_ring_grps = BNXT_MAX_RSS_CTXTS_P5;
 
rc = bnxt_vnic_queue_db_init(bp);
@@ -1247,12 +1247,6 @@ bnxt_receive_function(struct rte_eth_dev *eth_dev)
 {
struct bnxt *bp = eth_dev->data->dev_private;
 
-   /* Disable vector mode RX for Stingray2 for now */
-   if (BNXT_CHIP_SR2(bp)) {
-   bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
-   return bnxt_recv_pkts;
-   }
-
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
/* Vector mode receive cannot be enabled if scattered rx is in use. */
if (eth_dev->data->scattered_rx)
@@ -1321,10 +1315,6 @@ bnxt_transmit_function(struct rte_eth_dev *eth_dev)
 {
struct bnxt *bp = eth_dev->data->dev_private;
 
-   /* Disable vector mode TX for Stingray2 for now */
-   if (BNXT_CHIP_SR2(bp))
-   return bnxt_xmit_pkts;
-
 #if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
uint64_t offloads = eth_dev->data->dev_conf.txmode.offloads;
 
@@ -2091,7 +2081,7 @@ static int bnxt_reta_update_op(struct rte_eth_dev 
*eth_dev,
continue;
 
rxq = bnxt_qid_to_rxq(bp, reta_conf[idx].reta[sft]);
-   if (BNXT_CHIP_P5(bp)) {
+   if (BNXT_CHIP_P5_P7(bp)) {
vnic->rss_table[i * 2] =
rxq->rx_ring->rx_ring_struct->fw_ring_id;
vnic->rss_table[i * 2 + 1] =
@@ -2138,7 +2128,7 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
if (reta_conf[idx].mask & (1ULL << sft)) {
uint16_t qid;
 
-   if (BNXT_CHIP_P5(bp))
+   if (BNXT_CHIP_P5_P7(bp))
qid = bnxt_rss_to_qid(bp,
  vnic->rss_table[i * 2]);
else
@@ -3224,7 +3214,7 @@ bnxt_rx_queue_count_op(void *rx_queue)
break;
 
case CMPL_BASE_TYPE_RX_TPA_END:
-   if (BNXT_CHIP_P5(rxq->bp)) {
+   if (BNXT_CHIP_P5_P7(rxq->bp)) {
struct rx_tpa_v2_end_cmpl_hi *p5_tpa_end;
 
p5_tpa_end = (void *)rxcmp;
@@ -

[PATCH 08/14] net/bnxt: fix array overflow

[Ajit Khaparde]

In some cases the number of elements in the context memory array
can exceed the MAX_CTX_PAGES and that can cause the static members
ctx_pg_arr and ctx_dma_arr to overflow.
Allocate them dynamically to prevent this overflow.

Signed-off-by: Ajit Khaparde 
Reviewed-by: Damodharam Ammepalli 
---
 drivers/net/bnxt/bnxt.h|  4 ++--
 drivers/net/bnxt/bnxt_ethdev.c | 42 +++---
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 7439ecf4fa..3fbdf1ddcc 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -455,8 +455,8 @@ struct bnxt_ring_mem_info {
 
 struct bnxt_ctx_pg_info {
uint32_tentries;
-   void*ctx_pg_arr[MAX_CTX_PAGES];
-   rte_iova_t  ctx_dma_arr[MAX_CTX_PAGES];
+   void**ctx_pg_arr;
+   rte_iova_t  *ctx_dma_arr;
struct bnxt_ring_mem_info ring_mem;
 };
 
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index cab2589cf3..1eab8d5020 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4768,7 +4768,7 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
 {
struct bnxt_ring_mem_info *rmem = &ctx_pg->ring_mem;
const struct rte_memzone *mz = NULL;
-   char mz_name[RTE_MEMZONE_NAMESIZE];
+   char name[RTE_MEMZONE_NAMESIZE];
rte_iova_t mz_phys_addr;
uint64_t valid_bits = 0;
uint32_t sz;
@@ -4780,6 +4780,19 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
rmem->nr_pages = RTE_ALIGN_MUL_CEIL(mem_size, BNXT_PAGE_SIZE) /
 BNXT_PAGE_SIZE;
rmem->page_size = BNXT_PAGE_SIZE;
+
+   snprintf(name, RTE_MEMZONE_NAMESIZE, "bnxt_ctx_pg_arr%s_%x_%d",
+suffix, idx, bp->eth_dev->data->port_id);
+   ctx_pg->ctx_pg_arr = rte_zmalloc(name, sizeof(void *) * rmem->nr_pages, 
0);
+   if (ctx_pg->ctx_pg_arr == NULL)
+   return -ENOMEM;
+
+   snprintf(name, RTE_MEMZONE_NAMESIZE, "bnxt_ctx_dma_arr%s_%x_%d",
+suffix, idx, bp->eth_dev->data->port_id);
+   ctx_pg->ctx_dma_arr = rte_zmalloc(name, sizeof(rte_iova_t *) * 
rmem->nr_pages, 0);
+   if (ctx_pg->ctx_dma_arr == NULL)
+   return -ENOMEM;
+
rmem->pg_arr = ctx_pg->ctx_pg_arr;
rmem->dma_arr = ctx_pg->ctx_dma_arr;
rmem->flags = BNXT_RMEM_VALID_PTE_FLAG;
@@ -4787,13 +4800,13 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
valid_bits = PTU_PTE_VALID;
 
if (rmem->nr_pages > 1) {
-   snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
+   snprintf(name, RTE_MEMZONE_NAMESIZE,
 "bnxt_ctx_pg_tbl%s_%x_%d",
 suffix, idx, bp->eth_dev->data->port_id);
-   mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
-   mz = rte_memzone_lookup(mz_name);
+   name[RTE_MEMZONE_NAMESIZE - 1] = 0;
+   mz = rte_memzone_lookup(name);
if (!mz) {
-   mz = rte_memzone_reserve_aligned(mz_name,
+   mz = rte_memzone_reserve_aligned(name,
rmem->nr_pages * 8,
bp->eth_dev->device->numa_node,
RTE_MEMZONE_2MB |
@@ -4812,11 +4825,11 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
rmem->pg_tbl_mz = mz;
}
 
-   snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "bnxt_ctx_%s_%x_%d",
+   snprintf(name, RTE_MEMZONE_NAMESIZE, "bnxt_ctx_%s_%x_%d",
 suffix, idx, bp->eth_dev->data->port_id);
-   mz = rte_memzone_lookup(mz_name);
+   mz = rte_memzone_lookup(name);
if (!mz) {
-   mz = rte_memzone_reserve_aligned(mz_name,
+   mz = rte_memzone_reserve_aligned(name,
 mem_size,
 bp->eth_dev->device->numa_node,
 RTE_MEMZONE_1GB |
@@ -4862,6 +4875,17 @@ static void bnxt_free_ctx_mem(struct bnxt *bp)
return;
 
bp->ctx->flags &= ~BNXT_CTX_FLAG_INITED;
+   rte_free(bp->ctx->qp_mem.ctx_pg_arr);
+   rte_free(bp->ctx->srq_mem.ctx_pg_arr);
+   rte_free(bp->ctx->cq_mem.ctx_pg_arr);
+   rte_free(bp->ctx->vnic_mem.ctx_pg_arr);
+   rte_free(bp->ctx->stat_mem.ctx_pg_arr);
+   rte_free(bp->ctx->qp_mem.ctx_dma_arr);
+   rte_free(bp->ctx->srq_mem.ctx_dma_arr);
+   rte_free(bp->ctx->cq_mem.ctx_dma_arr);
+   rte_free(bp->ctx->vnic_mem.ctx_dma_arr);
+   rte_free(bp->ctx->stat_mem.ctx_dma_arr);
+
rte_memzone_free(bp->ctx->qp_mem.ring_mem.mz);
rte_memzone_free(bp->ctx->srq_mem.ring_mem.mz);
rte_memzone_free(bp->ctx->cq_mem.ring_mem.mz);
@@ -4874,6 +4898,8 @@ static void bnxt_free_ctx_mem(struct bnxt *b

[PATCH 09/14] net/bnxt: add support for backing store v2

[Ajit Khaparde]

Add backing store v2 changes.
The firmware supports the new backing store scheme for P7
and newer devices.

To support this, the driver queries the different types of chip
contexts the firmware supports and allocates the appropriate size
of memory for the firmware and hardware to use.
The code then goes ahead and frees up the memory during cleanup.

Older P5 device family continues to support the version 1 of
backing store. While the P4 device family does not need any
backing store memory.

Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h|  69 +++-
 drivers/net/bnxt/bnxt_ethdev.c | 177 ++--
 drivers/net/bnxt/bnxt_hwrm.c   | 298 +++--
 drivers/net/bnxt/bnxt_hwrm.h   |   8 +
 drivers/net/bnxt/bnxt_util.c   |  10 ++
 drivers/net/bnxt/bnxt_util.h   |   1 +
 6 files changed, 524 insertions(+), 39 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 3fbdf1ddcc..68c4778dc3 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -81,6 +81,11 @@
 #define BROADCOM_DEV_957508_N2100  0x5208
 #define BROADCOM_DEV_957414_N225   0x4145
 
+#define HWRM_SPEC_CODE_1_8_3   0x10803
+#define HWRM_VERSION_1_9_1 0x10901
+#define HWRM_VERSION_1_9_2 0x10903
+#define HWRM_VERSION_1_10_2_13 0x10a020d
+
 #define BNXT_MAX_MTU   9574
 #define BNXT_NUM_VLANS 2
 #define BNXT_MAX_PKT_LEN   (BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\
@@ -430,16 +435,26 @@ struct bnxt_coal {
 #define BNXT_PAGE_SIZE (1 << BNXT_PAGE_SHFT)
 #define MAX_CTX_PAGES  (BNXT_PAGE_SIZE / 8)
 
+#define BNXT_RTE_MEMZONE_FLAG  (RTE_MEMZONE_1GB | RTE_MEMZONE_IOVA_CONTIG)
+
 #define PTU_PTE_VALID 0x1UL
 #define PTU_PTE_LAST  0x2UL
 #define PTU_PTE_NEXT_TO_LAST  0x4UL
 
+#define BNXT_CTX_MIN   1
+#define BNXT_CTX_INV   0x
+
+#define BNXT_CTX_INIT_VALID(flags) \
+   ((flags) &  \
+HWRM_FUNC_BACKING_STORE_QCAPS_V2_OUTPUT_FLAGS_ENABLE_CTX_KIND_INIT)
+
 struct bnxt_ring_mem_info {
int nr_pages;
int page_size;
uint32_tflags;
 #define BNXT_RMEM_VALID_PTE_FLAG   1
 #define BNXT_RMEM_RING_PTE_FLAG2
+#define BNXT_RMEM_USE_FULL_PAGE_FLAG   4
 
void**pg_arr;
rte_iova_t  *dma_arr;
@@ -460,7 +475,50 @@ struct bnxt_ctx_pg_info {
struct bnxt_ring_mem_info ring_mem;
 };
 
+struct bnxt_ctx_mem {
+   uint16_ttype;
+   uint16_tentry_size;
+   uint32_tflags;
+#define BNXT_CTX_MEM_TYPE_VALID \
+   HWRM_FUNC_BACKING_STORE_QCAPS_V2_OUTPUT_FLAGS_TYPE_VALID
+   uint32_tinstance_bmap;
+   uint8_t init_value;
+   uint8_t entry_multiple;
+   uint16_tinit_offset;
+#defineBNXT_CTX_INIT_INVALID_OFFSET0x
+   uint32_tmax_entries;
+   uint32_tmin_entries;
+   uint8_t last:1;
+   uint8_t split_entry_cnt;
+#define BNXT_MAX_SPLIT_ENTRY   4
+   union {
+   struct {
+   uint32_tqp_l2_entries;
+   uint32_tqp_qp1_entries;
+   uint32_tqp_fast_qpmd_entries;
+   };
+   uint32_tsrq_l2_entries;
+   uint32_tcq_l2_entries;
+   uint32_tvnic_entries;
+   struct {
+   uint32_tmrav_av_entries;
+   uint32_tmrav_num_entries_units;
+   };
+   uint32_tsplit[BNXT_MAX_SPLIT_ENTRY];
+   };
+   struct bnxt_ctx_pg_info *pg_info;
+};
+
+#define BNXT_CTX_FLAG_INITED0x01
+
 struct bnxt_ctx_mem_info {
+   struct bnxt_ctx_mem *ctx_arr;
+   uint32_tsupported_types;
+   uint32_tflags;
+   uint16_ttypes;
+   uint8_t tqm_fp_rings_count;
+
+   /* The following are used for V1 */
uint32_tqp_max_entries;
uint16_tqp_min_qp1_entries;
uint16_tqp_max_l2_entries;
@@ -484,10 +542,6 @@ struct bnxt_ctx_mem_info {
uint16_ttim_entry_size;
uint32_ttim_max_entries;
uint8_t tqm_entries_multiple;
-   uint8_t tqm_fp_rings_count;
-
-   uint32_tflags;
-#define BNXT_CTX_FLAG_INITED0x01
 
struct bnxt_ctx_pg_info qp_mem;
struct bnxt_ctx_pg_info srq_mem;
@@ -739,6 +793,13 @@ struct bnxt {
 #define BNXT_FW_CAP_TRUFLOW_EN BIT(8)
 #define BNXT_FW_CAP_VLAN_TX_INSERT BIT(9)
 #define BNXT_FW_CAP_RX_ALL_PKT_TS  BIT(10)
+#define BNXT_FW_CAP_BACKING_STORE_V2   BIT(12)
+#define BNXT_FW_BACKING_STORE_V2_EN(bp)\
+   ((bp)->fw_cap & BNXT_FW_CAP_BACKING_STORE_V2)
+#define BNXT_FW_BACKI

[PATCH 10/14] net/bnxt: refactor the ulp initialization

[Ajit Khaparde]

From: Kishore Padmanabha 

Add new method to consider all the conditions to
check before the ulp could be initialized.

Signed-off-by: Kishore Padmanabha 
Reviewed-by: Ajit Khaparde 
Reviewed-by: Mike Baucom 
---
 drivers/net/bnxt/bnxt_ethdev.c | 28 +++-
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 4472268924..8f3bd858da 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -190,6 +190,7 @@ static void bnxt_dev_recover(void *arg);
 static void bnxt_free_error_recovery_info(struct bnxt *bp);
 static void bnxt_free_rep_info(struct bnxt *bp);
 static int bnxt_check_fw_ready(struct bnxt *bp);
+static bool bnxt_enable_ulp(struct bnxt *bp);
 
 int is_bnxt_in_error(struct bnxt *bp)
 {
@@ -1521,7 +1522,8 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev)
return ret;
 
/* delete the bnxt ULP port details */
-   bnxt_ulp_port_deinit(bp);
+   if (bnxt_enable_ulp(bp))
+   bnxt_ulp_port_deinit(bp);
 
bnxt_cancel_fw_health_check(bp);
 
@@ -1642,9 +1644,11 @@ int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
goto error;
 
/* Initialize bnxt ULP port details */
-   rc = bnxt_ulp_port_init(bp);
-   if (rc)
-   goto error;
+   if (bnxt_enable_ulp(bp)) {
+   rc = bnxt_ulp_port_init(bp);
+   if (rc)
+   goto error;
+   }
 
eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
@@ -3427,7 +3431,7 @@ bnxt_flow_ops_get_op(struct rte_eth_dev *dev,
 */
dev->data->dev_flags |= RTE_ETH_DEV_FLOW_OPS_THREAD_SAFE;
 
-   if (BNXT_TRUFLOW_EN(bp))
+   if (bnxt_enable_ulp(bp))
*ops = &bnxt_ulp_rte_flow_ops;
else
*ops = &bnxt_flow_ops;
@@ -6667,6 +6671,20 @@ struct tf *bnxt_get_tfp_session(struct bnxt *bp, enum 
bnxt_session_type type)
&bp->tfp[BNXT_SESSION_TYPE_REGULAR] : &bp->tfp[type];
 }
 
+/* check if ULP should be enabled or not */
+static bool bnxt_enable_ulp(struct bnxt *bp)
+{
+   /* truflow and MPC should be enabled */
+   /* not enabling ulp for cli and no truflow apps */
+   if (BNXT_TRUFLOW_EN(bp) && bp->app_id != 254 &&
+   bp->app_id != 255) {
+   if (BNXT_CHIP_P7(bp))
+   return false;
+   return true;
+   }
+   return false;
+}
+
 RTE_LOG_REGISTER_SUFFIX(bnxt_logtype_driver, driver, NOTICE);
 RTE_PMD_REGISTER_PCI(net_bnxt, bnxt_rte_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map);
-- 
2.39.2 (Apple Git-143)



smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH 11/14] net/bnxt: modify sending new HWRM commands to firmware

[Ajit Khaparde]

If the firmware fails to respond a HWRM command in a certain time,
it may be because the firmware is in a bad state.
Do not send any new HWRM commands in such a scenario.

Signed-off-by: Ajit Khaparde 
Reviewed-by: Damodharam Ammepalli 
---
 drivers/net/bnxt/bnxt.h  | 1 +
 drivers/net/bnxt/bnxt_hwrm.c | 5 +
 2 files changed, 6 insertions(+)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 68c4778dc3..f7a60eb9a1 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -745,6 +745,7 @@ struct bnxt {
 #define BNXT_FLAG_DFLT_MAC_SET BIT(26)
 #define BNXT_FLAG_GFID_ENABLE  BIT(27)
 #define BNXT_FLAG_CHIP_P7  BIT(30)
+#define BNXT_FLAG_FW_TIMEDOUT  BIT(31)
 #define BNXT_PF(bp)(!((bp)->flags & BNXT_FLAG_VF))
 #define BNXT_VF(bp)((bp)->flags & BNXT_FLAG_VF)
 #define BNXT_NPAR(bp)  ((bp)->flags & BNXT_FLAG_NPAR_PF)
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 67f8020e3c..ccc5417af1 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -200,6 +200,10 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void 
*msg,
if (bp->flags & BNXT_FLAG_FATAL_ERROR)
return 0;
 
+   /* If previous HWRM command timed out, donot send new HWRM command */
+   if (bp->flags & BNXT_FLAG_FW_TIMEDOUT)
+   return 0;
+
timeout = bp->hwrm_cmd_timeout;
 
/* Update the message length for backing store config for new FW. */
@@ -300,6 +304,7 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void 
*msg,
PMD_DRV_LOG(ERR,
"Error(timeout) sending msg 0x%04x, seq_id %d\n",
req->req_type, req->seq_id);
+   bp->flags |= BNXT_FLAG_FW_TIMEDOUT;
return -ETIMEDOUT;
}
return 0;
-- 
2.39.2 (Apple Git-143)



smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH 12/14] net/bnxt: retry HWRM ver get if the command fails

[Ajit Khaparde]

Retry HWRM ver get if the command timesout because of PCI FLR.
When the PCI driver issues an FLR during device initialization,
the firmware may have to block the PXP target traffic till the FLR
is complete.

HWRM_VER_GET command issued during that window may time out.
So retry the command again in such a scenario.

Signed-off-by: Ajit Khaparde 
Reviewed-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
---
 drivers/net/bnxt/bnxt.h|  1 +
 drivers/net/bnxt/bnxt_ethdev.c | 12 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index f7a60eb9a1..7aed4c3da3 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -879,6 +879,7 @@ struct bnxt {
 
 /* default command timeout value of 500ms */
 #define DFLT_HWRM_CMD_TIMEOUT  50
+#define PCI_FUNC_RESET_WAIT_TIMEOUT150
 /* short command timeout value of 50ms */
 #define SHORT_HWRM_CMD_TIMEOUT 5
/* default HWRM request timeout value */
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 8f3bd858da..0ae6697940 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -5442,6 +5442,7 @@ static int bnxt_map_hcomm_fw_status_reg(struct bnxt *bp)
 static int bnxt_get_config(struct bnxt *bp)
 {
uint16_t mtu;
+   int timeout;
int rc = 0;
 
bp->fw_cap = 0;
@@ -5450,8 +5451,17 @@ static int bnxt_get_config(struct bnxt *bp)
if (rc)
return rc;
 
-   rc = bnxt_hwrm_ver_get(bp, DFLT_HWRM_CMD_TIMEOUT);
+   timeout = BNXT_CHIP_P7(bp) ?
+ PCI_FUNC_RESET_WAIT_TIMEOUT :
+ DFLT_HWRM_CMD_TIMEOUT;
+try_again:
+   rc = bnxt_hwrm_ver_get(bp, timeout);
if (rc) {
+   if (rc == -ETIMEDOUT && timeout == PCI_FUNC_RESET_WAIT_TIMEOUT) 
{
+   bp->flags &= ~BNXT_FLAG_FW_TIMEDOUT;
+   timeout = DFLT_HWRM_CMD_TIMEOUT;
+   goto try_again;
+   }
bnxt_check_fw_status(bp);
return rc;
}
-- 
2.39.2 (Apple Git-143)



smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH 13/14] net/bnxt: cap ring resources for P7 devices

[Ajit Khaparde]

Cap the NQ count for P7 devices.
Driver does not need a high NQ ring count anyway since we operate in
poll mode.

Signed-off-by: Ajit Khaparde 
Reviewed-by: Kalesh AP 
Reviewed-by: Damodharam Ammepalli 
---
 drivers/net/bnxt/bnxt_hwrm.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index ccc5417af1..a747f6b6b8 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1222,7 +1222,10 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp)
else
bp->max_vnics = rte_le_to_cpu_16(resp->max_vnics);
bp->max_stat_ctx = rte_le_to_cpu_16(resp->max_stat_ctx);
-   bp->max_nq_rings = rte_le_to_cpu_16(resp->max_msix);
+   if (BNXT_CHIP_P7(bp))
+   bp->max_nq_rings = BNXT_P7_MAX_NQ_RING_CNT;
+   else
+   bp->max_nq_rings = rte_le_to_cpu_16(resp->max_msix);
bp->vf_resv_strategy = rte_le_to_cpu_16(resp->vf_reservation_strategy);
if (bp->vf_resv_strategy >
HWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESV_STRATEGY_MINIMAL_STATIC)
-- 
2.39.2 (Apple Git-143)



smime.p7s
Description: S/MIME Cryptographic Signature

[PATCH 14/14] net/bnxt: add support for v3 Rx completion

[Ajit Khaparde]

P7 devices support the newer Rx completion version.
This Rx completion though similar to the previous generation,
provides some extra information for flow offload scenarios
apart from the normal information.

Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt_rxr.c | 87 ++-
 drivers/net/bnxt/bnxt_rxr.h | 92 +
 2 files changed, 177 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 9d45065f28..59ea0121de 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -553,6 +553,41 @@ bnxt_parse_pkt_type(struct rx_pkt_cmpl *rxcmp, struct 
rx_pkt_cmpl_hi *rxcmp1)
return bnxt_ptype_table[index];
 }
 
+static void
+bnxt_parse_pkt_type_v3(struct rte_mbuf *mbuf,
+  struct rx_pkt_cmpl *rxcmp_v1,
+  struct rx_pkt_cmpl_hi *rxcmp1_v1)
+{
+   uint32_t flags_type, flags2, meta;
+   struct rx_pkt_v3_cmpl_hi *rxcmp1;
+   struct rx_pkt_v3_cmpl *rxcmp;
+   uint8_t index;
+
+   rxcmp = (void *)rxcmp_v1;
+   rxcmp1 = (void *)rxcmp1_v1;
+
+   flags_type = rte_le_to_cpu_16(rxcmp->flags_type);
+   flags2 = rte_le_to_cpu_32(rxcmp1->flags2);
+   meta = rte_le_to_cpu_32(rxcmp->metadata1_payload_offset);
+
+   /* TODO */
+   /* Validate ptype table indexing at build time. */
+   /* bnxt_check_ptype_constants_v3(); */
+
+   /*
+* Index format:
+* bit 0: Set if IP tunnel encapsulated packet.
+* bit 1: Set if IPv6 packet, clear if IPv4.
+* bit 2: Set if VLAN tag present.
+* bits 3-6: Four-bit hardware packet type field.
+*/
+   index = BNXT_CMPL_V3_ITYPE_TO_IDX(flags_type) |
+   BNXT_CMPL_V3_VLAN_TO_IDX(meta) |
+   BNXT_CMPL_V3_IP_VER_TO_IDX(flags2);
+
+   mbuf->packet_type = bnxt_ptype_table[index];
+}
+
 static void __rte_cold
 bnxt_init_ol_flags_tables(struct bnxt_rx_queue *rxq)
 {
@@ -716,6 +751,43 @@ bnxt_get_rx_ts_p5(struct bnxt *bp, uint32_t rx_ts_cmpl)
ptp->rx_timestamp = pkt_time;
 }
 
+static uint32_t
+bnxt_ulp_set_mark_in_mbuf_v3(struct bnxt *bp, struct rx_pkt_cmpl_hi *rxcmp1,
+struct rte_mbuf *mbuf, uint32_t *vfr_flag)
+{
+   struct rx_pkt_v3_cmpl_hi *rxcmp1_v3 = (void *)rxcmp1;
+   uint32_t flags2, meta, mark_id = 0;
+   /* revisit the usage of gfid/lfid if mark action is supported.
+* for now, only VFR is using mark and the metadata is the SVIF
+* (a small number)
+*/
+   bool gfid = false;
+   int rc = 0;
+
+   flags2 = rte_le_to_cpu_32(rxcmp1_v3->flags2);
+
+   switch (flags2 & RX_PKT_V3_CMPL_HI_FLAGS2_META_FORMAT_MASK) {
+   case RX_PKT_V3_CMPL_HI_FLAGS2_META_FORMAT_CHDR_DATA:
+   /* Only supporting Metadata for ulp now */
+   meta = rxcmp1_v3->metadata2;
+   break;
+   default:
+   goto skip_mark;
+   }
+
+   rc = ulp_mark_db_mark_get(bp->ulp_ctx, gfid, meta, vfr_flag, &mark_id);
+   if (!rc) {
+   /* Only supporting VFR for now, no Mark actions */
+   if (vfr_flag && *vfr_flag)
+   return mark_id;
+   }
+
+skip_mark:
+   mbuf->hash.fdir.hi = 0;
+
+   return 0;
+}
+
 static uint32_t
 bnxt_ulp_set_mark_in_mbuf(struct bnxt *bp, struct rx_pkt_cmpl_hi *rxcmp1,
  struct rte_mbuf *mbuf, uint32_t *vfr_flag)
@@ -892,7 +964,8 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
*rx_pkt = mbuf;
goto next_rx;
} else if ((cmp_type != CMPL_BASE_TYPE_RX_L2) &&
-  (cmp_type != CMPL_BASE_TYPE_RX_L2_V2)) {
+  (cmp_type != CMPL_BASE_TYPE_RX_L2_V2) &&
+  (cmp_type != CMPL_BASE_TYPE_RX_L2_V3)) {
rc = -EINVAL;
goto next_rx;
}
@@ -929,6 +1002,16 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
  bp->ptp_all_rx_tstamp)
bnxt_get_rx_ts_p5(rxq->bp, rxcmp1->reorder);
 
+   if (cmp_type == CMPL_BASE_TYPE_RX_L2_V3) {
+   bnxt_parse_csum_v3(mbuf, rxcmp1);
+   bnxt_parse_pkt_type_v3(mbuf, rxcmp, rxcmp1);
+   bnxt_rx_vlan_v3(mbuf, rxcmp, rxcmp1);
+   if (BNXT_TRUFLOW_EN(bp))
+   mark_id = bnxt_ulp_set_mark_in_mbuf_v3(rxq->bp, rxcmp1,
+  mbuf, &vfr_flag);
+   goto reuse_rx_mbuf;
+   }
+
if (cmp_type == CMPL_BASE_TYPE_RX_L2_V2) {
bnxt_parse_csum_v2(mbuf, rxcmp1);
bnxt_parse_pkt_type_v2(mbuf, rxcmp, rxcmp1);
@@ -1066,7 +1149,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf 
**rx_pkts,
if (CMP_TYPE(rxcmp) == CMPL_BASE_TYPE_HWRM_DONE) {
PMD_DRV_LOG(ERR, "Rx flush done\n");
   

Re: [v2] net/af_xdp: enable a sock path alongside use_cni

[Maryam Tahhan]

Hi Shibin

I'm not really sure what you are suggesting, is to make an assumption on 
the path part where the socket resides (aka hard code it) and then try 
to build the full UDS path in DPDK?


Yes the plugin is using constants ATM for certain parts of the UDS path, 
but that's not say that it's something that won't become configurable 
later on. Someone may not want to use "/tmp/afxdp_dp/" as the base 
directory. Then we'd have to change DPDK's implementation again. These 
are not really things that are configured by hand and are generated by 
initialization scripts (typically). I would rather build this with the 
idea that things can change in the future without having to change the 
DPDK implementation again.

BR
Maryam

On 04/12/2023 17:18, Koikkara Reeny, Shibin wrote:

Hi Maryam,

Apologies for asking this question bit late.
The UDS sock name will be afxdp.sock only and addition director is created between 
the sock name and the uds filepath (/tmp/afxdp_dp//afxdp.sock).

As per the command " --vdev net_af_xdp0,iface=,use_cni=1,uds_path=/tmp/afxdp_dp//afxdp.sock"
We are already passing the interface name(iface= . So can't we create the uds_path 
inside the program uds_path="/tmp/afxdp_dp/"+ iface + "afxdp.sock"


If you check the code afxdp-plugins-for-kubernetes constants.go [1] they still 
have the constants and also they are using these constants to create the path 
[2]

[1]https://github.com/intel/afxdp-plugins-for-kubernetes/blob/main/constants/constants.go#L84  
[2]https://github.com/intel/afxdp-plugins-for-kubernetes/blob/main/internal/deviceplugin/poolManager_test.go#L78


If we are able to create path in the program then user won't have to pass along 
argument value.

Regards,
Shibin


-Original Message-
From: Maryam Tahhan
Sent: Monday, December 4, 2023 10:31 AM
To:ferruh.yi...@amd.com;step...@networkplumber.org;
lihuis...@huawei.com;fengcheng...@huawei.com;
liuyongl...@huawei.com; Koikkara Reeny, Shibin

Cc:dev@dpdk.org; Tahhan, Maryam
Subject: [v2] net/af_xdp: enable a sock path alongside use_cni

With the original 'use_cni' implementation, (using a hardcoded socket rather
than a configurable one), if a single pod is requesting multiple net devices
and these devices are from different pools, then the container attempts to
mount all the netdev UDSes in the pod as /tmp/afxdp.sock. Which means
that at best only 1 netdev will handshake correctly with the AF_XDP DP. This
patch addresses this by making the socket parameter configurable alongside
the 'use_cni' param.
Tested with the AF_XDP DP CNI PR 81.

v2:
* Rename sock_path to uds_path.
* Update documentation to reflect when CAP_BPF is needed.
* Fix testpmd arguments in the provided example for Pods.
* Use AF_XDP API to update the xskmap entry.

Signed-off-by: Maryam Tahhan
---
  doc/guides/howto/af_xdp_cni.rst | 24 ++-
  drivers/net/af_xdp/rte_eth_af_xdp.c | 62 ++---
  2 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/doc/guides/howto/af_xdp_cni.rst
b/doc/guides/howto/af_xdp_cni.rst index a1a6d5b99c..7829526b40 100644
--- a/doc/guides/howto/af_xdp_cni.rst
+++ b/doc/guides/howto/af_xdp_cni.rst
@@ -38,9 +38,10 @@ The XSKMAP is a BPF map of AF_XDP sockets (XSK).
  The client can then proceed with creating an AF_XDP socket  and inserting
that socket into the XSKMAP pointed to by the descriptor.

-The EAL vdev argument ``use_cni`` is used to indicate that the user wishes -
to run the PMD in unprivileged mode and to receive the XSKMAP file
descriptor -from the CNI.
+The EAL vdev arguments ``use_cni`` and ``uds_path`` are used to
+indicate that the user wishes to run the PMD in unprivileged mode and
+to receive the XSKMAP file descriptor from the CNI.
+
  When this flag is set,
  the ``XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD`` libbpf flag  should be
used when creating the socket @@ -49,7 +50,7 @@ Instead the loading is
handled by the CNI.

  .. note::

-   The Unix Domain Socket file path appear in the end user is
"/tmp/afxdp.sock".
+   The Unix Domain Socket file path appears to the end user at
"/tmp/afxdp_dp//afxdp.sock".


  Prerequisites
@@ -223,8 +224,7 @@ Howto run dpdk-testpmd with CNI plugin:
   securityContext:
capabilities:
   add:
-   - CAP_NET_RAW
-   - CAP_BPF
+   - NET_RAW

Need to update the 1.3. Prerequisites.



   resources:
 requests:
   hugepages-2Mi: 2Gi
@@ -239,14 +239,20 @@ Howto run dpdk-testpmd with CNI plugin:

.. _pod.yaml:https://github.com/intel/afxdp-plugins-for-
kubernetes/blob/v0.0.2/test/e2e/pod-1c1d.yaml

+.. note::
+
+   For Kernel versions older than 5.19 `CAP_BPF` is also required in
+   the container capabilities stanza.
+
  * Run DPDK with a command like the following:

.. code-block:: console

   kubectl exec -i  --container  -- \
-   //dpdk-testpmd -l 0,1 --no-pci \
-   --vdev=net_af_xdp0,use_cni=1,iface= \
-   -- --no-

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

[fengchengwen]

Hi Stephen,

On 2023/12/5 1:10, Stephen Hemminger wrote:
> On Mon, 4 Dec 2023 07:50:43 +
> Chengwen Feng  wrote:
> 
>> +   static struct rte_argparse obj = {
>> +  .prog_name = "test-demo",
>> +  .usage = "[EAL options] -- [optional parameters] [positional 
>> parameters]",
>> +  .descriptor = NULL,
>> +  .epilog = NULL,
>> +  .exit_on_error = true,
>> +  .callback = argparse_user_callback,
>> +  .args = {
>> + { "--aaa", "-a", "aaa argument", (void *)&aaa_val, (void *)100, 
>> RTE_ARGPARSE_ARG_NO_VALUE   | RTE_ARGPARSE_ARG_VALUE_INT },
>> + { "--bbb", "-b", "bbb argument", (void *)&bbb_val, NULL,
>> RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
>> + { "--ccc", "-c", "ccc argument", (void *)&ccc_val, (void *)200, 
>> RTE_ARGPARSE_ARG_OPTIONAL_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
>> + { "--ddd", "-d", "ddd argument", NULL, (void *)1,   
>> RTE_ARGPARSE_ARG_NO_VALUE   },
>> + { "--eee", "-e", "eee argument", NULL, (void *)2,   
>> RTE_ARGPARSE_ARG_REQUIRED_VALUE },
>> + { "--fff", "-f", "fff argument", NULL, (void *)3,   
>> RTE_ARGPARSE_ARG_OPTIONAL_VALUE },
>> + { "ooo",   NULL, "ooo argument", (void *)&ooo_val, NULL,
>> RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT },
>> + { "ppp",   NULL, "ppp argument", NULL, (void *)300, 
>> RTE_ARGPARSE_ARG_REQUIRED_VALUE },
>> +  },
>> +   };
>> +
> 
> Could the API be made to work with immutable initializers?
> I.e allowing the application to use:
>   static const struct rte_argparse_obj {

Current impl, it can't be immutable, because the API will modify some reserved 
bit in args.flags field.

> 
> Also better to just skip the NULL elements here, and use field initializers 
> for the args.

Yes, both are OK.

> That way when structure layout changes, the example will still work.
> Also, pointers do not have to be cast to void * in C code.

OK, will modify in v3.

Thanks

> .
> 

RE: [dpdk-dev] [PATCH] net/af_xdp: fix memzone leak in error path

[wangyunjian]

> -Original Message-
> From: Ferruh Yigit [mailto:ferruh.yi...@amd.com]
> Sent: Monday, December 4, 2023 10:10 PM
> To: wangyunjian ; dev@dpdk.org
> Cc: ciara.lof...@intel.com; qi.z.zh...@intel.com; xudingke
> ; Lilijun (Jerry) ;
> sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/af_xdp: fix memzone leak in error path
> 
> On 12/1/2023 8:03 AM, Yunjian Wang wrote:
> > In xdp_umem_configure() allocated memzone for the 'umem', we should
> > free it when xsk_umem__create() call fails, otherwise it will lead to
> > memory zone leak.
> >
> > Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Yunjian Wang 
> > ---
> >  drivers/net/af_xdp/rte_eth_af_xdp.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
> > b/drivers/net/af_xdp/rte_eth_af_xdp.c
> > index 2a20a6960c..2a1fdafb3c 100644
> > --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
> > +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
> > @@ -1229,6 +1229,7 @@ xsk_umem_info *xdp_umem_configure(struct
> > pmd_internals *internals,
> >
> > if (ret) {
> > AF_XDP_LOG(ERR, "Failed to create umem\n");
> > +   rte_memzone_free(mz);
> >
> 
> Doesn't 'xdp_umem_destroy()', in the label 'err', already free it?

In this case, 'mz' is not assigned to 'umem->mz'. Therefore,
the'xdp_umem_destroy()' does not free 'mz'.

Thanks,
Yunjian

> 
> > goto err;
> > }
> > umem->mz = mz;

[PATCH 00/18] Convert static log types in libraries to dynamic

[Stephen Hemminger]

This patchset removes most of the uses of static LOGTYPE's in DPDK
libraries. It starts with the easy one and goes on to the more complex ones.

There are several options on how to treat the old static types:
leave them there, mark as deprecated, or remove them.
This version removes them since there is no guarantee in current
DPDK policies that says they can't be removed.

Note: there is one patch in this series that will get
flagged incorrectly as an ABI change.

v14 - rebase on 24.03-rc0
  skip port, table and pipeline libraries since lots of
  to be deprecated code.

v13 - rebase because log now moved.

v12 - rebase and add table and pipeline libraries

v11 - fix include check on arm cross build

v10 - add necessary rte_compat.h in thash_gfni stub for arm

v9 - fix handling of crc32 alg in lib/hash.
 make it an internal global variable.
 fix gfni stubs for case where they are not used.

Stephen Hemminger (18):
  gso: don't log message on non TCP/UDP
  eal: drop no longer used GSO logtype
  log: drop unused RTE_LOGTYPE_TIMER
  efd: convert RTE_LOGTYPE_EFD to dynamic type
  mbuf: convert RTE_LOGTYPE_MBUF to dynamic type
  acl: convert RTE_LOGTYPE_ACL to dynamic type
  examples/power: replace use of RTE_LOGTYPE_POWER
  examples/l3fwd-power: replace use of RTE_LOGTYPE_POWER
  power: convert RTE_LOGTYPE_POWER to dynamic type
  ring: convert RTE_LOGTYPE_RING to dynamic type
  mempool: convert RTE_LOGTYPE_MEMPOOL to dynamic type
  lpm: convert RTE_LOGTYPE_LPM to dynamic types
  sched: convert RTE_LOGTYPE_SCHED to dynamic type
  examples/ipsec-secgw: replace RTE_LOGTYPE_PORT
  app/test: remove use of RTE_LOGTYPE_PIPELINE
  hash: mover rte_thash_gfni stubs out of header file
  hash: move rte_hash_set_alg out of header file
  hash: convert RTE_LOGTYPE_HASH to dynamic type

 app/test/test_acl.c|  2 +-
 app/test/test_table_acl.c  | 50 -
 app/test/test_table_pipeline.c | 40 ++--
 examples/distributor/main.c|  2 +-
 examples/ipsec-secgw/sa.c  |  6 +--
 examples/l3fwd-power/main.c| 17 +
 lib/acl/acl.h  |  1 +
 lib/acl/acl_bld.c  |  3 ++
 lib/acl/acl_gen.c  |  1 +
 lib/acl/acl_log.h  |  6 +++
 lib/acl/rte_acl.c  |  3 ++
 lib/acl/tb_mem.c   |  3 +-
 lib/efd/rte_efd.c  |  4 ++
 lib/fib/fib_log.h  |  4 ++
 lib/fib/rte_fib.c  |  3 ++
 lib/fib/rte_fib6.c |  2 +
 lib/gso/rte_gso.c  |  4 +-
 lib/gso/rte_gso.h  |  1 +
 lib/hash/meson.build   |  9 -
 lib/hash/rte_crc_arm64.h   |  8 ++--
 lib/hash/rte_crc_x86.h | 10 ++---
 lib/hash/rte_cuckoo_hash.c |  5 +++
 lib/hash/rte_fbk_hash.c|  5 +++
 lib/hash/rte_hash_crc.c| 68 ++
 lib/hash/rte_hash_crc.h| 48 ++--
 lib/hash/rte_thash.c   |  3 ++
 lib/hash/rte_thash_gfni.c  | 50 +
 lib/hash/rte_thash_gfni.h  | 23 +++-
 lib/hash/version.map   |  9 +
 lib/log/log.c  | 13 ---
 lib/log/rte_log.h  | 26 ++---
 lib/lpm/lpm_log.h  |  4 ++
 lib/lpm/rte_lpm.c  |  3 ++
 lib/lpm/rte_lpm6.c |  1 +
 lib/mbuf/mbuf_log.h|  4 ++
 lib/mbuf/rte_mbuf.c|  4 ++
 lib/mbuf/rte_mbuf_dyn.c|  2 +
 lib/mbuf/rte_mbuf_pool_ops.c   |  2 +
 lib/mempool/rte_mempool.c  |  2 +
 lib/mempool/rte_mempool.h  |  8 
 lib/mempool/version.map|  3 ++
 lib/power/power_common.c   |  2 +
 lib/power/power_common.h   |  2 +
 lib/power/power_kvm_vm.c   |  1 +
 lib/power/rte_power.c  |  1 +
 lib/power/rte_power_uncore.c   |  1 +
 lib/rib/rib_log.h  |  4 ++
 lib/rib/rte_rib.c  |  3 ++
 lib/rib/rte_rib6.c |  3 ++
 lib/ring/rte_ring.c|  3 ++
 lib/sched/rte_pie.c|  1 +
 lib/sched/rte_sched.c  |  5 +++
 lib/sched/rte_sched_log.h  |  4 ++
 53 files changed, 329 insertions(+), 163 deletions(-)
 create mode 100644 lib/acl/acl_log.h
 create mode 100644 lib/fib/fib_log.h
 create mode 100644 lib/hash/rte_hash_crc.c
 create mode 100644 lib/hash/rte_thash_gfni.c
 create mode 100644 lib/lpm/lpm_log.h
 create mode 100644 lib/mbuf/mbuf_log.h
 create mode 100644 lib/rib/rib_log.h
 create mode 100644 lib/sched/rte_sched_log.h

-- 
2.42.0

[PATCH 01/18] gso: don't log message on non TCP/UDP

[Stephen Hemminger]

If a large packet is passed into GSO routines of unknown protocol
then library would log a message.
Better to tell the application instead of logging.

Fixes: 119583797b6a ("gso: support TCP/IPv4 GSO")
Reviewed-by: Jiayu Hu 
Signed-off-by: Stephen Hemminger 
---
 lib/gso/rte_gso.c | 4 +---
 lib/gso/rte_gso.h | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/gso/rte_gso.c b/lib/gso/rte_gso.c
index 4b59217c16ee..e29c7d884aed 100644
--- a/lib/gso/rte_gso.c
+++ b/lib/gso/rte_gso.c
@@ -80,9 +80,7 @@ rte_gso_segment(struct rte_mbuf *pkt,
ret = gso_udp4_segment(pkt, gso_size, direct_pool,
indirect_pool, pkts_out, nb_pkts_out);
} else {
-   /* unsupported packet, skip */
-   RTE_LOG(DEBUG, GSO, "Unsupported packet type\n");
-   ret = 0;
+   ret = -ENOTSUP; /* only UDP or TCP allowed */
}
 
if (ret < 0) {
diff --git a/lib/gso/rte_gso.h b/lib/gso/rte_gso.h
index 40922524df42..c0f9a1b66ff2 100644
--- a/lib/gso/rte_gso.h
+++ b/lib/gso/rte_gso.h
@@ -114,6 +114,7 @@ struct rte_gso_ctx {
  *  - The number of GSO segments filled in pkts_out on success.
  *  - Return 0 if it does not need to be GSO'd.
  *  - Return -ENOMEM if run out of memory in MBUF pools.
+ *  - Return -ENOTSUP for protocols that can not be segmented
  *  - Return -EINVAL for invalid parameters.
  */
 int rte_gso_segment(struct rte_mbuf *pkt,
-- 
2.42.0

[PATCH 02/18] eal: drop no longer used GSO logtype

[Stephen Hemminger]

The message that used this was replaced in previous patch.

Signed-off-by: Stephen Hemminger 
---
 lib/log/log.c | 1 -
 lib/log/rte_log.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/log/log.c b/lib/log/log.c
index b80725a5cf24..111a40932170 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -370,7 +370,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
{RTE_LOGTYPE_EFD,"lib.efd"},
{RTE_LOGTYPE_EVENTDEV,   "lib.eventdev"},
-   {RTE_LOGTYPE_GSO,"lib.gso"},
{RTE_LOGTYPE_USER1,  "user1"},
{RTE_LOGTYPE_USER2,  "user2"},
{RTE_LOGTYPE_USER3,  "user3"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index f7a8405de969..0ac10f580bc1 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -46,7 +46,7 @@ extern "C" {
 #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
 #define RTE_LOGTYPE_EFD   18 /**< Log related to EFD. */
 #define RTE_LOGTYPE_EVENTDEV  19 /**< Log related to eventdev. */
-#define RTE_LOGTYPE_GSO   20 /**< Log related to GSO. */
+/* was RTE_LOGTYPE_GSO */
 
 /* these log types can be used in an application */
 #define RTE_LOGTYPE_USER1 24 /**< User-defined log type 1. */
-- 
2.42.0

[PATCH 03/18] log: drop unused RTE_LOGTYPE_TIMER

[Stephen Hemminger]

The timer code does not use rte_log.

Signed-off-by: Stephen Hemminger 
---
 lib/log/log.c | 1 -
 lib/log/rte_log.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/log/log.c b/lib/log/log.c
index 111a40932170..c05a7cf5a2dd 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -355,7 +355,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_MALLOC, "lib.malloc"},
{RTE_LOGTYPE_RING,   "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
-   {RTE_LOGTYPE_TIMER,  "lib.timer"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 0ac10f580bc1..fe8188302125 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -30,7 +30,7 @@ extern "C" {
 #define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
 #define RTE_LOGTYPE_RING   2 /**< Log related to ring. */
 #define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
-#define RTE_LOGTYPE_TIMER  4 /**< Log related to timers. */
+/* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
 #define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
-- 
2.42.0

[PATCH 04/18] efd: convert RTE_LOGTYPE_EFD to dynamic type

[Stephen Hemminger]

Replace all uses of the global logtype with a dynamic log type.

Signed-off-by: Stephen Hemminger 
---
 lib/efd/rte_efd.c | 4 
 lib/log/log.c | 1 -
 lib/log/rte_log.h | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c
index dad962ce29bf..78fb9250ef87 100644
--- a/lib/efd/rte_efd.c
+++ b/lib/efd/rte_efd.c
@@ -9,6 +9,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -28,6 +29,9 @@
 #include "rte_efd_arm64.h"
 #endif
 
+RTE_LOG_REGISTER_DEFAULT(efd_logtype, INFO);
+#define RTE_LOGTYPE_EFDefd_logtype
+
 #define EFD_KEY(key_idx, table) (table->keys + ((key_idx) * table->key_len))
 /** Hash function used to determine chunk_id and bin_id for a group */
 #define EFD_HASH(key, table) \
diff --git a/lib/log/log.c b/lib/log/log.c
index c05a7cf5a2dd..c256709b8586 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -367,7 +367,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
{RTE_LOGTYPE_MBUF,   "lib.mbuf"},
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
-   {RTE_LOGTYPE_EFD,"lib.efd"},
{RTE_LOGTYPE_EVENTDEV,   "lib.eventdev"},
{RTE_LOGTYPE_USER1,  "user1"},
{RTE_LOGTYPE_USER2,  "user2"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index fe8188302125..c6594e0509a5 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -44,7 +44,7 @@ extern "C" {
 #define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
 #define RTE_LOGTYPE_MBUF  16 /**< Log related to mbuf. */
 #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
-#define RTE_LOGTYPE_EFD   18 /**< Log related to EFD. */
+/* was RTE_LOGTYPE_EFD */
 #define RTE_LOGTYPE_EVENTDEV  19 /**< Log related to eventdev. */
 /* was RTE_LOGTYPE_GSO */
 
-- 
2.42.0

[PATCH 05/18] mbuf: convert RTE_LOGTYPE_MBUF to dynamic type

[Stephen Hemminger]

Introduce a new dynamic logtype for mbuf related messages.
Since this is used in multiple files put one macro in mbuf_log.h

Signed-off-by: Stephen Hemminger 
---
 lib/log/log.c| 1 -
 lib/log/rte_log.h| 2 +-
 lib/mbuf/mbuf_log.h  | 4 
 lib/mbuf/rte_mbuf.c  | 4 
 lib/mbuf/rte_mbuf_dyn.c  | 2 ++
 lib/mbuf/rte_mbuf_pool_ops.c | 2 ++
 6 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 lib/mbuf/mbuf_log.h

diff --git a/lib/log/log.c b/lib/log/log.c
index c256709b8586..0718b84dcb04 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -365,7 +365,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_PORT,   "lib.port"},
{RTE_LOGTYPE_TABLE,  "lib.table"},
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
-   {RTE_LOGTYPE_MBUF,   "lib.mbuf"},
{RTE_LOGTYPE_CRYPTODEV,  "lib.cryptodev"},
{RTE_LOGTYPE_EVENTDEV,   "lib.eventdev"},
{RTE_LOGTYPE_USER1,  "user1"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index c6594e0509a5..bd10e32fe164 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -42,7 +42,7 @@ extern "C" {
 #define RTE_LOGTYPE_PORT  13 /**< Log related to port. */
 #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
 #define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
-#define RTE_LOGTYPE_MBUF  16 /**< Log related to mbuf. */
+/* was RTE_LOGTYPE_MBUF */
 #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */
 /* was RTE_LOGTYPE_EFD */
 #define RTE_LOGTYPE_EVENTDEV  19 /**< Log related to eventdev. */
diff --git a/lib/mbuf/mbuf_log.h b/lib/mbuf/mbuf_log.h
new file mode 100644
index ..d759a9a25501
--- /dev/null
+++ b/lib/mbuf/mbuf_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int mbuf_logtype;
+#define RTE_LOGTYPE_MBUF   mbuf_logtype
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index 686e797c80c4..3eccc618270b 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -20,6 +20,10 @@
 #include 
 #include 
 
+#include "mbuf_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(mbuf_logtype, INFO);
+
 /*
  * pktmbuf pool constructor, given as a callback function to
  * rte_mempool_create(), or called directly if using
diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
index 5049508bea6e..4fb1863a1043 100644
--- a/lib/mbuf/rte_mbuf_dyn.c
+++ b/lib/mbuf/rte_mbuf_dyn.c
@@ -17,6 +17,8 @@
 #include 
 #include 
 
+#include "mbuf_log.h"
+
 #define RTE_MBUF_DYN_MZNAME "rte_mbuf_dyn"
 
 struct mbuf_dynfield_elt {
diff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
index 4c91f4ce8569..5318430126cb 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.c
+++ b/lib/mbuf/rte_mbuf_pool_ops.c
@@ -8,6 +8,8 @@
 #include 
 #include 
 
+#include "mbuf_log.h"
+
 int
 rte_mbuf_set_platform_mempool_ops(const char *ops_name)
 {
-- 
2.42.0

[PATCH 06/18] acl: convert RTE_LOGTYPE_ACL to dynamic type

[Stephen Hemminger]

Get rid of RTE_LOGTYPE_ACL and RTE_LOGTYPE_MALLOC.
For ACL library use a dynamic type.
The one message using RTE_LOGTYPE_MALLOC should have been
under the ACL logtype anyway.

The test code should not have been using fixed log type
so just change that to stderr.

Signed-off-by: Stephen Hemminger 
---
 app/test/test_acl.c | 2 +-
 lib/acl/acl.h   | 1 +
 lib/acl/acl_bld.c   | 3 +++
 lib/acl/acl_gen.c   | 1 +
 lib/acl/acl_log.h   | 6 ++
 lib/acl/rte_acl.c   | 3 +++
 lib/acl/tb_mem.c| 3 ++-
 lib/log/log.c   | 2 --
 lib/log/rte_log.h   | 4 ++--
 9 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 lib/acl/acl_log.h

diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 8011639ddd1f..503ff0889405 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -154,7 +154,7 @@ rte_acl_ipv4vlan_add_rules(struct rte_acl_ctx *ctx,
for (i = 0; i != num; i++) {
rc = acl_ipv4vlan_check_rule(rules + i);
if (rc != 0) {
-   RTE_LOG(ERR, ACL, "%s: rule #%u is invalid\n",
+   fprintf(stderr,  "%s: rule #%u is invalid\n",
__func__, i + 1);
return rc;
}
diff --git a/lib/acl/acl.h b/lib/acl/acl.h
index c8e4e72fabfb..baed9513cb31 100644
--- a/lib/acl/acl.h
+++ b/lib/acl/acl.h
@@ -225,6 +225,7 @@ int
 rte_acl_classify_altivec(const struct rte_acl_ctx *ctx, const uint8_t **data,
uint32_t *results, uint32_t num, uint32_t categories);
 
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/lib/acl/acl_bld.c b/lib/acl/acl_bld.c
index 418751e9f4c7..eaf8770415a5 100644
--- a/lib/acl/acl_bld.c
+++ b/lib/acl/acl_bld.c
@@ -3,8 +3,11 @@
  */
 
 #include 
+#include 
+
 #include "tb_mem.h"
 #include "acl.h"
+#include "acl_log.h"
 
 #defineACL_POOL_ALIGN  8
 #defineACL_POOL_ALLOC_MIN  0x80
diff --git a/lib/acl/acl_gen.c b/lib/acl/acl_gen.c
index 25e75fec3534..03a47ea231ec 100644
--- a/lib/acl/acl_gen.c
+++ b/lib/acl/acl_gen.c
@@ -4,6 +4,7 @@
 
 #include 
 #include "acl.h"
+#include "acl_log.h"
 
 #defineQRANGE_MIN  ((uint8_t)INT8_MIN)
 
diff --git a/lib/acl/acl_log.h b/lib/acl/acl_log.h
new file mode 100644
index ..6147116d8d12
--- /dev/null
+++ b/lib/acl/acl_log.h
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+#include 
+
+extern int acl_logtype;
+#define RTE_LOGTYPE_ACLacl_logtype
diff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c
index 4182006d1d1c..760c3587d4dc 100644
--- a/lib/acl/rte_acl.c
+++ b/lib/acl/rte_acl.c
@@ -8,6 +8,9 @@
 #include 
 
 #include "acl.h"
+#include "acl_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(acl_logtype, INFO);
 
 TAILQ_HEAD(rte_acl_list, rte_tailq_entry);
 
diff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c
index f14d7b4fa26e..6a9d96aaeda2 100644
--- a/lib/acl/tb_mem.c
+++ b/lib/acl/tb_mem.c
@@ -3,6 +3,7 @@
  */
 
 #include "tb_mem.h"
+#include "acl_log.h"
 
 /*
  *  Memory management routines for temporary memory.
@@ -25,7 +26,7 @@ tb_pool(struct tb_mem_pool *pool, size_t sz)
size = sz + pool->alignment - 1;
block = calloc(1, size + sizeof(*pool->block));
if (block == NULL) {
-   RTE_LOG(ERR, MALLOC, "%s(%zu)\n failed, currently allocated "
+   RTE_LOG(ERR, ACL, "%s(%zu)\n failed, currently allocated "
"by pool: %zu bytes\n", __func__, sz, pool->alloc);
siglongjmp(pool->fail, -ENOMEM);
return NULL;
diff --git a/lib/log/log.c b/lib/log/log.c
index 0718b84dcb04..49ee89ffdd97 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -352,13 +352,11 @@ struct logtype {
 
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
-   {RTE_LOGTYPE_MALLOC, "lib.malloc"},
{RTE_LOGTYPE_RING,   "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
-   {RTE_LOGTYPE_ACL,"lib.acl"},
{RTE_LOGTYPE_POWER,  "lib.power"},
{RTE_LOGTYPE_METER,  "lib.meter"},
{RTE_LOGTYPE_SCHED,  "lib.sched"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index bd10e32fe164..0c651f58b58e 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -27,7 +27,7 @@ extern "C" {
 
 /* SDK log type */
 #define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
-#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */
+/* was RTE_LOGTYPE_MALLOC */
 #define RTE_LOGTYPE_RING   2 /**< Log related to ring. */
 #define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
 /* was RTE_LOGTYPE_TIMER */
@@ -35,7 +35,7 @@ extern "C" {
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
 #define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
  

[PATCH 07/18] examples/power: replace use of RTE_LOGTYPE_POWER

[Stephen Hemminger]

Don't use static logtype in sample application.

Signed-off-by: Stephen Hemminger 
Acked-by: David Hunt 
---
 examples/distributor/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/distributor/main.c b/examples/distributor/main.c
index 21304d661873..542f76cf9664 100644
--- a/examples/distributor/main.c
+++ b/examples/distributor/main.c
@@ -679,7 +679,7 @@ init_power_library(void)
/* init power management library */
ret = rte_power_init(lcore_id);
if (ret) {
-   RTE_LOG(ERR, POWER,
+   fprintf(stderr,
"Library initialization failed on core %u\n",
lcore_id);
/*
-- 
2.42.0

[PATCH 08/18] examples/l3fwd-power: replace use of RTE_LOGTYPE_POWER

[Stephen Hemminger]

Convert to using a dynamic logtype for the application.

Signed-off-by: Stephen Hemminger 
Acked-by: David Hunt 
---
 examples/l3fwd-power/main.c | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 9c0dcd343bd9..f4adcf41b55f 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -51,7 +51,8 @@
 #include "perf_core.h"
 #include "main.h"
 
-#define RTE_LOGTYPE_L3FWD_POWER RTE_LOGTYPE_USER1
+RTE_LOG_REGISTER(l3fwd_power_logtype, l3fwd.power, INFO);
+#define RTE_LOGTYPE_L3FWD_POWER l3fwd_power_logtype
 
 #define MAX_PKT_BURST 32
 
@@ -2242,7 +2243,7 @@ init_power_library(void)
/* init power management library */
ret = rte_power_init(lcore_id);
if (ret) {
-   RTE_LOG(ERR, POWER,
+   RTE_LOG(ERR, L3FWD_POWER,
"Library initialization failed on core %u\n",
lcore_id);
return ret;
@@ -2253,8 +2254,8 @@ init_power_library(void)
env != PM_ENV_PSTATE_CPUFREQ &&
env != PM_ENV_AMD_PSTATE_CPUFREQ &&
env != PM_ENV_CPPC_CPUFREQ) {
-   RTE_LOG(ERR, POWER,
-   "Only ACPI, PSTATE and CPPC mode are 
supported\n");
+   RTE_LOG(ERR, L3FWD_POWER,
+   "Only ACPI and PSTATE mode are supported\n");
return -1;
}
}
@@ -2271,7 +2272,7 @@ deinit_power_library(void)
/* deinit power management library */
ret = rte_power_exit(lcore_id);
if (ret) {
-   RTE_LOG(ERR, POWER,
+   RTE_LOG(ERR, L3FWD_POWER,
"Library deinitialization failed on core %u\n",
lcore_id);
return ret;
@@ -2340,7 +2341,7 @@ update_telemetry(__rte_unused struct rte_timer *tim,
ret = rte_metrics_update_values(RTE_METRICS_GLOBAL, telstats_index,
values, RTE_DIM(values));
if (ret < 0)
-   RTE_LOG(WARNING, POWER, "failed to update metrics\n");
+   RTE_LOG(WARNING, L3FWD_POWER, "failed to update metrics\n");
 }
 
 static int
@@ -2389,7 +2390,7 @@ launch_timer(unsigned int lcore_id)
rte_get_main_lcore());
}
 
-   RTE_LOG(INFO, POWER, "Bring up the Timer\n");
+   RTE_LOG(INFO, L3FWD_POWER, "Bring up the Timer\n");
 
telemetry_setup_timer();
 
@@ -2405,7 +2406,7 @@ launch_timer(unsigned int lcore_id)
}
}
 
-   RTE_LOG(INFO, POWER, "Timer_subsystem is done\n");
+   RTE_LOG(INFO, L3FWD_POWER, "Timer_subsystem is done\n");
 
return 0;
 }
-- 
2.42.0

[PATCH 09/18] power: convert RTE_LOGTYPE_POWER to dynamic type

[Stephen Hemminger]

Use dynamic log type for power library.

Signed-off-by: Stephen Hemminger 
Acked-by: David Hunt 
---
 lib/log/log.c| 1 -
 lib/log/rte_log.h| 2 +-
 lib/power/power_common.c | 2 ++
 lib/power/power_common.h | 2 ++
 lib/power/power_kvm_vm.c | 1 +
 lib/power/rte_power.c| 1 +
 lib/power/rte_power_uncore.c | 1 +
 7 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/log/log.c b/lib/log/log.c
index 49ee89ffdd97..70b3a0995e2e 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -357,7 +357,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
-   {RTE_LOGTYPE_POWER,  "lib.power"},
{RTE_LOGTYPE_METER,  "lib.meter"},
{RTE_LOGTYPE_SCHED,  "lib.sched"},
{RTE_LOGTYPE_PORT,   "lib.port"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 0c651f58b58e..0cdff28e12d6 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -36,7 +36,7 @@ extern "C" {
 #define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
 /* was RTE_LOGTYPE_KNI */
 /* was RTE_LOGTYPE_ACL */
-#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */
+/* was RTE_LOGTYPE_POWER */
 #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
 #define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */
 #define RTE_LOGTYPE_PORT  13 /**< Log related to port. */
diff --git a/lib/power/power_common.c b/lib/power/power_common.c
index 1e09facb863f..bf77eafa886b 100644
--- a/lib/power/power_common.c
+++ b/lib/power/power_common.c
@@ -12,6 +12,8 @@
 
 #include "power_common.h"
 
+RTE_LOG_REGISTER_DEFAULT(power_logtype, INFO);
+
 #define POWER_SYSFILE_SCALING_DRIVER   \
"/sys/devices/system/cpu/cpu%u/cpufreq/scaling_driver"
 #define POWER_SYSFILE_GOVERNOR  \
diff --git a/lib/power/power_common.h b/lib/power/power_common.h
index c1c713927621..c3fcbf4c1000 100644
--- a/lib/power/power_common.h
+++ b/lib/power/power_common.h
@@ -10,6 +10,8 @@
 
 #define RTE_POWER_INVALID_FREQ_INDEX (~0)
 
+extern int power_logtype;
+#define RTE_LOGTYPE_POWER power_logtype
 
 #ifdef RTE_LIBRTE_POWER_DEBUG
 #define POWER_DEBUG_TRACE(fmt, args...) \
diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c
index 6a8109d44959..db031f43105a 100644
--- a/lib/power/power_kvm_vm.c
+++ b/lib/power/power_kvm_vm.c
@@ -8,6 +8,7 @@
 
 #include "rte_power_guest_channel.h"
 #include "guest_channel.h"
+#include "power_common.h"
 #include "power_kvm_vm.h"
 
 #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent"
diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c
index 48c2e6b428d8..1502612b0a15 100644
--- a/lib/power/rte_power.c
+++ b/lib/power/rte_power.c
@@ -10,6 +10,7 @@
 #include "rte_power.h"
 #include "power_acpi_cpufreq.h"
 #include "power_cppc_cpufreq.h"
+#include "power_common.h"
 #include "power_kvm_vm.h"
 #include "power_pstate_cpufreq.h"
 #include "power_amd_pstate_cpufreq.h"
diff --git a/lib/power/rte_power_uncore.c b/lib/power/rte_power_uncore.c
index ce027bbeb829..9c20fe150d46 100644
--- a/lib/power/rte_power_uncore.c
+++ b/lib/power/rte_power_uncore.c
@@ -8,6 +8,7 @@
 #include 
 #include 
 
+#include "power_common.h"
 #include "rte_power_uncore.h"
 #include "power_intel_uncore.h"
 
-- 
2.42.0

[PATCH 11/18] mempool: convert RTE_LOGTYPE_MEMPOOL to dynamic type

[Stephen Hemminger]

Convert from RTE_LOGTYPE_MEMPOOL to logtype_mempool.

Signed-off-by: Stephen Hemminger 
---
 lib/log/log.c | 1 -
 lib/log/rte_log.h | 2 +-
 lib/mempool/rte_mempool.c | 2 ++
 lib/mempool/rte_mempool.h | 8 
 lib/mempool/version.map   | 3 +++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/log/log.c b/lib/log/log.c
index f0ab92a3cb59..f118e4c7fbaa 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -352,7 +352,6 @@ struct logtype {
 
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
-   {RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_LPM,"lib.lpm"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index f7cb85c7ab28..b0421a35954d 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -29,7 +29,7 @@ extern "C" {
 #define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
 /* was RTE_LOGTYPE_MALLOC */
 /* was RTE_LOGTYPE_RING */
-#define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
+/* was RTE_LOGTYPE_MEMPOOL */
 /* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 7a7a9bf6db63..2f8adad5ca10 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -31,6 +31,8 @@
 #include "mempool_trace.h"
 #include "rte_mempool.h"
 
+RTE_LOG_REGISTER_DEFAULT(rte_mempool_logtype, INFO);
+
 TAILQ_HEAD(rte_mempool_list, rte_tailq_entry);
 
 static struct rte_tailq_elem rte_mempool_tailq = {
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 95deade160c0..c6109732dfcf 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -176,6 +177,13 @@ struct rte_mempool_objtlr {
 
 #endif
 
+
+/**
+ * @internal Logtype used for mempool related messages.
+ */
+extern int rte_mempool_logtype;
+#define RTE_LOGTYPE_MEMPOOLrte_mempool_logtype
+
 /**
  * A list of memory where objects are stored
  */
diff --git a/lib/mempool/version.map b/lib/mempool/version.map
index d0bfedd1d875..ca6cf89ce3ea 100644
--- a/lib/mempool/version.map
+++ b/lib/mempool/version.map
@@ -57,4 +57,7 @@ INTERNAL {
# added in 21.11
rte_mempool_event_callback_register;
rte_mempool_event_callback_unregister;
+
+   # added in 23.07
+   rte_mempool_logtype;
 };
-- 
2.42.0

[PATCH 10/18] ring: convert RTE_LOGTYPE_RING to dynamic type

[Stephen Hemminger]

The logtype for ring only used in library.

Signed-off-by: Stephen Hemminger 
---
 lib/log/log.c   | 1 -
 lib/log/rte_log.h   | 2 +-
 lib/ring/rte_ring.c | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/log/log.c b/lib/log/log.c
index 70b3a0995e2e..f0ab92a3cb59 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -352,7 +352,6 @@ struct logtype {
 
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
-   {RTE_LOGTYPE_RING,   "lib.ring"},
{RTE_LOGTYPE_MEMPOOL,"lib.mempool"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 0cdff28e12d6..f7cb85c7ab28 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -28,7 +28,7 @@ extern "C" {
 /* SDK log type */
 #define RTE_LOGTYPE_EAL0 /**< Log related to eal. */
 /* was RTE_LOGTYPE_MALLOC */
-#define RTE_LOGTYPE_RING   2 /**< Log related to ring. */
+/* was RTE_LOGTYPE_RING */
 #define RTE_LOGTYPE_MEMPOOL3 /**< Log related to mempool. */
 /* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c
index 057d25ff6f2f..12046419f194 100644
--- a/lib/ring/rte_ring.c
+++ b/lib/ring/rte_ring.c
@@ -26,6 +26,9 @@
 #include "rte_ring.h"
 #include "rte_ring_elem.h"
 
+RTE_LOG_REGISTER_DEFAULT(ring_logtype, INFO);
+#define RTE_LOGTYPE_RING ring_logtype
+
 TAILQ_HEAD(rte_ring_list, rte_tailq_entry);
 
 static struct rte_tailq_elem rte_ring_tailq = {
-- 
2.42.0

[PATCH 12/18] lpm: convert RTE_LOGTYPE_LPM to dynamic types

[Stephen Hemminger]

Split lpm and lpm6 into separate log types since they
are in different files and user may want to change log
levels for IPv4 vs IPv6.

For rib and fib libraries give them own types as well.

Signed-off-by: Stephen Hemminger 
---
 lib/fib/fib_log.h  | 4 
 lib/fib/rte_fib.c  | 3 +++
 lib/fib/rte_fib6.c | 2 ++
 lib/log/log.c  | 1 -
 lib/log/rte_log.h  | 2 +-
 lib/lpm/lpm_log.h  | 4 
 lib/lpm/rte_lpm.c  | 3 +++
 lib/lpm/rte_lpm6.c | 1 +
 lib/rib/rib_log.h  | 4 
 lib/rib/rte_rib.c  | 3 +++
 lib/rib/rte_rib6.c | 3 +++
 11 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 lib/fib/fib_log.h
 create mode 100644 lib/lpm/lpm_log.h
 create mode 100644 lib/rib/rib_log.h

diff --git a/lib/fib/fib_log.h b/lib/fib/fib_log.h
new file mode 100644
index ..c731c820f621
--- /dev/null
+++ b/lib/fib/fib_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int fib_logtype;
+#define RTE_LOGTYPE_LPM fib_logtype
diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c
index 0c3b20e00a5a..f88e71a59d5a 100644
--- a/lib/fib/rte_fib.c
+++ b/lib/fib/rte_fib.c
@@ -17,6 +17,9 @@
 #include 
 
 #include "dir24_8.h"
+#include "fib_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(fib_logtype, INFO);
 
 TAILQ_HEAD(rte_fib_list, rte_tailq_entry);
 static struct rte_tailq_elem rte_fib_tailq = {
diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c
index 28c69b38999f..ab1d9604796f 100644
--- a/lib/fib/rte_fib6.c
+++ b/lib/fib/rte_fib6.c
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -17,6 +18,7 @@
 #include 
 
 #include "trie.h"
+#include "fib_log.h"
 
 TAILQ_HEAD(rte_fib6_list, rte_tailq_entry);
 static struct rte_tailq_elem rte_fib6_tailq = {
diff --git a/lib/log/log.c b/lib/log/log.c
index f118e4c7fbaa..95e0ba1c6b51 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -354,7 +354,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
-   {RTE_LOGTYPE_LPM,"lib.lpm"},
{RTE_LOGTYPE_METER,  "lib.meter"},
{RTE_LOGTYPE_SCHED,  "lib.sched"},
{RTE_LOGTYPE_PORT,   "lib.port"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index b0421a35954d..8d34ac902b39 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -33,7 +33,7 @@ extern "C" {
 /* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
 #define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
-#define RTE_LOGTYPE_LPM7 /**< Log related to LPM. */
+/* was RTE_LOGTYPE_LPM */
 /* was RTE_LOGTYPE_KNI */
 /* was RTE_LOGTYPE_ACL */
 /* was RTE_LOGTYPE_POWER */
diff --git a/lib/lpm/lpm_log.h b/lib/lpm/lpm_log.h
new file mode 100644
index ..a0621b70a5fe
--- /dev/null
+++ b/lib/lpm/lpm_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int lpm_logtype;
+#define RTE_LOGTYPE_LPM lpm_logtype
diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
index cdcd1b7f9e47..0ca82147866a 100644
--- a/lib/lpm/rte_lpm.c
+++ b/lib/lpm/rte_lpm.c
@@ -18,6 +18,9 @@
 #include 
 
 #include "rte_lpm.h"
+#include "lpm_log.h"
+
+RTE_LOG_REGISTER_DEFAULT(lpm_logtype, INFO);
 
 TAILQ_HEAD(rte_lpm_list, rte_tailq_entry);
 
diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
index 8d21aeddb83c..873cc8bc267d 100644
--- a/lib/lpm/rte_lpm6.c
+++ b/lib/lpm/rte_lpm6.c
@@ -20,6 +20,7 @@
 #include 
 
 #include "rte_lpm6.h"
+#include "lpm_log.h"
 
 #define RTE_LPM6_TBL24_NUM_ENTRIES(1 << 24)
 #define RTE_LPM6_TBL8_GROUP_NUM_ENTRIES 256
diff --git a/lib/rib/rib_log.h b/lib/rib/rib_log.h
new file mode 100644
index ..f3ee513ca854
--- /dev/null
+++ b/lib/rib/rib_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int rib_logtype;
+#define RTE_LOGTYPE_LPM rib_logtype
diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c
index 486e8216dfeb..251d0d4ef19e 100644
--- a/lib/rib/rte_rib.c
+++ b/lib/rib/rte_rib.c
@@ -16,6 +16,9 @@
 
 #include 
 
+RTE_LOG_REGISTER_DEFAULT(rib_logtype, INFO);
+#define RTE_LOGTYPE_LPM rib_logtype
+
 TAILQ_HEAD(rte_rib_list, rte_tailq_entry);
 static struct rte_tailq_elem rte_rib_tailq = {
.name = "RTE_RIB",
diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c
index 94ff434978b2..ad3d48ab8e1a 100644
--- a/lib/rib/rte_rib6.c
+++ b/lib/rib/rte_rib6.c
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -16,6 +17,8 @@
 
 #include 
 
+#include "rib_log.h"
+
 #define RTE_RIB_VALID_NODE 1
 #define RIB6_MAXDEPTH  128
 /* Maximum length of a RIB6 name. */
-- 
2.42.0

[PATCH 13/18] sched: convert RTE_LOGTYPE_SCHED to dynamic type

[Stephen Hemminger]

Also can remove unused RTE_LOGTYPE_METER

Signed-off-by: Stephen Hemminger 
---
 lib/log/log.c | 2 --
 lib/log/rte_log.h | 4 ++--
 lib/sched/rte_pie.c   | 1 +
 lib/sched/rte_sched.c | 5 +
 lib/sched/rte_sched_log.h | 4 
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 lib/sched/rte_sched_log.h

diff --git a/lib/log/log.c b/lib/log/log.c
index 95e0ba1c6b51..56877d42e6b9 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -354,8 +354,6 @@ static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
{RTE_LOGTYPE_HASH,   "lib.hash"},
-   {RTE_LOGTYPE_METER,  "lib.meter"},
-   {RTE_LOGTYPE_SCHED,  "lib.sched"},
{RTE_LOGTYPE_PORT,   "lib.port"},
{RTE_LOGTYPE_TABLE,  "lib.table"},
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 8d34ac902b39..189ad2bbd2cf 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -37,8 +37,8 @@ extern "C" {
 /* was RTE_LOGTYPE_KNI */
 /* was RTE_LOGTYPE_ACL */
 /* was RTE_LOGTYPE_POWER */
-#define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */
-#define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */
+/* was RTE_LOGTYPE_METER */
+/* was RTE_LOGTYPE_SCHED */
 #define RTE_LOGTYPE_PORT  13 /**< Log related to port. */
 #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */
 #define RTE_LOGTYPE_PIPELINE  15 /**< Log related to pipeline. */
diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c
index 947e2a059f6f..cce0ce762da8 100644
--- a/lib/sched/rte_pie.c
+++ b/lib/sched/rte_pie.c
@@ -6,6 +6,7 @@
 #include 
 #include 
 
+#include "rte_sched_log.h"
 #include "rte_pie.h"
 
 #ifdef __INTEL_COMPILER
diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index 1a6beb14f4ab..76dd8dd7388c 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -16,9 +16,12 @@
 #include 
 
 #include "rte_sched.h"
+#include "rte_sched_log.h"
 #include "rte_sched_common.h"
+
 #include "rte_approx.h"
 
+
 #ifdef __INTEL_COMPILER
 #pragma warning(disable:2259) /* conversion may lose significant bits */
 #endif
@@ -2999,3 +3002,5 @@ rte_sched_port_dequeue(struct rte_sched_port *port, 
struct rte_mbuf **pkts, uint
 
return count;
 }
+
+RTE_LOG_REGISTER_DEFAULT(sched_logtype, INFO);
diff --git a/lib/sched/rte_sched_log.h b/lib/sched/rte_sched_log.h
new file mode 100644
index ..fde051f49d62
--- /dev/null
+++ b/lib/sched/rte_sched_log.h
@@ -0,0 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+
+extern int sched_logtype;
+#define RTE_LOGTYPE_SCHED sched_logtype
-- 
2.42.0

[PATCH 14/18] examples/ipsec-secgw: replace RTE_LOGTYPE_PORT

[Stephen Hemminger]

Looks like some code got copy/paste in to the IPSEC gateway
example from another place. Shouldn't be using RTE_LOGTYPE_PORT
here.

Fixes: ec17993a145a ("examples/ipsec-secgw: support security offload")
Acked-by: Akhil Goyal 
Signed-off-by: Stephen Hemminger 
---
 examples/ipsec-secgw/sa.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 6ae0e49fd7f8..c4bac17cd77c 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -1128,7 +1128,7 @@ check_eth_dev_caps(uint16_t portid, uint32_t inbound, 
uint32_t tso)
if (inbound) {
if ((dev_info.rx_offload_capa &
RTE_ETH_RX_OFFLOAD_SECURITY) == 0) {
-   RTE_LOG(WARNING, PORT,
+   RTE_LOG(WARNING, IPSEC,
"hardware RX IPSec offload is not supported\n");
return -EINVAL;
}
@@ -1136,13 +1136,13 @@ check_eth_dev_caps(uint16_t portid, uint32_t inbound, 
uint32_t tso)
} else { /* outbound */
if ((dev_info.tx_offload_capa &
RTE_ETH_TX_OFFLOAD_SECURITY) == 0) {
-   RTE_LOG(WARNING, PORT,
+   RTE_LOG(WARNING, IPSEC,
"hardware TX IPSec offload is not supported\n");
return -EINVAL;
}
if (tso && (dev_info.tx_offload_capa &
RTE_ETH_TX_OFFLOAD_TCP_TSO) == 0) {
-   RTE_LOG(WARNING, PORT,
+   RTE_LOG(WARNING, IPSEC,
"hardware TCP TSO offload is not supported\n");
return -EINVAL;
}
-- 
2.42.0

[PATCH 15/18] app/test: remove use of RTE_LOGTYPE_PIPELINE

[Stephen Hemminger]

Instead of using static type PIPELINE for logging in test application
use stderr instead.  If not testing RTE_LOG() better to not use
it since log also goes to syslog.

Signed-off-by: Stephen Hemminger 
---
 app/test/test_table_acl.c  | 50 --
 app/test/test_table_pipeline.c | 40 +--
 2 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c
index e66f06b84d0a..dff9bddfb948 100644
--- a/app/test/test_table_acl.c
+++ b/app/test/test_table_acl.c
@@ -165,7 +165,7 @@ parse_cb_ipv4_rule(char *str, struct 
rte_table_acl_rule_add_params *v)
&v->field_value[SRC_FIELD_IPV4].value.u32,
&v->field_value[SRC_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read src address/mask: %s\n",
+   fprintf(stderr, "failed to read src address/mask: %s\n",
in[CB_FLD_SRC_ADDR]);
return rc;
}
@@ -178,7 +178,7 @@ parse_cb_ipv4_rule(char *str, struct 
rte_table_acl_rule_add_params *v)
&v->field_value[DST_FIELD_IPV4].value.u32,
&v->field_value[DST_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read dest address/mask: %s\n",
+   fprintf(stderr, "failed to read dest address/mask: %s\n",
in[CB_FLD_DST_ADDR]);
return rc;
}
@@ -190,7 +190,7 @@ parse_cb_ipv4_rule(char *str, struct 
rte_table_acl_rule_add_params *v)
&v->field_value[SRCP_FIELD_IPV4].value.u16,
&v->field_value[SRCP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read source port range: %s\n",
+   fprintf(stderr, "failed to read source port range: %s\n",
in[CB_FLD_SRC_PORT_RANGE]);
return rc;
}
@@ -202,7 +202,7 @@ parse_cb_ipv4_rule(char *str, struct 
rte_table_acl_rule_add_params *v)
&v->field_value[DSTP_FIELD_IPV4].value.u16,
&v->field_value[DSTP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read dest port range: %s\n",
+   fprintf(stderr, "failed to read dest port range: %s\n",
in[CB_FLD_DST_PORT_RANGE]);
return rc;
}
@@ -254,7 +254,7 @@ parse_cb_ipv4_rule_del(char *str, struct 
rte_table_acl_rule_delete_params *v)
&v->field_value[SRC_FIELD_IPV4].value.u32,
&v->field_value[SRC_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read src address/mask: %s\n",
+   fprintf(stderr, "failed to read src address/mask: %s\n",
in[CB_FLD_SRC_ADDR]);
return rc;
}
@@ -267,7 +267,7 @@ parse_cb_ipv4_rule_del(char *str, struct 
rte_table_acl_rule_delete_params *v)
&v->field_value[DST_FIELD_IPV4].value.u32,
&v->field_value[DST_FIELD_IPV4].mask_range.u32);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read dest address/mask: %s\n",
+   fprintf(stderr, "failed to read dest address/mask: %s\n",
in[CB_FLD_DST_ADDR]);
return rc;
}
@@ -279,7 +279,7 @@ parse_cb_ipv4_rule_del(char *str, struct 
rte_table_acl_rule_delete_params *v)
&v->field_value[SRCP_FIELD_IPV4].value.u16,
&v->field_value[SRCP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read source port range: %s\n",
+   fprintf(stderr, "failed to read source port range: %s\n",
in[CB_FLD_SRC_PORT_RANGE]);
return rc;
}
@@ -291,7 +291,7 @@ parse_cb_ipv4_rule_del(char *str, struct 
rte_table_acl_rule_delete_params *v)
&v->field_value[DSTP_FIELD_IPV4].value.u16,
&v->field_value[DSTP_FIELD_IPV4].mask_range.u16);
if (rc != 0) {
-   RTE_LOG(ERR, PIPELINE, "failed to read dest port range: %s\n",
+   fprintf(stderr, "failed to read dest port range: %s\n",
in[CB_FLD_DST_PORT_RANGE]);
return rc;
}
@@ -346,7 +346,7 @@ setup_acl_pipeline(void)
/* Pipeline configuration */
p = rte_pipeline_create(&pipeline_params);
if (p == NULL) {
-   RTE_LOG(INFO, PIPELINE, "%s: Failed to configure pipeline\n",
+   fprintf(stderr, "%s: Failed to configure pipeline\n",
__func__);
goto fail;
}
@@ -410,7 +410,7 @@ setup_acl_pipeline(void)
table_params.f_action_miss = NULL;
table_params.action_data_size = 0;
 
-   RTE_LOG(INFO, PIPELINE, 

[PATCH 16/18] hash: mover rte_thash_gfni stubs out of header file

[Stephen Hemminger]

Having stubs in header file makes it harder to update
RTE_LOG(). Also modify to only print warning once.

Signed-off-by: Stephen Hemminger 
---
 lib/hash/meson.build  |  8 ++-
 lib/hash/rte_thash_gfni.c | 47 +++
 lib/hash/rte_thash_gfni.h | 23 +--
 lib/hash/version.map  |  2 ++
 4 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 lib/hash/rte_thash_gfni.c

diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index 2f757d45f9bc..e56ee8572564 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -17,7 +17,13 @@ indirect_headers += files(
 'rte_thash_x86_gfni.h',
 )
 
-sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c', 'rte_thash.c')
+sources = files(
+'rte_cuckoo_hash.c',
+'rte_fbk_hash.c',
+'rte_thash.c',
+'rte_thash_gfni.c'
+)
+
 deps += ['net']
 deps += ['ring']
 deps += ['rcu']
diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c
new file mode 100644
index ..eb334185725c
--- /dev/null
+++ b/lib/hash/rte_thash_gfni.c
@@ -0,0 +1,47 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+
+#ifndef RTE_THASH_GFNI_DEFINED
+
+uint32_t
+rte_thash_gfni(const uint64_t *mtrx __rte_unused,
+  const uint8_t *key __rte_unused, int len __rte_unused)
+{
+   static bool warned;
+
+   if (!warned) {
+   warned = true;
+   RTE_LOG(ERR, HASH,
+   "%s is undefined under given arch\n", __func__);
+   }
+
+   return 0;
+}
+
+void
+rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused,
+   int len __rte_unused, uint8_t *tuple[] __rte_unused,
+   uint32_t val[], uint32_t num)
+{
+   unsigned int i;
+
+   static bool warned;
+
+   if (!warned) {
+   warned = true;
+   RTE_LOG(ERR, HASH,
+   "%s is undefined under given arch\n", __func__);
+   }
+
+   for (i = 0; i < num; i++)
+   val[i] = 0;
+}
+
+#endif
diff --git a/lib/hash/rte_thash_gfni.h b/lib/hash/rte_thash_gfni.h
index cd253459e7da..4e5388a1bf65 100644
--- a/lib/hash/rte_thash_gfni.h
+++ b/lib/hash/rte_thash_gfni.h
@@ -33,13 +33,8 @@ extern "C" {
  * @return
  *  Calculated Toeplitz hash value.
  */
-static inline uint32_t
-rte_thash_gfni(const uint64_t *mtrx __rte_unused,
-   const uint8_t *key __rte_unused, int len __rte_unused)
-{
-   RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__);
-   return 0;
-}
+uint32_t
+rte_thash_gfni(const uint64_t *mtrx, const uint8_t *key, int len);
 
 /**
  * Bulk implementation for Toeplitz hash.
@@ -58,17 +53,9 @@ rte_thash_gfni(const uint64_t *mtrx __rte_unused,
  * @param num
  *  Number of tuples to hash.
  */
-static inline void
-rte_thash_gfni_bulk(const uint64_t *mtrx __rte_unused,
-   int len __rte_unused, uint8_t *tuple[] __rte_unused,
-   uint32_t val[], uint32_t num)
-{
-   unsigned int i;
-
-   RTE_LOG(ERR, HASH, "%s is undefined under given arch\n", __func__);
-   for (i = 0; i < num; i++)
-   val[i] = 0;
-}
+void
+rte_thash_gfni_bulk(const uint64_t *mtrx, int len, uint8_t *tuple[],
+   uint32_t val[], uint32_t num);
 
 #endif /* RTE_THASH_GFNI_DEFINED */
 
diff --git a/lib/hash/version.map b/lib/hash/version.map
index b98b64a1638a..56a0cbd4b8a5 100644
--- a/lib/hash/version.map
+++ b/lib/hash/version.map
@@ -39,6 +39,8 @@ DPDK_24 {
rte_thash_get_gfni_matrices;
rte_thash_get_helper;
rte_thash_get_key;
+   rte_thash_gfni;
+   rte_thash_gfni_bulk;
rte_thash_gfni_supported;
rte_thash_init_ctx;
 
-- 
2.42.0

[PATCH 17/18] hash: move rte_hash_set_alg out of header file

[Stephen Hemminger]

The code for setting algorithm for hash is not at all perf sensitive,
and doing it inline has a couple of problems. First, it means that if
multiple files include the header, then the initialization gets done
multiple times. But also, it makes it harder to fix usage of RTE_LOG().

Despite what the checking script say. This is not an ABI change, the
previous version inlined the same code; therefore both old and new code
will work the same.

Signed-off-by: Stephen Hemminger 
Acked-by: Ruifeng Wang 
---
 lib/hash/meson.build |  1 +
 lib/hash/rte_crc_arm64.h |  8 ++---
 lib/hash/rte_crc_x86.h   | 10 +++---
 lib/hash/rte_hash_crc.c  | 68 
 lib/hash/rte_hash_crc.h  | 48 ++--
 lib/hash/version.map |  7 +
 6 files changed, 88 insertions(+), 54 deletions(-)
 create mode 100644 lib/hash/rte_hash_crc.c

diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index e56ee8572564..c345c6f561fc 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -19,6 +19,7 @@ indirect_headers += files(
 
 sources = files(
 'rte_cuckoo_hash.c',
+'rte_hash_crc.c',
 'rte_fbk_hash.c',
 'rte_thash.c',
 'rte_thash_gfni.c'
diff --git a/lib/hash/rte_crc_arm64.h b/lib/hash/rte_crc_arm64.h
index c9f52510871b..414fe065caa8 100644
--- a/lib/hash/rte_crc_arm64.h
+++ b/lib/hash/rte_crc_arm64.h
@@ -53,7 +53,7 @@ crc32c_arm64_u64(uint64_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_1byte(uint8_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_ARM64))
+   if (likely(rte_hash_crc32_alg & CRC32_ARM64))
return crc32c_arm64_u8(data, init_val);
 
return crc32c_1byte(data, init_val);
@@ -67,7 +67,7 @@ rte_hash_crc_1byte(uint8_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_2byte(uint16_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_ARM64))
+   if (likely(rte_hash_crc32_alg & CRC32_ARM64))
return crc32c_arm64_u16(data, init_val);
 
return crc32c_2bytes(data, init_val);
@@ -81,7 +81,7 @@ rte_hash_crc_2byte(uint16_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_4byte(uint32_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_ARM64))
+   if (likely(rte_hash_crc32_alg & CRC32_ARM64))
return crc32c_arm64_u32(data, init_val);
 
return crc32c_1word(data, init_val);
@@ -95,7 +95,7 @@ rte_hash_crc_4byte(uint32_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_8byte(uint64_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_ARM64))
+   if (likely(rte_hash_crc32_alg & CRC32_ARM64))
return crc32c_arm64_u64(data, init_val);
 
return crc32c_2words(data, init_val);
diff --git a/lib/hash/rte_crc_x86.h b/lib/hash/rte_crc_x86.h
index 205bc182be77..3b865e251db2 100644
--- a/lib/hash/rte_crc_x86.h
+++ b/lib/hash/rte_crc_x86.h
@@ -67,7 +67,7 @@ crc32c_sse42_u64(uint64_t data, uint64_t init_val)
 static inline uint32_t
 rte_hash_crc_1byte(uint8_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_SSE42))
+   if (likely(rte_hash_crc32_alg & CRC32_SSE42))
return crc32c_sse42_u8(data, init_val);
 
return crc32c_1byte(data, init_val);
@@ -81,7 +81,7 @@ rte_hash_crc_1byte(uint8_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_2byte(uint16_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_SSE42))
+   if (likely(rte_hash_crc32_alg & CRC32_SSE42))
return crc32c_sse42_u16(data, init_val);
 
return crc32c_2bytes(data, init_val);
@@ -95,7 +95,7 @@ rte_hash_crc_2byte(uint16_t data, uint32_t init_val)
 static inline uint32_t
 rte_hash_crc_4byte(uint32_t data, uint32_t init_val)
 {
-   if (likely(crc32_alg & CRC32_SSE42))
+   if (likely(rte_hash_crc32_alg & CRC32_SSE42))
return crc32c_sse42_u32(data, init_val);
 
return crc32c_1word(data, init_val);
@@ -110,11 +110,11 @@ static inline uint32_t
 rte_hash_crc_8byte(uint64_t data, uint32_t init_val)
 {
 #ifdef RTE_ARCH_X86_64
-   if (likely(crc32_alg == CRC32_SSE42_x64))
+   if (likely(rte_hash_crc32_alg == CRC32_SSE42_x64))
return crc32c_sse42_u64(data, init_val);
 #endif
 
-   if (likely(crc32_alg & CRC32_SSE42))
+   if (likely(rte_hash_crc32_alg & CRC32_SSE42))
return crc32c_sse42_u64_mimic(data, init_val);
 
return crc32c_2words(data, init_val);
diff --git a/lib/hash/rte_hash_crc.c b/lib/hash/rte_hash_crc.c
new file mode 100644
index ..1439d8a71f6a
--- /dev/null
+++ b/lib/hash/rte_hash_crc.c
@@ -0,0 +1,68 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include 
+#include 
+
+#include "rte_hash_crc.h"
+
+RTE_LOG_REGISTER_SUFFIX(hash_crc_logtype, crc, INFO);
+#define RTE_LOGTYPE_HASH_CRC hash_crc_logtype
+
+uint8_t rte_hash_crc32_alg = CRC32_SW;
+

[PATCH 18/18] hash: convert RTE_LOGTYPE_HASH to dynamic type

[Stephen Hemminger]

Use dynamic type for hash and add subtypes for crc and gfni.

Signed-off-by: Stephen Hemminger 
---
 lib/hash/rte_cuckoo_hash.c | 5 +
 lib/hash/rte_fbk_hash.c| 5 +
 lib/hash/rte_thash.c   | 3 +++
 lib/hash/rte_thash_gfni.c  | 3 +++
 lib/log/log.c  | 1 -
 lib/log/rte_log.h  | 2 +-
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index ccdc3b989489..8e4364f060a3 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -24,6 +24,11 @@
 #include 
 
 #include "rte_hash.h"
+
+/* needs to be before rte_cuckoo_hash.h */
+RTE_LOG_REGISTER_DEFAULT(hash_logtype, INFO);
+#define RTE_LOGTYPE_HASH hash_logtype
+
 #include "rte_cuckoo_hash.h"
 
 /* Mask of all flags supported by this version */
diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
index 538b23a4030a..b4c4c191abdc 100644
--- a/lib/hash/rte_fbk_hash.c
+++ b/lib/hash/rte_fbk_hash.c
@@ -8,6 +8,8 @@
 #include 
 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -18,6 +20,9 @@
 
 #include "rte_fbk_hash.h"
 
+RTE_LOG_REGISTER_SUFFIX(fbk_hash_logtype, fbk, INFO);
+#define RTE_LOGTYPE_HASH fbk_hash_logtype
+
 TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry);
 
 static struct rte_tailq_elem rte_fbk_hash_tailq = {
diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 4ff567ee5adf..d81984f4 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -13,6 +13,9 @@
 #include 
 #include 
 
+RTE_LOG_REGISTER_SUFFIX(thash_logtype, thash, INFO);
+#define RTE_LOGTYPE_HASH thash_logtype
+
 #define THASH_NAME_LEN 64
 #define TOEPLITZ_HASH_LEN  32
 
diff --git a/lib/hash/rte_thash_gfni.c b/lib/hash/rte_thash_gfni.c
index eb334185725c..35206d575153 100644
--- a/lib/hash/rte_thash_gfni.c
+++ b/lib/hash/rte_thash_gfni.c
@@ -10,6 +10,9 @@
 
 #ifndef RTE_THASH_GFNI_DEFINED
 
+RTE_LOG_REGISTER_SUFFIX(hash_gfni_logtype, gfni, INFO);
+#define RTE_LOGTYPE_HASH hash_gfni_logtype
+
 uint32_t
 rte_thash_gfni(const uint64_t *mtrx __rte_unused,
   const uint8_t *key __rte_unused, int len __rte_unused)
diff --git a/lib/log/log.c b/lib/log/log.c
index 56877d42e6b9..e3cd4cff0fbc 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -353,7 +353,6 @@ struct logtype {
 static const struct logtype logtype_strings[] = {
{RTE_LOGTYPE_EAL,"lib.eal"},
{RTE_LOGTYPE_PMD,"pmd"},
-   {RTE_LOGTYPE_HASH,   "lib.hash"},
{RTE_LOGTYPE_PORT,   "lib.port"},
{RTE_LOGTYPE_TABLE,  "lib.table"},
{RTE_LOGTYPE_PIPELINE,   "lib.pipeline"},
diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h
index 189ad2bbd2cf..27fb6129a7aa 100644
--- a/lib/log/rte_log.h
+++ b/lib/log/rte_log.h
@@ -32,7 +32,7 @@ extern "C" {
 /* was RTE_LOGTYPE_MEMPOOL */
 /* was RTE_LOGTYPE_TIMER */
 #define RTE_LOGTYPE_PMD5 /**< Log related to poll mode driver. */
-#define RTE_LOGTYPE_HASH   6 /**< Log related to hash table. */
+/* was RTE_LOGTYPE_HASH */
 /* was RTE_LOGTYPE_LPM */
 /* was RTE_LOGTYPE_KNI */
 /* was RTE_LOGTYPE_ACL */
-- 
2.42.0

Re: [PATCH v3 0/7] fix race-condition of proactive error handling mode

[fengchengwen]

Hi Ferruh,

I notice this patchset was delegated to you, so could you take a view?

Thanks.

On 2023/11/6 21:11, Chengwen Feng wrote:
> This patch fixes race-condition of proactive error handling mode, the
> discussion thread [1].
> 
> [1] 
> http://patchwork.dpdk.org/project/dpdk/patch/20230220060839.1267349-2-ashok.k.kal...@intel.com/
> 
> Chengwen Feng (7):
>   ethdev: fix race-condition of proactive error handling mode
>   net/hns3: replace fp ops config function
>   net/bnxt: fix race-condition when report error recovery
>   net/bnxt: use fp ops setup function
>   app/testpmd: add error recovery usage demo
>   app/testpmd: extract event handling to event.c
>   doc: testpmd support event handling section
> 
> ---
> v3:
> - adjust the usage of RTE_ETH_EVENT_QUEUE_STATE in 7/7 commit.
> - add ack-by from Konstantin Ananyev, Ajit Khaparde and Huisong Li.
> v2:
> - extract event handling to event.c and document it, which address
>   Ferruh's comment.
> - add ack-by from Konstantin Ananyev and Dongdong Liu.
> 
>  app/test-pmd/event.c | 390 +++
>  app/test-pmd/meson.build |   1 +
>  app/test-pmd/parameters.c|  36 +-
>  app/test-pmd/testpmd.c   | 247 +---
>  app/test-pmd/testpmd.h   |  10 +-
>  doc/guides/prog_guide/poll_mode_drv.rst  |  20 +-
>  doc/guides/testpmd_app_ug/event_handling.rst |  81 
>  doc/guides/testpmd_app_ug/index.rst  |   1 +
>  drivers/net/bnxt/bnxt_cpr.c  |  18 +-
>  drivers/net/bnxt/bnxt_ethdev.c   |   9 +-
>  drivers/net/hns3/hns3_rxtx.c |  21 +-
>  lib/ethdev/ethdev_driver.c   |   8 +
>  lib/ethdev/ethdev_driver.h   |  10 +
>  lib/ethdev/rte_ethdev.h  |  32 +-
>  lib/ethdev/version.map   |   1 +
>  15 files changed, 552 insertions(+), 333 deletions(-)
>  create mode 100644 app/test-pmd/event.c
>  create mode 100644 doc/guides/testpmd_app_ug/event_handling.rst
> 

[PATCH v2 00/11] Add basic flow support for corenic firmware

[Chaoyong He]

Add the very basic rte_flow support for corenic firmware.

---
v2:
* Update the 'nfp.ini' document.
* Rebase to the latest main branch.
---

Chaoyong He (11):
  net/nfp: move some source files
  net/nfp: add the structures and functions for flow offload
  net/nfp: add the control message channel
  net/nfp: support flow API for CoreNIC firmware
  net/nfp: support Ethernet flow item
  net/nfp: support drop flow action
  net/nfp: support IPv4 flow item
  net/nfp: support IPv6 flow item
  net/nfp: support TCP/UDP/SCTP flow items
  net/nfp: support MARK flow action
  net/nfp: support QUEUE flow action

 doc/guides/nics/features/nfp.ini  |2 +
 drivers/common/nfp/nfp_common_ctrl.h  |2 +
 drivers/net/nfp/flower/nfp_conntrack.h|2 +-
 drivers/net/nfp/flower/nfp_flower_cmsg.h  |2 +-
 .../{nfp_flow.c => flower/nfp_flower_flow.c}  |4 +-
 .../{nfp_flow.h => flower/nfp_flower_flow.h}  |   10 +-
 .../net/nfp/flower/nfp_flower_representor.c   |2 +-
 drivers/net/nfp/meson.build   |4 +-
 drivers/net/nfp/nfp_ethdev.c  |   28 +-
 drivers/net/nfp/nfp_net_cmsg.c|   66 ++
 drivers/net/nfp/nfp_net_cmsg.h|  176 +++
 drivers/net/nfp/nfp_net_common.h  |   12 +
 drivers/net/nfp/nfp_net_ctrl.h|1 +
 drivers/net/nfp/nfp_net_flow.c| 1017 +
 drivers/net/nfp/nfp_net_flow.h|   30 +
 drivers/net/nfp/nfp_rxtx.c|   18 +
 16 files changed, 1359 insertions(+), 17 deletions(-)
 rename drivers/net/nfp/{nfp_flow.c => flower/nfp_flower_flow.c} (99%)
 rename drivers/net/nfp/{nfp_flow.h => flower/nfp_flower_flow.h} (96%)
 create mode 100644 drivers/net/nfp/nfp_net_cmsg.c
 create mode 100644 drivers/net/nfp/nfp_net_cmsg.h
 create mode 100644 drivers/net/nfp/nfp_net_flow.c
 create mode 100644 drivers/net/nfp/nfp_net_flow.h

-- 
2.39.1

[PATCH v2 01/11] net/nfp: move some source files

[Chaoyong He]

Rename module 'nfp_flow' into 'nfp_flower_flow' and move the source
files into the 'flower' sub-directory.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/flower/nfp_conntrack.h |  2 +-
 drivers/net/nfp/flower/nfp_flower_cmsg.h   |  2 +-
 .../net/nfp/{nfp_flow.c => flower/nfp_flower_flow.c}   |  4 ++--
 .../net/nfp/{nfp_flow.h => flower/nfp_flower_flow.h}   | 10 +-
 drivers/net/nfp/flower/nfp_flower_representor.c|  2 +-
 drivers/net/nfp/meson.build|  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename drivers/net/nfp/{nfp_flow.c => flower/nfp_flower_flow.c} (99%)
 rename drivers/net/nfp/{nfp_flow.h => flower/nfp_flower_flow.h} (96%)

diff --git a/drivers/net/nfp/flower/nfp_conntrack.h 
b/drivers/net/nfp/flower/nfp_conntrack.h
index 5abab4e984..9bfca236ed 100644
--- a/drivers/net/nfp/flower/nfp_conntrack.h
+++ b/drivers/net/nfp/flower/nfp_conntrack.h
@@ -11,7 +11,7 @@
 #include 
 #include 
 
-#include "../nfp_flow.h"
+#include "nfp_flower_flow.h"
 
 struct nfp_ct_map_entry;
 
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h 
b/drivers/net/nfp/flower/nfp_flower_cmsg.h
index c2938fb6f6..45543816ae 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
@@ -6,8 +6,8 @@
 #ifndef __NFP_CMSG_H__
 #define __NFP_CMSG_H__
 
-#include "../nfp_flow.h"
 #include "nfp_flower.h"
+#include "nfp_flower_flow.h"
 
 struct nfp_flower_cmsg_hdr {
rte_be16_t pad;
diff --git a/drivers/net/nfp/nfp_flow.c 
b/drivers/net/nfp/flower/nfp_flower_flow.c
similarity index 99%
rename from drivers/net/nfp/nfp_flow.c
rename to drivers/net/nfp/flower/nfp_flower_flow.c
index f832b52d89..e26be30d18 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/flower/nfp_flower_flow.c
@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 
-#include "nfp_flow.h"
+#include "nfp_flower_flow.h"
 
 #include 
 #include 
@@ -4318,7 +4318,7 @@ static const struct rte_flow_ops nfp_flow_ops = {
 };
 
 int
-nfp_net_flow_ops_get(struct rte_eth_dev *dev,
+nfp_flow_ops_get(struct rte_eth_dev *dev,
const struct rte_flow_ops **ops)
 {
if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) == 0) {
diff --git a/drivers/net/nfp/nfp_flow.h 
b/drivers/net/nfp/flower/nfp_flower_flow.h
similarity index 96%
rename from drivers/net/nfp/nfp_flow.h
rename to drivers/net/nfp/flower/nfp_flower_flow.h
index 09e5b30dd8..75f18c6bd5 100644
--- a/drivers/net/nfp/nfp_flow.h
+++ b/drivers/net/nfp/flower/nfp_flower_flow.h
@@ -3,10 +3,10 @@
  * All rights reserved.
  */
 
-#ifndef __NFP_FLOW_H__
-#define __NFP_FLOW_H__
+#ifndef __NFP_FLOWER_FLOW_H__
+#define __NFP_FLOWER_FLOW_H__
 
-#include "nfp_net_common.h"
+#include "../nfp_net_common.h"
 
 /* The firmware expects lengths in units of long words */
 #define NFP_FL_LW_SIZ   2
@@ -182,7 +182,7 @@ struct nfp_flower_representor;
 
 int nfp_flow_priv_init(struct nfp_pf_dev *pf_dev);
 void nfp_flow_priv_uninit(struct nfp_pf_dev *pf_dev);
-int nfp_net_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops 
**ops);
+int nfp_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops);
 bool nfp_flow_inner_item_get(const struct rte_flow_item items[],
const struct rte_flow_item **inner_item);
 struct rte_flow *nfp_flow_process(struct nfp_flower_representor *representor,
@@ -202,4 +202,4 @@ int nfp_flow_destroy(struct rte_eth_dev *dev,
struct rte_flow *nfp_flow,
struct rte_flow_error *error);
 
-#endif /* __NFP_FLOW_H__ */
+#endif /* __NFP_FLOWER_FLOW_H__ */
diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c 
b/drivers/net/nfp/flower/nfp_flower_representor.c
index 02089d390e..7d8c055b80 100644
--- a/drivers/net/nfp/flower/nfp_flower_representor.c
+++ b/drivers/net/nfp/flower/nfp_flower_representor.c
@@ -435,7 +435,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = {
.mac_addr_set = nfp_flower_repr_mac_addr_set,
.fw_version_get   = nfp_net_firmware_version_get,
 
-   .flow_ops_get = nfp_net_flow_ops_get,
+   .flow_ops_get = nfp_flow_ops_get,
.mtr_ops_get  = nfp_net_mtr_ops_get,
 };
 
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index cf9c16266d..8407073af8 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -11,6 +11,7 @@ sources = files(
 'flower/nfp_flower.c',
 'flower/nfp_flower_cmsg.c',
 'flower/nfp_flower_ctrl.c',
+'flower/nfp_flower_flow.c',
 'flower/nfp_flower_representor.c',
 'nfd3/nfp_nfd3_dp.c',
 'nfdk/nfp_nfdk_dp.c',
@@ -30,7 +31,6 @@ sources = files(
 'nfp_cpp_bridge.c',
 'nfp_ethdev.c',
 'nfp_ethdev_vf.c',
-'nfp_flow.c',
 'nfp_ipsec.c',
 'nfp_logs.c',
 'nfp_mtr.c',
-- 
2.39.1

[PATCH v2 02/11] net/nfp: add the structures and functions for flow offload

[Chaoyong He]

Add the structures and functions to process flow table, which is used in
the rte_flow offload logics.
This module is used for the CoreNIC firmware.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/common/nfp/nfp_common_ctrl.h |   1 +
 drivers/net/nfp/meson.build  |   1 +
 drivers/net/nfp/nfp_ethdev.c |  27 -
 drivers/net/nfp/nfp_net_common.h |  11 ++
 drivers/net/nfp/nfp_net_flow.c   | 166 +++
 drivers/net/nfp/nfp_net_flow.h   |  28 +
 6 files changed, 228 insertions(+), 6 deletions(-)
 create mode 100644 drivers/net/nfp/nfp_net_flow.c
 create mode 100644 drivers/net/nfp/nfp_net_flow.h

diff --git a/drivers/common/nfp/nfp_common_ctrl.h 
b/drivers/common/nfp/nfp_common_ctrl.h
index d09fd2b892..cbde987736 100644
--- a/drivers/common/nfp/nfp_common_ctrl.h
+++ b/drivers/common/nfp/nfp_common_ctrl.h
@@ -223,6 +223,7 @@ struct nfp_net_fw_ver {
 #define NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP  (0x1 << 3) /**< SA short match 
lookup */
 #define NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP  (0x1 << 4) /**< SA long match lookup 
*/
 #define NFP_NET_CFG_CTRL_MULTI_PF (0x1 << 5)
+#define NFP_NET_CFG_CTRL_FLOW_STEER   (0x1 << 8) /**< Flow Steering */
 #define NFP_NET_CFG_CTRL_IN_ORDER (0x1 << 11) /**< Virtio in-order 
flag */
 
 #define NFP_NET_CFG_CAP_WORD1   0x00a4
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 8407073af8..0d0a0bd8f4 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -36,6 +36,7 @@ sources = files(
 'nfp_mtr.c',
 'nfp_net_common.c',
 'nfp_net_ctrl.c',
+'nfp_net_flow.c',
 'nfp_rxtx.c',
 )
 
diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 537b4fe792..d0a1950ff3 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -23,6 +23,7 @@
 #include "nfp_cpp_bridge.h"
 #include "nfp_ipsec.h"
 #include "nfp_logs.h"
+#include "nfp_net_flow.h"
 
 #define NFP_PF_DRIVER_NAME net_nfp_pf
 
@@ -151,6 +152,10 @@ nfp_net_start(struct rte_eth_dev *dev)
ctrl_extend |= NFP_NET_CFG_CTRL_IPSEC_SM_LOOKUP
| NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;
 
+   /* Enable flow steer by extend ctrl word1. */
+   if ((cap_extend & NFP_NET_CFG_CTRL_FLOW_STEER) != 0)
+   ctrl_extend |= NFP_NET_CFG_CTRL_FLOW_STEER;
+
update = NFP_NET_CFG_UPDATE_GEN;
if (nfp_ext_reconfig(hw, ctrl_extend, update) != 0)
return -EIO;
@@ -323,6 +328,10 @@ nfp_net_uninit(struct rte_eth_dev *eth_dev)
struct nfp_net_hw *net_hw;
 
net_hw = eth_dev->data->dev_private;
+
+   if ((net_hw->super.cap_ext & NFP_NET_CFG_CTRL_FLOW_STEER) != 0)
+   nfp_net_flow_priv_uninit(net_hw->pf_dev, net_hw->idx);
+
rte_free(net_hw->eth_xstats_base);
nfp_ipsec_uninit(eth_dev);
if (net_hw->mac_stats_area != NULL)
@@ -762,6 +771,14 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
/* Recording current stats counters values */
nfp_net_stats_reset(eth_dev);
 
+   if ((hw->cap_ext & NFP_NET_CFG_CTRL_FLOW_STEER) != 0) {
+   err = nfp_net_flow_priv_init(pf_dev, port);
+   if (err != 0) {
+   PMD_INIT_LOG(ERR, "Init net flow priv failed");
+   goto xstats_free;
+   }
+   }
+
return 0;
 
 xstats_free:
@@ -1195,13 +1212,11 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev,
 port_cleanup:
for (i = 0; i < app_fw_nic->total_phyports; i++) {
id = nfp_function_id_get(pf_dev, i);
+   hw = app_fw_nic->ports[id];
 
-   if (app_fw_nic->ports[id] != NULL &&
-   app_fw_nic->ports[id]->eth_dev != NULL) {
-   struct rte_eth_dev *tmp_dev;
-   tmp_dev = app_fw_nic->ports[id]->eth_dev;
-   nfp_net_uninit(tmp_dev);
-   rte_eth_dev_release_port(tmp_dev);
+   if (hw != NULL && hw->eth_dev != NULL) {
+   nfp_net_uninit(hw->eth_dev);
+   rte_eth_dev_release_port(hw->eth_dev);
}
}
nfp_cpp_area_release_free(pf_dev->ctrl_area);
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index ded491cbdc..eb668a1505 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -108,6 +108,14 @@ struct nfp_pf_dev {
struct nfp_multi_pf multi_pf;
 };
 
+#define NFP_NET_FLOW_LIMIT1024
+
+struct nfp_net_priv {
+   uint32_t hash_seed; /**< Hash seed for hash tables in this structure. */
+   struct rte_hash *flow_table; /**< Hash table to store flow rules. */
+   uint16_t flow_count; /**< Flow count in hash table */
+};
+
 struct nfp_app_fw_nic {
/** Backpointer to the PF device */
struct nfp_pf_dev *pf_de

Re: [PATCH 0/7] refactor kvargs test

[fengchengwen]

Hi Thomas,

  Could you please apply the commits 1~6 ? There commits are independent and 
could use for current code.

Thanks

On 2023/11/3 17:53, Chengwen Feng wrote:
> When developing patchset [1], I found the kvargs test is hard to 
> understand when tried to add some testcase.
> 
> So refactor kvargs by:
> 1. introduce UT suite framework.
> 2. extract big test_valid_kvargs() to five part.
> 
> And add myself for voluntary maintenance of the kvargs library.
> 
> Note: to ensure patch independenct, new API which in patchset [1]
> are not included in this patchset.
> 
> [1] 
> https://patchwork.dpdk.org/project/dpdk/cover/20231103073811.13196-1-fengcheng...@huawei.com/
> 
> Chengwen Feng (7):
>   app/test: introduce UT suite framework for kvargs
>   app/test: extract basic token count testcase for kvargs
>   app/test: extract without keys testcase for kvargs
>   app/test: extract with keys testcase for kvargs
>   app/test: extract parse list value testcase for kvargs
>   app/test: extract parse empty elements testcase for kvargs
>   maintainers: update for kvargs library
> 
>  MAINTAINERS|   1 +
>  app/test/test_kvargs.c | 256 -
>  2 files changed, 128 insertions(+), 129 deletions(-)
> 

[PATCH v2 03/11] net/nfp: add the control message channel

[Chaoyong He]

Using the mailbox, which serves as the control message channel
between driver and CoreNIC firmware.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/meson.build|  1 +
 drivers/net/nfp/nfp_net_cmsg.c | 66 ++
 drivers/net/nfp/nfp_net_cmsg.h | 37 +++
 drivers/net/nfp/nfp_net_ctrl.h |  1 +
 4 files changed, 105 insertions(+)
 create mode 100644 drivers/net/nfp/nfp_net_cmsg.c
 create mode 100644 drivers/net/nfp/nfp_net_cmsg.h

diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 0d0a0bd8f4..46be6f60cd 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -34,6 +34,7 @@ sources = files(
 'nfp_ipsec.c',
 'nfp_logs.c',
 'nfp_mtr.c',
+'nfp_net_cmsg.c',
 'nfp_net_common.c',
 'nfp_net_ctrl.c',
 'nfp_net_flow.c',
diff --git a/drivers/net/nfp/nfp_net_cmsg.c b/drivers/net/nfp/nfp_net_cmsg.c
new file mode 100644
index 00..f2f694be0b
--- /dev/null
+++ b/drivers/net/nfp/nfp_net_cmsg.c
@@ -0,0 +1,66 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Corigine, Inc.
+ * All rights reserved.
+ */
+
+#include "nfp_net_cmsg.h"
+
+#include 
+
+#include "nfp_logs.h"
+
+struct nfp_net_cmsg *
+nfp_net_cmsg_alloc(uint32_t msg_size)
+{
+   struct nfp_net_cmsg *cmsg;
+
+   cmsg = rte_zmalloc(NULL, msg_size, 0);
+   if (cmsg == NULL) {
+   PMD_DRV_LOG(ERR, "Failed malloc memory.");
+   return NULL;
+   }
+
+   return cmsg;
+}
+
+void
+nfp_net_cmsg_free(struct nfp_net_cmsg *cmsg)
+{
+   rte_free(cmsg);
+}
+
+int
+nfp_net_cmsg_xmit(struct nfp_net_hw *hw,
+   struct nfp_net_cmsg *cmsg,
+   uint32_t msg_size)
+{
+   int ret;
+   uint32_t i;
+
+   for (i = 0; i < msg_size; i++)
+   nn_cfg_writel(&hw->super, NFP_NET_CFG_MBOX_VAL + 4 * i, 
*((uint32_t *)cmsg + i));
+
+   ret = nfp_net_mbox_reconfig(hw, NFP_NET_CFG_MBOX_CMD_FLOW_STEER);
+   switch (ret) {
+   case NFP_NET_CFG_MBOX_RET_FS_OK:
+   break;
+   case NFP_NET_CFG_MBOX_RET_FS_ERR_NO_SPACE:
+   PMD_DRV_LOG(ERR, "Not enough space for cmd %u", cmsg->cmd);
+   ret = -ENOSPC;
+   break;
+   case NFP_NET_CFG_MBOX_RET_FS_ERR_MASK_FULL:
+   PMD_DRV_LOG(ERR, "The mask table is full for cmd %u", 
cmsg->cmd);
+   ret = -EXFULL;
+   break;
+   case NFP_NET_CFG_MBOX_RET_FS_ERR_CMD_INVALID:
+   PMD_DRV_LOG(ERR, "The mbox cmd %u invalid", cmsg->cmd);
+   ret = -EINVAL;
+   break;
+   default:
+   PMD_DRV_LOG(ERR, "Unrecognized mbox cmd %u", cmsg->cmd);
+   ret = -EINVAL;
+   break;
+   }
+
+   return ret;
+}
diff --git a/drivers/net/nfp/nfp_net_cmsg.h b/drivers/net/nfp/nfp_net_cmsg.h
new file mode 100644
index 00..15e0bb60d8
--- /dev/null
+++ b/drivers/net/nfp/nfp_net_cmsg.h
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Corigine, Inc.
+ * All rights reserved.
+ */
+
+#ifndef __NFP_NET_CMSG_H__
+#define __NFP_NET_CMSG_H__
+
+#include "nfp_net_common.h"
+
+enum nfp_net_cfg_mbox_cmd {
+   NFP_NET_CFG_MBOX_CMD_FS_ADD_V4,   /* Add Flow Steer rule for V4 
table */
+   NFP_NET_CFG_MBOX_CMD_FS_DEL_V4,   /* Delete Flow Steer rule for V4 
table */
+   NFP_NET_CFG_MBOX_CMD_FS_ADD_V6,   /* Add Flow Steer rule for V4 
table */
+   NFP_NET_CFG_MBOX_CMD_FS_DEL_V6,   /* Delete Flow Steer rule for V4 
table */
+   NFP_NET_CFG_MBOX_CMD_FS_ADD_ETHTYPE,  /* Add Flow Steer rule for 
Ethtype table */
+   NFP_NET_CFG_MBOX_CMD_FS_DEL_ETHTYPE,  /* Delete Flow Steer rule for 
Ethtype table */
+};
+
+enum nfp_net_cfg_mbox_ret {
+   NFP_NET_CFG_MBOX_RET_FS_OK,   /* No error happen */
+   NFP_NET_CFG_MBOX_RET_FS_ERR_NO_SPACE, /* Return error code no space 
*/
+   NFP_NET_CFG_MBOX_RET_FS_ERR_MASK_FULL,/* Return error code mask 
table full */
+   NFP_NET_CFG_MBOX_RET_FS_ERR_CMD_INVALID,  /* Return error code invalid 
cmd */
+};
+
+/* 4B cmd, and up to 500B data. */
+struct nfp_net_cmsg {
+   uint32_t cmd; /**< One of nfp_net_cfg_mbox_cmd */
+   uint32_t data[0];
+};
+
+struct nfp_net_cmsg *nfp_net_cmsg_alloc(uint32_t msg_size);
+void nfp_net_cmsg_free(struct nfp_net_cmsg *cmsg);
+int nfp_net_cmsg_xmit(struct nfp_net_hw *hw, struct nfp_net_cmsg *cmsg, 
uint32_t msg_size);
+
+#endif /* __NFP_NET_CMSG_H__ */
diff --git a/drivers/net/nfp/nfp_net_ctrl.h b/drivers/net/nfp/nfp_net_ctrl.h
index ee1b784bb1..7ac0f89571 100644
--- a/drivers/net/nfp/nfp_net_ctrl.h
+++ b/drivers/net/nfp/nfp_net_ctrl.h
@@ -92,6 +92,7 @@
 #define NFP_NET_CFG_MBOX_SIMPLE_VAL   0x8
 
 #define NFP_NET_CFG_MBOX_CMD_IPSEC3
+#define NFP_NET_CFG_MBOX_CMD_FLOW_STEER   10
 
 /*
  * TLV capabilities
-- 
2.39.1

[PATCH v2 04/11] net/nfp: support flow API for CoreNIC firmware

[Chaoyong He]

Add the flow validate/create/destroy/flush API of nfp PMD with CoreNIC
firmware.

The flow create API construct a control cmsg and send it to
firmware, then add this flow to the hash table.

The flow destroy API construct a control cmsg and send it to
firmware, then delete this flow from the hash table.

The flow flush API just iterate the flows in hash table and
call the flow destroy API.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_ethdev.c |   1 +
 drivers/net/nfp/nfp_net_cmsg.h   |  28 +++
 drivers/net/nfp/nfp_net_common.h |   1 +
 drivers/net/nfp/nfp_net_flow.c   | 409 ++-
 drivers/net/nfp/nfp_net_flow.h   |   2 +
 5 files changed, 434 insertions(+), 7 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index d0a1950ff3..336d18491e 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -604,6 +604,7 @@ static const struct eth_dev_ops nfp_net_eth_dev_ops = {
.fw_version_get = nfp_net_firmware_version_get,
.flow_ctrl_get  = nfp_net_flow_ctrl_get,
.flow_ctrl_set  = nfp_net_flow_ctrl_set,
+   .flow_ops_get   = nfp_net_flow_ops_get,
 };
 
 static inline void
diff --git a/drivers/net/nfp/nfp_net_cmsg.h b/drivers/net/nfp/nfp_net_cmsg.h
index 15e0bb60d8..b526feaff2 100644
--- a/drivers/net/nfp/nfp_net_cmsg.h
+++ b/drivers/net/nfp/nfp_net_cmsg.h
@@ -8,6 +8,34 @@
 
 #include "nfp_net_common.h"
 
+#define NFP_NET_CMSG_ACTION_DROP  (0x1 << 0) /* Drop action */
+#define NFP_NET_CMSG_ACTION_QUEUE (0x1 << 1) /* Queue action */
+#define NFP_NET_CMSG_ACTION_MARK  (0x1 << 2) /* Mark action */
+
+/**
+ * Action data
+ * Bit3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * Word  +---+---+
+ *0  | |Queue|  Actions  |
+ *   +-+-+---+
+ *1  | Mark ID   |
+ *   +---+
+ *
+ * Queue – Queue ID, 7 bits.
+ * Actions – An action bitmap, each bit represents an action type:
+ *   - Bit 0: Drop action. Drop the packet.
+ *   - Bit 1: Queue action. Use the queue specified by “Queue” field.
+ *If not set, the queue is usually specified by RSS.
+ *   - Bit 2: Mark action. Mark packet with Mark ID.
+ */
+struct nfp_net_cmsg_action {
+   uint16_t action;
+   uint8_t queue;
+   uint8_t spare;
+   uint16_t mark_id;
+};
+
 enum nfp_net_cfg_mbox_cmd {
NFP_NET_CFG_MBOX_CMD_FS_ADD_V4,   /* Add Flow Steer rule for V4 
table */
NFP_NET_CFG_MBOX_CMD_FS_DEL_V4,   /* Delete Flow Steer rule for V4 
table */
diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h
index eb668a1505..305b221a15 100644
--- a/drivers/net/nfp/nfp_net_common.h
+++ b/drivers/net/nfp/nfp_net_common.h
@@ -114,6 +114,7 @@ struct nfp_net_priv {
uint32_t hash_seed; /**< Hash seed for hash tables in this structure. */
struct rte_hash *flow_table; /**< Hash table to store flow rules. */
uint16_t flow_count; /**< Flow count in hash table */
+   bool flow_position[NFP_NET_FLOW_LIMIT]; /**< Flow position array */
 };
 
 struct nfp_app_fw_nic {
diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index 25da9ed8ac..658bdff1f9 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -11,8 +11,9 @@
 #include 
 
 #include "nfp_logs.h"
+#include "nfp_net_cmsg.h"
 
-__rte_unused static int
+static int
 nfp_net_flow_table_add(struct nfp_net_priv *priv,
struct rte_flow *nfp_flow)
 {
@@ -27,7 +28,7 @@ nfp_net_flow_table_add(struct nfp_net_priv *priv,
return 0;
 }
 
-__rte_unused static int
+static int
 nfp_net_flow_table_delete(struct nfp_net_priv *priv,
struct rte_flow *nfp_flow)
 {
@@ -42,7 +43,7 @@ nfp_net_flow_table_delete(struct nfp_net_priv *priv,
return 0;
 }
 
-__rte_unused static struct rte_flow *
+static struct rte_flow *
 nfp_net_flow_table_search(struct nfp_net_priv *priv,
struct rte_flow *nfp_flow)
 {
@@ -59,11 +60,58 @@ nfp_net_flow_table_search(struct nfp_net_priv *priv,
return flow_find;
 }
 
-__rte_unused static struct rte_flow *
-nfp_net_flow_alloc(uint32_t match_len,
+static int
+nfp_net_flow_position_acquire(struct nfp_net_priv *priv,
+   uint32_t priority,
+   struct rte_flow *nfp_flow)
+{
+   uint32_t i;
+
+   if (priority != 0) {
+   i = NFP_NET_FLOW_LIMIT - priority - 1;
+
+   if (priv->flow_position[i]) {
+   PMD_DRV_LOG(ERR, "There is already a flow rule

[PATCH v2 06/11] net/nfp: support drop flow action

[Chaoyong He]

Add the corresponding logics to support the offload of drop action.

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

diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index 5b6c8553d8..c8b6902bf1 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -335,6 +335,37 @@ nfp_net_flow_compile_items(const struct rte_flow_item 
items[],
return ret;
 }
 
+static void
+nfp_net_flow_action_drop(struct rte_flow *nfp_flow)
+{
+   struct nfp_net_cmsg_action *action_data;
+
+   action_data = (struct nfp_net_cmsg_action 
*)nfp_flow->payload.action_data;
+
+   action_data->action = NFP_NET_CMSG_ACTION_DROP;
+}
+
+static int
+nfp_net_flow_compile_actions(const struct rte_flow_action actions[],
+   struct rte_flow *nfp_flow)
+{
+   const struct rte_flow_action *action;
+
+   for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; 
++action) {
+   switch (action->type) {
+   case RTE_FLOW_ACTION_TYPE_DROP:
+   PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_DROP");
+   nfp_net_flow_action_drop(nfp_flow);
+   return 0;
+   default:
+   PMD_DRV_LOG(ERR, "Unsupported action type: %d", 
action->type);
+   return -ENOTSUP;
+   }
+   }
+
+   return 0;
+}
+
 static void
 nfp_net_flow_process_priority(__rte_unused struct rte_flow *nfp_flow,
uint32_t match_len)
@@ -349,7 +380,7 @@ static struct rte_flow *
 nfp_net_flow_setup(struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
const struct rte_flow_item items[],
-   __rte_unused const struct rte_flow_action actions[])
+   const struct rte_flow_action actions[])
 {
int ret;
char *hash_data;
@@ -387,6 +418,12 @@ nfp_net_flow_setup(struct rte_eth_dev *dev,
goto free_flow;
}
 
+   ret = nfp_net_flow_compile_actions(actions, nfp_flow);
+   if (ret != 0) {
+   PMD_DRV_LOG(ERR, "NFP flow action process failed.");
+   goto free_flow;
+   }
+
/* Calculate and store the hash_key for later use */
hash_data = nfp_flow->payload.match_data;
nfp_flow->hash_key = rte_jhash(hash_data, match_len + action_len,
-- 
2.39.1

[PATCH v2 05/11] net/nfp: support Ethernet flow item

[Chaoyong He]

Add the corresponding data structure and logics, to support the offload
of ethernet item.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_net_cmsg.h |  13 +++
 drivers/net/nfp/nfp_net_flow.c | 169 +
 2 files changed, 182 insertions(+)

diff --git a/drivers/net/nfp/nfp_net_cmsg.h b/drivers/net/nfp/nfp_net_cmsg.h
index b526feaff2..a95f4ef831 100644
--- a/drivers/net/nfp/nfp_net_cmsg.h
+++ b/drivers/net/nfp/nfp_net_cmsg.h
@@ -8,6 +8,19 @@
 
 #include "nfp_net_common.h"
 
+/**
+ * Match EtherType data
+ * Bit3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * Word  +---+---+
+ *0  |   |Ethtype|
+ *   +-+-+---+
+ */
+struct nfp_net_cmsg_match_eth {
+   uint16_t ether_type;
+   uint16_t spare;
+};
+
 #define NFP_NET_CMSG_ACTION_DROP  (0x1 << 0) /* Drop action */
 #define NFP_NET_CMSG_ACTION_QUEUE (0x1 << 1) /* Queue action */
 #define NFP_NET_CMSG_ACTION_MARK  (0x1 << 2) /* Mark action */
diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index 658bdff1f9..5b6c8553d8 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -13,6 +13,28 @@
 #include "nfp_logs.h"
 #include "nfp_net_cmsg.h"
 
+/* Static initializer for a list of subsequent item types */
+#define NEXT_ITEM(...) \
+   ((const enum rte_flow_item_type []){ \
+   __VA_ARGS__, RTE_FLOW_ITEM_TYPE_END, \
+   })
+
+/* Process structure associated with a flow item */
+struct nfp_net_flow_item_proc {
+   /* Bit-mask for fields supported by this PMD. */
+   const void *mask_support;
+   /* Bit-mask to use when @p item->mask is not provided. */
+   const void *mask_default;
+   /* Size in bytes for @p mask_support and @p mask_default. */
+   const uint32_t mask_sz;
+   /* Merge a pattern item into a flow rule handle. */
+   int (*merge)(struct rte_flow *nfp_flow,
+   const struct rte_flow_item *item,
+   const struct nfp_net_flow_item_proc *proc);
+   /* List of possible subsequent items. */
+   const enum rte_flow_item_type *const next_item;
+};
+
 static int
 nfp_net_flow_table_add(struct nfp_net_priv *priv,
struct rte_flow *nfp_flow)
@@ -162,6 +184,10 @@ nfp_net_flow_calculate_items(const struct rte_flow_item 
items[],
 
for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) {
switch (item->type) {
+   case RTE_FLOW_ITEM_TYPE_ETH:
+   PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_ETH detected");
+   *match_len = sizeof(struct nfp_net_cmsg_match_eth);
+   return 0;
default:
PMD_DRV_LOG(ERR, "Can't calculate match length");
*match_len = 0;
@@ -172,6 +198,143 @@ nfp_net_flow_calculate_items(const struct rte_flow_item 
items[],
return -EINVAL;
 }
 
+static int
+nfp_net_flow_merge_eth(__rte_unused struct rte_flow *nfp_flow,
+   const struct rte_flow_item *item,
+   __rte_unused const struct nfp_net_flow_item_proc *proc)
+{
+   struct nfp_net_cmsg_match_eth *eth;
+   const struct rte_flow_item_eth *spec;
+
+   spec = item->spec;
+   if (spec == NULL) {
+   PMD_DRV_LOG(ERR, "NFP flow merge eth: no item->spec!");
+   return -EINVAL;
+   }
+
+   nfp_flow->payload.cmsg_type = NFP_NET_CFG_MBOX_CMD_FS_ADD_ETHTYPE;
+
+   eth = (struct nfp_net_cmsg_match_eth *)nfp_flow->payload.match_data;
+   eth->ether_type = rte_be_to_cpu_16(spec->type);
+
+   return 0;
+}
+
+/* Graph of supported items and associated process function */
+static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = {
+   [RTE_FLOW_ITEM_TYPE_END] = {
+   .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH),
+   },
+   [RTE_FLOW_ITEM_TYPE_ETH] = {
+   .merge = nfp_net_flow_merge_eth,
+   },
+};
+
+static int
+nfp_net_flow_item_check(const struct rte_flow_item *item,
+   const struct nfp_net_flow_item_proc *proc)
+{
+   uint32_t i;
+   int ret = 0;
+   const uint8_t *mask;
+
+   /* item->last and item->mask cannot exist without item->spec. */
+   if (item->spec == NULL) {
+   if (item->mask || item->last) {
+   PMD_DRV_LOG(ERR, "'mask' or 'last' field provided"
+   " without a corresponding 'spec'.");
+   return -EINVAL;
+   }
+
+   /* No spec, no mask, no problem. */
+   return 0;
+   }
+
+   mask = (ite

[PATCH v2 07/11] net/nfp: support IPv4 flow item

[Chaoyong He]

Add the corresponding data structure and logics, to support the offload
of IPv4 item.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_net_cmsg.h | 37 ++
 drivers/net/nfp/nfp_net_flow.c | 58 --
 2 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_net_cmsg.h b/drivers/net/nfp/nfp_net_cmsg.h
index a95f4ef831..9bc064d9d7 100644
--- a/drivers/net/nfp/nfp_net_cmsg.h
+++ b/drivers/net/nfp/nfp_net_cmsg.h
@@ -21,6 +21,43 @@ struct nfp_net_cmsg_match_eth {
uint16_t spare;
 };
 
+/**
+ * Match IPv4 data
+ * Bit3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * Word  +-+-+---+---+
+ *0  | |Position |   L4 Proto| L4 Proto Mask |
+ *   +-+-+---+---+
+ *1  | SIP4  |
+ *   +---+
+ *2  |   SIP4 Mask   |
+ *   +---+
+ *3  | DIP4  |
+ *   +---+
+ *4  |   DIP4 Mask   |
+ *   +---+---+
+ *5  | SPort |   SPort Mask  |
+ *   +---+---+
+ *6  | DPort |   DPort Mask  |
+ *   +-+-+---+
+ *
+ * Position – Position index of the rule, 13bits.
+ *As priority, smaller value indicates higher priority.
+ */
+struct nfp_net_cmsg_match_v4 {
+   uint8_t l4_protocol_mask;
+   uint8_t l4_protocol;
+   uint16_t position;
+   uint32_t src_ipv4;
+   uint32_t src_ipv4_mask;
+   uint32_t dst_ipv4;
+   uint32_t dst_ipv4_mask;
+   uint16_t src_port;
+   uint16_t src_port_mask;
+   uint16_t dst_port;
+   uint16_t dst_port_mask;
+};
+
 #define NFP_NET_CMSG_ACTION_DROP  (0x1 << 0) /* Drop action */
 #define NFP_NET_CMSG_ACTION_QUEUE (0x1 << 1) /* Queue action */
 #define NFP_NET_CMSG_ACTION_MARK  (0x1 << 2) /* Mark action */
diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index c8b6902bf1..6edb96c17a 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -188,6 +188,10 @@ nfp_net_flow_calculate_items(const struct rte_flow_item 
items[],
PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_ETH detected");
*match_len = sizeof(struct nfp_net_cmsg_match_eth);
return 0;
+   case RTE_FLOW_ITEM_TYPE_IPV4:
+   PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected");
+   *match_len = sizeof(struct nfp_net_cmsg_match_v4);
+   return 0;
default:
PMD_DRV_LOG(ERR, "Can't calculate match length");
*match_len = 0;
@@ -220,14 +224,58 @@ nfp_net_flow_merge_eth(__rte_unused struct rte_flow 
*nfp_flow,
return 0;
 }
 
+static int
+nfp_net_flow_merge_ipv4(struct rte_flow *nfp_flow,
+   const struct rte_flow_item *item,
+   const struct nfp_net_flow_item_proc *proc)
+{
+   struct nfp_net_cmsg_match_v4 *ipv4;
+   const struct rte_flow_item_ipv4 *mask;
+   const struct rte_flow_item_ipv4 *spec;
+
+   spec = item->spec;
+   if (spec == NULL) {
+   PMD_DRV_LOG(DEBUG, "NFP flow merge ipv4: no item->spec!");
+   return 0;
+   }
+
+   mask = (item->mask != NULL) ? item->mask : proc->mask_default;
+
+   nfp_flow->payload.cmsg_type = NFP_NET_CFG_MBOX_CMD_FS_ADD_V4;
+   ipv4 = (struct nfp_net_cmsg_match_v4 *)nfp_flow->payload.match_data;
+
+   ipv4->l4_protocol_mask = mask->hdr.next_proto_id;
+   ipv4->src_ipv4_mask= rte_be_to_cpu_32(mask->hdr.src_addr);
+   ipv4->dst_ipv4_mask= rte_be_to_cpu_32(mask->hdr.dst_addr);
+
+   ipv4->l4_protocol  = spec->hdr.next_proto_id;
+   ipv4->src_ipv4 = rte_be_to_cpu_32(spec->hdr.src_addr);
+   ipv4->dst_ipv4 = rte_be_to_cpu_32(spec->hdr.dst_addr);
+
+   return 0;
+}
+
 /* Graph of supported items and associated process function */
 static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = {
[RTE_FLOW_ITEM_TYPE_END] = {
-   .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH),
+   .next_item = NEXT_ITEM(RTE_FLO

[PATCH v2 08/11] net/nfp: support IPv6 flow item

[Chaoyong He]

Add the corresponding data structure and logics, to support the offload
of IPv6 item.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 drivers/net/nfp/nfp_net_cmsg.h | 61 +++
 drivers/net/nfp/nfp_net_flow.c | 76 +-
 2 files changed, 136 insertions(+), 1 deletion(-)

diff --git a/drivers/net/nfp/nfp_net_cmsg.h b/drivers/net/nfp/nfp_net_cmsg.h
index 9bc064d9d7..e177ac7cd6 100644
--- a/drivers/net/nfp/nfp_net_cmsg.h
+++ b/drivers/net/nfp/nfp_net_cmsg.h
@@ -58,6 +58,67 @@ struct nfp_net_cmsg_match_v4 {
uint16_t dst_port_mask;
 };
 
+/**
+ * Match IPv6 data
+ * Bit3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
+ * -\ 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * Word  +-+-+---+---+
+ *0  | |Position |   L4 Proto| L4 Proto Mask |
+ *   +-+-+---+---+
+ *1  |SIP6 (0-3B)|
+ *   +---+
+ *2  |SIP6 (4-7B)|
+ *   +---+
+ *3  |SIP6 (8-11B)   |
+ *   +---+
+ *4  |SIP6 (12-15B)  |
+ *   +---+
+ *5  | SIP6 Mask (0-3B)  |
+ *   +---+
+ *6  | SIP6 Mask (4-7B)  |
+ *   +---+
+ *7  | SIP6 Mask (8-11B) |
+ *   +---+
+ *8  | SIP6 Mask (12-15B)|
+ *   +---+
+ *9  |DIP6 (0-3B)|
+ *   +---+
+ *10 |DIP6 (4-7B)|
+ *   +---+
+ *11 |DIP6 (8-11B)   |
+ *   +---+
+ *12 |DIP6 (12-15B)  |
+ *   +---+
+ *13 | DIP6 Mask (0-3B)  |
+ *   +---+
+ *14 | DIP6 Mask (4-7B)  |
+ *   +---+
+ *15 | DIP6 Mask (8-11B) |
+ *   +---+
+ *16 | DIP6 Mask (12-15B)|
+ *   +---+---+
+ *17 | SPort |   SPort Mask  |
+ *   +---+---+
+ *18 | DPort |   DPort Mask  |
+ *   +-+-+---+
+ *
+ * Position – Position index of the rule, 13bits.
+ *As priority, smaller value indicates higher priority.
+ */
+struct nfp_net_cmsg_match_v6 {
+   uint8_t l4_protocol_mask;
+   uint8_t l4_protocol;
+   uint16_t position;
+   uint8_t src_ipv6[16];
+   uint8_t src_ipv6_mask[16];
+   uint8_t dst_ipv6[16];
+   uint8_t dst_ipv6_mask[16];
+   uint16_t src_port_mask;
+   uint16_t src_port;
+   uint16_t dst_port_mask;
+   uint16_t dst_port;
+};
+
 #define NFP_NET_CMSG_ACTION_DROP  (0x1 << 0) /* Drop action */
 #define NFP_NET_CMSG_ACTION_QUEUE (0x1 << 1) /* Queue action */
 #define NFP_NET_CMSG_ACTION_MARK  (0x1 << 2) /* Mark action */
diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index 6edb96c17a..56846e3935 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -192,6 +192,10 @@ nfp_net_flow_calculate_items(const struct rte_flow_item 
items[],
PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected");
*match_len = sizeof(struct nfp_net_cmsg_match_v4);
return 0;
+   case RTE_FLOW_ITEM_TYPE_IPV6:

[PATCH v2 09/11] net/nfp: support TCP/UDP/SCTP flow items

[Chaoyong He]

Add the corresponding logics to support the offload of TCP/UDP/SCTP
items.

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

diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index 56846e3935..f561e9ecbe 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -309,6 +309,53 @@ nfp_net_flow_merge_ipv6(struct rte_flow *nfp_flow,
return 0;
 }
 
+static int
+nfp_flow_merge_l4(struct rte_flow *nfp_flow,
+   const struct rte_flow_item *item,
+   const struct nfp_net_flow_item_proc *proc)
+{
+   const struct rte_flow_item_tcp *mask;
+   const struct rte_flow_item_tcp *spec;
+   struct nfp_net_cmsg_match_v4 *ipv4 = NULL;
+   struct nfp_net_cmsg_match_v6 *ipv6 = NULL;
+
+   spec = item->spec;
+   if (spec == NULL) {
+   PMD_DRV_LOG(ERR, "NFP flow merge tcp: no item->spec!");
+   return -EINVAL;
+   }
+
+   mask = (item->mask != NULL) ? item->mask : proc->mask_default;
+
+   switch (nfp_flow->payload.cmsg_type) {
+   case NFP_NET_CFG_MBOX_CMD_FS_ADD_V4:
+   ipv4 = (struct nfp_net_cmsg_match_v4 
*)nfp_flow->payload.match_data;
+   break;
+   case NFP_NET_CFG_MBOX_CMD_FS_ADD_V6:
+   ipv6 = (struct nfp_net_cmsg_match_v6 
*)nfp_flow->payload.match_data;
+   break;
+   default:
+   PMD_DRV_LOG(ERR, "L3 layer neither IPv4 nor IPv6.");
+   return -EINVAL;
+   }
+
+   if (ipv4 != NULL) {
+   ipv4->src_port_mask = rte_be_to_cpu_16(mask->hdr.src_port);
+   ipv4->dst_port_mask = rte_be_to_cpu_16(mask->hdr.dst_port);
+
+   ipv4->src_port = rte_be_to_cpu_16(spec->hdr.src_port);
+   ipv4->dst_port = rte_be_to_cpu_16(spec->hdr.dst_port);
+   } else {
+   ipv6->src_port_mask = rte_be_to_cpu_16(mask->hdr.src_port);
+   ipv6->dst_port_mask = rte_be_to_cpu_16(mask->hdr.dst_port);
+
+   ipv6->src_port = rte_be_to_cpu_16(spec->hdr.src_port);
+   ipv6->dst_port = rte_be_to_cpu_16(spec->hdr.dst_port);
+   }
+
+   return 0;
+}
+
 /* Graph of supported items and associated process function */
 static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = {
[RTE_FLOW_ITEM_TYPE_END] = {
@@ -320,6 +367,9 @@ static const struct nfp_net_flow_item_proc 
nfp_net_flow_item_proc_list[] = {
.merge = nfp_net_flow_merge_eth,
},
[RTE_FLOW_ITEM_TYPE_IPV4] = {
+   .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_SCTP),
.mask_support = &(const struct rte_flow_item_ipv4){
.hdr = {
.next_proto_id = 0xff,
@@ -332,6 +382,9 @@ static const struct nfp_net_flow_item_proc 
nfp_net_flow_item_proc_list[] = {
.merge = nfp_net_flow_merge_ipv4,
},
[RTE_FLOW_ITEM_TYPE_IPV6] = {
+   .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_SCTP),
.mask_support = &(const struct rte_flow_item_ipv6){
.hdr = {
.proto= 0xff,
@@ -345,6 +398,39 @@ static const struct nfp_net_flow_item_proc 
nfp_net_flow_item_proc_list[] = {
.mask_sz = sizeof(struct rte_flow_item_ipv6),
.merge = nfp_net_flow_merge_ipv6,
},
+   [RTE_FLOW_ITEM_TYPE_TCP] = {
+   .mask_support = &(const struct rte_flow_item_tcp){
+   .hdr = {
+   .src_port  = RTE_BE16(0x),
+   .dst_port  = RTE_BE16(0x),
+   },
+   },
+   .mask_default = &rte_flow_item_tcp_mask,
+   .mask_sz = sizeof(struct rte_flow_item_tcp),
+   .merge = nfp_flow_merge_l4,
+   },
+   [RTE_FLOW_ITEM_TYPE_UDP] = {
+   .mask_support = &(const struct rte_flow_item_udp){
+   .hdr = {
+   .src_port = RTE_BE16(0x),
+   .dst_port = RTE_BE16(0x),
+   },
+   },
+   .mask_default = &rte_flow_item_udp_mask,
+   .mask_sz = sizeof(struct rte_flow_item_udp),
+   .merge = nfp_flow_merge_l4,
+   },
+   [RTE_FLOW_ITEM_TYPE_SCTP] = {
+   .mask_support = &(const struct rte_flow_item_sctp){
+   .hdr = {
+   .src_port  = RTE_BE16(0x),
+   .dst_port  = RTE_BE16(0x),
+ 

[PATCH v2 10/11] net/nfp: support MARK flow action

[Chaoyong He]

Add the corresponding logics to support the offload of MARK action.
Also add the related logics to parse the mark id and put into the mbuf
structure, and assigned the offload flags.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 doc/guides/nics/features/nfp.ini |  1 +
 drivers/common/nfp/nfp_common_ctrl.h |  1 +
 drivers/net/nfp/nfp_net_flow.c   | 18 ++
 drivers/net/nfp/nfp_rxtx.c   | 18 ++
 4 files changed, 38 insertions(+)

diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index 1a09c4cbaf..248fd34a39 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -48,6 +48,7 @@ conntrack= Y
 count= Y
 drop = Y
 jump = Y
+mark = Y
 meter= Y
 of_pop_vlan  = Y
 of_push_vlan = Y
diff --git a/drivers/common/nfp/nfp_common_ctrl.h 
b/drivers/common/nfp/nfp_common_ctrl.h
index cbde987736..d65fcd17cb 100644
--- a/drivers/common/nfp/nfp_common_ctrl.h
+++ b/drivers/common/nfp/nfp_common_ctrl.h
@@ -33,6 +33,7 @@
 
 /* Prepend field types */
 #define NFP_NET_META_HASH   1 /* Next field carries hash type */
+#define NFP_NET_META_MARK   2
 #define NFP_NET_META_VLAN   4
 #define NFP_NET_META_PORTID 5
 #define NFP_NET_META_IPSEC  9
diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index f561e9ecbe..71f126156e 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -548,6 +548,20 @@ nfp_net_flow_action_drop(struct rte_flow *nfp_flow)
action_data->action = NFP_NET_CMSG_ACTION_DROP;
 }
 
+static void
+nfp_net_flow_action_mark(struct rte_flow *nfp_flow,
+   const struct rte_flow_action *action)
+{
+   struct nfp_net_cmsg_action *action_data;
+   const struct rte_flow_action_mark *mark;
+
+   action_data = (struct nfp_net_cmsg_action 
*)nfp_flow->payload.action_data;
+   mark = action->conf;
+
+   action_data->action |= NFP_NET_CMSG_ACTION_MARK;
+   action_data->mark_id = mark->id;
+}
+
 static int
 nfp_net_flow_compile_actions(const struct rte_flow_action actions[],
struct rte_flow *nfp_flow)
@@ -560,6 +574,10 @@ nfp_net_flow_compile_actions(const struct rte_flow_action 
actions[],
PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_DROP");
nfp_net_flow_action_drop(nfp_flow);
return 0;
+   case RTE_FLOW_ACTION_TYPE_MARK:
+   PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_MARK");
+   nfp_net_flow_action_mark(nfp_flow, action);
+   break;
default:
PMD_DRV_LOG(ERR, "Unsupported action type: %d", 
action->type);
return -ENOTSUP;
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index f21e120a43..5094bbf145 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -25,6 +25,8 @@ struct nfp_meta_parsed {
uint32_t port_id; /**< Port id value */
uint32_t sa_idx;  /**< IPsec SA index */
uint32_t hash;/**< RSS hash value */
+   uint32_t mark_id; /**< Mark id value */
+   uint16_t flags;   /**< Bitmap to indicate if meta exist */
uint8_t hash_type;/**< RSS hash type */
uint8_t ipsec_type;   /**< IPsec type */
uint8_t vlan_layer;   /**< The valid number of value in @vlan[] */
@@ -290,6 +292,10 @@ nfp_net_parse_chained_meta(uint8_t *meta_base,
meta->sa_idx = rte_be_to_cpu_32(*(rte_be32_t 
*)meta_offset);
meta->ipsec_type = meta_info & NFP_NET_META_FIELD_MASK;
break;
+   case NFP_NET_META_MARK:
+   meta->flags |= (1 << NFP_NET_META_MARK);
+   meta->mark_id = rte_be_to_cpu_32(*(rte_be32_t 
*)meta_offset);
+   break;
default:
/* Unsupported metadata can be a performance issue */
return false;
@@ -434,6 +440,17 @@ nfp_net_parse_meta_ipsec(struct nfp_meta_parsed *meta,
}
 }
 
+static void
+nfp_net_parse_meta_mark(const struct nfp_meta_parsed *meta,
+   struct rte_mbuf *mbuf)
+{
+   if (((meta->flags >> NFP_NET_META_MARK) & 0x1) == 0)
+   return;
+
+   mbuf->hash.fdir.hi = meta->mark_id;
+   mbuf->ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID;
+}
+
 /* Parse the metadata from packet */
 static void
 nfp_net_parse_meta(struct nfp_net_rx_desc *rxds,
@@ -458,6 +475,7 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds,
nfp_net_parse_meta_vlan(meta, rxds, rxq, mb);
nfp_net_parse_

[PATCH v2 11/11] net/nfp: support QUEUE flow action

[Chaoyong He]

Add the corresponding logics to support the offload of QUEUE action.

Signed-off-by: Chaoyong He 
Reviewed-by: Long Wu 
Reviewed-by: Peng Zhang 
---
 doc/guides/nics/features/nfp.ini |  1 +
 drivers/net/nfp/nfp_net_flow.c   | 18 ++
 2 files changed, 19 insertions(+)

diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index 248fd34a39..df1d403c6e 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -54,6 +54,7 @@ of_pop_vlan  = Y
 of_push_vlan = Y
 of_set_vlan_pcp  = Y
 of_set_vlan_vid  = Y
+queue= Y
 raw_decap= Y
 raw_encap= Y
 represented_port = Y
diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c
index 71f126156e..98e8499756 100644
--- a/drivers/net/nfp/nfp_net_flow.c
+++ b/drivers/net/nfp/nfp_net_flow.c
@@ -562,6 +562,20 @@ nfp_net_flow_action_mark(struct rte_flow *nfp_flow,
action_data->mark_id = mark->id;
 }
 
+static void
+nfp_net_flow_action_queue(struct rte_flow *nfp_flow,
+   const struct rte_flow_action *action)
+{
+   struct nfp_net_cmsg_action *action_data;
+   const struct rte_flow_action_queue *queue;
+
+   action_data = (struct nfp_net_cmsg_action 
*)nfp_flow->payload.action_data;
+   queue = action->conf;
+
+   action_data->action |= NFP_NET_CMSG_ACTION_QUEUE;
+   action_data->queue = queue->index;
+}
+
 static int
 nfp_net_flow_compile_actions(const struct rte_flow_action actions[],
struct rte_flow *nfp_flow)
@@ -578,6 +592,10 @@ nfp_net_flow_compile_actions(const struct rte_flow_action 
actions[],
PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_MARK");
nfp_net_flow_action_mark(nfp_flow, action);
break;
+   case RTE_FLOW_ACTION_TYPE_QUEUE:
+   PMD_DRV_LOG(DEBUG, "Process 
RTE_FLOW_ACTION_TYPE_QUEUE");
+   nfp_net_flow_action_queue(nfp_flow, action);
+   break;
default:
PMD_DRV_LOG(ERR, "Unsupported action type: %d", 
action->type);
return -ENOTSUP;
-- 
2.39.1

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

[Feifei Wang]

在 2023/12/4 15:41, Morten Brørup 写道:

From: Feifei Wang [mailto:feifei.wa...@arm.com]
Sent: Monday, 4 December 2023 03.39

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

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

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

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

diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index 286b32b788..42e9b50d51 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -1328,7 +1328,7 @@ static inline int
__rte_pktmbuf_pinned_extbuf_decref(struct rte_mbuf *m)
   *
   * This function does the same than a free, except that it does not
   * return the segment to its pool.
- * It decreases the reference counter, and if it reaches 0, it is
+ * It decreases the reference counter, and if it reaches 1, it is

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


Ok.

for 'else if (__rte_mbuf_refcnt_update(m, -1) == 0)' case, it is easy to 
understand.


but for '(likely(rte_mbuf_refcnt_read(m) == 1))' case, I think this will 
create misleading. dpdk users maybe difficult to understand why the code 
can not match the function description.


Maybe we need some explanation here?


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

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

Ok.

m->nb_segs = 1;

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

--
2.25.1

NAK.

This patch is not race safe. With the patch:

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

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

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

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

Agree. After we see the failture of unit_test, we realize that we 
ignored the mutiple thread case.


Also maybe we need to add extra descripion to avoid misleading？

[PATCH v4 0/2] config changes for cross build

[Joyce Kong]

The patch series implement two changes for cross build.
The first one is to correct cpu instruction set. And the
second one is to use a common cpu arch for cross files.

---
V4:
* Add patch to correct cpu instruction set for cross build.

v3:
* Rebase the patch to use a common cpu arch for cross files.

v2:
* Add the missing cross files which are not changed to use
  the common cpu arch in v1.
---


Joyce Kong (2):
  config: correct cpu instruction set for cross build
  config/arm: use common cpu arch for cross files

 config/arm/arm32_armv8_linux_gcc  |  2 +-
 config/arm/arm64_altra_linux_gcc  |  2 +-
 config/arm/arm64_ampereone_linux_gcc  |  2 +-
 config/arm/arm64_armada_linux_gcc |  2 +-
 config/arm/arm64_armv8_linux_clang_ubuntu |  2 +-
 config/arm/arm64_armv8_linux_gcc  |  2 +-
 config/arm/arm64_bluefield3_linux_gcc |  2 +-
 config/arm/arm64_bluefield_linux_gcc  |  2 +-
 config/arm/arm64_cdx_linux_gcc|  2 +-
 config/arm/arm64_centriq2400_linux_gcc|  2 +-
 config/arm/arm64_cn10k_linux_gcc  |  2 +-
 config/arm/arm64_cn9k_linux_gcc   |  2 +-
 config/arm/arm64_dpaa_linux_gcc   |  2 +-
 config/arm/arm64_emag_linux_gcc   |  2 +-
 config/arm/arm64_ft2000plus_linux_gcc |  2 +-
 config/arm/arm64_graviton2_linux_gcc  |  2 +-
 config/arm/arm64_graviton3_linux_gcc  |  2 +-
 config/arm/arm64_hip10_linux_gcc  |  2 +-
 config/arm/arm64_kunpeng920_linux_gcc |  2 +-
 config/arm/arm64_kunpeng930_linux_gcc |  2 +-
 config/arm/arm64_n1sdp_linux_gcc  |  2 +-
 config/arm/arm64_n2_linux_gcc |  2 +-
 config/arm/arm64_stingray_linux_gcc   |  2 +-
 config/arm/arm64_thunderx2_linux_gcc  |  2 +-
 config/arm/arm64_thunderxt83_linux_gcc|  2 +-
 config/arm/arm64_thunderxt88_linux_gcc|  2 +-
 config/arm/arm64_tys2500_linux_gcc|  2 +-
 config/meson.build| 11 ++-
 28 files changed, 33 insertions(+), 32 deletions(-)

-- 
2.25.1

[PATCH v4 1/2] config: correct cpu instruction set for cross build

[Joyce Kong]

The platform value would be 'native' only when not cross build.
Move the operation about modifying cpu_instruction_set while
platform equals 'native' to the not cross build branch.

Fixes: bf66003b51ec ("build: use platform for generic and native builds")
Cc: sta...@dpdk.org

Signed-off-by: Joyce Kong 
Reviewed-by: Ruifeng Wang 
---
 config/meson.build | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/meson.build b/config/meson.build
index a9ccd56deb..0f37bc733c 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -121,13 +121,14 @@ else
 cpu_instruction_set = 'generic'
 endif
 endif
+if platform == 'native'
+if cpu_instruction_set == 'auto'
+cpu_instruction_set = 'native'
+endif
+endif
 endif
 
-if platform == 'native'
-if cpu_instruction_set == 'auto'
-cpu_instruction_set = 'native'
-endif
-elif platform == 'generic'
+if platform == 'generic'
 if cpu_instruction_set == 'auto'
 cpu_instruction_set = 'generic'
 endif
-- 
2.25.1

[PATCH v4 2/2] config/arm: use common cpu arch for cross files

[Joyce Kong]

The cpu info in some cross files is inconsistent with
that in SoC flags. The mismatch doesn't cause any issue
because the cpu field in the cross file takes no effect
and machine_args in config/arm/meson.build actually works.
Use a common one in cross files to remove any confusion.

Reported-by: Honnappa Nagarahalli 
Signed-off-by: Joyce Kong 
Reviewed-by: Ruifeng Wang 
---
 config/arm/arm32_armv8_linux_gcc  | 2 +-
 config/arm/arm64_altra_linux_gcc  | 2 +-
 config/arm/arm64_ampereone_linux_gcc  | 2 +-
 config/arm/arm64_armada_linux_gcc | 2 +-
 config/arm/arm64_armv8_linux_clang_ubuntu | 2 +-
 config/arm/arm64_armv8_linux_gcc  | 2 +-
 config/arm/arm64_bluefield3_linux_gcc | 2 +-
 config/arm/arm64_bluefield_linux_gcc  | 2 +-
 config/arm/arm64_cdx_linux_gcc| 2 +-
 config/arm/arm64_centriq2400_linux_gcc| 2 +-
 config/arm/arm64_cn10k_linux_gcc  | 2 +-
 config/arm/arm64_cn9k_linux_gcc   | 2 +-
 config/arm/arm64_dpaa_linux_gcc   | 2 +-
 config/arm/arm64_emag_linux_gcc   | 2 +-
 config/arm/arm64_ft2000plus_linux_gcc | 2 +-
 config/arm/arm64_graviton2_linux_gcc  | 2 +-
 config/arm/arm64_graviton3_linux_gcc  | 2 +-
 config/arm/arm64_hip10_linux_gcc  | 2 +-
 config/arm/arm64_kunpeng920_linux_gcc | 2 +-
 config/arm/arm64_kunpeng930_linux_gcc | 2 +-
 config/arm/arm64_n1sdp_linux_gcc  | 2 +-
 config/arm/arm64_n2_linux_gcc | 2 +-
 config/arm/arm64_stingray_linux_gcc   | 2 +-
 config/arm/arm64_thunderx2_linux_gcc  | 2 +-
 config/arm/arm64_thunderxt83_linux_gcc| 2 +-
 config/arm/arm64_thunderxt88_linux_gcc| 2 +-
 config/arm/arm64_tys2500_linux_gcc| 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/config/arm/arm32_armv8_linux_gcc b/config/arm/arm32_armv8_linux_gcc
index 269a60ba19..af1c8b68c3 100644
--- a/config/arm/arm32_armv8_linux_gcc
+++ b/config/arm/arm32_armv8_linux_gcc
@@ -9,7 +9,7 @@ pcap-config = ''
 [host_machine]
 system = 'linux'
 cpu_family = 'aarch32'
-cpu = 'armv8-a'
+cpu = 'auto'
 endian = 'little'
 
 [properties]
diff --git a/config/arm/arm64_altra_linux_gcc b/config/arm/arm64_altra_linux_gcc
index ce0667ebe2..972de20614 100644
--- a/config/arm/arm64_altra_linux_gcc
+++ b/config/arm/arm64_altra_linux_gcc
@@ -9,7 +9,7 @@ pcap-config = ''
 [host_machine]
 system = 'linux'
 cpu_family = 'aarch64'
-cpu = 'armv8.2-a'
+cpu = 'auto'
 endian = 'little'
 
 [properties]
diff --git a/config/arm/arm64_ampereone_linux_gcc 
b/config/arm/arm64_ampereone_linux_gcc
index 8964432a74..f1235993d8 100644
--- a/config/arm/arm64_ampereone_linux_gcc
+++ b/config/arm/arm64_ampereone_linux_gcc
@@ -9,7 +9,7 @@ pcap-config = ''
 [host_machine]
 system = 'linux'
 cpu_family = 'aarch64'
-cpu = 'armv8.6-a'
+cpu = 'auto'
 endian = 'little'
 
 [properties]
diff --git a/config/arm/arm64_armada_linux_gcc 
b/config/arm/arm64_armada_linux_gcc
index 635b4946a3..aca498a3db 100644
--- a/config/arm/arm64_armada_linux_gcc
+++ b/config/arm/arm64_armada_linux_gcc
@@ -10,7 +10,7 @@ pcap-config = ''
 [host_machine]
 system = 'linux'
 cpu_family = 'aarch64'
-cpu = 'armv8-a'
+cpu = 'aarch64'
 endian = 'little'
 
 [properties]
diff --git a/config/arm/arm64_armv8_linux_clang_ubuntu 
b/config/arm/arm64_armv8_linux_clang_ubuntu
index 86ae43937b..3d52a5e32e 100644
--- a/config/arm/arm64_armv8_linux_clang_ubuntu
+++ b/config/arm/arm64_armv8_linux_clang_ubuntu
@@ -10,7 +10,7 @@ pkgconfig = 'aarch64-linux-gnu-pkg-config'
 [host_machine]
 system = 'linux'
 cpu_family = 'aarch64'
-cpu = 'armv8-a'
+cpu = 'auto'
 endian = 'little'
 
 [properties]
diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc
index 529694b49d..98efa7fd2d 100644
--- a/config/arm/arm64_armv8_linux_gcc
+++ b/config/arm/arm64_armv8_linux_gcc
@@ -9,7 +9,7 @@ pcap-config = ''
 [host_machine]
 system = 'linux'
 cpu_family = 'aarch64'
-cpu = 'armv8-a'
+cpu = 'auto'
 endian = 'little'
 
 [properties]
diff --git a/config/arm/arm64_bluefield3_linux_gcc 
b/config/arm/arm64_bluefield3_linux_gcc
index 775cf5883d..cf58b4aa6b 100644
--- a/config/arm/arm64_bluefield3_linux_gcc
+++ b/config/arm/arm64_bluefield3_linux_gcc
@@ -9,7 +9,7 @@ pcap-config = ''
 [host_machine]
 system = 'linux'
 cpu_family = 'aarch64'
-cpu = 'armv8.4-a'
+cpu = 'auto'
 endian = 'little'
 
 [properties]
diff --git a/config/arm/arm64_bluefield_linux_gcc 
b/config/arm/arm64_bluefield_linux_gcc
index 1286227915..d38922fea5 100644
--- a/config/arm/arm64_bluefield_linux_gcc
+++ b/config/arm/arm64_bluefield_linux_gcc
@@ -9,7 +9,7 @@ pcap-config = ''
 [host_machine]
 system = 'linux'
 cpu_family = 'aarch64'
-cpu = 'armv8-a'
+cpu = 'auto'
 endian = 'little'
 
 [properties]
diff --git a/config/arm/arm64_cdx_linux_gcc b/config/arm/arm64_cdx_linux_gcc
index 8e6d619dae..be2aa56430 100644
--- a/config/arm/arm64_cdx_linux_gcc
+++ b/config/arm/arm64_cdx_linux_gcc
@@ -10,7 +10,7 @@ pcap-config = ''
 [host_machine]
 system = 'linux'
 cpu_family

[PATCH v1] net/memif: fix segfault with Tx burst larger than 255

[Joyce Kong]

There will be a segfault when tx burst size is larger than
256. This is because eth_memif_tx uses an index i which is
uint8_t to count transmitted nb_pkts. Extend i to uint16_t,
the same size as nb_pkts.

Fixes: b5613c8f9d0a ("net/memif: add a Tx fast path")
Cc: sta...@dpdk.org

Reported-by: Liangxing Wang 
Signed-off-by: Joyce Kong 
Reviewed-by: Ruifeng Wang 
---
 drivers/net/memif/rte_eth_memif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/memif/rte_eth_memif.c 
b/drivers/net/memif/rte_eth_memif.c
index 7cc8c0da91..6f45a00172 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -684,7 +684,7 @@ eth_memif_tx(void *queue, struct rte_mbuf **bufs, uint16_t 
nb_pkts)
n_free = __atomic_load_n(&ring->head, __ATOMIC_ACQUIRE) - slot;
}
 
-   uint8_t i;
+   uint16_t i;
struct rte_mbuf **buf_tmp = bufs;
mbuf_head = *buf_tmp++;
struct rte_mempool *mp = mbuf_head->pool;
-- 
2.25.1

[PATCH v3 1/3] node: support to add next node to ethdev Rx node

[Rakesh Kudurumalla]

By default all packets received on ethdev_rx node
is forwarded to pkt_cls node.This patch provides
library support to add a new node as next node to
ethdev_rx node and forward packet to new node from
rx node.

Signed-off-by: Rakesh Kudurumalla 
---
V3: Resolve compilation Issue

 lib/node/ethdev_ctrl.c  | 45 +
 lib/node/rte_node_eth_api.h | 19 
 lib/node/version.map|  1 +
 3 files changed, 65 insertions(+)

diff --git a/lib/node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c
index d564b80e37..4580c123d1 100644
--- a/lib/node/ethdev_ctrl.c
+++ b/lib/node/ethdev_ctrl.c
@@ -3,6 +3,7 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
@@ -129,3 +130,47 @@ rte_node_eth_config(struct rte_node_ethdev_config *conf, 
uint16_t nb_confs,
ctrl.nb_graphs = nb_graphs;
return 0;
 }
+
+int
+rte_node_ethdev_rx_next_update(rte_node_t id, const char *edge_name)
+{
+   struct ethdev_rx_node_main *data;
+   ethdev_rx_node_elem_t *elem;
+   char **next_nodes;
+   int rc = -EINVAL;
+   uint32_t count;
+   uint16_t i = 0;
+
+   if (edge_name == NULL)
+   return -ENODATA;
+
+   count = rte_node_edge_get(id, NULL);
+
+   if (count == RTE_NODE_ID_INVALID)
+   return rc;
+
+   next_nodes = malloc(count);
+   if (next_nodes == NULL)
+   return -ENOMEM;
+
+   count = rte_node_edge_get(id, next_nodes);
+
+   while (next_nodes[i] != NULL) {
+   if (strcmp(edge_name, next_nodes[i]) == 0) {
+   data = ethdev_rx_get_node_data_get();
+   elem = data->head;
+   while (elem->next != data->head) {
+   if (elem->nid == id) {
+   elem->ctx.cls_next = i;
+   rc = 0;
+   goto exit;
+   }
+   elem = elem->next;
+   }
+   }
+   i++;
+   }
+exit:
+   free(next_nodes);
+   return rc;
+}
diff --git a/lib/node/rte_node_eth_api.h b/lib/node/rte_node_eth_api.h
index eaae50772d..f99e565b30 100644
--- a/lib/node/rte_node_eth_api.h
+++ b/lib/node/rte_node_eth_api.h
@@ -57,6 +57,25 @@ struct rte_node_ethdev_config {
  */
 int rte_node_eth_config(struct rte_node_ethdev_config *cfg,
uint16_t cnt, uint16_t nb_graphs);
+
+/**
+ * Update ethdev rx next node.
+ *
+ * @param id
+ *   Node id whose edge is to be updated.
+ * @param edge_name
+ *   Name of the next node.
+ *
+ * @return
+ *   RTE_EDGE_ID_INVALID if id is invalid
+ *   ENINVAL: Either of input parameters are invalid
+ *   ENODATA: If edge_name is not found
+ *   ENOMEM: If memory allocation failed
+ *   0 on successful initialization.
+ */
+__rte_experimental
+int rte_node_ethdev_rx_next_update(rte_node_t id, const char *edge_name);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/node/version.map b/lib/node/version.map
index 99ffcdd414..07abc3a79f 100644
--- a/lib/node/version.map
+++ b/lib/node/version.map
@@ -16,6 +16,7 @@ EXPERIMENTAL {
rte_node_ip6_route_add;
 
# added in 23.11
+   rte_node_ethdev_rx_next_update;
rte_node_ip4_reassembly_configure;
rte_node_udp4_dst_port_add;
rte_node_udp4_usr_node_add;
-- 
2.25.1