build: Release v22.1 (bug fix release)

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
virtio-devices: Enable F_EVENT_IDX on control queue if negotiated
2026-08-05 02:19:16 +00:00 · 2022-03-11 08:44:17 +00:00 · 2022-03-11 08:44:17 +00:00 · 2022-03-11 08:44:17 +00:00 · 2022-03-11 08:44:17 +00:00
6 changed files with 26 additions and 14 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -148,7 +148,7 @@ dependencies = [

 [[package]]
 name = "cloud-hypervisor"
-version = "22.0.0"
+version = "22.1.0"
 dependencies = [
 "anyhow",
 "api_client",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cloud-hypervisor"
-version = "22.0.0"
+version = "22.1.0"
 authors = ["The Cloud Hypervisor Authors"]
 edition = "2018"
 default-run = "cloud-hypervisor"
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,4 @@
+- [v22.1](#v221)
 - [v22.0](#v220)
    - [GDB Debug Stub Support](#gdb-debug-stub-support)
    - [`virtio-iommu` Backed Segments](#virtio-iommu-backed-segments)
@@ -5,7 +6,7 @@
    - [`virtio-balloon` Free Page Reporting](#virtio-balloon-free-page-reporting)
    - [Support for Direct Kernel Booting with TDX](#support-for-direct-kernel-booting-with-tdx)
    - [PMU Support for AArch64](#pmu-support-for-aarch64)
-    - [Documentation Under CC-BY-4.0 Licese](#documentation-under-cc-by-40-licese)
+    - [Documentation Under CC-BY-4.0 License](#documentation-under-cc-by-40-license)
    - [Deprecation of "Classic" `virtiofsd`](#deprecation-of-classic-virtiofsd)
    - [Notable Bug Fixes](#notable-bug-fixes)
    - [Contributors](#contributors)
@@ -194,10 +195,17 @@
    - [Unit testing](#unit-testing)
    - [Integration tests parallelization](#integration-tests-parallelization)

+# v22.1
+
+This is a bug fix release. The following issues have been addressed:
+
+* VFIO ioctl reordering to fix MSI on AMD platforms (#3827)
+* Fix `virtio-net` control queue (#3829)
+
 # v22.0

-This release has been tracked through the [v21.0
-project](https://github.com/cloud-hypervisor/cloud-hypervisor/projects/24).
+This release has been tracked through the [v22.0
+project](https://github.com/cloud-hypervisor/cloud-hypervisor/projects/25).

 ### GDB Debug Stub Support

@@ -238,7 +246,7 @@ has been updated for this usage.
 A PMU is now available on AArch64 for guest performance profiling. This will be
 exposed automatically if available from the host.

-### Documentation Under CC-BY-4.0 Licese
+### Documentation Under CC-BY-4.0 License

 The documentation is now licensed under the "Creative Commons Attribution 4.0
 International" license which is aligned with the project charter under the
--- a/rpm/cloud-hypervisor.spec
+++ b/rpm/cloud-hypervisor.spec
@@ -9,7 +9,7 @@

 Name:           cloud-hypervisor
 Summary:        Cloud Hypervisor is an open source Virtual Machine Monitor (VMM) that runs on top of KVM.
-Version:        22.0
+Version:        22.1
 Release:        0%{?dist}
 License:        ASL 2.0 or BSD-3-clause
 Group:          Applications/System
@@ -112,6 +112,9 @@ rm -rf %{buildroot}


 %changelog
+*   Thu Mar 10 2022 Rob Bradford <robert.bradford@intel.com> 22.1-0
+-   Update to 22.1
+
 *   Thu Mar 03 2022 Rob Bradford <robert.bradford@intel.com> 22.0-0
 -   Update to 22.0

--- a/virtio-devices/src/net.rs
+++ b/virtio-devices/src/net.rs
@@ -566,10 +566,13 @@ impl VirtioDevice for Net {
        self.common.activate(&queues, &queue_evts, &interrupt_cb)?;

        let queue_num = queues.len();
+        let event_idx = self.common.feature_acked(VIRTIO_RING_F_EVENT_IDX.into());
        if self.common.feature_acked(VIRTIO_NET_F_CTRL_VQ.into()) && queue_num % 2 != 0 {
-            let cvq_queue = queues.remove(queue_num - 1);
+            let mut cvq_queue = queues.remove(queue_num - 1);
            let cvq_queue_evt = queue_evts.remove(queue_num - 1);

+            cvq_queue.set_event_idx(event_idx);
+
            let (kill_evt, pause_evt) = self.common.dup_eventfds();
            let mut ctrl_handler = NetCtrlEpollHandler {
                kill_evt,
@@ -603,8 +606,6 @@ impl VirtioDevice for Net {
            self.ctrl_queue_epoll_thread = Some(epoll_threads.remove(0));
        }

-        let event_idx = self.common.feature_acked(VIRTIO_RING_F_EVENT_IDX.into());
-
        let mut epoll_threads = Vec::new();
        let mut taps = self.taps.clone();
        for i in 0..queues.len() / 2 {
--- a/vmm/src/interrupt.rs
+++ b/vmm/src/interrupt.rs
@@ -190,8 +190,8 @@ impl InterruptSourceGroup for MsiInterruptGroup<IrqRoutingEntry> {
                    format!("mask: No existing route for interrupt index {}", index),
                ));
            }
-            self.set_gsi_routes(&routes)?;
-            return route.disable(&self.vm);
+            route.disable(&self.vm)?;
+            return self.set_gsi_routes(&routes);
        }

        Err(io::Error::new(
@@ -211,8 +211,8 @@ impl InterruptSourceGroup for MsiInterruptGroup<IrqRoutingEntry> {
                    format!("mask: No existing route for interrupt index {}", index),
                ));
            }
-            self.set_gsi_routes(&routes)?;
-            return route.enable(&self.vm);
+            route.enable(&self.vm)?;
+            return self.set_gsi_routes(&routes);
        }

        Err(io::Error::new(
Author	SHA1	Message	Date
Rob Bradford	f6557acf60	build: Release v22.1 (bug fix release) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-03-11 08:44:17 +00:00
Rob Bradford	4d041bd603	virtio-devices: Enable F_EVENT_IDX on control queue if negotiated With the VIRTIO_F_EVENT_IDX handling now conducted inside the virtio-queue crate it is necessary to activate the functionality on every queue if it is negotiatated. Otherwise this leads to a failure of the guest to signal to the host that there is something in the available queue as the queue's internal state has not been configured correctly. Fixes: #3829 Signed-off-by: Rob Bradford <robert.bradford@intel.com> (cherry picked from commit `223d0cf787`) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-03-11 08:44:17 +00:00
Yi Wang	e0fda7bef9	vmm: interrupt: fix msi mask irq causing kernel panic on AMD When mask a msi irq, we set the entry.masked to be true, so kvm hypervisor will not pass the gsi to kernel through KVM_SET_GSI_ROUTING ioctl which update kvm->irq_routing. This will trigger kernel panic on AMD platform when the gsi is the largest one in kernel kvm->irqfds.items: crash> bt PID: 22218 TASK: ffff951a6ad74980 CPU: 73 COMMAND: "vcpu8" #0 [ffffb1ba6707fa40] machine_kexec at ffffffff8565b397 #1 [ffffb1ba6707fa90] __crash_kexec at ffffffff85788a6d #2 [ffffb1ba6707fb58] crash_kexec at ffffffff8578995d #3 [ffffb1ba6707fb70] oops_end at ffffffff85623c0d #4 [ffffb1ba6707fb90] no_context at ffffffff856692c9 #5 [ffffb1ba6707fbf8] exc_page_fault at ffffffff85f95b51 #6 [ffffb1ba6707fc50] asm_exc_page_fault at ffffffff86000ace [exception RIP: svm_update_pi_irte+227] RIP: ffffffffc0761b53 RSP: ffffb1ba6707fd08 RFLAGS: 00010086 RAX: ffffb1ba6707fd78 RBX: ffffb1ba66d91000 RCX: 0000000000000001 RDX: 00003c803f63f1c0 RSI: 000000000000019a RDI: ffffb1ba66db2ab8 RBP: 000000000000019a R8: 0000000000000040 R9: ffff94ca41b82200 R10: ffffffffffffffcf R11: 0000000000000001 R12: 0000000000000001 R13: 0000000000000001 R14: ffffffffffffffcf R15: 000000000000005f ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 #7 [ffffb1ba6707fdb8] kvm_irq_routing_update at ffffffffc09f19a1 [kvm] #8 [ffffb1ba6707fde0] kvm_set_irq_routing at ffffffffc09f2133 [kvm] #9 [ffffb1ba6707fe18] kvm_vm_ioctl at ffffffffc09ef544 [kvm] RIP: 00007f143c36488b RSP: 00007f143a4e04b8 RFLAGS: 00000246 RAX: ffffffffffffffda RBX: 00007f05780041d0 RCX: 00007f143c36488b RDX: 00007f05780041d0 RSI: 000000004008ae6a RDI: 0000000000000020 RBP: 00000000000004e8 R8: 0000000000000008 R9: 00007f05780041e0 R10: 00007f0578004560 R11: 0000000000000246 R12: 00000000000004e0 R13: 000000000000001a R14: 00007f1424001c60 R15: 00007f0578003bc0 ORIG_RAX: 0000000000000010 CS: 0033 SS: 002b To solve this problem, move route.disable() before set_gsi_routes() to remove the gsi from irqfds.items first. This problem only exists on AMD platform, 'cause on Intel platform kernel just return when update irte while it only prints a warning on AMD. Also, this patch adjusts the order of enable() and set_gsi_routes() in unmask(), which should do no harm. Signed-off-by: Yi Wang <wang.yi59@zte.com.cn> (cherry picked from commit `5375b84e3b`) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-03-11 08:44:17 +00:00
Yi Wang	9e2d051237	vmm: interrupt: fix msi mask irq causing kernel panic on AMD When mask a msi irq, we set the entry.masked to be true, so kvm hypervisor will not pass the gsi to kernel through KVM_SET_GSI_ROUTING ioctl which update kvm->irq_routing. This will trigger kernel panic on AMD platform when the gsi is the largest one in kernel kvm->irqfds.items: crash> bt PID: 22218 TASK: ffff951a6ad74980 CPU: 73 COMMAND: "vcpu8" #0 [ffffb1ba6707fa40] machine_kexec at ffffffff8565b397 #1 [ffffb1ba6707fa90] __crash_kexec at ffffffff85788a6d #2 [ffffb1ba6707fb58] crash_kexec at ffffffff8578995d #3 [ffffb1ba6707fb70] oops_end at ffffffff85623c0d #4 [ffffb1ba6707fb90] no_context at ffffffff856692c9 #5 [ffffb1ba6707fbf8] exc_page_fault at ffffffff85f95b51 #6 [ffffb1ba6707fc50] asm_exc_page_fault at ffffffff86000ace [exception RIP: svm_update_pi_irte+227] RIP: ffffffffc0761b53 RSP: ffffb1ba6707fd08 RFLAGS: 00010086 RAX: ffffb1ba6707fd78 RBX: ffffb1ba66d91000 RCX: 0000000000000001 RDX: 00003c803f63f1c0 RSI: 000000000000019a RDI: ffffb1ba66db2ab8 RBP: 000000000000019a R8: 0000000000000040 R9: ffff94ca41b82200 R10: ffffffffffffffcf R11: 0000000000000001 R12: 0000000000000001 R13: 0000000000000001 R14: ffffffffffffffcf R15: 000000000000005f ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 #7 [ffffb1ba6707fdb8] kvm_irq_routing_update at ffffffffc09f19a1 [kvm] #8 [ffffb1ba6707fde0] kvm_set_irq_routing at ffffffffc09f2133 [kvm] #9 [ffffb1ba6707fe18] kvm_vm_ioctl at ffffffffc09ef544 [kvm] RIP: 00007f143c36488b RSP: 00007f143a4e04b8 RFLAGS: 00000246 RAX: ffffffffffffffda RBX: 00007f05780041d0 RCX: 00007f143c36488b RDX: 00007f05780041d0 RSI: 000000004008ae6a RDI: 0000000000000020 RBP: 00000000000004e8 R8: 0000000000000008 R9: 00007f05780041e0 R10: 00007f0578004560 R11: 0000000000000246 R12: 00000000000004e0 R13: 000000000000001a R14: 00007f1424001c60 R15: 00007f0578003bc0 ORIG_RAX: 0000000000000010 CS: 0033 SS: 002b To solve this problem, move route.disable() before set_gsi_routes() to remove the gsi from irqfds.items first. This problem only exists on AMD platform, 'cause on Intel platform kernel just return when update irte while it only prints a warning on AMD. Signed-off-by: Yi Wang <wang.yi59@zte.com.cn> (cherry picked from commit `db9e5e5a87`) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-03-11 08:44:17 +00:00