From nobody Wed Nov 5 16:57:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536412007119588.6692477310733; Sat, 8 Sep 2018 06:06:47 -0700 (PDT) Received: from localhost ([::1]:42550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fycwk-0008Hg-Bk for importer@patchew.org; Sat, 08 Sep 2018 09:06:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fycvo-00080Z-Q3 for qemu-devel@nongnu.org; Sat, 08 Sep 2018 09:05:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fycvj-0003uG-Tu for qemu-devel@nongnu.org; Sat, 08 Sep 2018 09:05:44 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:60372 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fycvj-0003cD-Dc for qemu-devel@nongnu.org; Sat, 08 Sep 2018 09:05:39 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id DC5C045E644CC; Sat, 8 Sep 2018 21:05:26 +0800 (CST) Received: from localhost (10.177.68.90) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.399.0; Sat, 8 Sep 2018 21:05:21 +0800 From: liujunjie To: , Date: Sat, 8 Sep 2018 21:04:48 +0800 Message-ID: <20180908130448.24516-1-liujunjie23@huawei.com> X-Mailer: git-send-email 2.13.3.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.177.68.90] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 45.249.212.32 Subject: [Qemu-devel] [PATCH] clean up callback when del virtqueue 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: weidong.huang@huawei.com, liujunjie , wangxinxin.wang@huawei.com, qemu-devel@nongnu.org, arei.gonglei@huawei.com, jianjay.zhou@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Before, we did not clear callback like handle_output when delete the virtqueue which may result be segmentfault. The scene is as follows: 1. Start a vm with multiqueue vhost-net, 2. then we write VIRTIO_PCI_GUEST_FEATURES in PCI configuration to triger multiqueue disable in this vm which will delete the virtqueue. In this step, the tx_bh is deleted but the callback virtio_net_handle_tx_bh still exist. 3. Finally, we write VIRTIO_PCI_QUEUE_NOTIFY in PCI configuration to notify the deleted virtqueue. In this way, virtio_net_handle_tx_bh will be called and qemu will be crashed. Although the way described above is uncommon, we had better reinforce it. Signed-off-by: liujunjie --- hw/net/virtio-net.c | 4 +++- hw/virtio/virtio.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index f154756..9bb20e3 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1467,7 +1467,9 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vde= v, VirtQueue *vq) return; } virtio_queue_set_notification(vq, 0); - qemu_bh_schedule(q->tx_bh); + if (q->tx_bh) { + qemu_bh_schedule(q->tx_bh); + } } =20 static void virtio_net_tx_timer(void *opaque) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index d4e4d98..7577518 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1604,6 +1604,9 @@ void virtio_del_queue(VirtIODevice *vdev, int n) =20 vdev->vq[n].vring.num =3D 0; vdev->vq[n].vring.num_default =3D 0; + vdev->vq[n].vring.align =3D 0; + vdev->vq[n].handle_output =3D NULL; + vdev->vq[n].handle_aio_output =3D NULL; } =20 static void virtio_set_isr(VirtIODevice *vdev, int value) --=20 1.8.3.1