From patchwork Mon Dec 17 16:24:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 206944 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E7CD42C007C for ; Tue, 18 Dec 2012 04:55:23 +1100 (EST) Received: from localhost ([::1]:42242 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkeuP-0000lT-VV for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 12:55:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVl-00019c-2B for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkdVj-0008Nr-RP for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:48 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:50882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVj-0008Nk-B5 for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:47 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so9604571iej.4 for ; Mon, 17 Dec 2012 08:25:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=n5zfHYshU2+qiCPX9kQ4sxwARnidTzfehmZiO+2APRo=; b=zI5peHtaaiNW3bCZ5ivaEfL8DxLbs48e+tnQwF9KVYTaInTb/9SBz/tLdzskvf8f2W QlZR9QK7s3B6X/gS7t42jdq2p5sc6Kicz2Mc6SJG6IokYqGEQyCC1ua3Wa6HbaaCaPII BzpaoLGza9NsiNd4YuNcOziVeRCWRh+OuQS7Wf5SYk2HmMK2uYgswpa8RA0G1dvzyJG8 GuDq7NH7EI5Xx0MvHXKwst4x5xM1JDjhu0jfqhTAXgEoO00vqRH4BGVMoAQpCwAPb2la JP4m1pBoO//Nh0vZMOKWSnxViON8W4UAeFydT9wBfulsHzdt0TtQ/oH8IGfGph3wDRIM B0zg== X-Received: by 10.50.57.200 with SMTP id k8mr9700927igq.29.1355761546853; Mon, 17 Dec 2012 08:25:46 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id bh3sm5950327igc.0.2012.12.17.08.25.43 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 08:25:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 17:24:48 +0100 Message-Id: <1355761490-10073-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> References: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.173 Cc: aliguori@us.ibm.com, mst@redhat.com Subject: [Qemu-devel] [PATCH 13/15] virtio-pci: reset all qbuses too when writing to the status field X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org virtio-pci devices do not perform a full reset when zero is written to the status byte. While PCI-specific status is initialized, the reset does not propagate down the qdev bus hierarchy. Because of this, a virtio reset does not cancel in-flight I/O for virtio-scsi (where the cancellation is handled automatically by the SCSI devices underneath virtio-scsi-pci). Reported-by: Bryan Venteicher Cc: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- hw/virtio-pci.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index a7c75fe..2cf5282 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -268,12 +268,10 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) case VIRTIO_PCI_QUEUE_PFN: pa = (hwaddr)val << VIRTIO_PCI_QUEUE_ADDR_SHIFT; if (pa == 0) { - virtio_reset(proxy->vdev); - virtio_pci_stop_ioeventfd(proxy); - msix_unuse_all_vectors(&proxy->pci_dev); - } - else + qdev_reset_all(&proxy->pci_dev.qdev); + } else { virtio_queue_set_addr(vdev, vdev->queue_sel, pa); + } break; case VIRTIO_PCI_QUEUE_SEL: if (val < VIRTIO_PCI_QUEUE_MAX) @@ -285,22 +283,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) } break; case VIRTIO_PCI_STATUS: - if (vdev->status == 0) { - virtio_reset(proxy->vdev); - } - - if (!(val & VIRTIO_CONFIG_S_DRIVER_OK)) { - virtio_pci_stop_ioeventfd(proxy); - } - virtio_set_status(vdev, val & 0xFF); - if (val & VIRTIO_CONFIG_S_DRIVER_OK) { - virtio_pci_start_ioeventfd(proxy); - } - if (vdev->status == 0) { - msix_unuse_all_vectors(&proxy->pci_dev); + qdev_reset_all(&proxy->pci_dev.qdev); + } else { + if (!(val & VIRTIO_CONFIG_S_DRIVER_OK)) { + virtio_pci_stop_ioeventfd(proxy); + } else { + virtio_pci_start_ioeventfd(proxy); + } } /* Linux before 2.6.34 sets the device as OK without enabling