From: "Michael S. Tsirkin" <mst@redhat.com> To: David Gibson <david@gibson.dropbear.id.au> Cc: rusty@rustcorp.com.au, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, paulus@samba.org, qemu-devel@nongnu.org Subject: Re: [PATCH 2/3] virtio_balloon: Fix endian bug Date: Thu, 12 Apr 2012 11:30:50 +0300 [thread overview] Message-ID: <20120412083049.GA13053@redhat.com> (raw) In-Reply-To: <1334208995-29985-3-git-send-email-david@gibson.dropbear.id.au> On Thu, Apr 12, 2012 at 03:36:34PM +1000, David Gibson wrote: > Although virtio config space fields are usually in guest-native endian, > the spec for the virtio balloon device explicitly states that both fields > in its config space are little-endian. > > However, the current virtio_balloon driver does not have a suitable endian > swap for the 'num_pages' field, although it does have one for the 'actual' > field. This patch corrects the bug, adding sparse annotation while we're > at it. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Indeed. And qemu byte-swaps according to the spec, too. Applied for 3.4, thanks. > --- > drivers/virtio/virtio_balloon.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c > index 6c07793..553cc1f 100644 > --- a/drivers/virtio/virtio_balloon.c > +++ b/drivers/virtio/virtio_balloon.c > @@ -238,11 +238,14 @@ static void virtballoon_changed(struct virtio_device *vdev) > > static inline s64 towards_target(struct virtio_balloon *vb) > { > - u32 v; > + __le32 v; > + s64 target; > + > vb->vdev->config->get(vb->vdev, > offsetof(struct virtio_balloon_config, num_pages), > &v, sizeof(v)); > - return (s64)v - vb->num_pages; > + target = le32_to_cpu(v); > + return target - vb->num_pages; > } > > static void update_balloon_size(struct virtio_balloon *vb) > -- > 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: David Gibson <david@gibson.dropbear.id.au> Cc: qemu-devel@nongnu.org, paulus@samba.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH 2/3] virtio_balloon: Fix endian bug Date: Thu, 12 Apr 2012 11:30:50 +0300 [thread overview] Message-ID: <20120412083049.GA13053@redhat.com> (raw) In-Reply-To: <1334208995-29985-3-git-send-email-david@gibson.dropbear.id.au> On Thu, Apr 12, 2012 at 03:36:34PM +1000, David Gibson wrote: > Although virtio config space fields are usually in guest-native endian, > the spec for the virtio balloon device explicitly states that both fields > in its config space are little-endian. > > However, the current virtio_balloon driver does not have a suitable endian > swap for the 'num_pages' field, although it does have one for the 'actual' > field. This patch corrects the bug, adding sparse annotation while we're > at it. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Indeed. And qemu byte-swaps according to the spec, too. Applied for 3.4, thanks. > --- > drivers/virtio/virtio_balloon.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c > index 6c07793..553cc1f 100644 > --- a/drivers/virtio/virtio_balloon.c > +++ b/drivers/virtio/virtio_balloon.c > @@ -238,11 +238,14 @@ static void virtballoon_changed(struct virtio_device *vdev) > > static inline s64 towards_target(struct virtio_balloon *vb) > { > - u32 v; > + __le32 v; > + s64 target; > + > vb->vdev->config->get(vb->vdev, > offsetof(struct virtio_balloon_config, num_pages), > &v, sizeof(v)); > - return (s64)v - vb->num_pages; > + target = le32_to_cpu(v); > + return target - vb->num_pages; > } > > static void update_balloon_size(struct virtio_balloon *vb) > -- > 1.7.9.5
next prev parent reply other threads:[~2012-04-12 8:30 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-04-12 5:36 [PATCH 0/3] Bugfixes for virtio balloon driver David Gibson 2012-04-12 5:36 ` David Gibson 2012-04-12 5:36 ` [PATCH 1/3] virtio_balloon: Remove unnecessarily persistent state David Gibson 2012-04-12 5:36 ` David Gibson 2012-04-12 8:11 ` Michael S. Tsirkin 2012-04-12 8:11 ` Michael S. Tsirkin 2012-04-12 8:25 ` Michael S. Tsirkin 2012-04-12 8:25 ` Michael S. Tsirkin 2012-04-12 5:36 ` [PATCH 2/3] virtio_balloon: Fix endian bug David Gibson 2012-04-12 5:36 ` David Gibson 2012-04-12 8:30 ` Michael S. Tsirkin [this message] 2012-04-12 8:30 ` Michael S. Tsirkin 2012-04-12 5:36 ` [PATCH 3/3] virtio_balloon: Bugfixes for PAGE_SIZE != 4k David Gibson 2012-04-12 5:36 ` David Gibson 2012-04-12 10:14 ` Michael S. Tsirkin 2012-04-12 10:14 ` Michael S. Tsirkin 2012-04-13 3:12 ` David Gibson 2012-04-13 3:12 ` David Gibson 2012-04-15 8:52 ` Michael S. Tsirkin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120412083049.GA13053@redhat.com \ --to=mst@redhat.com \ --cc=david@gibson.dropbear.id.au \ --cc=linux-kernel@vger.kernel.org \ --cc=paulus@samba.org \ --cc=qemu-devel@nongnu.org \ --cc=rusty@rustcorp.com.au \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.