Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NvVWn-0003CO-0j for qemu-devel@nongnu.org; Sat, 27 Mar 2010 08:54:13 -0400 Received: from [140.186.70.92] (port=38818 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NvVWl-0003AR-M6 for qemu-devel@nongnu.org; Sat, 27 Mar 2010 08:54:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NvVWk-0003U3-Ed for qemu-devel@nongnu.org; Sat, 27 Mar 2010 08:54:11 -0400 Received: from hall.aurel32.net ([88.191.82.174]:33681) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NvVWk-0003Tu-6g for qemu-devel@nongnu.org; Sat, 27 Mar 2010 08:54:10 -0400 Date: Sat, 27 Mar 2010 13:54:07 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] balloon: Fix overflow when reporting actual memory size Message-ID: <20100327125407.GC13677@hall.aurel32.net> References: <4BAB6BF9.30701@us.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <4BAB6BF9.30701@us.ibm.com> Sender: Aurelien Jarno List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Adam Litke Cc: qemu-devel@nongnu.org On Thu, Mar 25, 2010 at 08:58:17AM -0500, Adam Litke wrote: > Beginning with its introduction, the virtio balloon has had an overflow error > that causes 'info balloon' to misreport the actual memory size when the balloon > itself becomes larger than 4G. Use a cast when converting dev->actual from > pages to kB to prevent overflows. > > Before: > (qemu) info balloon > balloon: actual=5120 > (qemu) balloon 1025 > (qemu) info balloon > balloon: actual=1025 > (qemu) balloon 1024 > (qemu) info balloon > balloon: actual=5120 > > After: > (qemu) info balloon > balloon: actual=5120 > (qemu) balloon 1025 > (qemu) info balloon > balloon: actual=1025 > (qemu) balloon 1024 > (qemu) info balloon > balloon: actual=1024 Thanks, applied. > Signed-off-by: Adam Litke > --- > hw/virtio-balloon.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c > index 086d9d1..6eedab1 100644 > --- a/hw/virtio-balloon.c > +++ b/hw/virtio-balloon.c > @@ -78,7 +78,8 @@ static void stat_put(QDict *dict, const char *label, uint64_t val) > static QObject *get_stats_qobject(VirtIOBalloon *dev) > { > QDict *dict = qdict_new(); > - uint32_t actual = ram_size - (dev->actual << VIRTIO_BALLOON_PFN_SHIFT); > + uint64_t actual = ram_size - ((uint64_t) dev->actual << > + VIRTIO_BALLOON_PFN_SHIFT); > > stat_put(dict, "actual", actual); > stat_put(dict, "mem_swapped_in", dev->stats[VIRTIO_BALLOON_S_SWAP_IN]); > -- > 1.6.3.3 > > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net