From patchwork Thu Apr 26 19:03:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 155319 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 BDDDCB6FB4 for ; Fri, 27 Apr 2012 05:04:02 +1000 (EST) Received: from localhost ([::1]:49502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNTyy-0007X1-K6 for incoming@patchwork.ozlabs.org; Thu, 26 Apr 2012 15:04:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNTym-0007Wf-Fk for qemu-devel@nongnu.org; Thu, 26 Apr 2012 15:03:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SNTyi-0006xt-4J for qemu-devel@nongnu.org; Thu, 26 Apr 2012 15:03:48 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:55434) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNTyh-0006xD-S7 for qemu-devel@nongnu.org; Thu, 26 Apr 2012 15:03:44 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Apr 2012 20:03:41 +0100 Received: from d06nrmr1507.portsmouth.uk.ibm.com (9.149.38.233) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 26 Apr 2012 20:03:39 +0100 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3QJ3c2H2138238 for ; Thu, 26 Apr 2012 20:03:38 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3QJ3cBd006156 for ; Thu, 26 Apr 2012 13:03:38 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q3QJ3c5r006149; Thu, 26 Apr 2012 13:03:38 -0600 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id 024F81224435; Thu, 26 Apr 2012 21:03:37 +0200 (CEST) From: Christian Borntraeger To: Alexander Graf Date: Thu, 26 Apr 2012 21:03:36 +0200 Message-Id: <1335467016-49116-1-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.7.9.6 In-Reply-To: <7F8B94E1-EDF1-465B-B748-8AC1109B2231@suse.de> References: <7F8B94E1-EDF1-465B-B748-8AC1109B2231@suse.de> x-cbid: 12042619-5024-0000-0000-0000026043CE X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.107 Cc: Cornelia Huck , Christian Borntraeger , Jens Freimann , Heinz Graalfs , qemu-devel Subject: [Qemu-devel] [PATCH 04 v2] s390: reset avail and used index on reboot 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 From: Jens Freimann reset the guest vring avail/used idx fields, otherwise it's possible that old values remain in memory which would cause a reboot to fail with a "Guest moved used index" message version 2: split out the index reset Signed-off-by: Jens Freimann Signed-off-by: Christian Borntraeger --- hw/s390-virtio-bus.c | 19 ++++++++++++++++++- hw/s390-virtio-bus.h | 4 ++++ hw/s390-virtio.c | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 74419b3..63ccd5c 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -63,6 +63,23 @@ static void s390_virtio_bus_reset(void *opaque) bus->next_ring = bus->dev_page + TARGET_PAGE_SIZE; } +void s390_virtio_reset_idx(VirtIOS390Device *dev) +{ + int i; + target_phys_addr_t idx_addr; + uint8_t num_vq; + + num_vq = s390_virtio_device_num_vq(dev); + for (i = 0; i < num_vq; i++) { + idx_addr = virtio_queue_get_avail_addr(dev->vdev, i) + + VIRTIO_VRING_AVAIL_IDX_OFFS; + stw_phys(idx_addr, 0); + idx_addr = virtio_queue_get_used_addr(dev->vdev, i) + + VIRTIO_VRING_USED_IDX_OFFS; + stw_phys(idx_addr, 0); + } +} + VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size) { VirtIOS390Bus *bus; @@ -121,7 +138,7 @@ static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev) virtio_bind_device(vdev, &virtio_s390_bindings, dev); dev->host_features = vdev->get_features(vdev, dev->host_features); s390_virtio_device_sync(dev); - + s390_virtio_reset_idx(dev); if (dev->qdev.hotplugged) { CPUS390XState *env = s390_cpu_addr2state(0); s390_virtio_irq(env, VIRTIO_PARAM_DEV_ADD, dev->dev_offs); diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h index 0e60bc0..49e6c46 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -34,6 +34,8 @@ #define VIRTIO_VQCONFIG_LEN 24 #define VIRTIO_RING_LEN (TARGET_PAGE_SIZE * 3) +#define VIRTIO_VRING_AVAIL_IDX_OFFS 2 +#define VIRTIO_VRING_USED_IDX_OFFS 2 #define S390_DEVICE_PAGES 512 #define VIRTIO_PARAM_MASK 0xff @@ -90,3 +92,5 @@ VirtIOS390Device *s390_virtio_bus_find_vring(VirtIOS390Bus *bus, ram_addr_t mem, int *vq_num); VirtIOS390Device *s390_virtio_bus_find_mem(VirtIOS390Bus *bus, ram_addr_t mem); void s390_virtio_device_sync(VirtIOS390Device *dev); +void s390_virtio_reset_idx(VirtIOS390Device *dev); + diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index d17602f..38e8fba 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -99,6 +99,7 @@ int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall) virtio_reset(dev->vdev); stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS, 0); s390_virtio_device_sync(dev); + s390_virtio_reset_idx(dev); break; } case KVM_S390_VIRTIO_SET_STATUS: