From fdcfec081b2da2ad57d0781140c557db7183d89b Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Tue, 27 Apr 2021 18:56:25 +0200 Subject: [PATCH] tests: Fix test_vfio The new kernel 5.12 requires the devices to be manually bound to vfio-pci while adding a new_id is only needed once per device_id:vendor_id pair. Signed-off-by: Sebastien Boeuf --- test_data/cloud-init/ubuntu/user-data | 7 ++++--- tests/integration.rs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test_data/cloud-init/ubuntu/user-data b/test_data/cloud-init/ubuntu/user-data index b9a58e99e..b1f1d4b2c 100644 --- a/test_data/cloud-init/ubuntu/user-data +++ b/test_data/cloud-init/ubuntu/user-data @@ -36,14 +36,15 @@ write_files: #!/bin/bash mount /dev/vdc /mnt + bash -c "echo 1af4 1041 > /sys/bus/pci/drivers/vfio-pci/new_id" bash -c "echo 0000:00:06.0 > /sys/bus/pci/devices/0000\:00\:06.0/driver/unbind" - bash -c "echo 1af4 1041 > /sys/bus/pci/drivers/vfio-pci/new_id" + bash -c "echo 0000:00:06.0 > /sys/bus/pci/drivers/vfio-pci/bind" bash -c "echo 0000:00:07.0 > /sys/bus/pci/devices/0000\:00\:07.0/driver/unbind" - bash -c "echo 1af4 1041 > /sys/bus/pci/drivers/vfio-pci/new_id" + bash -c "echo 0000:00:07.0 > /sys/bus/pci/drivers/vfio-pci/bind" # 1G ram requires 512 pages echo 512 | sudo tee /proc/sys/vm/nr_hugepages sudo chmod a+rwX /dev/hugepages - /mnt/cloud-hypervisor --kernel /mnt/vmlinux --cmdline "console=hvc0 reboot=k panic=1 nomodules i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd root=/dev/vda1 VFIOTAG" --disk path=/mnt/focal-server-cloudimg-amd64-custom-20210407-0.qcow2 path=/mnt/cloudinit.img --cpus boot=1 --memory size=512M,hotplug_size=1G,hugepages=on --device path=/sys/bus/pci/devices/0000:00:06.0/ path=/sys/bus/pci/devices/0000:00:07.0/ --api-socket /tmp/ch_api.sock + /mnt/cloud-hypervisor --kernel /mnt/vmlinux --cmdline "console=hvc0 reboot=k panic=1 nomodules root=/dev/vda1 VFIOTAG" --disk path=/mnt/focal-server-cloudimg-amd64-custom-20210407-0.qcow2 path=/mnt/cloudinit.img --cpus boot=1 --memory size=512M,hotplug_size=1G,hugepages=on --device path=/sys/bus/pci/devices/0000:00:06.0/ path=/sys/bus/pci/devices/0000:00:07.0/ --api-socket /tmp/ch_api.sock - path: /etc/systemd/system/notify-booted.service diff --git a/tests/integration.rs b/tests/integration.rs index 013ac174e..5a3c1330b 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -3559,7 +3559,7 @@ mod tests { ).unwrap(); guest .ssh_command_l1( - "echo 1af4 1041 | sudo tee /sys/bus/pci/drivers/vfio-pci/new_id", + "echo 0000:00:08.0 | sudo tee /sys/bus/pci/drivers/vfio-pci/bind", ) .unwrap(); let vfio_hotplug_output = guest