hotplug_virtio_mem: forbid virtio_mem unplug for QEMU < 8.1.0 #4109

mcasquer · 2024-07-17T10:54:02Z

hotplug_virtio_mem: forbid virtio_mem unplug for QEMU < 8.1.0

The unplug support for virtio_mem was introduced in RHEL 9.4
with QEMU 8.1, corrects the test to only do this action when
the proper QEMU is used. Also applies the black code formatter.

Signed-off-by: mcasquer [email protected]
ID: 2626

mcasquer · 2024-07-17T12:16:10Z

QEMU 8.2.0

 (1/2) Host_RHEL.m9.u4.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.4.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: STARTED
 (1/2) Host_RHEL.m9.u4.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.4.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: PASS (172.40 s)
 (2/2) Host_RHEL.m9.u4.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.4.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.with_unplug.q35: STARTED
 (2/2) Host_RHEL.m9.u4.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.4.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.with_unplug.q35: PASS (166.20 s)
RESULTS    : PASS 2 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0

QEMU 8.0.0

 (1/2) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: STARTED
 (1/2) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: PASS (166.33 s)
 (2/2) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.with_unplug.q35: STARTED
 (2/2) Host_RHEL.m9.u3.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.3.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.with_unplug.q35: CANCEL: Got host qemu version:8.0.0-16, which is not in [8.1.0,) (2.59 s)
RESULTS    : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 1

mcasquer · 2024-07-17T12:16:59Z

@zhenyzha @menli820 @YongxueHong @PaulYuuu please, could you review this PR? Thanks !

menli820 · 2024-07-18T02:40:21Z

LGTM.

(1/3) Host_RHEL.m9.u5.qcow2.virtio_blk.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: STARTED
(1/3) Host_RHEL.m9.u5.qcow2.virtio_blk.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads.q35: PASS (724.16 s)
(2/3) Host_RHEL.m9.u5.qcow2.virtio_blk.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: STARTED
(2/3) Host_RHEL.m9.u5.qcow2.virtio_blk.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: PASS (140.92 s)
(3/3) Host_RHEL.m9.u5.qcow2.virtio_blk.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.with_unplug.q35: STARTED
(3/3) Host_RHEL.m9.u5.qcow2.virtio_blk.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.with_unplug.q35: PASS (110.45 s)
RESULTS : PASS 3 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB HTML : /root/avocado/job-results/job-2024-07-18T10.17-7ecd7df/results.html
JOB TIME : 977.90 s

yanan-fu · 2024-07-18T07:01:40Z

IMO, it is redundant to add a new variant. For QEMU >= 8.1.0, the case with_unplug can cover all the test scenarios for case default . Inefficient to run both of these 2 cases.

I would like to suggest handle it in the script, filter different test steps based on qemu version.

    qemu_path = utils_misc.get_qemu_binary(params)
    qemu_version = env_process._get_qemu_version(qemu_path)
    match = re.search(r"[0-9]+\.[0-9]+\.[0-9]+(\-[0-9]+)?", qemu_version)
    host_qemu = match.group(0)
    if host_qemu in VersionInterval('[8.1.0,)'):
        **** hot unplug ****

zhenyzha · 2024-07-18T07:05:05Z

LGTM.Acked-by: Zhenyu Zhang [email protected]

 (1/2) Host_RHEL.m9.u5.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.aarch64.page_4k.io-github-autotest-qemu.hotplug_virtio_mem.arm64-pci: STARTED
 (1/2) Host_RHEL.m9.u5.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.aarch64.page_4k.io-github-autotest-qemu.hotplug_virtio_mem.arm64-pci: PASS (142.26 s)
 (2/2) Host_RHEL.m9.u5.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.aarch64.page_4k.io-github-autotest-qemu.hotplug_virtio_mem.with_unplug.arm64-pci: STARTED
 (2/2) Host_RHEL.m9.u5.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.aarch64.page_4k.io-github-autotest-qemu.hotplug_virtio_mem.with_unplug.arm64-pci: PASS (129.31 s)

