From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02CE2C32771 for ; Wed, 22 Jan 2020 06:59:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C32E02465B for ; Wed, 22 Jan 2020 06:59:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Fl9nljzx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C32E02465B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iu9z1-000874-UF for qemu-devel@archiver.kernel.org; Wed, 22 Jan 2020 01:59:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36199) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iu9qW-0004su-V9 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 01:50:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iu9qV-00089z-JX for qemu-devel@nongnu.org; Wed, 22 Jan 2020 01:50:36 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:45816 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iu9qV-00089i-GO for qemu-devel@nongnu.org; Wed, 22 Jan 2020 01:50:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579675835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fvu/JejnrpbIYjtd6kH0elorwKES/+22eaULELxAawU=; b=Fl9nljzxEbWRFnP6FRxrSoTbkKO6oVwoprLfK30UpMst1WWqrR7gJzMyEHEk1Dfer1WYnD y3AnIEnGQUw78LBJD3rZ1l+aHshiOQk+mA7omeNzrwaAdm1HzgkzoEvbnKplaoYM6H7fRk sgQNRQouwWE7DbkCMcpq7t6RHu6HieQ= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-247-hAfWfcCON2eVPLMoIe12Lw-1; Wed, 22 Jan 2020 01:50:33 -0500 Received: by mail-wr1-f72.google.com with SMTP id d8so2585794wrq.12 for ; Tue, 21 Jan 2020 22:50:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Pvkfe/62fecBB0WaC+0Ls5admcVzWgltEZR0OGv8pe0=; b=U/vaKsX9m69Mjx3TbaAf4hitq18/NKQw+nvym301cZx4VGgC0pKJks3ENSPMuIMUES reWUdonb35AR9ehoEdC5N8FLxnMWW/k1j6Vq4Nxqocb6xlxcPPH8V8ppY0/qJR7TV2Nw lHj8jrEXWD86JnxaKPgkOGMosl758/DyIvT4MefCm4lL88xHUySgIPo3lU7cKTGvqAp0 Yg9Ga8FzHpL1TBHFsiGfhIb2RVgHKe/IdapDhzuLMCVYcDbXOmbhu6RyaBZ8GihbEcfZ u1bf0AKfAVFMEtPHQ5CwQU5grr+xpYUq80exoPhTiNF4OQ/FzVCzOCIpLpldOyxwn4zi /7qQ== X-Gm-Message-State: APjAAAWlYE74vyVpvF/YUmnA3wE2lrEUJ1CkA2q9tNZ4A1TYiAZUFq+x I/HzMSC4Z+FAMt+7zUhdEWeMUII8+WG5PMWkDWAnOyk0SRadgCKXt/EnvNSvRAuMKW+FeEdYDSt uNDO63lv9G49+n/k= X-Received: by 2002:adf:8541:: with SMTP id 59mr9301256wrh.307.1579675831602; Tue, 21 Jan 2020 22:50:31 -0800 (PST) X-Google-Smtp-Source: APXvYqxD7M6pNst3XdABjFe+H6o/3UTX45nqmSSyySfdRObqyd+Jgv0N87yWQplhFs6c9DODU+cpZA== X-Received: by 2002:adf:8541:: with SMTP id 59mr9301230wrh.307.1579675831342; Tue, 21 Jan 2020 22:50:31 -0800 (PST) Received: from redhat.com (bzq-79-176-0-156.red.bezeqint.net. [79.176.0.156]) by smtp.gmail.com with ESMTPSA id t190sm2521163wmt.44.2020.01.21.22.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2020 22:50:30 -0800 (PST) Date: Wed, 22 Jan 2020 01:50:29 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 14/17] vhost-vsock: delete vqs in vhost_vsock_unrealize to avoid memleaks Message-ID: <20200122064907.512501-15-mst@redhat.com> References: <20200122064907.512501-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200122064907.512501-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: hAfWfcCON2eVPLMoIe12Lw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefano Garzarella , Pan Nengyuan , Stefan Hajnoczi , Euler Robot Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Pan Nengyuan Receive/transmit/event vqs forgot to cleanup in vhost_vsock_unrealize. This patch save receive/transmit vq pointer in realize() and cleanup vqs through those vq pointers in unrealize(). The leak stack is as follow: Direct leak of 21504 byte(s) in 3 object(s) allocated from: #0 0x7f86a1356970 (/lib64/libasan.so.5+0xef970) ??:? #1 0x7f86a09aa49d (/lib64/libglib-2.0.so.0+0x5249d) ??:? #2 0x5604852f85ca (./x86_64-softmmu/qemu-system-x86_64+0x2c3e5ca) /mnt/s= db/qemu/hw/virtio/virtio.c:2333 #3 0x560485356208 (./x86_64-softmmu/qemu-system-x86_64+0x2c9c208) /mnt/s= db/qemu/hw/virtio/vhost-vsock.c:339 #4 0x560485305a17 (./x86_64-softmmu/qemu-system-x86_64+0x2c4ba17) /mnt/s= db/qemu/hw/virtio/virtio.c:3531 #5 0x5604858e6b65 (./x86_64-softmmu/qemu-system-x86_64+0x322cb65) /mnt/s= db/qemu/hw/core/qdev.c:865 #6 0x5604861e6c41 (./x86_64-softmmu/qemu-system-x86_64+0x3b2cc41) /mnt/s= db/qemu/qom/object.c:2102 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Message-Id: <20200115062535.50644-1-pannengyuan@huawei.com> Reviewed-by: Stefano Garzarella Reviewed-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/vhost-vsock.h | 2 ++ hw/virtio/vhost-vsock.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/hw/virtio/vhost-vsock.h b/include/hw/virtio/vhost-vsoc= k.h index d509d67c4a..bc5a988ee5 100644 --- a/include/hw/virtio/vhost-vsock.h +++ b/include/hw/virtio/vhost-vsock.h @@ -33,6 +33,8 @@ typedef struct { struct vhost_virtqueue vhost_vqs[2]; struct vhost_dev vhost_dev; VirtQueue *event_vq; + VirtQueue *recv_vq; + VirtQueue *trans_vq; QEMUTimer *post_load_timer; =20 /*< public >*/ diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index f5744363a8..b6cee479bb 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -335,8 +335,10 @@ static void vhost_vsock_device_realize(DeviceState *de= v, Error **errp) sizeof(struct virtio_vsock_config)); =20 /* Receive and transmit queues belong to vhost */ - virtio_add_queue(vdev, VHOST_VSOCK_QUEUE_SIZE, vhost_vsock_handle_outp= ut); - virtio_add_queue(vdev, VHOST_VSOCK_QUEUE_SIZE, vhost_vsock_handle_outp= ut); + vsock->recv_vq =3D virtio_add_queue(vdev, VHOST_VSOCK_QUEUE_SIZE, + vhost_vsock_handle_output); + vsock->trans_vq =3D virtio_add_queue(vdev, VHOST_VSOCK_QUEUE_SIZE, + vhost_vsock_handle_output); =20 /* The event queue belongs to QEMU */ vsock->event_vq =3D virtio_add_queue(vdev, VHOST_VSOCK_QUEUE_SIZE, @@ -363,6 +365,9 @@ static void vhost_vsock_device_realize(DeviceState *dev= , Error **errp) err_vhost_dev: vhost_dev_cleanup(&vsock->vhost_dev); err_virtio: + virtio_delete_queue(vsock->recv_vq); + virtio_delete_queue(vsock->trans_vq); + virtio_delete_queue(vsock->event_vq); virtio_cleanup(vdev); close(vhostfd); return; @@ -379,6 +384,9 @@ static void vhost_vsock_device_unrealize(DeviceState *d= ev, Error **errp) vhost_vsock_set_status(vdev, 0); =20 vhost_dev_cleanup(&vsock->vhost_dev); + virtio_delete_queue(vsock->recv_vq); + virtio_delete_queue(vsock->trans_vq); + virtio_delete_queue(vsock->event_vq); virtio_cleanup(vdev); } =20 --=20 MST