From nobody Fri Dec 19 06:16:27 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595915960; cv=none; d=zohomail.com; s=zohoarc; b=llUEWkvzZcBUc0Z+4RnnkOKrGLp2qWazNWZMPnn0ktw5aKtOihgjc555WVCUbVBpaKlDgBRI4x/CG1ufXsvns8aC1PF7D0qm3qEgakEMSzr3tUz8MsME2gRX/xhBBXWZkytW4QXhkIhMcwC6DQQ+QpSzaxgHfOP94p7fq6VB54Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595915960; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=3Sk+nCR7gZdtz5vJOCeGQeUmnmQKGvAkJ7TtLyJu0/k=; b=E4yTxdXzohWCHawe+vm8RDRzkXSS5xYvL3kgH+9Dx5sT4uV1Iyadk3bhwKfRYC6fDAt300RB4VagIpAxX/5jvVx/AA5U1iJDTOisdrHyV79AE/hiH4nh+osE37UOSWkN9NwoBsdtjwqetcsb80aXk3rNOvtbJpjWEmp2EXRR7aw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595915960819564.8826491556399; Mon, 27 Jul 2020 22:59:20 -0700 (PDT) Received: from localhost ([::1]:46534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0Idz-0002aR-As for importer@patchew.org; Tue, 28 Jul 2020 01:59:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0Icz-0001Mr-Bz for qemu-devel@nongnu.org; Tue, 28 Jul 2020 01:58:17 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:40114 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0Icx-0007BI-OE for qemu-devel@nongnu.org; Tue, 28 Jul 2020 01:58:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-378-dNYAYNeMMU6gTmtMpB-5iA-1; Tue, 28 Jul 2020 01:58:11 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 685978017FB; Tue, 28 Jul 2020 05:58:10 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-13-130.pek2.redhat.com [10.72.13.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92EA41002388; Tue, 28 Jul 2020 05:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595915895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=3Sk+nCR7gZdtz5vJOCeGQeUmnmQKGvAkJ7TtLyJu0/k=; b=Q7i7SZt2gQRTAckHV7jRVNIGMA/aGDPG0tU1k7KDWtn5Vbz3LInCAZGgiOghZF7nqI652j uobImnjmZm/gABMDxATr/sKSYdLKzp2gfG3NAGPe2LRTHqdvlw6beVSKrzrTWo9Ag8Seht MSwYz9qf4gka+lVdNZXRz+xH+2zu3vI= X-MC-Unique: dNYAYNeMMU6gTmtMpB-5iA-1 From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL 2/4] virtio-pci: fix virtio_pci_queue_enabled() Date: Tue, 28 Jul 2020 13:57:56 +0800 Message-Id: <1595915878-22568-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1595915878-22568-1-git-send-email-jasowang@redhat.com> References: <1595915878-22568-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=jasowang@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/27 23:56:14 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Jason Wang , qemu-devel@nongnu.org, Cindy Lu , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier In legacy mode, virtio_pci_queue_enabled() falls back to virtio_queue_enabled() to know if the queue is enabled. But virtio_queue_enabled() calls again virtio_pci_queue_enabled() if k->queue_enabled is set. This ends in a crash after a stack overflow. The problem can be reproduced with "-device virtio-net-pci,disable-legacy=3Doff,disable-modern=3Dtrue -net tap,vhost=3Don" And a look to the backtrace is very explicit: ... #4 0x000000010029a438 in virtio_queue_enabled () #5 0x0000000100497a9c in virtio_pci_queue_enabled () ... #130902 0x000000010029a460 in virtio_queue_enabled () #130903 0x0000000100497a9c in virtio_pci_queue_enabled () #130904 0x000000010029a460 in virtio_queue_enabled () #130905 0x0000000100454a20 in vhost_net_start () ... This patch fixes the problem by introducing a new function for the legacy case and calls it from virtio_pci_queue_enabled(). It also calls it from virtio_queue_enabled() to avoid code duplication. Fixes: f19bcdfedd53 ("virtio-pci: implement queue_enabled method") Cc: Jason Wang Cc: Cindy Lu CC: Michael S. Tsirkin Reviewed-by: Richard Henderson Signed-off-by: Laurent Vivier Signed-off-by: Jason Wang --- hw/virtio/virtio-pci.c | 2 +- hw/virtio/virtio.c | 7 ++++++- include/hw/virtio/virtio.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 2b1f9cc..ccdf54e 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1116,7 +1116,7 @@ static bool virtio_pci_queue_enabled(DeviceState *d, = int n) return proxy->vqs[n].enabled; } =20 - return virtio_queue_enabled(vdev, n); + return virtio_queue_enabled_legacy(vdev, n); } =20 static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy, diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 546a198..e983025 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -3309,6 +3309,11 @@ hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev= , int n) return vdev->vq[n].vring.desc; } =20 +bool virtio_queue_enabled_legacy(VirtIODevice *vdev, int n) +{ + return virtio_queue_get_desc_addr(vdev, n) !=3D 0; +} + bool virtio_queue_enabled(VirtIODevice *vdev, int n) { BusState *qbus =3D qdev_get_parent_bus(DEVICE(vdev)); @@ -3317,7 +3322,7 @@ bool virtio_queue_enabled(VirtIODevice *vdev, int n) if (k->queue_enabled) { return k->queue_enabled(qbus->parent, n); } - return virtio_queue_get_desc_addr(vdev, n) !=3D 0; + return virtio_queue_enabled_legacy(vdev, n); } =20 hwaddr virtio_queue_get_avail_addr(VirtIODevice *vdev, int n) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 198ffc7..e424df1 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -295,6 +295,7 @@ typedef struct VirtIORNGConf VirtIORNGConf; VIRTIO_F_RING_PACKED, false) =20 hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n); +bool virtio_queue_enabled_legacy(VirtIODevice *vdev, int n); bool virtio_queue_enabled(VirtIODevice *vdev, int n); hwaddr virtio_queue_get_avail_addr(VirtIODevice *vdev, int n); hwaddr virtio_queue_get_used_addr(VirtIODevice *vdev, int n); --=20 2.7.4