From 586c02abcca49fceeca0d6f1b4e5cab30dd9a123 Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

Date: Wed, 17 Apr 2019 13:57:29 +0100

Subject: [PATCH 12/24] s390x/pci: Always delete and free the release_timer

RH-Author: Cornelia Huck <cohuck@redhat.com>

Message-id: <20190417135741.25297-13-cohuck@redhat.com>

Patchwork-id: 85795

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 12/24] s390x/pci: Always delete and free the release_timer

Bugzilla: 1699070

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

From: David Hildenbrand <david@redhat.com>

We should always get rid of it. I don't see a reason to keep the timer

alive if the devices are going away. This looks like a memory leak.

(hmp) device_add virtio-mouse-pci,id=test

(hmp) device_del test

-> guest notified, timer pending.

-> guest does not react for some reason (e.g. crash)

-> s390_pcihost_timer_cb(). Timer not pending anymore. qmp_unplug().

-> Device deleted. Timer expired (not pending) but not freed.

Signed-off-by: David Hildenbrand <david@redhat.com>

Message-Id: <20190114103110.10909-4-david@redhat.com>

Reviewed-by: Collin Walling <walling@linux.ibm.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit d648a3e62d5e726526f9df283341999792f4fbf9)

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/s390x/s390-pci-bus.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c

index a785acb..ea0c74c 100644

--- a/hw/s390x/s390-pci-bus.c

+++ b/hw/s390x/s390-pci-bus.c

@@ -982,7 +982,7 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,

         return;

     }

-    if (pbdev->release_timer && timer_pending(pbdev->release_timer)) {

+    if (pbdev->release_timer) {

         timer_del(pbdev->release_timer);

         timer_free(pbdev->release_timer);

         pbdev->release_timer = NULL;

-- 

1.8.3.1