| Message ID | 0ed2315f59965380ffbbfb01556e18075fc654b2.1626722742.git.jag.raman@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vfio-user server in QEMU | expand |
> -----Original Message----- > From: Jagannathan Raman <jag.raman@oracle.com> > Sent: 19 July 2021 21:00 > To: qemu-devel@nongnu.org > Cc: stefanha@redhat.com; alex.williamson@redhat.com; > elena.ufimtseva@oracle.com; John Levon <john.levon@nutanix.com>; > john.g.johnson@oracle.com; Thanos Makatos > <thanos.makatos@nutanix.com>; Swapnil Ingle > <swapnil.ingle@nutanix.com>; jag.raman@oracle.com > Subject: [PATCH RFC server 11/11] vfio-user: acceptance test > > Acceptance test for libvfio-user in QEMU > > Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com> > Signed-off-by: John G Johnson <john.g.johnson@oracle.com> > Signed-off-by: Jagannathan Raman <jag.raman@oracle.com> > --- > MAINTAINERS | 1 + > tests/acceptance/vfio-user.py | 94 > +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 95 insertions(+) > create mode 100644 tests/acceptance/vfio-user.py > > diff --git a/MAINTAINERS b/MAINTAINERS > index 46ab6b6..644bd35 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -3381,6 +3381,7 @@ F: include/hw/remote/proxy-memory-listener.h > F: hw/remote/iohub.c > F: include/hw/remote/iohub.h > F: hw/remote/vfio-user-obj.c > +F: tests/acceptance/vfio-user.py > > EBPF: > M: Jason Wang <jasowang@redhat.com> > diff --git a/tests/acceptance/vfio-user.py b/tests/acceptance/vfio-user.py > new file mode 100644 > index 0000000..ef318d9 > --- /dev/null > +++ b/tests/acceptance/vfio-user.py > @@ -0,0 +1,94 @@ > +# vfio-user protocol sanity test > +# > +# This work is licensed under the terms of the GNU GPL, version 2 or > +# later. See the COPYING file in the top-level directory. > + > + > +import os > +import socket > +import uuid > + > +from avocado_qemu import Test > +from avocado_qemu import wait_for_console_pattern > +from avocado_qemu import exec_command > +from avocado_qemu import exec_command_and_wait_for_pattern > + > +class VfioUser(Test): > + """ > + :avocado: tags=vfiouser > + """ > + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' > + > + def do_test(self, kernel_url, initrd_url, kernel_command_line, > + machine_type): > + """Main test method""" > + self.require_accelerator('kvm') > + > + kernel_path = self.fetch_asset(kernel_url) > + initrd_path = self.fetch_asset(initrd_url) > + > + socket = os.path.join('/tmp', str(uuid.uuid4())) > + if os.path.exists(socket): > + os.remove(socket) > + > + # Create remote process > + remote_vm = self.get_vm() > + remote_vm.add_args('-machine', 'x-remote') > + remote_vm.add_args('-nodefaults') > + remote_vm.add_args('-device', 'lsi53c895a,id=lsi1') IIUC the LSI controller will now be a migratable device and migration will be handled by vfu_mig_transition() introduced in your "vfio-user: register handlers to facilitate migration" patch. In vfu_mig_transition(), you don’t copy migration data in the VFU_MIGR_STATE_STOP_AND_COPY case but only in VFU_MIGR_STATE_PRE_COPY, however I believe that in VFIO it's possible to jump from the running state straight to the stop-and-copy state. Are you relying on QEMU not doing this? > + remote_vm.add_args('-object', 'vfio-user,id=vfioobj1,' > + 'devid=lsi1,socket='+socket) > + remote_vm.launch() > + > + # Create proxy process > + self.vm.set_console() > + self.vm.add_args('-machine', machine_type) > + self.vm.add_args('-accel', 'kvm') > + self.vm.add_args('-cpu', 'host') > + self.vm.add_args('-object', > + 'memory-backend-memfd,id=sysmem-file,size=2G') > + self.vm.add_args('--numa', 'node,memdev=sysmem-file') > + self.vm.add_args('-m', '2048') > + self.vm.add_args('-kernel', kernel_path, > + '-initrd', initrd_path, > + '-append', kernel_command_line) > + self.vm.add_args('-device', > + 'vfio-user-pci,' > + 'socket='+socket) > + self.vm.launch() > + wait_for_console_pattern(self, 'as init process', > + 'Kernel panic - not syncing') > + exec_command(self, 'mount -t sysfs sysfs /sys') > + exec_command_and_wait_for_pattern(self, > + 'cat /sys/bus/pci/devices/*/uevent', > + 'PCI_ID=1000:0012') > + > + def test_multiprocess_x86_64(self): > + """ > + :avocado: tags=arch:x86_64 > + """ > + kernel_url = ('https://urldefense.proofpoint.com/v2/url?u=https- > 3A__archives.fedoraproject.org_pub_archive_fedora&d=DwIBAg&c=s883G > pUCOChKOHiocYtGcg&r=XTpYsh5Ps2zJvtw6ogtti46atk736SI4vgsJiUKIyDE&m= > 4nAZXeA9xd82TON6H7CXF5LVa0jKBAJkyu0Y- > curSd4&s=hP6IktdmIVlw3gMuZlWRkPvFq9OzjUji6sb_28sapwk&e= ' > + '/linux/releases/31/Everything/x86_64/os/images' > + '/pxeboot/vmlinuz') > + initrd_url = ('https://urldefense.proofpoint.com/v2/url?u=https- > 3A__archives.fedoraproject.org_pub_archive_fedora&d=DwIBAg&c=s883G > pUCOChKOHiocYtGcg&r=XTpYsh5Ps2zJvtw6ogtti46atk736SI4vgsJiUKIyDE&m= > 4nAZXeA9xd82TON6H7CXF5LVa0jKBAJkyu0Y- > curSd4&s=hP6IktdmIVlw3gMuZlWRkPvFq9OzjUji6sb_28sapwk&e= ' > + '/linux/releases/31/Everything/x86_64/os/images' > + '/pxeboot/initrd.img') > + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + > + 'console=ttyS0 rdinit=/bin/bash') > + machine_type = 'pc' > + self.do_test(kernel_url, initrd_url, kernel_command_line, > machine_type) > + > + def test_multiprocess_aarch64(self): > + """ > + :avocado: tags=arch:aarch64 > + """ > + kernel_url = ('https://urldefense.proofpoint.com/v2/url?u=https- > 3A__archives.fedoraproject.org_pub_archive_fedora&d=DwIBAg&c=s883G > pUCOChKOHiocYtGcg&r=XTpYsh5Ps2zJvtw6ogtti46atk736SI4vgsJiUKIyDE&m= > 4nAZXeA9xd82TON6H7CXF5LVa0jKBAJkyu0Y- > curSd4&s=hP6IktdmIVlw3gMuZlWRkPvFq9OzjUji6sb_28sapwk&e= ' > + '/linux/releases/31/Everything/aarch64/os/images' > + '/pxeboot/vmlinuz') > + initrd_url = ('https://urldefense.proofpoint.com/v2/url?u=https- > 3A__archives.fedoraproject.org_pub_archive_fedora&d=DwIBAg&c=s883G > pUCOChKOHiocYtGcg&r=XTpYsh5Ps2zJvtw6ogtti46atk736SI4vgsJiUKIyDE&m= > 4nAZXeA9xd82TON6H7CXF5LVa0jKBAJkyu0Y- > curSd4&s=hP6IktdmIVlw3gMuZlWRkPvFq9OzjUji6sb_28sapwk&e= ' > + '/linux/releases/31/Everything/aarch64/os/images' > + '/pxeboot/initrd.img') > + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + > + 'rdinit=/bin/bash console=ttyAMA0') > + machine_type = 'virt,gic-version=3' > + self.do_test(kernel_url, initrd_url, kernel_command_line, > machine_type) > -- > 1.8.3.1
diff --git a/MAINTAINERS b/MAINTAINERS index 46ab6b6..644bd35 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3381,6 +3381,7 @@ F: include/hw/remote/proxy-memory-listener.h F: hw/remote/iohub.c F: include/hw/remote/iohub.h F: hw/remote/vfio-user-obj.c +F: tests/acceptance/vfio-user.py EBPF: M: Jason Wang <jasowang@redhat.com> diff --git a/tests/acceptance/vfio-user.py b/tests/acceptance/vfio-user.py new file mode 100644 index 0000000..ef318d9 --- /dev/null +++ b/tests/acceptance/vfio-user.py @@ -0,0 +1,94 @@ +# vfio-user protocol sanity test +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + + +import os +import socket +import uuid + +from avocado_qemu import Test +from avocado_qemu import wait_for_console_pattern +from avocado_qemu import exec_command +from avocado_qemu import exec_command_and_wait_for_pattern + +class VfioUser(Test): + """ + :avocado: tags=vfiouser + """ + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' + + def do_test(self, kernel_url, initrd_url, kernel_command_line, + machine_type): + """Main test method""" + self.require_accelerator('kvm') + + kernel_path = self.fetch_asset(kernel_url) + initrd_path = self.fetch_asset(initrd_url) + + socket = os.path.join('/tmp', str(uuid.uuid4())) + if os.path.exists(socket): + os.remove(socket) + + # Create remote process + remote_vm = self.get_vm() + remote_vm.add_args('-machine', 'x-remote') + remote_vm.add_args('-nodefaults') + remote_vm.add_args('-device', 'lsi53c895a,id=lsi1') + remote_vm.add_args('-object', 'vfio-user,id=vfioobj1,' + 'devid=lsi1,socket='+socket) + remote_vm.launch() + + # Create proxy process + self.vm.set_console() + self.vm.add_args('-machine', machine_type) + self.vm.add_args('-accel', 'kvm') + self.vm.add_args('-cpu', 'host') + self.vm.add_args('-object', + 'memory-backend-memfd,id=sysmem-file,size=2G') + self.vm.add_args('--numa', 'node,memdev=sysmem-file') + self.vm.add_args('-m', '2048') + self.vm.add_args('-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line) + self.vm.add_args('-device', + 'vfio-user-pci,' + 'socket='+socket) + self.vm.launch() + wait_for_console_pattern(self, 'as init process', + 'Kernel panic - not syncing') + exec_command(self, 'mount -t sysfs sysfs /sys') + exec_command_and_wait_for_pattern(self, + 'cat /sys/bus/pci/devices/*/uevent', + 'PCI_ID=1000:0012') + + def test_multiprocess_x86_64(self): + """ + :avocado: tags=arch:x86_64 + """ + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/31/Everything/x86_64/os/images' + '/pxeboot/vmlinuz') + initrd_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/31/Everything/x86_64/os/images' + '/pxeboot/initrd.img') + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'console=ttyS0 rdinit=/bin/bash') + machine_type = 'pc' + self.do_test(kernel_url, initrd_url, kernel_command_line, machine_type) + + def test_multiprocess_aarch64(self): + """ + :avocado: tags=arch:aarch64 + """ + kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/31/Everything/aarch64/os/images' + '/pxeboot/vmlinuz') + initrd_url = ('https://archives.fedoraproject.org/pub/archive/fedora' + '/linux/releases/31/Everything/aarch64/os/images' + '/pxeboot/initrd.img') + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'rdinit=/bin/bash console=ttyAMA0') + machine_type = 'virt,gic-version=3' + self.do_test(kernel_url, initrd_url, kernel_command_line, machine_type)