From nobody Fri Nov 7 09:13:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547463288185715.7681760142838; Mon, 14 Jan 2019 02:54:48 -0800 (PST) Received: from localhost ([127.0.0.1]:43857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1giztH-0006Tb-7M for importer@patchew.org; Mon, 14 Jan 2019 05:54:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gizWv-0004ba-Ia for qemu-devel@nongnu.org; Mon, 14 Jan 2019 05:31:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gizWu-0001Kf-I2 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 05:31:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gizWu-00010K-Am; Mon, 14 Jan 2019 05:31:40 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4CC1A811DB; Mon, 14 Jan 2019 10:31:28 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3E605E9C4; Mon, 14 Jan 2019 10:31:23 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 11:31:08 +0100 Message-Id: <20190114103110.10909-5-david@redhat.com> In-Reply-To: <20190114103110.10909-1-david@redhat.com> References: <20190114103110.10909-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 14 Jan 2019 10:31:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 4/6] s390x/pci: Ignore the unplug call if we already have a release_timer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , David Hildenbrand , Cornelia Huck , Collin Walling , Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" ... otherwise two successive calls to qdev_unplug() (e.g. by an impatient user) will effectively overwrite pbdev->release_timer, resulting in a memory leak. We are already processing the unplug. If there is already a release_timer, the unplug will be performed after the timeout. Can be easily triggered by (hmp) device_add virtio-mouse-pci,id=3Dtest (hmp) stop (hmp) device_del test (hmp) device_del test Signed-off-by: David Hildenbrand Reviewed-by: Collin Walling --- hw/s390x/s390-pci-bus.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 59325cae3b..34a9cb2a80 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -972,6 +972,9 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug= _dev, DeviceState *dev, case ZPCI_FS_STANDBY: break; default: + if (pbdev->release_timer) { + return; + } s390_pci_generate_plug_event(HP_EVENT_DECONFIGURE_REQUEST, pbdev->fh, pbdev->fid); pbdev->release_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, --=20 2.17.2