From patchwork Thu Aug 26 06:05:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 62756 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5ED01B70DB for ; Thu, 26 Aug 2010 16:08:55 +1000 (EST) Received: from localhost ([127.0.0.1]:53995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OoVd4-0004kb-4j for incoming@patchwork.ozlabs.org; Thu, 26 Aug 2010 02:08:02 -0400 Received: from [140.186.70.92] (port=41720 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OoVab-00044q-75 for qemu-devel@nongnu.org; Thu, 26 Aug 2010 02:05:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OoVaT-0007PE-5k for qemu-devel@nongnu.org; Thu, 26 Aug 2010 02:05:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27520) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OoVaS-0007P8-Uf for qemu-devel@nongnu.org; Thu, 26 Aug 2010 02:05:21 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7Q65J6i006725 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Aug 2010 02:05:19 -0400 Received: from localhost (ovpn-113-40.phx2.redhat.com [10.3.113.40]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7Q65ES0014604; Thu, 26 Aug 2010 02:05:16 -0400 Date: Thu, 26 Aug 2010 11:35:13 +0530 From: Amit Shah To: Anthony Liguori Subject: Re: [Qemu-devel] [PATCH V2] balloon: Don't try fetching info if machine is stopped Message-ID: <20100826060513.GF18351@amit-laptop.redhat.com> References: <8450ea8e785c9049f0b3edddc01650a8c4b9ffe7.1282265244.git.amit.shah@redhat.com> <4C719C7E.6030606@codemonkey.ws> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4C719C7E.6030606@codemonkey.ws> User-Agent: Mutt/1.5.20 (2009-12-10) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Paolo Bonzini , agl@us.ibm.com, qemu list , Juan Quintela X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On (Sun) Aug 22 2010 [16:54:06], Anthony Liguori wrote: > On 08/19/2010 07:48 PM, Amit Shah wrote: > >If the machine is stopped and 'info balloon' is invoked, the monitor > >process just hangs waiting for info from the guest. Return the most > >recent balloon data in that case. > > > >See https://bugzilla.redhat.com/show_bug.cgi?id=623903 > > > >Reported-by: > >Signed-off-by: Amit Shah > > !vm_running is just a special case of an unresponsive guest. Even > if the guest was running, if it was oops'd and the administrator > didn't know, you would have the same issue. > > I'd suggest using a timeout based on rt_clock. If the stats request > times out, print an appropriate message to the user. This is what I have currently. It would need some timer handling in the save/load case as well, right? Amit From efe4a36423d7dec1aa9b142ac14c82c2dc80abe4 Mon Sep 17 00:00:00 2001 Message-Id: From: Amit Shah Date: Thu, 26 Aug 2010 11:17:14 +0530 Subject: [PATCH] balloon: Don't try fetching info if guest is unresponsive If the guest is unresponsive and 'info balloon' is invoked, the monitor process just hangs waiting for info from the guest. Return the most recent balloon data in that case. A new timer is added, which on expiry, just presents the old data to the monitor callback functions. See https://bugzilla.redhat.com/show_bug.cgi?id=623903 Reported-by: Signed-off-by: Amit Shah --- hw/virtio-balloon.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 9fe3886..1ec03b3 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -40,6 +40,7 @@ typedef struct VirtIOBalloon size_t stats_vq_offset; MonitorCompletion *stats_callback; void *stats_opaque_callback_data; + QEMUTimer *timer; } VirtIOBalloon; static VirtIOBalloon *to_virtio_balloon(VirtIODevice *vdev) @@ -137,6 +138,11 @@ static void complete_stats_request(VirtIOBalloon *vb) vb->stats_callback = NULL; } +static void stats_timer_expired(void *opaque) +{ + complete_stats_request(opaque); +} + static void virtio_balloon_receive_stats(VirtIODevice *vdev, VirtQueue *vq) { VirtIOBalloon *s = DO_UPCAST(VirtIOBalloon, vdev, vdev); @@ -148,6 +154,8 @@ static void virtio_balloon_receive_stats(VirtIODevice *vdev, VirtQueue *vq) return; } + qemu_del_timer(s->timer); + /* Initialize the stats to get rid of any stale values. This is only * needed to handle the case where a guest supports fewer stats than it * used to (ie. it has booted into an old kernel). @@ -215,6 +223,7 @@ static void virtio_balloon_to_target(void *opaque, ram_addr_t target, dev->stats_callback = cb; dev->stats_opaque_callback_data = cb_data; if (dev->vdev.guest_features & (1 << VIRTIO_BALLOON_F_STATS_VQ)) { + qemu_mod_timer(dev->timer, qemu_get_clock(rt_clock) + 5000); virtqueue_push(dev->svq, &dev->stats_vq_elem, dev->stats_vq_offset); virtio_notify(&dev->vdev, dev->svq); } else { @@ -267,6 +276,8 @@ VirtIODevice *virtio_balloon_init(DeviceState *dev) s->dvq = virtio_add_queue(&s->vdev, 128, virtio_balloon_handle_output); s->svq = virtio_add_queue(&s->vdev, 128, virtio_balloon_receive_stats); + s->timer = qemu_new_timer(rt_clock, stats_timer_expired, s); + reset_stats(s); qemu_add_balloon_handler(virtio_balloon_to_target, s);