Blame SOURCES/kvm-s390x-pci-Ignore-the-unplug-call-if-we-already-have-.patch

Pablo Greco e6a3ae
From 231d80e36c0788378d87ad4ee376ea87dc43745d Mon Sep 17 00:00:00 2001
Pablo Greco e6a3ae
From: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Date: Wed, 17 Apr 2019 13:57:30 +0100
Pablo Greco e6a3ae
Subject: [PATCH 13/24] s390x/pci: Ignore the unplug call if we already have a
Pablo Greco e6a3ae
 release_timer
Pablo Greco e6a3ae
Pablo Greco e6a3ae
RH-Author: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Message-id: <20190417135741.25297-14-cohuck@redhat.com>
Pablo Greco e6a3ae
Patchwork-id: 85791
Pablo Greco e6a3ae
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 13/24] s390x/pci: Ignore the unplug call if we already have a release_timer
Pablo Greco e6a3ae
Bugzilla: 1699070
Pablo Greco e6a3ae
RH-Acked-by: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Thomas Huth <thuth@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
From: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
... otherwise two successive calls to qdev_unplug() (e.g. by an impatient
Pablo Greco e6a3ae
user) will effectively overwrite pbdev->release_timer, resulting in a
Pablo Greco e6a3ae
memory leak. We are already processing the unplug.
Pablo Greco e6a3ae
Pablo Greco e6a3ae
If there is already a release_timer, the unplug will be performed after
Pablo Greco e6a3ae
the timeout.
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Can be easily triggered by
Pablo Greco e6a3ae
(hmp) device_add virtio-mouse-pci,id=test
Pablo Greco e6a3ae
(hmp) stop
Pablo Greco e6a3ae
(hmp) device_del test
Pablo Greco e6a3ae
(hmp) device_del test
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Signed-off-by: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Message-Id: <20190114103110.10909-5-david@redhat.com>
Pablo Greco e6a3ae
Reviewed-by: Collin Walling <walling@linux.ibm.com>
Pablo Greco e6a3ae
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
(cherry picked from commit 3549f8c9e4f0ef1c3417ff43b2164f68ad34b922)
Pablo Greco e6a3ae
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
Pablo Greco e6a3ae
---
Pablo Greco e6a3ae
 hw/s390x/s390-pci-bus.c | 3 +++
Pablo Greco e6a3ae
 1 file changed, 3 insertions(+)
Pablo Greco e6a3ae
Pablo Greco e6a3ae
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
index ea0c74c..24a0d78 100644
Pablo Greco e6a3ae
--- a/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
+++ b/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
@@ -972,6 +972,9 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
Pablo Greco e6a3ae
     case ZPCI_FS_STANDBY:
Pablo Greco e6a3ae
         break;
Pablo Greco e6a3ae
     default:
Pablo Greco e6a3ae
+        if (pbdev->release_timer) {
Pablo Greco e6a3ae
+            return;
Pablo Greco e6a3ae
+        }
Pablo Greco e6a3ae
         s390_pci_generate_plug_event(HP_EVENT_DECONFIGURE_REQUEST,
Pablo Greco e6a3ae
                                      pbdev->fh, pbdev->fid);
Pablo Greco e6a3ae
         pbdev->release_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
Pablo Greco e6a3ae
-- 
Pablo Greco e6a3ae
1.8.3.1
Pablo Greco e6a3ae