* [PATCH v1 1/4] dts: add send_packets to test suites and rework packet addressing
2024-06-25 15:53 [PATCH v1 0/4] dts: add dynamic queue configuration test suite jspewock
@ 2024-06-25 15:53 ` jspewock
2024-06-25 15:53 ` [PATCH v1 2/4] dts: add port queue modification and forwarding stats to testpmd jspewock
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: jspewock @ 2024-06-25 15:53 UTC (permalink / raw)
To: Honnappa.Nagarahalli, wathsala.vithanage, npratte, thomas,
juraj.linkes, probb, Luca.Vizzarro, paul.szczepanek, yoan.picchi
Cc: dev, Jeremy Spewock
From: Jeremy Spewock <jspewock@iol.unh.edu>
Currently the only method provided in the test suite class for sending
packets sends a single packet and then captures the results. There is,
in some cases, a need to send multiple packets at once while not really
needing to capture any traffic received back. The method to do this
exists in the traffic generator already, but this patch exposes the
method to test suites.
This patch also updates the _adjust_addresses method of test suites so
that addresses of packets are only modified if the developer did not
configure them beforehand. This allows for developers to have more
control over the content of their packets when sending them through the
framework.
Signed-off-by: Jeremy Spewock <jspewock@iol.unh.edu>
---
dts/framework/test_suite.py | 78 +++++++++++++++++++-------
dts/framework/testbed_model/tg_node.py | 9 +++
2 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py
index 694b2eba65..6069025b2b 100644
--- a/dts/framework/test_suite.py
+++ b/dts/framework/test_suite.py
@@ -199,7 +199,7 @@ def send_packet_and_capture(
Returns:
A list of received packets.
"""
- packet = self._adjust_addresses(packet)
+ packet = self._adjust_addresses([packet])[0]
return self.tg_node.send_packet_and_capture(
packet,
self._tg_port_egress,
@@ -208,6 +208,18 @@ def send_packet_and_capture(
duration,
)
+ def send_packets(
+ self,
+ packets: list[Packet],
+ ) -> None:
+ """Send packets using the traffic generator and do not capture received traffic.
+
+ Args:
+ packets: Packets to send.
+ """
+ packets = self._adjust_addresses(packets)
+ self.tg_node.send_packets(packets, self._tg_port_egress)
+
def get_expected_packet(self, packet: Packet) -> Packet:
"""Inject the proper L2/L3 addresses into `packet`.
@@ -219,39 +231,63 @@ def get_expected_packet(self, packet: Packet) -> Packet:
"""
return self._adjust_addresses(packet, expected=True)
- def _adjust_addresses(self, packet: Packet, expected: bool = False) -> Packet:
+ def _adjust_addresses(self, packets: list[Packet], expected: bool = False) -> list[Packet]:
"""L2 and L3 address additions in both directions.
+ Only missing addresses are added to packets, existing addressed will not be overridden.
+
Assumptions:
Two links between SUT and TG, one link is TG -> SUT, the other SUT -> TG.
Args:
- packet: The packet to modify.
+ packets: The packets to modify.
expected: If :data:`True`, the direction is SUT -> TG,
otherwise the direction is TG -> SUT.
"""
- if expected:
- # The packet enters the TG from SUT
- # update l2 addresses
- packet.src = self._sut_port_egress.mac_address
- packet.dst = self._tg_port_ingress.mac_address
+ ret_packets = []
+ for packet in packets:
+ default_pkt_src = type(packet)().src
+ default_pkt_dst = type(packet)().dst
+ default_pkt_payload_src = (
+ type(packet.payload)().src if hasattr(packet.payload, "src") else None
+ )
+ default_pkt_payload_dst = (
+ type(packet.payload)().dst if hasattr(packet.payload, "dst") else None
+ )
+ # If `expected` is :data:`True`, the packet enters the TG from SUT, otherwise the
+ # packet leaves the TG towards the SUT
- # The packet is routed from TG egress to TG ingress
- # update l3 addresses
- packet.payload.src = self._tg_ip_address_egress.ip.exploded
- packet.payload.dst = self._tg_ip_address_ingress.ip.exploded
- else:
- # The packet leaves TG towards SUT
# update l2 addresses
- packet.src = self._tg_port_egress.mac_address
- packet.dst = self._sut_port_ingress.mac_address
+ if packet.src == default_pkt_src:
+ packet.src = (
+ self._sut_port_egress.mac_address
+ if expected
+ else self._tg_port_egress.mac_address
+ )
+ if packet.dst == default_pkt_dst:
+ packet.dst = (
+ self._tg_port_ingress.mac_address
+ if expected
+ else self._sut_port_ingress.mac_address
+ )
+
+ # The packet is routed from TG egress to TG ingress regardless of if it is expected or
+ # not.
- # The packet is routed from TG egress to TG ingress
# update l3 addresses
- packet.payload.src = self._tg_ip_address_egress.ip.exploded
- packet.payload.dst = self._tg_ip_address_ingress.ip.exploded
-
- return Ether(packet.build())
+ if (
+ default_pkt_payload_src is not None
+ and packet.payload.src == default_pkt_payload_src
+ ):
+ packet.payload.src = self._tg_ip_address_egress.ip.exploded
+ if (
+ default_pkt_payload_dst is not None
+ and packet.payload.dst == default_pkt_payload_dst
+ ):
+ packet.payload.dst = self._tg_ip_address_ingress.ip.exploded
+ ret_packets.append(Ether(packet.build()))
+
+ return ret_packets
def verify(self, condition: bool, failure_description: str) -> None:
"""Verify `condition` and handle failures.
diff --git a/dts/framework/testbed_model/tg_node.py b/dts/framework/testbed_model/tg_node.py
index 4ee326e99c..758b676258 100644
--- a/dts/framework/testbed_model/tg_node.py
+++ b/dts/framework/testbed_model/tg_node.py
@@ -83,6 +83,15 @@ def send_packet_and_capture(
duration,
)
+ def send_packets(self, packets: list[Packet], port: Port):
+ """Send packets without capturing resulting received packets.
+
+ Args:
+ packets: Packets to send.
+ port: Port to send the packets on.
+ """
+ self.traffic_generator.send_packets(packets, port)
+
def close(self) -> None:
"""Free all resources used by the node.
--
2.45.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v1 2/4] dts: add port queue modification and forwarding stats to testpmd
2024-06-25 15:53 [PATCH v1 0/4] dts: add dynamic queue configuration test suite jspewock
2024-06-25 15:53 ` [PATCH v1 1/4] dts: add send_packets to test suites and rework packet addressing jspewock
@ 2024-06-25 15:53 ` jspewock
2024-06-25 15:53 ` [PATCH v1 3/4] dts: add dynamic queue test suite jspewock
2024-06-25 15:53 ` [PATCH v1 4/4] dts: add dynamic queue conf to the yaml schema jspewock
3 siblings, 0 replies; 5+ messages in thread
From: jspewock @ 2024-06-25 15:53 UTC (permalink / raw)
To: Honnappa.Nagarahalli, wathsala.vithanage, npratte, thomas,
juraj.linkes, probb, Luca.Vizzarro, paul.szczepanek, yoan.picchi
Cc: dev, Jeremy Spewock
From: Jeremy Spewock <jspewock@iol.unh.edu>
This patch adds methods for querying and modifying port queue state and
configuration. In addition to this, it also adds the ability to capture
the forwarding statistics that get outputted when you send the "stop"
command in testpmd. Querying of port queue information is handled
through a TextParser dataclass in case there is future need for using
more of the output from the command used to query the information.
Signed-off-by: Jeremy Spewock <jspewock@iol.unh.edu>
---
dts/framework/remote_session/testpmd_shell.py | 225 +++++++++++++++++-
1 file changed, 223 insertions(+), 2 deletions(-)
diff --git a/dts/framework/remote_session/testpmd_shell.py b/dts/framework/remote_session/testpmd_shell.py
index ec22f72221..e628d60dbe 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -19,7 +19,7 @@
from dataclasses import dataclass, field
from enum import Flag, auto
from pathlib import PurePath
-from typing import ClassVar
+from typing import ClassVar, cast
from typing_extensions import Self, Unpack
@@ -541,6 +541,48 @@ class TestPmdPort(TextParser):
)
+@dataclass
+class TestPmdPortQueue(TextParser):
+ """Dataclass representation of the common parts of the testpmd `show rxq/txq info` commands."""
+
+ #:
+ prefetch_threshold: int = field(metadata=TextParser.find_int(r"prefetch threshold: (\d+)"))
+ #:
+ host_threshold: int = field(metadata=TextParser.find_int(r"host threshold: (\d+)"))
+ #:
+ writeback_threshold: int = field(metadata=TextParser.find_int(r"writeback threshold: (\d+)"))
+ #:
+ free_threshold: int = field(metadata=TextParser.find_int(r"free threshold: (\d+)"))
+ #:
+ deferred_start: bool = field(metadata=TextParser.find("deferred start: on"))
+ #: The number of RXD/TXDs is just the ring size of the queue.
+ ring_size: int = field(metadata=TextParser.find_int(r"Number of (?:RXDs|TXDs): (\d+)"))
+ #:
+ is_queue_started: bool = field(metadata=TextParser.find("queue state: started"))
+ #:
+ burst_mode: str = field(metadata=TextParser.find(r"Burst mode: ([^\r\n]+)"))
+
+
+@dataclass
+class TestPmdTxPortQueue(TestPmdPortQueue):
+ """Dataclass representation for testpmd `show txq info` command."""
+
+ #:
+ rs_threshold: int = field(metadata=TextParser.find_int(r"RS threshold: (\d+)"))
+
+
+@dataclass
+class TestPmdRxPortQueue(TestPmdPortQueue):
+ """Dataclass representation for testpmd `show rxq info` command."""
+
+ #:
+ mempool: str = field(metadata=TextParser.find(r"Mempool: ([^\r\n]+)"))
+ #:
+ can_drop_packets: bool = field(metadata=TextParser.find(r"drop packets: on"))
+ #:
+ is_scattering_packets: bool = field(metadata=TextParser.find(r"scattered packets: on"))
+
+
@dataclass
class TestPmdPortStats(TextParser):
"""Port statistics."""
@@ -645,7 +687,7 @@ def start(self, verify: bool = True) -> None:
"Not all ports came up after starting packet forwarding in testpmd."
)
- def stop(self, verify: bool = True) -> None:
+ def stop(self, verify: bool = True) -> str:
"""Stop packet forwarding.
Args:
@@ -653,6 +695,9 @@ def stop(self, verify: bool = True) -> None:
forwarding was stopped successfully or not started. If neither is found, it is
considered an error.
+ Returns:
+ Output gathered from sending the stop command.
+
Raises:
InteractiveCommandExecutionError: If `verify` is :data:`True` and the command to stop
forwarding results in an error.
@@ -665,6 +710,7 @@ def stop(self, verify: bool = True) -> None:
):
self._logger.debug(f"Failed to stop packet forwarding: \n{stop_cmd_output}")
raise InteractiveCommandExecutionError("Testpmd failed to stop packet forwarding.")
+ return stop_cmd_output
def get_devices(self) -> list[TestPmdDevice]:
"""Get a list of device names that are known to testpmd.
@@ -806,6 +852,181 @@ def show_port_stats(self, port_id: int) -> TestPmdPortStats:
return TestPmdPortStats.parse(output)
+ def show_port_queue_info(
+ self, port_id: int, queue_id: int, is_rx_queue: bool
+ ) -> TestPmdPortQueue:
+ """Get the info for a queue on a given port.
+
+ Args:
+ port_id: ID of the port where the queue resides.
+ queue_id: ID of the queue to query.
+ is_rx_queue: Whether to check an RX or TX queue. If :data:`True` an RX queue will be
+ queried, otherwise a TX queue will be queried.
+
+ Raises:
+ InteractiveCommandExecutionError: If there is a failure when getting the info for the
+ queue.
+
+ Returns:
+ Information about the queue on the given port.
+ """
+ queue_type = "rxq" if is_rx_queue else "txq"
+ queue_info = self.send_command(
+ f"show {queue_type} info {port_id} {queue_id}", skip_first_line=True
+ )
+ if queue_info.startswith("ETHDEV: Invalid"):
+ raise InteractiveCommandExecutionError(
+ f"Could not get the info for {queue_type} {queue_id} on port {port_id}"
+ )
+ return (
+ TestPmdRxPortQueue.parse(queue_info)
+ if is_rx_queue
+ else TestPmdTxPortQueue.parse(queue_info)
+ )
+
+ def show_port_rx_queue_info(self, port_id: int, queue_id: int) -> TestPmdRxPortQueue:
+ """Get port queue info and cast to :class:`TestPmdRxPortQueue`.
+
+ Wrapper around :meth:`show_port_queue_info` that casts the more generic type into the
+ correct subclass.
+
+ Args:
+ port_id: ID of the port where the queue resides.
+ queue_id: ID of the queue to query.
+
+ Returns:
+ Information about the Rx queue on the given port.
+ """
+ return cast(TestPmdRxPortQueue, self.show_port_queue_info(port_id, queue_id, True))
+
+ def show_port_tx_queue_info(self, port_id: int, queue_id: int) -> TestPmdTxPortQueue:
+ """Get port queue info and cast to :class:`TestPmdTxPortQueue`.
+
+ Wrapper around :meth:`show_port_queue_info` that casts the more generic type into the
+ correct subclass.
+
+ Args:
+ port_id: ID of the port where the queue resides.
+ queue_id: ID of the queue to query.
+
+ Returns:
+ Information about the Tx queue on the given port.
+ """
+ return cast(TestPmdTxPortQueue, self.show_port_queue_info(port_id, queue_id, False))
+
+ def stop_port_queue(
+ self, port_id: int, queue_id: int, is_rx_queue: bool, verify: bool = True
+ ) -> None:
+ """Stops a given queue on a port.
+
+ Args:
+ port_id: ID of the port that the queue belongs to.
+ queue_id: ID of the queue to stop.
+ is_rx_queue: Type of queue to stop. If :data:`True` an RX queue will be stopped,
+ otherwise a TX queue will be stopped.
+ verify: If :data:`True` an additional command will be sent to verify the queue stopped.
+ Defaults to :data:`True`.
+
+ Raises:
+ InteractiveCommandExecutionError: If `verify` is :data:`True` and the queue fails to
+ stop.
+ """
+ port_type = "rxq" if is_rx_queue else "txq"
+ stop_cmd_output = self.send_command(f"port {port_id} {port_type} {queue_id} stop")
+ if verify:
+ if self.show_port_queue_info(port_id, queue_id, is_rx_queue).is_queue_started:
+ self._logger.debug(
+ f"Failed to stop {port_type} {queue_id} on port {port_id}:\n{stop_cmd_output}"
+ )
+ raise InteractiveCommandExecutionError(
+ f"Test pmd failed to stop {port_type} {queue_id} on port {port_id}"
+ )
+
+ def start_port_queue(
+ self, port_id: int, queue_id: int, is_rx_queue: bool, verify: bool = True
+ ) -> None:
+ """Starts a given queue on a port.
+
+ First sets up the port queue, then starts it.
+
+ Args:
+ port_id: ID of the port that the queue belongs to.
+ queue_id: ID of the queue to start.
+ is_rx_queue: Type of queue to start. If :data:`True` an RX queue will be started,
+ otherwise a TX queue will be started.
+ verify: if :data:`True` an additional command will be sent to verify that the queue was
+ started. Defaults to :data:`True`.
+
+ Raises:
+ InteractiveCommandExecutionError: If `verify` is :data:`True` and the queue fails to
+ start.
+ """
+ port_type = "rxq" if is_rx_queue else "txq"
+ self.setup_port_queue(port_id, queue_id, is_rx_queue)
+ start_cmd_output = self.send_command(f"port {port_id} {port_type} {queue_id} start")
+ if verify:
+ if not self.show_port_queue_info(port_id, queue_id, is_rx_queue).is_queue_started:
+ self._logger.debug(
+ f"Failed to start {port_type} {queue_id} on port {port_id}:\n{start_cmd_output}"
+ )
+ raise InteractiveCommandExecutionError(
+ f"Test pmd failed to start {port_type} {queue_id} on port {port_id}"
+ )
+
+ def setup_port_queue(self, port_id: int, queue_id: int, is_rx_queue: bool) -> None:
+ """Setup a given queue on a port.
+
+ This functionality cannot be verified because the setup action only takes effect when the
+ queue is started.
+
+ Args:
+ port_id: ID of the port where the queue resides.
+ queue_id: ID of the queue to setup.
+ is_rx_queue: Type of queue to setup. If :data:`True` an RX queue will be setup,
+ otherwise a TX queue will be setup.
+ """
+ self.send_command(f"port {port_id} {'rxq' if is_rx_queue else 'txq'} {queue_id} setup")
+
+ def set_queue_ring_size(
+ self,
+ port_id: int,
+ queue_id: int,
+ size: int,
+ is_rx_queue: bool,
+ verify: bool = True,
+ ) -> None:
+ """Update the ring size of an Rx/Tx queue on a given port.
+
+ Queue is setup after setting the ring size so that the queue info reflects this change and
+ it can be verified.
+
+ Args:
+ port_id: The port that the queue resides on.
+ queue_id: The ID of the queue on the port.
+ size: The size to update the ring size to.
+ is_rx_queue: Whether to modify an RX or TX queue. If :data:`True` an RX queue will be
+ updated, otherwise a TX queue will be updated.
+ verify: If :data:`True` an additional command will be sent to check the ring size of
+ the queue in an attempt to validate that the size was changes properly.
+
+ Raises:
+ InteractiveCommandExecutionError: If `verify` is :data:`True` and there is a failure
+ when updating ring size.
+ """
+ queue_type = "rxq" if is_rx_queue else "txq"
+ self.send_command(f"port config {port_id} {queue_type} {queue_id} ring_size {size}")
+ self.setup_port_queue(port_id, queue_id, is_rx_queue)
+ if verify:
+ curr_ring_size = self.show_port_queue_info(port_id, queue_id, is_rx_queue).ring_size
+ if curr_ring_size != size:
+ self._logger.debug(
+ f"Failed up update ring size of queue {queue_id} on port {port_id}. Current"
+ f" ring size is {curr_ring_size}."
+ )
+ raise InteractiveCommandExecutionError(
+ f"Failed to update ring size of queue {queue_id} on port {port_id}"
+ )
+
def close(self) -> None:
"""Overrides :meth:`~.interactive_shell.close`."""
self.send_command("quit", "")
--
2.45.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v1 3/4] dts: add dynamic queue test suite
2024-06-25 15:53 [PATCH v1 0/4] dts: add dynamic queue configuration test suite jspewock
2024-06-25 15:53 ` [PATCH v1 1/4] dts: add send_packets to test suites and rework packet addressing jspewock
2024-06-25 15:53 ` [PATCH v1 2/4] dts: add port queue modification and forwarding stats to testpmd jspewock
@ 2024-06-25 15:53 ` jspewock
2024-06-25 15:53 ` [PATCH v1 4/4] dts: add dynamic queue conf to the yaml schema jspewock
3 siblings, 0 replies; 5+ messages in thread
From: jspewock @ 2024-06-25 15:53 UTC (permalink / raw)
To: Honnappa.Nagarahalli, wathsala.vithanage, npratte, thomas,
juraj.linkes, probb, Luca.Vizzarro, paul.szczepanek, yoan.picchi
Cc: dev, Jeremy Spewock
From: Jeremy Spewock <jspewock@iol.unh.edu>
This patch adds a new test suite that is designed to test the stopping
and modification of port queues at runtime. Specifically, there are
test cases that display the ports ability to stop some queues but still
send and receive traffic on others, as well as the ability to configure
the ring size of the queue without blocking the traffic on other queues.
Signed-off-by: Jeremy Spewock <jspewock@iol.unh.edu>
---
dts/tests/TestSuite_dynamic_queue_conf.py | 287 ++++++++++++++++++++++
1 file changed, 287 insertions(+)
create mode 100644 dts/tests/TestSuite_dynamic_queue_conf.py
diff --git a/dts/tests/TestSuite_dynamic_queue_conf.py b/dts/tests/TestSuite_dynamic_queue_conf.py
new file mode 100644
index 0000000000..6415593a0d
--- /dev/null
+++ b/dts/tests/TestSuite_dynamic_queue_conf.py
@@ -0,0 +1,287 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+
+"""Dynamic configuration of port queues test suite.
+
+This test suite tests the support of being able to either stop or reconfigure port queues at
+runtime without stopping the entire device. Previously, to configure a DPDK ethdev, the application
+first specifies how many Tx and Rx queues to include in the ethdev and then application sets up
+each queue individually. Only once all the queues have been set up can the application then start
+the device, and at this point traffic can flow. If device stops, this halts the flow of traffic on
+all queues in the ethdev completely. Dynamic queue is a capability present on some NICs that
+specifies whether the NIC is able to delay the configuration of queues on its port. This capability
+allows for the support of stopping and reconfiguring queues on a port at runtime without stopping
+the entire device.
+
+Support of this capability is shown by starting the Poll Mode Driver with multiple Rx and Tx queues
+configured and stopping some prior to forwarding packets, then examining whether or not the stopped
+ports and the unmodified ports were able to handle traffic. In addition to just stopping the ports,
+the ports must also show that they support configuration changes on their queues at runtime without
+stopping the entire device. This is shown by changing the ring size of the queues.
+
+If the Poll Mode Driver is able to stop some queues on a port and modify them then handle traffic
+on the unmodified queues while the others are stopped, then it is the case that the device properly
+supports dynamic configuration of its queues.
+"""
+
+import random
+from typing import Callable, ClassVar, MutableSet
+
+from scapy.layers.inet import IP # type: ignore[import-untyped]
+from scapy.layers.l2 import Ether # type: ignore[import-untyped]
+from scapy.packet import Raw # type: ignore[import-untyped]
+
+from framework.exception import InteractiveCommandExecutionError
+from framework.params.testpmd import PortTopology, SimpleForwardingModes
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.test_suite import TestSuite
+
+
+def setup_and_teardown_test(
+ test_meth: Callable[
+ ["TestDynamicQueueConf", int, MutableSet, MutableSet, TestPmdShell, bool], None
+ ],
+) -> Callable[["TestDynamicQueueConf", bool], None]:
+ """Decorator that provides a setup and teardown for testing methods.
+
+ This decorator provides a method that sets up the environment for testing, runs the test
+ method, and then does a clean-up verification step after the queues are started again. The
+ decorated method will be provided with all the variables it should need to run testing
+ including: The ID of the port where the queues for testing reside, disjoint sets of IDs for
+ queues that are/aren't modified, a testpmd session to run testing with, and a flag that
+ indicates whether or not testing should be done on Rx or Tx queues.
+
+ Args:
+ test_meth: The decorated method that tests configuration of port queues at runtime.
+ This method must have the following parameters in order: An int that represents a
+ port ID, a set of queues for testing, a set of unmodified queues, a testpmd
+ interactive shell, and a boolean that, when :data:`True`, does Rx testing,
+ otherwise does Tx testing. This method must also be a member of the
+ :class:`TestDynamicQueueConf` class.
+
+ Returns:
+ A method that sets up the environment, runs the decorated method, then re-enables all
+ queues and validates they can still handle traffic.
+ """
+
+ def wrap(self: "TestDynamicQueueConf", is_rx_testing: bool) -> None:
+ """Setup environment, run test function, then cleanup.
+
+ Start a testpmd shell and stop ports for testing, then call the decorated function that
+ performs the testing. After the decorated function is finished running its testing,
+ start the stopped queues and send packets to validate that these ports can properly
+ handle traffic after being started again.
+
+ Args:
+ self: Instance of :class:`TestDynamicQueueConf` `test_meth` belongs to.
+ is_rx_testing: If :data:`True` then Rx queues will be the ones modified throughout
+ the test, otherwise Tx queues will be modified.
+ """
+ port_id = self.rx_port_num if is_rx_testing else self.tx_port_num
+ queues_to_config: set[int] = set()
+ while len(queues_to_config) < self.num_ports_to_modify:
+ queues_to_config.add(random.randint(1, self.number_of_queues - 1))
+ unchanged_queues = set(range(self.number_of_queues)) - queues_to_config
+ testpmd = TestPmdShell(
+ self.sut_node,
+ port_topology=PortTopology.chained,
+ rx_queues=self.number_of_queues,
+ tx_queues=self.number_of_queues,
+ )
+ for q in queues_to_config:
+ testpmd.stop_port_queue(port_id, q, is_rx_testing)
+ testpmd.set_forward_mode(SimpleForwardingModes.mac)
+
+ test_meth(self, port_id, queues_to_config, unchanged_queues, testpmd, is_rx_testing)
+
+ for queue_id in queues_to_config:
+ testpmd.start_port_queue(port_id, queue_id, is_rx_testing)
+
+ testpmd.start()
+ self.send_packets_with_different_addresses(self.number_of_packets_to_send)
+ forwarding_stats = testpmd.stop()
+ for queue_id in queues_to_config:
+ self.verify(
+ self.port_queue_in_stats(port_id, is_rx_testing, queue_id, forwarding_stats),
+ f"Modified queue {queue_id} on port {port_id} failed to receive traffic after"
+ "being started again.",
+ )
+ testpmd.close()
+
+ return wrap
+
+
+class TestDynamicQueueConf(TestSuite):
+ """DPDK dynamic queue configuration test suite.
+
+ Testing for the support of dynamic queue configuration is done by splitting testing by the type
+ of queue (either Rx or Tx) and the type of testing (testing for stopping a port at runtime vs
+ testing configuration changes at runtime). Testing is done by first stopping a finite number of
+ port queues (3 is sufficient) and either modifying the configuration or sending packets to
+ verify that the unmodified queues can handle traffic. Specifically, the following cases are
+ tested:
+
+ 1. The application should be able to start the device with only some of the
+ queues set up.
+ 2. The application should be able to reconfigure existing queues at runtime
+ without calling dev_stop().
+ """
+
+ #:
+ num_ports_to_modify: ClassVar[int] = 3
+ #: Source IP address to use when sending packets.
+ src_addr: ClassVar[str] = "192.168.0.1"
+ #: Subnet to use for all of the destination addresses of the packets being sent.
+ dst_address_subnet: ClassVar[str] = "192.168.1"
+ #: ID of the port to modify Rx queues on.
+ rx_port_num: ClassVar[int] = 0
+ #: ID of the port to modify Tx queues on.
+ tx_port_num: ClassVar[int] = 1
+ #: Number of queues to start testpmd with. There will be the same number of Rx and Tx queues.
+ #: 8 was chosen as a number that is low enough for most NICs to accommodate while also being
+ #: enough to validate the usage of the queues.
+ number_of_queues: ClassVar[int] = 8
+ #: The number of packets to send while testing. The test calls for well over the ring size - 1
+ #: packets in the modification test case and the only options for ring size are 256 or 512,
+ #: therefore 1024 will be more than enough.
+ number_of_packets_to_send: ClassVar[int] = 1024
+
+ def send_packets_with_different_addresses(self, number_of_packets: int) -> None:
+ """Send a set number of packets each with different dst addresses.
+
+ Different destination addresses are required to ensure that each queue is used. If every
+ packet had the same address, then they would all be processed by the same queue. Note that
+ this means the current implementation of this method is limited to only work for up to 254
+ queues. A smaller subnet would be required to handle an increased number of queues.
+
+ Args:
+ number_of_packets: The number of packets to generate and then send using the traffic
+ generator.
+ """
+ packets_to_send = [
+ Ether()
+ / IP(src=self.src_addr, dst=f"{self.dst_address_subnet}.{(i % 254) + 1}")
+ / Raw()
+ for i in range(number_of_packets)
+ ]
+ self.send_packets(packets_to_send)
+
+ def port_queue_in_stats(
+ self, port_id: int, is_rx_queue: bool, queue_id: int, stats: str
+ ) -> bool:
+ """Verify if stats for a queue are in the provided output.
+
+ Args:
+ port_id: ID of the port that the queue resides on.
+ is_rx_queue: Type of queue to scan for, if :data:`True` then search for an Rx queue,
+ otherwise search for a Tx queue.
+ queue_id: ID of the queue.
+ stats: Testpmd forwarding statistics to scan for the given queue.
+
+ Returns:
+ If the queue appeared in the forwarding statistics.
+ """
+ type_of_queue = "RX" if is_rx_queue else "TX"
+ return f"{type_of_queue} Port= {port_id}/Queue={queue_id:2d}" in stats
+
+ @setup_and_teardown_test
+ def modify_ring_size(
+ self,
+ port_id: int,
+ queues_to_modify: MutableSet[int],
+ unchanged_queues: MutableSet[int],
+ testpmd: TestPmdShell,
+ is_rx_testing: bool,
+ ) -> None:
+ """Verify ring size of port queues can be configured at runtime.
+
+ Ring size of queues in `queues_to_modify` are set to 512 unless that is already their
+ configured size, in which case they are instead set to 256. Queues in `queues_to_modify`
+ are expected to already be stopped before calling this method. `testpmd` is also expected
+ to already be started.
+
+ Args:
+ port_id: Port where the queues reside.
+ queues_to_modify: IDs of stopped queues to configure in the test.
+ unchanged_queues: IDs of running, unmodified queues.
+ testpmd: Running interactive testpmd application.
+ is_rx_testing: If :data:`True` Rx queues will be modified in the test, otherwise Tx
+ queues will be modified.
+ """
+ for queue_id in queues_to_modify:
+ curr_ring_size = testpmd.show_port_queue_info(
+ port_id, queue_id, is_rx_testing
+ ).ring_size
+ new_ring_size = 256 if curr_ring_size == 512 else 512
+ try:
+ testpmd.set_queue_ring_size(
+ port_id, queue_id, new_ring_size, is_rx_testing, verify=True
+ )
+ # The testpmd method verifies that the modification worked, so we catch that error
+ # and just re-raise it as a test case failure
+ except InteractiveCommandExecutionError:
+ self.verify(
+ False,
+ f"Failed to update the ring size of queue {queue_id} on port "
+ f"{port_id} at runtime",
+ )
+
+ @setup_and_teardown_test
+ def stop_queues(
+ self,
+ port_id: int,
+ queues_to_modify: MutableSet[int],
+ unchanged_queues: MutableSet[int],
+ testpmd: TestPmdShell,
+ is_rx_testing: bool,
+ ) -> None:
+ """Verify stopped queues do not handle traffic and do not block traffic on other queues.
+
+ Queues in `queues_to_modify` are expected to already be stopped before calling this method.
+ `testpmd` is also expected to already be started.
+
+ Args:
+ port_id: Port where the queues reside.
+ queues_to_modify: IDs of stopped queues to configure in the test.
+ unchanged_queues: IDs of running, unmodified queues.
+ testpmd: Running interactive testpmd application.
+ is_rx_testing: If :data:`True` Rx queues will be modified in the test, otherwise Tx
+ queues will be modified.
+ """
+ testpmd.start()
+ self.send_packets_with_different_addresses(self.number_of_packets_to_send)
+ forwarding_stats = testpmd.stop()
+
+ # Checking that all unmodified queues handled some packets is important because this
+ # test case checks for the absence of stopped queues to validate that they cannot
+ # receive traffic. If there are some unchanged queues that also didn't receive traffic,
+ # it means there could be another reason for the packets not transmitting and,
+ # therefore, a false positive result.
+ for unchanged_q_id in unchanged_queues:
+ self.verify(
+ self.port_queue_in_stats(port_id, is_rx_testing, unchanged_q_id, forwarding_stats),
+ f"Queue {unchanged_q_id} failed to receive traffic.",
+ )
+ for stopped_q_id in queues_to_modify:
+ self.verify(
+ not self.port_queue_in_stats(
+ port_id, is_rx_testing, stopped_q_id, forwarding_stats
+ ),
+ f"Queue {stopped_q_id} should be stopped but still received traffic.",
+ )
+
+ def test_rx_queue_stop(self):
+ """Run method for stopping queues with flag for Rx testing set to :data:`True`."""
+ self.stop_queues(True)
+
+ def test_rx_queue_configuration(self):
+ """Run method for configuring queues with flag for Rx testing set to :data:`True`."""
+ self.modify_ring_size(True)
+
+ def test_tx_queue_stop(self):
+ """Run method for stopping queues with flag for Rx testing set to :data:`False`."""
+ self.stop_queues(False)
+
+ def test_tx_queue_configuration(self):
+ """Run method for configuring queues with flag for Rx testing set to :data:`False`."""
+ self.modify_ring_size(False)
--
2.45.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v1 4/4] dts: add dynamic queue conf to the yaml schema
2024-06-25 15:53 [PATCH v1 0/4] dts: add dynamic queue configuration test suite jspewock
` (2 preceding siblings ...)
2024-06-25 15:53 ` [PATCH v1 3/4] dts: add dynamic queue test suite jspewock
@ 2024-06-25 15:53 ` jspewock
3 siblings, 0 replies; 5+ messages in thread
From: jspewock @ 2024-06-25 15:53 UTC (permalink / raw)
To: Honnappa.Nagarahalli, wathsala.vithanage, npratte, thomas,
juraj.linkes, probb, Luca.Vizzarro, paul.szczepanek, yoan.picchi
Cc: dev, Jeremy Spewock
From: Jeremy Spewock <jspewock@iol.unh.edu>
Adds the ability to run the test suite using the yaml configuration
file.
Signed-off-by: Jeremy Spewock <jspewock@iol.unh.edu>
---
dts/framework/config/conf_yaml_schema.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dts/framework/config/conf_yaml_schema.json b/dts/framework/config/conf_yaml_schema.json
index f02a310bb5..d83a2f51c5 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -187,7 +187,8 @@
"enum": [
"hello_world",
"os_udp",
- "pmd_buffer_scatter"
+ "pmd_buffer_scatter",
+ "dynamic_queue_conf"
]
},
"test_target": {
--
2.45.2
^ permalink raw reply [flat|nested] 5+ messages in thread