Skip to content

Refactor SR-IOV VFIO test to use dynamic driver verification #6629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor SR-IOV VFIO test to use dynamic driver verification #6629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion libvirt/tests/cfg/sriov/plug_unplug/sriov_attach_detach_device_vfio_variant_driver.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
- sriov.plug_unplug.vfio_variant_driver:
type = sriov_attach_detach_device_vfio_variant_driver
start_vm = "no"
expr_driver = "mlx5_vfio_pci"
ping_dest = "www.redhat.com"
test_pf = "ens3f0np0"

only x86_64, aarch64
x86_64:
test_pf = "ens3f0np0"
variants:
- mlx5_vfio:
expr_driver = "mlx5_vfio_pci"
driver_dict = {'driver': {'driver_attr': {'name': 'vfio', 'model': 'mlx5_vfio_pci'}}}
- vfio_vfio:
driver_dict = {'driver': {'driver_attr': {'name': 'vfio', 'model': 'vfio_pci'}}}
Expand Down
15 changes: 13 additions & 2 deletions libvirt/tests/src/sriov/plug_unplug/sriov_attach_detach_device_vfio_variant_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def parse_iface_dict(pf_pci):

dev_type = params.get("dev_type", "hostdev_interface")
device_type = "hostdev" if dev_type == "hostdev_device" else "interface"
expr_driver = params.get("expr_driver", "mlx5_vfio_pci")
expr_driver = params.get("expr_driver")
test_pf = params.get("test_pf")
pf_pci = utils_sriov.get_pf_pci(test_pf=test_pf)
iface_number = int(params.get("iface_number", "1"))
Expand All @@ -51,6 +51,7 @@ def parse_iface_dict(pf_pci):
vm = env.get_vm(vm_name)
new_xml = vm_xml.VMXML.new_from_inactive_dumpxml(vm.name)
orig_vm_xml = new_xml.copy()
original_drivers = {}
try:
libvirt_vmxml.remove_vm_devices_by_type(vm, 'interface')
libvirt_vmxml.remove_vm_devices_by_type(vm, 'hostdev')
Expand All @@ -66,6 +67,10 @@ def parse_iface_dict(pf_pci):
for idx in range(iface_number):
test.log.info("TEST_STEP: Attach a hostdev interface/device to VM")
vf_pci = utils_sriov.get_vf_pci_id(pf_pci, idx)
if vf_pci not in original_drivers:
original_driver = libvirt_vfio.get_pci_driver(vf_pci)
original_drivers[vf_pci] = original_driver
test.log.debug(f"Stored original driver for {vf_pci}: {original_driver}")
iface_dict = parse_iface_dict(vf_pci)
iface_dev = libvirt_vmxml.create_vm_device_by_type(device_type, iface_dict)
virsh.attach_device(vm.name, iface_dev.xml, ignore_status=False,
Expand Down Expand Up @@ -99,7 +104,13 @@ def parse_iface_dict(pf_pci):
"device!" % vm_hostdevs)
else:
test.log.debug("Verify: The hostdev interface/device in VM xml is removed successfully - PASS")
libvirt_vfio.check_vfio_pci(vf_pci, exp_driver="mlx5_core")

# Verify original drivers are restored after detach
for idx in range(iface_number):
vf_pci = utils_sriov.get_vf_pci_id(pf_pci, idx)
original_driver = original_drivers[vf_pci]
libvirt_vfio.check_vfio_pci(vf_pci, exp_driver=original_driver)
test.log.debug(f"Verify: Original driver {original_driver} restored for {vf_pci} - PASS")
test.log.debug("Verify: Check VF driver successfully after detaching hostdev interface/device - PASS")
virsh.reboot(vm.name, ignore_status=False, debug=True)
test.log.debug("Verify: VM reboot is successful after detaching hostdev interface/device - PASS")
Expand Down