From patchwork Wed Dec 12 14:26:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 205541 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 107072C0093 for ; Thu, 13 Dec 2012 01:27:51 +1100 (EST) Received: from localhost ([::1]:55537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TinHp-0004IE-31 for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2012 09:27:49 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TinH8-0002ac-BX for qemu-devel@nongnu.org; Wed, 12 Dec 2012 09:27:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TinGu-00061k-OL for qemu-devel@nongnu.org; Wed, 12 Dec 2012 09:27:06 -0500 Received: from mail-ia0-f173.google.com ([209.85.210.173]:47686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TinGu-00061V-Jw for qemu-devel@nongnu.org; Wed, 12 Dec 2012 09:26:52 -0500 Received: by mail-ia0-f173.google.com with SMTP id w21so891587iac.4 for ; Wed, 12 Dec 2012 06:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=2L5JcJhhqXlwZ7WS8WK3iLuqRnEOpn8XLFKgB925m+g=; b=jH0iEOkxlc7HOrD0I3IjSE4JRwpgtOZZ4yrOSqqTvSDHyBJqTbmaAOIjEhN2Xt6o95 4o+ar1JcVxnGNCnYalUjedUgHSGRFlUoaG+Jh+CIvfjdQFH6AXBR3E6YnFPeDKIeO5yk XPcVe1g2ty4LbhAq1OpGiS8bGtbT+Xf9DIjpyp2rV+J4P3H7YpZkIjNMVCpaH1mawUa6 4cx/JlhAsD6P+EQpzul1ye3cGjpP6uWtC2sXN7XfLqygsTCKc8ipJVGFW5bODjX7yun2 TJ/VIXazIWwxGputXjIsx0cYl2AiplH6/+nvIIclNwhnm7pKrfsS/yG7RR9fNM8rZ9vR bmwA== Received: by 10.50.150.174 with SMTP id uj14mr997222igb.19.1355322411976; Wed, 12 Dec 2012 06:26:51 -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 gk1sm12230993igc.5.2012.12.12.06.26.48 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 06:26:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2012 15:26:35 +0100 Message-Id: <1355322396-32026-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1355322396-32026-1-git-send-email-pbonzini@redhat.com> References: <1355322396-32026-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.210.173 Cc: agraf@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH 1/2] 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 field. 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). The patch calls qdev_reset_all, which calls virtio_pci_reset, instead of basically inlining the contents of the latter. Reported-by: Bryan Venteicher Cc: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- hw/virtio-pci.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 71f4fb5..a1685f1 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_pci_stop_ioeventfd(proxy); - virtio_reset(proxy->vdev); - 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,19 +283,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) } break; case VIRTIO_PCI_STATUS: - 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) { - virtio_reset(proxy->vdev); - 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