memory_nvdimm: Fix cpu mode to enable test for aarch64 #5378

hs0210 · 2024-01-04T10:16:02Z

The cpu mode is host-passthrough for arm.

Internal snapshots of a VM with pflash based firmware are not supported on arm, so skip this check on arm

The following is the test result on arm, the failed two cases are because arm does not support and they have been skipped in libvirt-ci:

 (1/6) type_specific.io-github-autotest-libvirt.nvdimm.back_file.label.default: PASS (89.60 s)
 (2/6) type_specific.io-github-autotest-libvirt.nvdimm.back_file.label.check_life_cycle: PASS (107.47 s)
 (3/6) type_specific.io-github-autotest-libvirt.nvdimm.back_file.label.discard: PASS (10.98 s)
 (4/6) type_specific.io-github-autotest-libvirt.nvdimm.back_file.label.pmem_alignsize: ERROR: Command '/usr/bin/virsh start avocado-vt-vm1 ' failed.\nstdout: b'\n'\nstderr: b"error: Failed to start domain 'avocado-vt-vm1'\nerror: unsupported configuration: nvdimm pmem property is not available with this QEMU binary\n"\nadditional_info: None (11.85 s)
 (5/6) type_specific.io-github-autotest-libvirt.nvdimm.back_file.no_label: PASS (191.47 s)
 (6/6) type_specific.io-github-autotest-libvirt.nvdimm.hot_plug: FAIL: error: Failed to detach device from /tmp/xml_utils_temp__yvn_jk8.xml\nerror: internal error: unable to execute QEMU command 'device_del': nvdimm device hot unplug is not supported yet.\n (59.04 s)
RESULTS    : PASS 4 | ERROR 1 | FAIL 1 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0

dzhengfy

Others LGTM

dzhengfy · 2024-01-05T06:53:01Z

libvirt/tests/src/memory/nvdimm.py

-        virsh.snapshot_create_as(vm_name, vm_s1, ignore_status=False, debug=True)
-        virsh.snapshot_revert(vm_name, vm_s1, ignore_status=False, debug=True)
-        virsh.snapshot_delete(vm_name, vm_s1, ignore_status=False, debug=True)
+        if platform.machine() == 'aarch64':


We need to use external snapshot instead of simply skipping the steps. Thanks.

Revert to external snapshot not supported yet

# virsh snapshot-create-as avocado-vt-vm1 avocado-vt-vm1.s1 --disk-only Domain snapshot avocado-vt-vm1.s1 created # virsh snapshot-revert avocado-vt-vm1 avocado-vt-vm1.s1 error: unsupported configuration: revert to external snapshot not supported yet

Can we just skip snapshot-revert for external snapshots?

Discussed with feature owner and the decision is we accept the unsupported result in the codes as pass and also keep delete snapshot step.

Updated.
For external dish snapshot on ARM
On xxxx-8, both revert and delete are not supported
On xxxx-9, since 9.10.0, both revert and delete are supported, but if the guest is on, the revert will be refused.

chunfuwen

lgtm

dzhengfy · 2024-01-25T13:33:48Z

libvirt/tests/src/memory/nvdimm.py

+                if not re.search(error_msg_1, revert_result.stderr) \
+                        and not re.search(error_msg_2, revert_result.stderr):
+                    test.fail("The error '{}' or '{}' should be in the output \n'{}'" %
+                              format(error_msg_1, error_msg_2, revert_result.stderr))


From line 347 to 357, we could use libvirt.check_result( revert_result, expected_fails=[error_msg_1, error_msg_2])

libvirt/tests/src/memory/nvdimm.py

dzhengfy · 2024-01-25T13:39:11Z

libvirt/tests/src/memory/nvdimm.py

+                virsh.snapshot_delete(vm_name, "%s --metadata" % vm_s1, ignore_status=False, debug=True)
+                domxml = virsh.dumpxml(vm_name).stdout.strip()
+                xtf_dom = xml_utils.XMLTreeFile(domxml)
+                snap_file_path = xtf_dom.find("devices/disk/source").get("file")