mcasquer · 2024-07-18T07:46:15Z

IMO, it is redundant to add a new variant. For QEMU >= 8.1.0, the case with_unplug can cover all the test scenarios for case default . Inefficient to run both of these 2 cases.

I would like to suggest handle it in the script, filter different test steps based on qemu version.
    qemu_path = utils_misc.get_qemu_binary(params)
    qemu_version = env_process._get_qemu_version(qemu_path)
    match = re.search(r"[0-9]+\.[0-9]+\.[0-9]+(\-[0-9]+)?", qemu_version)
    host_qemu = match.group(0)
    if host_qemu in VersionInterval('[8.1.0,)'):
        **** hot unplug ****

@yanan-fu thanks for the suggestion, code updated !

yanan-fu · 2024-07-18T09:26:54Z

Could you please update the doc string to show the test steps correctly ? Thanks!

mcasquer · 2024-07-18T11:22:14Z

Could you please update the doc string to show the test steps correctly ? Thanks!

Done !

mcasquer · 2024-07-18T11:22:28Z

 (1/1) Host_RHEL.m9.u5.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: STARTED
 (1/1) Host_RHEL.m9.u5.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: PASS (174.90 s)
RESULTS    : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0

yanan-fu

Acked-by: Yanan Fu [email protected]

YongxueHong

LGTM.

YongxueHong · 2024-07-19T03:20:18Z

qemu/tests/hotplug_virtio_mem.py

+    qemu_version = env_process._get_qemu_version(qemu_path)
+    match = re.search(r"[0-9]+\.[0-9]+\.[0-9]+(\-[0-9]+)?", qemu_version)
+    host_qemu = match.group(0)


I recommend calling a public function to get the qemu version: virttest.utils_qemu.get_qemu_version instead of the private function _get_qemu_version.

@YongxueHong Thanks for the suggestion, code updated !

mcasquer · 2024-07-19T10:11:45Z

 (1/1) Host_RHEL.m9.u5.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: STARTED
 (1/1) Host_RHEL.m9.u5.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: PASS (137.17 s)
RESULTS    : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0

YongxueHong · 2024-07-22T05:24:51Z

qemu/tests/hotplug_virtio_mem.py

+    qemu_path = utils_misc.get_qemu_binary(params)
+    qemu_version = utils_qemu.get_qemu_version(qemu_path)
+    match = re.search(r"[0-9]+\.[0-9]+\.[0-9]+(\-[0-9]+)?", str(qemu_version))
+    host_qemu = match.group(0)


Suggested change

qemu_path = utils_misc.get_qemu_binary(params)

qemu_version = utils_qemu.get_qemu_version(qemu_path)

match = re.search(r"[0-9]+\.[0-9]+\.[0-9]+(\-[0-9]+)?", str(qemu_version))

host_qemu = match.group(0)

qemu_path = utils_misc.get_qemu_binary(params)

qemu_version = utils_qemu.get_qemu_version(qemu_path)[0]

HIi @mcasquer
I think that we could get the host_qemu(qemu_version) by qemu_version[0] directly.

@YongxueHong thanks, code updated!

The unplug support for virtio_mem was introduced in RHEL 9.4 with QEMU 8.1, corrects the test to only do this action when the proper QEMU is used. Also applies the black code formatter. Signed-off-by: mcasquer <[email protected]>

mcasquer · 2024-07-22T06:13:04Z

 (1/1) Host_RHEL.m9.u5.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: STARTED
 (1/1) Host_RHEL.m9.u5.ovmf.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.9.5.0.x86_64.io-github-autotest-qemu.hotplug_virtio_mem.q35: PASS (140.41 s)
RESULTS    : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0

YongxueHong

LGTM.

yanan-fu

Ack

mcasquer force-pushed the 2626_limit_unplug branch from 3e73f52 to 484a154 Compare July 17, 2024 10:57

mcasquer marked this pull request as ready for review July 17, 2024 12:16

menli820 approved these changes Jul 18, 2024

View reviewed changes

