Merge pull request #6197 from yalzhang/passt_vhostuser

Add vhostuser support for passt

Author: smitterl

libvirt/tests/cfg/virtual_network/passt/passt_attach_detach.cfg

@@ -24,6 +24,11 @@
         - detach:
             add_iface = yes
         - attach_detach:
+    variants:
+        - default:
+        - vhostuser:
+            vhostuser = yes
+            func_supported_since_libvirt_ver = (10, 10, 0)
     variants:
         - ip_portfw:
             alias = {'name': 'ua-c87b89ff-b769-4abc-921f-30d42d7aec5b'}

libvirt/tests/cfg/virtual_network/passt/passt_function.cfg

@@ -78,3 +78,8 @@
             iface_attrs = {'model': 'virtio', 'acpi': {'index': '1'}, 'ips': ${ips}, 'backend': ${backend}, 'source': {'dev': host_iface}, 'alias': ${alias}, 'type_name': 'user', 'portForwards': ${portForwards}}
             s390-virtio:
                 iface_attrs = {'model': 'virtio', 'ips': ${ips}, 'backend': ${backend}, 'source': {'dev': host_iface}, 'alias': ${alias}, 'type_name': 'user', 'portForwards': ${portForwards}}
+    variants:
+        - default:
+        - vhostuser:
+            vhostuser = yes
+            func_supported_since_libvirt_ver = (10, 10, 0)

libvirt/tests/cfg/virtual_network/passt/passt_lifecycle.cfg

@@ -20,13 +20,23 @@
             operation_a = suspend
             operation_b = resume
             passt_running = yes
+    variants:
+        - default:
+        - vhostuser:
+            vhostuser = yes
+            func_supported_since_libvirt_ver = (10, 10, 0)
     variants user_type:
         - non_root_user:
             test_user = USER.EXAMPLE
             test_passwd = PASSWORD.EXAMPLE
             user_id = 
             unpr_vm_name = UNPRIVILEGED_VM.EXAMPLE
             socket_dir = f'/run/user/{user_id}/libvirt/qemu/run/passt/'
+        - root_user:
+            test_user = root
+            user_id = 107
+            log_dir = /run/user/${user_id}
+            socket_dir = f'/run/libvirt/qemu/passt/'
     variants scenario:
         - ip_portfw:
             ipv6_prefix = 128

libvirt/tests/cfg/virtual_network/passt/passt_reconnect.cfg

@@ -20,6 +20,12 @@
             unpr_vm_name = UNPRIVILEGED_VM.EXAMPLE
             virsh_uri = 'qemu+ssh://${test_user}@localhost/session'
             socket_dir = f'/run/user/{user_id}/libvirt/qemu/run/passt/'
+    variants:
+        - default:
+        - vhostuser:
+            vhostuser = 'yes'
+            qemu_cmd_check = "reconnect=5"
+            func_supported_since_libvirt_ver = (10, 10, 0)
     variants:
         - ip_portfw:
             alias = {'alias': {'name': 'ua-c87b89ff-b769-4abc-921f-30d42d7aec5b'}}

libvirt/tests/cfg/virtual_network/passt/passt_transfer_file.cfg

@@ -18,6 +18,11 @@
             unpr_vm_name = UNPRIVILEGED_VM.EXAMPLE
             virsh_uri = 'qemu+ssh://${test_user}@localhost/session'
             socket_dir = f'/run/user/{user_id}/libvirt/qemu/run/passt/'
+    variants:
+        - default:
+        - vhostuser:
+            vhostuser = 'yes'
+            func_supported_since_libvirt_ver = (10, 10, 0)
     variants:
         - ip_portfw:
             alias = {'alias': {'name': 'ua-c87b89ff-b769-4abc-921f-30d42d7aec5b'}}

libvirt/tests/src/virtual_network/passt/passt_attach_detach.py

@@ -11,6 +11,7 @@
 from virttest import virsh
 from virttest.libvirt_xml import vm_xml
 from virttest.staging import service
+from virttest.staging import utils_memory
 from virttest.utils_libvirt import libvirt_unprivileged
 from virttest.utils_libvirt import libvirt_vmxml
 
@@ -79,10 +80,12 @@ def run(test, params, env):
     log_file = f'/run/user/{user_id}/passt.log'
     iface_attrs['backend']['logFile'] = log_file
     iface_attrs['source']['dev'] = host_iface
+    vhostuser = 'yes' == params.get('vhostuser', 'no')
 
     vmxml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name,
                                                    virsh_instance=virsh_ins)
     bkxml = vmxml.copy()