To get the disk source, you might use libvirt_disk.get_first_disk_source(vm)

dzhengfy · 2024-01-25T13:42:21Z

libvirt/tests/src/memory/nvdimm.py

+                if os.path.exists(snap_file_path):
+                    os.remove(snap_file_path)
+        else:
+            virsh.snapshot_create_as(vm_name, vm_s1, ignore_status=False, debug=True)


Could you help also update with

virsh.snapshot_create_as(vm_name, "%s --disk-only" % vm_s1, ignore_status=False, debug=True) ```for x86_64? Someone will help to test it on x86_64. Thanks.

dzhengfy

Thanks

dzhengfy · 2024-01-28T08:53:31Z

libvirt/tests/src/memory/nvdimm.py

-        virsh.snapshot_revert(vm_name, vm_s1, ignore_status=False, debug=True)
-        virsh.snapshot_delete(vm_name, vm_s1, ignore_status=False, debug=True)
+        if platform.machine() == 'aarch64':
+            virsh.snapshot_create_as(vm_name, "%s --disk-only" % vm_s1,


After I tested on x86_64, the error message is same with on aarch64. That is to say, these operations are arch independant.
So could you remove the arch checking and just keep line 344 to line 355?

Done, PTAL.

The cpu mode is host-passthrough for arm. Internal snapshots of a VM with pflash based firmware are not supported on arm, so skip this check on arm. Signed-off-by: Hu Shuai <[email protected]>

dzhengfy

LGTM

Yingshun

LGTM

hs0210 force-pushed the memory_nvdimm branch from aa31e3c to 7a3fde2 Compare January 4, 2024 10:25

dzhengfy reviewed Jan 5, 2024

View reviewed changes

chunfuwen approved these changes Jan 8, 2024

View reviewed changes

hs0210 force-pushed the memory_nvdimm branch 3 times, most recently from 0a645ad to c5f1efe Compare January 12, 2024 09:13

dzhengfy reviewed Jan 25, 2024

View reviewed changes

hs0210 force-pushed the memory_nvdimm branch 2 times, most recently from 578d0d7 to 4da8556 Compare January 26, 2024 05:57

dzhengfy reviewed Jan 28, 2024

View reviewed changes

memory_nvdimm: Fix cpu mode to enable test for aarch64

d98f86a

The cpu mode is host-passthrough for arm. Internal snapshots of a VM with pflash based firmware are not supported on arm, so skip this check on arm. Signed-off-by: Hu Shuai <[email protected]>

hs0210 force-pushed the memory_nvdimm branch from 4da8556 to d98f86a Compare January 29, 2024 03:18

dzhengfy approved these changes Feb 22, 2024

View reviewed changes

Yingshun approved these changes Feb 22, 2024

View reviewed changes

Yingshun merged commit c6a36d8 into autotest:master Feb 22, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

memory_nvdimm: Fix cpu mode to enable test for aarch64 #5378

memory_nvdimm: Fix cpu mode to enable test for aarch64 #5378

hs0210 commented Jan 4, 2024

dzhengfy left a comment

dzhengfy Jan 5, 2024

hs0210 Jan 5, 2024

Yingshun Jan 9, 2024

dzhengfy Jan 11, 2024

hs0210 Jan 12, 2024

chunfuwen left a comment

dzhengfy Jan 25, 2024

dzhengfy Jan 25, 2024

hs0210 Jan 26, 2024

dzhengfy Jan 25, 2024

hs0210 Jan 26, 2024

dzhengfy left a comment

dzhengfy Jan 28, 2024

hs0210 Jan 29, 2024

dzhengfy left a comment

Yingshun left a comment

memory_nvdimm: Fix cpu mode to enable test for aarch64 #5378

memory_nvdimm: Fix cpu mode to enable test for aarch64 #5378

Conversation

hs0210 commented Jan 4, 2024

dzhengfy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chunfuwen left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dzhengfy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dzhengfy left a comment

Choose a reason for hiding this comment

Yingshun left a comment

Choose a reason for hiding this comment