[PATCH] virtio_balloon: clear modern features under legacy

Alexander Duyck
Tue, 14 Jul 2020 17:31:56 -0000

On Tue, Jul 14, 2020 at 1:45 AM Michael S. Tsirkin <mst at redhat.com>
wrote:
>
> On Mon, Jul 13, 2020 at 08:10:14AM -0700, Alexander Duyck wrote:
> > On Sun, Jul 12, 2020 at 8:10 AM Michael S. Tsirkin <mst at
redhat.com> wrote:
> > >
> > > On Fri, Jul 10, 2020 at 09:13:41AM -0700, Alexander Duyck wrote:
> > > > On Fri, Jul 10, 2020 at 4:31 AM Michael S. Tsirkin <mst
at redhat.com> wrote:
> > > > >

<snip>

> > > As you say correctly the command id is actually assumed native
endian:
> > >
> > >
> > > static u32 virtio_balloon_cmd_id_received(struct virtio_balloon
*vb)
> > > {
> > >         if (test_and_clear_bit(VIRTIO_BALLOON_CONFIG_READ_CMD_ID,
> > >                                &vb->config_read_bitmap))
> > >                 virtio_cread(vb->vdev, struct
virtio_balloon_config,
> > >                              free_page_hint_cmd_id,
> > >                              &vb->cmd_id_received_cache);
> > >
> > >         return vb->cmd_id_received_cache;
> > > }
> > >
> > >
> > > So guest assumes native, host assumes LE.
> >
> > This wasn't even the one I was talking about, but now that you
point
> > it out this is definately bug. The command ID I was talking about was
> > the one being passed via the descriptor ring. That one I believe is
> > native on both sides.
>
> Well qemu swaps it for modern devices:
>
>         virtio_tswap32s(vdev, &id);
>
> guest swaps it too:
>         vb->cmd_id_active = cpu_to_virtio32(vb->vdev,
>
virtio_balloon_cmd_id_received(vb));
>         sg_init_one(&sg, &vb->cmd_id_active,
sizeof(vb->cmd_id_active));
>         err = virtqueue_add_outbuf(vq, &sg, 1,
&vb->cmd_id_active, GFP_KERNEL);
>
> So it's native for legacy.

Okay, that makes sense. I just wasn't familiar with the virtio32 type.

I guess that just means we need to fix the original issue you found
where the guest was assuming native for the command ID in the config.
Do you plan to patch that or should I?

> > >
> > >
> > >
> > > > > ---
> > > > >  drivers/virtio/virtio_balloon.c | 9 +++++++++
> > > > >  1 file changed, 9 insertions(+)
> > > > >
> > > > > diff --git a/drivers/virtio/virtio_balloon.c
b/drivers/virtio/virtio_balloon.c
> > > > > index 5d4b891bf84f..b9bc03345157 100644
> > > > > --- a/drivers/virtio/virtio_balloon.c
> > > > > +++ b/drivers/virtio/virtio_balloon.c
> > > > > @@ -1107,6 +1107,15 @@ static int
virtballoon_restore(struct virtio_device *vdev)
> > > > >
> > > > >  static int virtballoon_validate(struct virtio_device
*vdev)
> > > > >  {
> > > > > +       /*
> > > > > +        * Legacy devices never specified how modern
features should behave.
> > > > > +        * E.g. which endian-ness to use? Better not to
assume anything.
> > > > > +        */
> > > > > +       if (!virtio_has_feature(vdev,
VIRTIO_F_VERSION_1)) {
> > > > > +               __virtio_clear_bit(vdev,
VIRTIO_BALLOON_F_FREE_PAGE_HINT);
> > > > > +               __virtio_clear_bit(vdev,
VIRTIO_BALLOON_F_PAGE_POISON);
> > > > > +               __virtio_clear_bit(vdev,
VIRTIO_BALLOON_F_REPORTING);
> > > > > +       }
> > > > >         /*
> > > > >          * Inform the hypervisor that our pages are
poisoned or
> > > > >          * initialized. If we cannot do that then we
should disable
> > > >
> > > > The patch content itself I am fine with since odds are
nobody would
> > > > expect to use these features with a legacy device.
> > > >
> > > > Acked-by: Alexander Duyck <alexander.h.duyck at
linux.intel.com>
> > >
> > > Hmm so now you pointed out it's just cmd id, maybe I should
just fix it
> > > instead? what do you say?
> >
> > So the config issues are bugs, but I don't think you saw the one I
was
> > talking about. In the function send_cmd_id_start the cmd_id_active
> > value which is initialized as a virtio32 is added as a sg entry and
> > then sent as an outbuf to the device. I'm assuming virtio32 is a
host
> > native byte ordering.
>
> IIUC it isn't :) virtio32 is guest native if device is legacy, and LE
if
> device is modern.

Okay. So I should probably document that for the spec I have been
working on. It looks like there is an example of similar documentation
for the memory statistics so it should be pretty straight forward.

Thanks.

- Alex