PaulYuuu previously approved these changes Jul 18, 2024

View reviewed changes

zhenyzha approved these changes Jul 18, 2024

View reviewed changes

mcasquer dismissed PaulYuuu’s stale review via 0d050cb July 18, 2024 07:45

mcasquer force-pushed the 2626_limit_unplug branch from 484a154 to 0d050cb Compare July 18, 2024 07:45

mcasquer force-pushed the 2626_limit_unplug branch from 0d050cb to 634ec23 Compare July 18, 2024 11:12

yanan-fu previously approved these changes Jul 18, 2024

View reviewed changes

YongxueHong previously approved these changes Jul 19, 2024

View reviewed changes

YongxueHong reviewed Jul 19, 2024

View reviewed changes

mcasquer dismissed stale reviews from YongxueHong and yanan-fu via 0b7a85c July 19, 2024 09:39

mcasquer force-pushed the 2626_limit_unplug branch 2 times, most recently from 0b7a85c to 578e582 Compare July 19, 2024 10:10

YongxueHong reviewed Jul 22, 2024

View reviewed changes

mcasquer force-pushed the 2626_limit_unplug branch from 578e582 to d49e26e Compare July 22, 2024 06:02

mcasquer force-pushed the 2626_limit_unplug branch from d49e26e to 1a01476 Compare July 22, 2024 06:07

YongxueHong approved these changes Jul 22, 2024

View reviewed changes

yanan-fu approved these changes Jul 22, 2024

View reviewed changes

yanan-fu merged commit e9fa1ee into autotest:master Jul 22, 2024
6 checks passed

mcasquer deleted the 2626_limit_unplug branch July 22, 2024 09:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

hotplug_virtio_mem: forbid virtio_mem unplug for QEMU < 8.1.0 #4109

hotplug_virtio_mem: forbid virtio_mem unplug for QEMU < 8.1.0 #4109

mcasquer commented Jul 17, 2024 •

edited

Loading

mcasquer commented Jul 17, 2024

mcasquer commented Jul 17, 2024

menli820 commented Jul 18, 2024

yanan-fu commented Jul 18, 2024

zhenyzha commented Jul 18, 2024

mcasquer commented Jul 18, 2024

yanan-fu commented Jul 18, 2024

mcasquer commented Jul 18, 2024

mcasquer commented Jul 18, 2024

yanan-fu left a comment

YongxueHong left a comment

YongxueHong Jul 19, 2024

mcasquer Jul 19, 2024

mcasquer commented Jul 19, 2024

YongxueHong Jul 22, 2024

mcasquer Jul 22, 2024

mcasquer commented Jul 22, 2024

YongxueHong left a comment

yanan-fu left a comment

hotplug_virtio_mem: forbid virtio_mem unplug for QEMU < 8.1.0 #4109

hotplug_virtio_mem: forbid virtio_mem unplug for QEMU < 8.1.0 #4109

Conversation

mcasquer commented Jul 17, 2024 • edited Loading

mcasquer commented Jul 17, 2024

mcasquer commented Jul 17, 2024

menli820 commented Jul 18, 2024

yanan-fu commented Jul 18, 2024

zhenyzha commented Jul 18, 2024

mcasquer commented Jul 18, 2024

yanan-fu commented Jul 18, 2024

mcasquer commented Jul 18, 2024

mcasquer commented Jul 18, 2024

yanan-fu left a comment

Choose a reason for hiding this comment

YongxueHong left a comment

Choose a reason for hiding this comment

YongxueHong Jul 19, 2024

Choose a reason for hiding this comment

mcasquer Jul 19, 2024

Choose a reason for hiding this comment

mcasquer commented Jul 19, 2024

YongxueHong Jul 22, 2024

Choose a reason for hiding this comment

mcasquer Jul 22, 2024

Choose a reason for hiding this comment

mcasquer commented Jul 22, 2024

YongxueHong left a comment

Choose a reason for hiding this comment

yanan-fu left a comment

Choose a reason for hiding this comment

mcasquer commented Jul 17, 2024 •

edited

Loading