Prior to this patch, the virtual functions created by DTS for crypto
devices were not properly cleanedu up. This could lead to a system to be
left in a bad state after running the cryptodev throughput test suite.
This patch properly cleans up the environment after cryptodev testing.
Bugzilla ID: 1923
Fixes: 8ee2df9da125 ("dts: add cryptodev package")
Signed-off-by: Andrew Bailey <[email protected]>
---
dts/framework/testbed_model/linux_session.py | 28 +++++++++++++++++++-
dts/framework/testbed_model/os_session.py | 8 ++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/dts/framework/testbed_model/linux_session.py
b/dts/framework/testbed_model/linux_session.py
index ee943462c2..a5bb34b4e8 100644
--- a/dts/framework/testbed_model/linux_session.py
+++ b/dts/framework/testbed_model/linux_session.py
@@ -181,6 +181,21 @@ def get_port_info(self, pci_address: str) -> PortInfo:
return PortInfo(mac_address, logical_name, driver, is_link_up)
+ def unbind_ports(self, ports):
+ """Overrides :meth:`~.os_session.OSSession.unbind_ports`.
+
+ The :attr:`~.devbind_script_path` property must be setup in order to
call this method.
+ """
+ ports_pci_addrs = " ".join(port.pci for port in ports)
+
+ self.send_command(
+ f"{self.devbind_script_path} -u --force {ports_pci_addrs}",
+ privileged=True,
+ verify=True,
+ )
+
+ del self._lshw_net_info
+
def bind_ports_to_driver(self, ports: list[Port], driver_name: str) ->
None:
"""Overrides :meth:`~.os_session.OSSession.bind_ports_to_driver`.
@@ -289,7 +304,18 @@ def create_vfs(self, pf_port: Port) -> None:
self.refresh_lshw()
def delete_crypto_vfs(self, pf_port: Port) -> None:
- """Overrides :meth:`~.os_session.OSSession.delete_crypto_vfs`."""
+ """Overrides :meth:`~.os_session.OSSession.delete_crypto_vfs`.
+
+ The :attr:`~.devbind_script_path` property must be setup in order to
call this method.
+ """
+ if vfs := self.get_pci_addr_of_crypto_vfs(pf_port):
+ vf_pci_addrs = " ".join(vf for vf in vfs)
+ self.send_command(
+ f"{self.devbind_script_path} -u --force {vf_pci_addrs}",
+ privileged=True,
+ verify=True,
+ )
+ self.unbind_ports([pf_port])
self.send_command(
f"echo 1 | sudo tee
/sys/bus/pci/devices/{pf_port.pci}/remove".replace(":", "\\:"),
privileged=True,
diff --git a/dts/framework/testbed_model/os_session.py
b/dts/framework/testbed_model/os_session.py
index 2c267afed1..f2dc9b20a9 100644
--- a/dts/framework/testbed_model/os_session.py
+++ b/dts/framework/testbed_model/os_session.py
@@ -573,6 +573,14 @@ def get_port_info(self, pci_address: str) -> PortInfo:
ConfigurationError: If the port could not be found.
"""
+ @abstractmethod
+ def unbind_ports(self, ports: list[Port]) -> None:
+ """Unbind `ports` from any driver.
+
+ Args:
+ ports: The list of ports to unbind.
+ """
+
@abstractmethod
def bind_ports_to_driver(self, ports: list[Port], driver_name: str) ->
None:
"""Bind `ports` to the given `driver_name`.
--
2.50.1