+    shp_orig_num = utils_memory.get_num_huge_pages()
 
     selinux_status = passt.ensure_selinux_enforcing()
     passt.check_socat_installed()
@@ -93,6 +96,12 @@ def run(test, params, env):
             passt.make_log_dir(user_id, log_dir)
 
         vmxml.del_device('interface', by_tag=True)
+        if vhostuser:
+            # set static hugepage
+            utils_memory.set_num_huge_pages(2048)
+            vm_xml.VMXML.set_memoryBacking_tag(vm_name, access_mode="shared", hpgs=True, vmxml=vmxml)
+            # update vm xml with shared memory and vhostuser interface
+            iface_attrs['type_name'] = 'vhostuser'
         iface_device = libvirt_vmxml.create_vm_device_by_type('interface',
                                                               iface_attrs)
         LOG.debug(f'iface_device: {iface_device}')
@@ -150,7 +159,7 @@ def run(test, params, env):
         if 'detach' not in scenario:
             vm.destroy()
             passt.check_passt_pid_not_exist()
-            if os.listdir(socket_dir):
+            if not vhostuser and os.listdir(socket_dir):
                 test.fail(f'Socket dir is not empty: {os.listdir(socket_dir)}')
         else:
             vmxml = vm_xml.VMXML.new_from_dumpxml(vm_name,
@@ -183,3 +192,4 @@ def run(test, params, env):
         if root:
             shutil.rmtree(log_dir)
         utils_selinux.set_status(selinux_status)
+        utils_memory.set_num_huge_pages(shp_orig_num)

libvirt/tests/src/virtual_network/passt/passt_function.py

@@ -10,6 +10,7 @@
 from virttest import virsh
 from virttest.libvirt_xml import vm_xml
 from virttest.staging import service
+from virttest.staging import utils_memory
 from virttest.utils_libvirt import libvirt_unprivileged
 from virttest.utils_libvirt import libvirt_vmxml
 
@@ -65,10 +66,12 @@ def run(test, params, env):
     log_file = f'/run/user/{user_id}/passt.log'
     iface_attrs = eval(params.get('iface_attrs'))
     iface_attrs['backend']['logFile'] = log_file
+    vhostuser = 'yes' == params.get('vhostuser', 'no')
 
     vmxml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name,
                                                    virsh_instance=virsh_ins)
     bkxml = vmxml.copy()
+    shp_orig_num = utils_memory.get_num_huge_pages()
 
     selinux_status = passt.ensure_selinux_enforcing()
     passt.check_socat_installed()
@@ -83,6 +86,12 @@ def run(test, params, env):
 
         vmxml.del_device('interface', by_tag=True)
         vmxml.sync(virsh_instance=virsh_ins)
+        if vhostuser:
+            # set static hugepage
+            utils_memory.set_num_huge_pages(2048)
+            vm_xml.VMXML.set_memoryBacking_tag(vm_name, access_mode="shared", hpgs=True, vmxml=vmxml)
+            # update vm xml with shared memory and vhostuser interface
+            iface_attrs['type_name'] = 'vhostuser'
         libvirt_vmxml.modify_vm_device(vmxml, 'interface', iface_attrs,
                                        virsh_instance=virsh_ins)
         LOG.debug(virsh_ins.dumpxml(vm_name).stdout_text)
@@ -92,6 +101,7 @@ def run(test, params, env):
         passt.check_proc_info(params, log_file, mac)
 
         #   check the passt log
+        LOG.debug(virsh.dumpxml(vm_name))
         if not os.path.exists(log_file):
             test.fail(f'Logfile of passt "{log_file}" not created')
 
@@ -123,7 +133,7 @@ def run(test, params, env):
         vm.destroy()
 
         passt.check_passt_pid_not_exist()
-        if os.listdir(socket_dir):
+        if not vhostuser and os.listdir(socket_dir):
             test.fail(f'Socket dir is not empty: {os.listdir(socket_dir)}')
 
     finally:
@@ -132,3 +142,4 @@ def run(test, params, env):
         if root:
             shutil.rmtree(log_dir)
         utils_selinux.set_status(selinux_status)
+        utils_memory.set_num_huge_pages(shp_orig_num)

libvirt/tests/src/virtual_network/passt/passt_lifecycle.py

@@ -11,6 +11,7 @@
 from virttest import virsh
 from virttest.libvirt_xml import vm_xml
 from virttest.staging import service
