Merge ~sergiodj/ubuntu/+source/qemu:allow-repeating-hot-unplug-jammy into ubuntu/+source/qemu:ubuntu/jammy-devel

[Sergio Durigan Junior]

This MP is the Jammy version of https://code.launchpad.net/~sergiodj/ubuntu/+source/qemu/+git/qemu/+merge/443231.

The backported patch is exactly the same.

PPA: https://launchpad.net/~sergiodj/+archive/ubuntu/qemu

dep8 results:

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-sergiodj-qemu/?format=plain)
  qemu @ amd64:
    27.05.23 19:29:31 Log 🗒️ ✅ Triggers: qemu/1:6.2+dfsg-2ubuntu6.10~ppa1
  qemu @ armhf:
    28.05.23 13:30:31 Log 🗒️ ✅ Triggers: qemu/1:6.2+dfsg-2ubuntu6.10~ppa1
  qemu @ ppc64el:
    29.05.23 09:14:46 Log 🗒️ ✅ Triggers: qemu/1:6.2+dfsg-2ubuntu6.10~ppa1

I'll post results for s390x and arm64 when I have them.

[Sergio Durigan Junior (sergiodj)]

Forgot to mention that I also reproduced the issue and verified the fix locally. Let me know if you'd like detailed instructions on how to do the same.

[Sergio Durigan Junior (sergiodj)]

I'd like to verify a few more things, so I'm marking this as WIP.

[Sergio Durigan Junior (sergiodj)]

OK, I modified the Test Plan to better explain how to reproduce the issue. This MP is ready to be reviewed.

[Lena Voytek (lvoytek)]

LGTM, patch matches up with mantic. Added an additional optional request in the comments. The SRU report on the bug also looks good

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, lvoytek
Uploaders: sergiodj, lvoytek
MP auto-approved

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thanks for the review, Lena.

[Sergio Durigan Junior (sergiodj)]

Uploaded:

$ dput qemu_6.2+dfsg-2ubuntu6.10_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/qemu/qemu_6.2+dfsg-2ubuntu6.10_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/qemu/qemu_6.2+dfsg-2ubuntu6.10.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_6.2+dfsg-2ubuntu6.10.dsc: done.
  Uploading qemu_6.2+dfsg-2ubuntu6.10.debian.tar.xz: done.
  Uploading qemu_6.2+dfsg-2ubuntu6.10_source.buildinfo: done.
  Uploading qemu_6.2+dfsg-2ubuntu6.10_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 30759b6..5ce8296 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qemu (1:6.2+dfsg-2ubuntu6.10) jammy; urgency=medium
+
+  * d/p/u/allow-repeating-hot-unplug-requests.patch: Allow repeating
+    hot-unplug requests by making ACPI PCI able to requeue them.
+    (LP: #2018733)
+
+ -- Sergio Durigan Junior <[e-mail]>  Fri, 26 May 2023 17:40:31 -0400
+
 qemu (1:6.2+dfsg-2ubuntu6.9) jammy; urgency=medium
 
   * d/p/u/lp-2019766-target-arm-kvm-Retry-KVM_CREATE_VM-call-if-it-fails-.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 63a907e..20ff7f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -57,3 +57,4 @@ ubuntu/lp-2011832-target-ppc-Fix-xs-max-min-cj-dp-to-use-VSX-registers.patch
 ubuntu/lp-2011832-target-mips-Fix-df_extract_val-and-df_extract_df-dfe.patch
 ubuntu/lp-2011832-target-mips-Fix-FTRUNC_S-and-FTRUNC_U-trans-helper.patch
 ubuntu/lp-2019766-target-arm-kvm-Retry-KVM_CREATE_VM-call-if-it-fails-.patch
+ubuntu/allow-repeating-hot-unplug-requests.patch
diff --git a/debian/patches/ubuntu/allow-repeating-hot-unplug-requests.patch b/debian/patches/ubuntu/allow-repeating-hot-unplug-requests.patch
new file mode 100644
index 0000000..8128c0b
--- /dev/null
+++ b/debian/patches/ubuntu/allow-repeating-hot-unplug-requests.patch
@@ -0,0 +1,74 @@
+From 0f689cf5ada4d5df5ab95c7f7aa9fc221afa855d Mon Sep 17 00:00:00 2001
+From: Igor Mammedov <[e-mail]>
+Date: Tue, 18 Apr 2023 11:04:49 +0200
+Subject: [PATCH] acpi: pcihp: allow repeating hot-unplug requests
+
+with Q35 using ACPI PCI hotplug by default, user's request to unplug
+device is ignored when it's issued before guest OS has been booted.
+And any additional attempt to request device hot-unplug afterwards
+results in following error:
+
+  "Device XYZ is already in the process of unplug"
+
+arguably it can be considered as a regression introduced by [2],
+before which it was possible to issue unplug request multiple
+times.
+
+Accept new uplug requests after timeout (1ms). This brings ACPI PCI
+hotplug on par with native PCIe unplug behavior [1] and allows user
+to repeat unplug requests at propper times.
+Set expire timeout to arbitrary 1msec so user won't be able to
+flood guest with SCI interrupts by calling device_del in tight loop.
+
+PS:
+ACPI spec doesn't mandate what OSPM can do with GPEx.status
+bits set before it's booted => it's impl. depended.
+Status bits may be retained (I tested with one Windows version)
+or cleared (Linux since 2.6 kernel times) during guest's ACPI
+subsystem initialization.
+Clearing status bits (though not wrong per se) hides the unplug
+event from guest, and it's upto user to repeat device_del later
+when guest is able to handle unplug requests.
+
+1) 18416c62e3 ("pcie: expire pending delete")
+2)
+Fixes: cce8944cc9ef ("qdev-monitor: Forbid repeated device_del")
+Signed-off-by: Igor Mammedov <[e-mail]>
+Acked-by: Gerd Hoffmann <[e-mail]>
+CC: [e-mail]
+CC: [e-mail]
+CC: [e-mail]
+CC: [e-mail]
+Message-Id: <[e-mail]>
+Reviewed-by: Michael S. Tsirkin <[e-mail]>
+Signed-off-by: Michael S. Tsirkin <[e-mail]>
+Reviewed-by: Ani Sinha <[e-mail]>
+
+Origin: upstream, https://gitlab.com/qemu-project/qemu/-/commit/0f689cf5ada4
+Bug: https://gitlab.com/libvirt/libvirt/-/issues/309
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/2018733
+---
+ hw/acpi/pcihp.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+Index: qemu/hw/acpi/pcihp.c
+===================================================================
+--- a/hw/acpi/pcihp.c	2023-05-26 16:00:52.488394876 -0400
++++ b/hw/acpi/pcihp.c	2023-05-26 16:00:52.488394876 -0400
+@@ -420,6 +420,16 @@
+      * acpi_pcihp_eject_slot() when the operation is completed.
+      */
+     pdev->qdev.pending_deleted_event = true;
++    /* if unplug was requested before OSPM is initialized,
++     * linux kernel will clear GPE0.sts[] bits during boot, which effectively
++     * hides unplug event. And than followup qmp_device_del() calls remain
++     * blocked by above flag permanently.
++     * Unblock qmp_device_del() by setting expire limit, so user can
++     * repeat unplug request later when OSPM has been booted.
++     */
++    pdev->qdev.pending_deleted_expires_ms =
++        qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL); /* 1 msec */
++
+     s->acpi_pcihp_pci_status[bsel].down |= (1U << slot);
+     acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS);
+ }