From nobody Thu Nov 13 19:27:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1582616517; cv=none; d=zohomail.com; s=zohoarc; b=dk7eJTOfX/p9YFyqXZlNWedqjuxRzjxywRxjvcFDIV/S+ybA/Ken7q2Cco/6ZvspwVmdmiPJ7qwJBM5kacaPVsJdAbj4oNTgAMFIAFq8UiWQLifKZE9SxnDRAkhNMrQcsJgg6Iy+7tteHpJoueAw6jx/OxBCCvKzDgf7zSfgDlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582616517; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R8nGxP5a4QFIqmCPfsSAma551P+fovoJH+7v/OD8RJY=; b=PIGB0s6CvFHc67ZTcqmf5o0FqfNLQNcZjmqG6sve4xtukVwWoBQDO8Od7gPFKop29DruWlEpnhKdh1tWQMQ+NWAodYAmNMTB69oVVBJ7kAdgYN2B/MzoHJh1DymU5Lye+TwrSqloRvBHtfIC20MmZx7SIy20IB4b0MF4JfMeyzY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15826165170741006.5591026174916; Mon, 24 Feb 2020 23:41:57 -0800 (PST) Received: from localhost ([::1]:49972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Uqp-0001QK-Ua for importer@patchew.org; Tue, 25 Feb 2020 02:41:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40994) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Upe-0008N8-30 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Upc-0003av-NQ for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:42 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:55636 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Upc-0003Xy-Bo for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:40 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 8A63CF144D291DE3A32A; Tue, 25 Feb 2020 15:40:36 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Tue, 25 Feb 2020 15:40:28 +0800 From: Pan Nengyuan To: Subject: [PATCH 1/4] vhost-user-fs: do delete virtio_queues in unrealize Date: Tue, 25 Feb 2020 15:55:51 +0800 Message-ID: <20200225075554.10835-2-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200225075554.10835-1-pannengyuan@huawei.com> References: <20200225075554.10835-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 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: zhang.zhanghailiang@huawei.com, Pan Nengyuan , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , Stefan Hajnoczi , euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to other virtio device(https://patchwork.kernel.org/patch/11399237/= ), virtio queues forgot to delete in unrealize, and aslo error path in real= ize, this patch fix these memleaks, the leak stack is as follow: Direct leak of 57344 byte(s) in 1 object(s) allocated from: #0 0x7f15784fb970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970) #1 0x7f157790849d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d) #2 0x55587a1bf859 in virtio_add_queue /mnt/sdb/qemu-new/qemu_test/qemu/= hw/virtio/virtio.c:2333 #3 0x55587a2071d5 in vuf_device_realize /mnt/sdb/qemu-new/qemu_test/qem= u/hw/virtio/vhost-user-fs.c:212 #4 0x55587a1ae360 in virtio_device_realize /mnt/sdb/qemu-new/qemu_test/= qemu/hw/virtio/virtio.c:3531 #5 0x55587a63fb7b in device_set_realized /mnt/sdb/qemu-new/qemu_test/qe= mu/hw/core/qdev.c:891 #6 0x55587acf03f5 in property_set_bool /mnt/sdb/qemu-new/qemu_test/qemu= /qom/object.c:2238 #7 0x55587acfce0d in object_property_set_qobject /mnt/sdb/qemu-new/qemu= _test/qemu/qom/qom-qobject.c:26 #8 0x55587acf5c8c in object_property_set_bool /mnt/sdb/qemu-new/qemu_te= st/qemu/qom/object.c:1390 #9 0x55587a8e22a2 in pci_qdev_realize /mnt/sdb/qemu-new/qemu_test/qemu/= hw/pci/pci.c:2095 #10 0x55587a63fb7b in device_set_realized /mnt/sdb/qemu-new/qemu_test/q= emu/hw/core/qdev.c:891 #11 0x55587acf03f5 in property_set_bool /mnt/sdb/qemu-new/qemu_test/qem= u/qom/object.c:2238 #12 0x55587acfce0d in object_property_set_qobject /mnt/sdb/qemu-new/qem= u_test/qemu/qom/qom-qobject.c:26 #13 0x55587acf5c8c in object_property_set_bool /mnt/sdb/qemu-new/qemu_t= est/qemu/qom/object.c:1390 #14 0x55587a496d65 in qdev_device_add /mnt/sdb/qemu-new/qemu_test/qemu/= qdev-monitor.c:679 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Cc: "Dr. David Alan Gilbert" Cc: Stefan Hajnoczi --- hw/virtio/vhost-user-fs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index 33b17848c2..4554d123b7 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -230,6 +230,10 @@ static void vuf_device_realize(DeviceState *dev, Error= **errp) =20 err_virtio: vhost_user_cleanup(&fs->vhost_user); + virtio_del_queue(vdev, 0); + for (i =3D 0; i < fs->conf.num_request_queues; i++) { + virtio_del_queue(vdev, i + 1); + } virtio_cleanup(vdev); g_free(fs->vhost_dev.vqs); return; @@ -239,6 +243,7 @@ static void vuf_device_unrealize(DeviceState *dev, Erro= r **errp) { VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VHostUserFS *fs =3D VHOST_USER_FS(dev); + int i; =20 /* This will stop vhost backend if appropriate. */ vuf_set_status(vdev, 0); @@ -247,6 +252,10 @@ static void vuf_device_unrealize(DeviceState *dev, Err= or **errp) =20 vhost_user_cleanup(&fs->vhost_user); =20 + virtio_del_queue(vdev, 0); + for (i =3D 0; i < fs->conf.num_request_queues; i++) { + virtio_del_queue(vdev, i + 1); + } virtio_cleanup(vdev); g_free(fs->vhost_dev.vqs); fs->vhost_dev.vqs =3D NULL; --=20 2.18.2 From nobody Thu Nov 13 19:27:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1582616613; cv=none; d=zohomail.com; s=zohoarc; b=ItK1JklzF/RgC9GkK80M4GJnk8WJHdu3ojaScDOPSGURlTdf7Y7oZdbi+onSoflwAxM3c2QFfpMZ6YLN0OZ0UPMX77WKzbleSbiMuTplscDHYi9DB0zNwMT6iUgOYGrRz1VVNU0+FSNGyQDhbkbe+kOOrOWZb97kwsiItldOkeE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582616613; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tYhYAhq1K0+V8CsPcAiFm+voJKa7oN5XIqsrD074NW4=; b=HHzDDFGOqHxLJXb/BiLukm/AQmrqzu++nJfsaGlQow8IVZ8hkF8Qde2460L/Utf3LKi1zCeO0BMuZZicZpOEuLlUQlgi8e9vpZfs3pWG84sSYw56crcYbRaHt7anFCVWmdk2VXxyM8dvWDqV8O0rXygPjalwBP32ne70gTXKnQ0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582616613610355.653644254789; Mon, 24 Feb 2020 23:43:33 -0800 (PST) Received: from localhost ([::1]:50064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6UsO-0004uB-IY for importer@patchew.org; Tue, 25 Feb 2020 02:43:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41018) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Uph-0008OM-59 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Upg-0003cC-4V for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:45 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:55678 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Upf-0003bh-PP for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:44 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id A1B0A4B482C74B6EBB24; Tue, 25 Feb 2020 15:40:41 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Tue, 25 Feb 2020 15:40:31 +0800 From: Pan Nengyuan To: Subject: [PATCH 2/4] vhost-user-fs: convert to the new virtio_delete_queue function Date: Tue, 25 Feb 2020 15:55:52 +0800 Message-ID: <20200225075554.10835-3-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200225075554.10835-1-pannengyuan@huawei.com> References: <20200225075554.10835-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 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: zhang.zhanghailiang@huawei.com, Pan Nengyuan , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , Stefan Hajnoczi , euler.robot@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" use the new virtio_delete_queue function to cleanup. Signed-off-by: Pan Nengyuan Cc: "Dr. David Alan Gilbert" Cc: Stefan Hajnoczi --- hw/virtio/vhost-user-fs.c | 15 +++++++++------ include/hw/virtio/vhost-user-fs.h | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index 4554d123b7..6136768875 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -209,11 +209,12 @@ static void vuf_device_realize(DeviceState *dev, Erro= r **errp) sizeof(struct virtio_fs_config)); =20 /* Hiprio queue */ - virtio_add_queue(vdev, fs->conf.queue_size, vuf_handle_output); + fs->hiprio_vq =3D virtio_add_queue(vdev, fs->conf.queue_size, vuf_hand= le_output); =20 /* Request queues */ + fs->req_vqs =3D g_new(VirtQueue *, fs->conf.num_request_queues); for (i =3D 0; i < fs->conf.num_request_queues; i++) { - virtio_add_queue(vdev, fs->conf.queue_size, vuf_handle_output); + fs->req_vqs[i] =3D virtio_add_queue(vdev, fs->conf.queue_size, vuf= _handle_output); } =20 /* 1 high prio queue, plus the number configured */ @@ -230,10 +231,11 @@ static void vuf_device_realize(DeviceState *dev, Erro= r **errp) =20 err_virtio: vhost_user_cleanup(&fs->vhost_user); - virtio_del_queue(vdev, 0); + virtio_delete_queue(fs->hiprio_vq); for (i =3D 0; i < fs->conf.num_request_queues; i++) { - virtio_del_queue(vdev, i + 1); + virtio_delete_queue(fs->req_vqs[i]); } + g_free(fs->req_vqs); virtio_cleanup(vdev); g_free(fs->vhost_dev.vqs); return; @@ -252,10 +254,11 @@ static void vuf_device_unrealize(DeviceState *dev, Er= ror **errp) =20 vhost_user_cleanup(&fs->vhost_user); =20 - virtio_del_queue(vdev, 0); + virtio_delete_queue(fs->hiprio_vq); for (i =3D 0; i < fs->conf.num_request_queues; i++) { - virtio_del_queue(vdev, i + 1); + virtio_delete_queue(fs->req_vqs[i]); } + g_free(fs->req_vqs); virtio_cleanup(vdev); g_free(fs->vhost_dev.vqs); fs->vhost_dev.vqs =3D NULL; diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-us= er-fs.h index 9ff1bdb7cf..6f3030d288 100644 --- a/include/hw/virtio/vhost-user-fs.h +++ b/include/hw/virtio/vhost-user-fs.h @@ -37,6 +37,8 @@ typedef struct { struct vhost_virtqueue *vhost_vqs; struct vhost_dev vhost_dev; VhostUserState vhost_user; + VirtQueue **req_vqs; + VirtQueue *hiprio_vq; =20 /*< public >*/ } VHostUserFS; --=20 2.18.2 From nobody Thu Nov 13 19:27:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1582616549; cv=none; d=zohomail.com; s=zohoarc; b=bDQoLd/rQWHftJv8PDsocJMxkNIwShkT+JWKfC9WJkMBS5EAmAXITFsb2Opuu7hZlm3dXtioXiv6x1OHUFbeC3LEAqt5x2kw5kcLaZvwLKH6BgpCzM3z9vbO7u5hcJIMbt49S8xyDuZCX3OOo21IZylSoXiEnoPruU+Ptk+qbhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582616549; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SPAJuiNCzQ1J+lQv+HMcqt+EeWAIKign8x4plpI94b4=; b=hIQDF1qGNx32dZYQDQAt67U9LBHIGG1V3B51/Z/icnOXR+6Y67k9ynLCgJ56Z+Lz9o4yRSvCfHEhq1cX7tAhlIV7A2AVGfLLV12Im5/m7lxVBKxeytAvwi9P1ZcbZfOvK3mY0k9wc4UOSxoOmPDrKAr7+KJOjbyOIqJAmFrA5qg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582616549277588.7678692396181; Mon, 24 Feb 2020 23:42:29 -0800 (PST) Received: from localhost ([::1]:49984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6UrM-0002qX-5G for importer@patchew.org; Tue, 25 Feb 2020 02:42:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41016) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Uph-0008O6-1D for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Upg-0003c6-3l for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:44 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:55674 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Upf-0003bZ-ON for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:44 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 9DAA3AC42AAE15193582; Tue, 25 Feb 2020 15:40:41 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Tue, 25 Feb 2020 15:40:33 +0800 From: Pan Nengyuan To: Subject: [PATCH 3/4] virtio-pmem: do delete rq_vq in virtio_pmem_unrealize Date: Tue, 25 Feb 2020 15:55:53 +0800 Message-ID: <20200225075554.10835-4-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200225075554.10835-1-pannengyuan@huawei.com> References: <20200225075554.10835-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 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: euler.robot@huawei.com, Pan Nengyuan , qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to other virtio-deivces, rq_vq forgot to delete in virtio_pmem_unre= alize, this patch fix it. This device has aleardy maintained a vq pointer, thus we use the new virtio= _delete_queue function directly to do the cleanup. Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/virtio-pmem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index 97287e923b..43399522f5 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -130,6 +130,7 @@ static void virtio_pmem_unrealize(DeviceState *dev, Err= or **errp) VirtIOPMEM *pmem =3D VIRTIO_PMEM(dev); =20 host_memory_backend_set_mapped(pmem->memdev, false); + virtio_delete_queue(pmem->rq_vq); virtio_cleanup(vdev); } =20 --=20 2.18.2 From nobody Thu Nov 13 19:27:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1582616526; cv=none; d=zohomail.com; s=zohoarc; b=O8FrYgmsaN9UX/PfNurdvYxieZnLNM9YWTg4OiIPwom5o+yhUGEY7jbo3t9EoO2dOXjQ2rfsxAWOcKat3uvCVxnpCzgHxOusEU4Cm7wmi4CJ7ysG0fpViiDvpc38ijjb1TTdh9i8KKuWBbVgURK+huZQIB8JmeORxMH6vyHC1mE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582616526; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SQvPIXWeaI0af9ZXv2Q34hkbMFaqduB4oxK1IfaaI6I=; b=MajV831bo7yP6nyjT/k2FTGADY5wkljam8Y6rbX5Mu3koxC99Kg+EjQ/Gbx5fY8eQDU2aTQIl+qYY1Guh1vMIlZYYBKIk1D29zqNbdaww6AIf0orbgA5vBAmz6t3EmCuA9toj5QHpWNvXV2JXeTbQBgUesQgH0LHoSShSAAnakM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582616526625788.8747082549627; Mon, 24 Feb 2020 23:42:06 -0800 (PST) Received: from localhost ([::1]:49976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Uqz-0001tu-GE for importer@patchew.org; Tue, 25 Feb 2020 02:42:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41042) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Upm-00009J-9Y for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6Upl-0003dx-6p for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:50 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:55772 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6Upk-0003dM-RH for qemu-devel@nongnu.org; Tue, 25 Feb 2020 02:40:49 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id ADAF1A2DFF4E42C25089; Tue, 25 Feb 2020 15:40:46 +0800 (CST) Received: from localhost.localdomain (10.175.104.216) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Tue, 25 Feb 2020 15:40:38 +0800 From: Pan Nengyuan To: Subject: [PATCH 4/4] virtio-crypto: do delete ctrl_vq in virtio_crypto_device_unrealize Date: Tue, 25 Feb 2020 15:55:54 +0800 Message-ID: <20200225075554.10835-5-pannengyuan@huawei.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200225075554.10835-1-pannengyuan@huawei.com> References: <20200225075554.10835-1-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.216] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 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: "Gonglei \(Arei\)" , euler.robot@huawei.com, Pan Nengyuan , qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to other virtio-deivces, ctrl_vq forgot to delete in virtio_crypto_= device_unrealize, this patch fix it. This device has aleardy maintained vq pointers. Thus, we use the new virtio= _delete_queue function directly to do the cleanup. The leak stack: Direct leak of 10752 byte(s) in 3 object(s) allocated from: #0 0x7f4c024b1970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970) #1 0x7f4c018be49d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d) #2 0x55a2f8017279 in virtio_add_queue /mnt/sdb/qemu-new/qemu_test/qemu/= hw/virtio/virtio.c:2333 #3 0x55a2f8057035 in virtio_crypto_device_realize /mnt/sdb/qemu-new/qem= u_test/qemu/hw/virtio/virtio-crypto.c:814 #4 0x55a2f8005d80 in virtio_device_realize /mnt/sdb/qemu-new/qemu_test/= qemu/hw/virtio/virtio.c:3531 #5 0x55a2f8497d1b in device_set_realized /mnt/sdb/qemu-new/qemu_test/qe= mu/hw/core/qdev.c:891 #6 0x55a2f8b48595 in property_set_bool /mnt/sdb/qemu-new/qemu_test/qemu= /qom/object.c:2238 #7 0x55a2f8b54fad in object_property_set_qobject /mnt/sdb/qemu-new/qemu= _test/qemu/qom/qom-qobject.c:26 #8 0x55a2f8b4de2c in object_property_set_bool /mnt/sdb/qemu-new/qemu_te= st/qemu/qom/object.c:1390 #9 0x55a2f80609c9 in virtio_crypto_pci_realize /mnt/sdb/qemu-new/qemu_t= est/qemu/hw/virtio/virtio-crypto-pci.c:58 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Cc: "Gonglei (Arei)" --- hw/virtio/virtio-crypto.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 7351ab0a19..4c65114de5 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -831,12 +831,13 @@ static void virtio_crypto_device_unrealize(DeviceStat= e *dev, Error **errp) =20 max_queues =3D vcrypto->multiqueue ? vcrypto->max_queues : 1; for (i =3D 0; i < max_queues; i++) { - virtio_del_queue(vdev, i); + virtio_delete_queue(vcrypto->vqs[i].dataq); q =3D &vcrypto->vqs[i]; qemu_bh_delete(q->dataq_bh); } =20 g_free(vcrypto->vqs); + virtio_delete_queue(vcrypto->ctrl_vq); =20 virtio_cleanup(vdev); cryptodev_backend_set_used(vcrypto->cryptodev, false); --=20 2.18.2