+from virttest.staging import utils_memory
 from virttest.utils_libvirt import libvirt_unprivileged
 from virttest.utils_libvirt import libvirt_vmxml
 
@@ -29,6 +30,7 @@ def run(test, params, env):
     """
     libvirt_version.is_libvirt_feature_supported(params)
     root = 'root_user' == params.get('user_type', '')
+    test_user = params.get('test_user')
     if root:
         vm_name = params.get('main_vm')
         vm = env.get_vm(vm_name)
@@ -70,14 +72,16 @@ def run(test, params, env):
     iface_attrs['backend']['logFile'] = log_file
     operation_a = params.get('operation_a')
     operation_b = params.get('operation_b')
-    save_path = f'/home/{test_user}/save_{utils_misc.generate_random_string(3)}'
+    save_path = f'/tmp/save_{utils_misc.generate_random_string(3)}'
     options_a = eval(params.get('options_a', '{}'))
     options_b = eval(params.get('options_b', '{}'))
     passt_running = 'yes' == params.get('passt_running', 'no')
+    vhostuser = 'yes' == params.get('vhostuser', 'no')
 
     vmxml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name,
                                                    virsh_instance=virsh_ins)
     bkxml = vmxml.copy()
+    shp_orig_num = utils_memory.get_num_huge_pages()
 
     selinux_status = passt.ensure_selinux_enforcing()
     passt.check_socat_installed()
@@ -97,6 +101,12 @@ def run(test, params, env):
         vmxml.sync(virsh_instance=virsh_ins)
         libvirt_vmxml.modify_vm_device(vmxml, 'interface', iface_attrs,
                                        virsh_instance=virsh_ins)
+        if vhostuser:
+            # set static hugepage
+            utils_memory.set_num_huge_pages(2048)
+            vm_xml.VMXML.set_memoryBacking_tag(vm_name, access_mode="shared", hpgs=True, vmxml=vmxml)
+            # update vm xml with shared memory and vhostuser interface
+            iface_attrs['type_name'] = 'vhostuser'
         LOG.debug(virsh_ins.dumpxml(vm_name).stdout_text)
         mac = vm.get_virsh_mac_address()
 
@@ -148,7 +158,7 @@ def run(test, params, env):
         vm.destroy()
 
         passt.check_passt_pid_not_exist()
-        if os.listdir(socket_dir):
+        if not vhostuser and os.listdir(socket_dir):
             test.fail(f'Socket dir is not empty: {os.listdir(socket_dir)}')
 
     finally:
@@ -159,3 +169,4 @@ def run(test, params, env):
         utils_selinux.set_status(selinux_status)
         if os.path.exists(save_path):
             os.remove(save_path)
+        utils_memory.set_num_huge_pages(shp_orig_num)

libvirt/tests/src/virtual_network/passt/passt_reconnect.py

@@ -13,6 +13,7 @@
 from virttest import virsh
 from virttest.libvirt_xml import vm_xml
 from virttest.staging import service
+from virttest.staging import utils_memory
 from virttest.utils_libvirt import libvirt_unprivileged
 from virttest.utils_test import libvirt
 
@@ -69,10 +70,12 @@ def run(test, params, env):
     log_file = f'/run/user/{user_id}/passt.log'
     iface_attrs['backend']['logFile'] = log_file
     iface_attrs['source']['dev'] = host_iface
+    vhostuser = 'yes' == params.get('vhostuser', 'no')
 
     vmxml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name,
                                                    virsh_instance=virsh_ins)
     bkxml = vmxml.copy()
+    shp_orig_num = utils_memory.get_num_huge_pages()
 
     selinux_status = passt.ensure_selinux_enforcing()
     passt.check_socat_installed()
@@ -82,6 +85,10 @@ def run(test, params, env):
         if root:
             passt.make_log_dir(user_id, log_dir)
 
+        if vhostuser:
+            iface_attrs['type_name'] = 'vhostuser'
+            utils_memory.set_num_huge_pages(2048)
+            vm_xml.VMXML.set_memoryBacking_tag(vm_name, access_mode="shared", hpgs=True, vmxml=vmxml)
         passt.vm_add_iface(vmxml, iface_attrs, virsh_ins)
         vm.start()
 
@@ -142,3 +149,4 @@ def run(test, params, env):
         if root:
             shutil.rmtree(log_dir)
         utils_selinux.set_status(selinux_status)
+        utils_memory.set_num_huge_pages(shp_orig_num)