From nobody Fri May 3 14:02:34 2024 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=1575857039; cv=none; d=zohomail.com; s=zohoarc; b=kH+rWgEcpDtss84YodpbXUqsLkQTi2YMlCnQkFnbf9LJitn/KQxWWkT/Owz6uya5VI+3yEp/7tuKMmWWLMQBv+Yn4hnKBN3G8ICyin4dovjiosdQfOZougC9T2IZOY+nUB4dRu9qiXNEFyuX+/kc0IByAK9jzDvpVw41XAFd1bs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575857039; 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=0vxuPFWytMIW8mYjQljpJyE2qu0FMaJpXzhcZnMs/qw=; b=YxXwJwlIJUxYAnyJULhiUbLl2HxUX+6Lk0AOcvDuWAqu3qoGde+AB87FnLr8wdOfTf9q5Uu9WX0yl/CTP1uLla1fKXIvz1mwSaxhVmi1tMfI/zysrNbVCdsQDGzllRv+9dIddd38yBogm2nRVhJ2TWh9PDl7TEDRnok5eiDdqYM= 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 1575857039314161.39472639239887; Sun, 8 Dec 2019 18:03:59 -0800 (PST) Received: from localhost ([::1]:35080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie8Oz-0005fp-Mi for importer@patchew.org; Sun, 08 Dec 2019 21:03:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53204) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie8MH-0004IO-TH for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:01:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ie8Ly-00085N-Cw for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:01:01 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2216 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ie8Lw-0007zd-7t for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:00:50 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 8C14555946C97999D62A; Mon, 9 Dec 2019 10:00:41 +0800 (CST) Received: from HGHY2P002143101.china.huawei.com (10.184.39.213) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.439.0; Mon, 9 Dec 2019 10:00:31 +0800 From: To: Subject: [PATCH v3 1/3] virtio: add ability to delete vq through a pointer Date: Mon, 9 Dec 2019 10:00:08 +0800 Message-ID: <1575856810-9388-2-git-send-email-pannengyuan@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1575856810-9388-1-git-send-email-pannengyuan@huawei.com> References: <1575856810-9388-1-git-send-email-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.39.213] 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.190 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: liyiting@huawei.com, zhang.zhanghailiang@huawei.com, Amit Shah , Pan Nengyuan , qemu-devel@nongnu.org, kuhn.chenqun@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" From: Michael S. Tsirkin =20 Devices tend to maintain vq pointers, allow deleting them through a vq pointer. Signed-off-by: Michael S. Tsirkin Signed-off-by: Pan Nengyuan [PMM: change function name to virtio_queue_cleanup; set used_elems to NULL = after free] Cc: Amit Shah Reviewed-by: Pankaj Gupta Reviewed-by: Laurent Vivier Reviewed-by: David Hildenbrand --- Changes v2 to v1: - use virtio_delete_queue to cleanup vq through a vq pointer --- Changes v3 to v2: - change function name from virtio_delete_queue to virtio_queue_cleanup --- hw/virtio/virtio.c | 16 +++++++++++----- include/hw/virtio/virtio.h | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 04716b5..2743258 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2330,17 +2330,23 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int= queue_size, return &vdev->vq[i]; } =20 +void virtio_queue_cleanup(VirtQueue *vq) +{ + vq->vring.num =3D 0; + vq->vring.num_default =3D 0; + vq->handle_output =3D NULL; + vq->handle_aio_output =3D NULL; + g_free(vq->used_elems); + vq->used_elems =3D NULL; +} + void virtio_del_queue(VirtIODevice *vdev, int n) { if (n < 0 || n >=3D VIRTIO_QUEUE_MAX) { abort(); } =20 - vdev->vq[n].vring.num =3D 0; - vdev->vq[n].vring.num_default =3D 0; - vdev->vq[n].handle_output =3D NULL; - vdev->vq[n].handle_aio_output =3D NULL; - g_free(vdev->vq[n].used_elems); + virtio_queue_cleanup(&vdev->vq[n]); } =20 static void virtio_set_isr(VirtIODevice *vdev, int value) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index c32a815..cc0b3f0 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -183,6 +183,8 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int que= ue_size, =20 void virtio_del_queue(VirtIODevice *vdev, int n); =20 +void virtio_queue_cleanup(VirtQueue *vq); + void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem, unsigned int len); void virtqueue_flush(VirtQueue *vq, unsigned int count); --=20 2.7.2.windows.1 From nobody Fri May 3 14:02:34 2024 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=1575857038; cv=none; d=zohomail.com; s=zohoarc; b=imdwRN921EMExo2jyrDWGUTuY0RB9NtKnAGMpNAaSSpDXB8Zu5OwJvPlYwjb3PcDGRvAAjcprk0sWFX8Tqmxd/v/M+d9teR7rHOE7h9gA8r7Cl0OdPBkm8DzRtBpwUbqBroE1gbbWJFBya4LoTXxcORqaa7HgrlQ7w+IEu9e+qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575857038; 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=FHP96c9ABW2HD36bcxkam6TPlPCFEPtFnVW8B+eYy/o=; b=mNHsKr1eaVvR+2Y2DMeAmaIe+9ofel1Nl+srXv3sycYIFkMw7NN96DqHw2Thy4S7GkXnuHxBW0Aq7B8eSwE/kvT4adSyYeD5+1nfSoK4DLAT/JF0hgkDGMURhd4zdvS7zI/ncmGFG0miy5Q2tOawx2EErPzktvActRk31l0o1FY= 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 1575857038618760.5146989195539; Sun, 8 Dec 2019 18:03:58 -0800 (PST) Received: from localhost ([::1]:35078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie8Oz-0005e8-01 for importer@patchew.org; Sun, 08 Dec 2019 21:03:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53183) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie8MF-0004ID-9J for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:01:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ie8Ly-000857-CR for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:00:52 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2218 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ie8Lw-0007zq-82 for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:00:50 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 98E31EE7E29061FF7364; Mon, 9 Dec 2019 10:00:41 +0800 (CST) Received: from HGHY2P002143101.china.huawei.com (10.184.39.213) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.439.0; Mon, 9 Dec 2019 10:00:32 +0800 From: To: Subject: [PATCH v3 2/3] virtio-balloon: fix memory leak while attach virtio-balloon device Date: Mon, 9 Dec 2019 10:00:09 +0800 Message-ID: <1575856810-9388-3-git-send-email-pannengyuan@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1575856810-9388-1-git-send-email-pannengyuan@huawei.com> References: <1575856810-9388-1-git-send-email-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.39.213] 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.190 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: liyiting@huawei.com, zhang.zhanghailiang@huawei.com, Amit Shah , Pan Nengyuan , qemu-devel@nongnu.org, kuhn.chenqun@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" From: Pan Nengyuan ivq/dvq/svq/free_page_vq forgot to cleanup in virtio_balloon_device_unrealize, the memory leak stack is as follow: Direct leak of 14336 byte(s) in 2 object(s) allocated from: #0 0x7f99fd9d8560 in calloc (/usr/lib64/libasan.so.3+0xc7560) #1 0x7f99fcb20015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015) #2 0x557d90638437 in virtio_add_queue hw/virtio/virtio.c:2327 #3 0x557d9064401d in virtio_balloon_device_realize hw/virtio/virtio-bal= loon.c:793 #4 0x557d906356f7 in virtio_device_realize hw/virtio/virtio.c:3504 #5 0x557d9073f081 in device_set_realized hw/core/qdev.c:876 #6 0x557d908b1f4d in property_set_bool qom/object.c:2080 #7 0x557d908b655e in object_property_set_qobject qom/qom-qobject.c:26 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Cc: Amit Shah Reviewed-by: Laurent Vivier Reviewed-by: David Hildenbrand --- Changes v2 to v1: - use virtio_delete_queue to cleanup vq through a vq pointer (suggested by Michael S. Tsirkin) --- Changes v3 to v2: - change virtio_delete_queue to virtio_queue_cleanup --- hw/virtio/virtio-balloon.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 40b04f5..681a2b2 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -831,6 +831,13 @@ static void virtio_balloon_device_unrealize(DeviceStat= e *dev, Error **errp) } balloon_stats_destroy_timer(s); qemu_remove_balloon_handler(s); + + virtio_queue_cleanup(s->ivq); + virtio_queue_cleanup(s->dvq); + virtio_queue_cleanup(s->svq); + if (s->free_page_vq) { + virtio_queue_cleanup(s->free_page_vq); + } virtio_cleanup(vdev); } =20 --=20 2.7.2.windows.1 From nobody Fri May 3 14:02:34 2024 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=1575857143; cv=none; d=zohomail.com; s=zohoarc; b=EgNm5cQKLASI+3pQkJtFQxmc/KXk9wDfK9QGhaoFUHaqrkCvqX+Fmj27YyN5l5vuxCfc+ZDS6RYp5oJoYznzzuQKA4qmKaMy361JyIoGonvUBSbzm6jwitYVflL1Gs50+GPKy7dgpyN8F/oQRXZ4eslwCHuvBQdy0OVZxjBI3nk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575857143; h=Content-Type:Content-Transfer-Encoding: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=DFRrOGtdCJuZIJ3MaBMedqCWLjb89ujZEXhnui+0YmI=; b=E5BJ/3yRFOoceRzi7ZvRFCQbhbsh3OpxaR9T4BJWOs62kYUkL6WtFbjHPhc3WILfgG+lwgQ0TwweY+q7L6Tzux9hcrghc3SwmMTxwwqM9zbPEc+2ask50Ki2f9PNkEgjvSs0WtUtb31XOMktx+N2gcGDTBhf+I1xtiJBNFOelHg= 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 1575857143144595.7844820638406; Sun, 8 Dec 2019 18:05:43 -0800 (PST) Received: from localhost ([::1]:35108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie8Qg-0007ys-38 for importer@patchew.org; Sun, 08 Dec 2019 21:05:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53205) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ie8MH-0004IP-T8 for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:01:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ie8Ly-00085C-Ct for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:00:54 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2217 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ie8Lw-0007zh-7N for qemu-devel@nongnu.org; Sun, 08 Dec 2019 21:00:50 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 90F34C99B42DC8C01274; Mon, 9 Dec 2019 10:00:41 +0800 (CST) Received: from HGHY2P002143101.china.huawei.com (10.184.39.213) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.439.0; Mon, 9 Dec 2019 10:00:32 +0800 From: To: Subject: [PATCH v3 3/3] virtio-serial-bus: fix memory leak while attach virtio-serial-bus Date: Mon, 9 Dec 2019 10:00:10 +0800 Message-ID: <1575856810-9388-4-git-send-email-pannengyuan@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1575856810-9388-1-git-send-email-pannengyuan@huawei.com> References: <1575856810-9388-1-git-send-email-pannengyuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.39.213] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.190 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: liyiting@huawei.com, Laurent Vivier , zhang.zhanghailiang@huawei.com, Amit Shah , Pan Nengyuan , qemu-devel@nongnu.org, Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kuhn.chenqun@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Pan Nengyuan ivqs/ovqs/c_ivq/c_ovq forgot to cleanup in virtio_serial_device_unrealize, the memory leak stack is as below: Direct leak of 1290240 byte(s) in 180 object(s) allocated from: #0 0x7fc9bfc27560 in calloc (/usr/lib64/libasan.so.3+0xc7560) #1 0x7fc9bed6f015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015) #2 0x5650e02b83e7 in virtio_add_queue hw/virtio/virtio.c:2327 #3 0x5650e02847b5 in virtio_serial_device_realize hw/char/virtio-serial= -bus.c:1089 #4 0x5650e02b56a7 in virtio_device_realize hw/virtio/virtio.c:3504 #5 0x5650e03bf031 in device_set_realized hw/core/qdev.c:876 #6 0x5650e0531efd in property_set_bool qom/object.c:2080 #7 0x5650e053650e in object_property_set_qobject qom/qom-qobject.c:26 #8 0x5650e0533e14 in object_property_set_bool qom/object.c:1338 #9 0x5650e04c0e37 in virtio_pci_realize hw/virtio/virtio-pci.c:1801 Reported-by: Euler Robot Signed-off-by: Pan Nengyuan Reviewed-by: Laurent Vivier Cc: Laurent Vivier Cc: Amit Shah Cc: "Marc-Andr=C3=A9 Lureau" Cc: Paolo Bonzini --- Changes v2 to v1: - use virtio_delete_queue to cleanup vq through a vq pointer (suggested by Michael S. Tsirkin) Changes v3 to v1: - change virtio_delete_queue to virtio_queue_cleanup. --- hw/char/virtio-serial-bus.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 3325904..f63dc46 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -1126,9 +1126,17 @@ static void virtio_serial_device_unrealize(DeviceSta= te *dev, Error **errp) { VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VirtIOSerial *vser =3D VIRTIO_SERIAL(dev); + int i; =20 QLIST_REMOVE(vser, next); =20 + virtio_queue_cleanup(vser->c_ivq); + virtio_queue_cleanup(vser->c_ovq); + for (i =3D 0; i < vser->bus.max_nr_ports; i++) { + virtio_queue_cleanup(vser->ivqs[i]); + virtio_queue_cleanup(vser->ovqs[i]); + } + g_free(vser->ivqs); g_free(vser->ovqs); g_free(vser->ports_map); --=20 2.7.2.windows.1