[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1231928110.4944.290.camel@localhost.localdomain>
Date: Wed, 14 Jan 2009 10:15:10 +0000
From: Mark McLoughlin <markmc@...hat.com>
To: Alex Williamson <alex.williamson@...com>
Cc: Rusty Russell <rusty@...tcorp.com.au>, kvm <kvm@...r.kernel.org>,
netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH 2/4] virtio_net: Add a virtqueue for outbound control
commands
On Tue, 2009-01-13 at 14:23 -0700, Alex Williamson wrote:
> This will be used for RX mode, MAC filter table, VLAN filtering, etc...
Looks very reasonable. I'm a bit wary of send_command() being
synchronous, but it probably makes sense.
Could do with some details in the commit log as to why this approach was
chosen over increasing virtio_net_config.
> Signed-off-by: Alex Williamson <alex.williamson@...com>
> ---
>
> drivers/net/virtio_net.c | 55 +++++++++++++++++++++++++++++++++++++++++++-
> include/linux/virtio_net.h | 3 ++
> 2 files changed, 57 insertions(+), 1 deletions(-)
>
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index e7700de..de348de 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -39,7 +39,7 @@ module_param(gso, bool, 0444);
> struct virtnet_info
> {
> struct virtio_device *vdev;
> - struct virtqueue *rvq, *svq;
> + struct virtqueue *rvq, *svq, *cvq;
> struct net_device *dev;
> struct napi_struct napi;
>
> @@ -603,6 +603,47 @@ static int virtnet_open(struct net_device *dev)
> return 0;
> }
>
> +static int virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
> + void *data, unsigned int len)
> +{
> + struct scatterlist sg[3];
> + struct {
> + u8 class;
> + u8 cmd;
> + } ctrl_cmd;
I'd like to see this defined in virtio_net_hdr.
Why the need for class/cmd? Why not just a single 16 bit command field?
> + u8 ctrl_status;
> + unsigned int tmp;
> + int i = 0;
> +
> + if (!vi->cvq)
> + return -EFAULT;
BUG_ON() probably makes more sense here.
> +
> + sg_init_table(sg, len ? 3 : 2);
> +
> + sg_set_buf(&sg[i++], &ctrl_cmd, sizeof(ctrl_cmd));
> + if (len)
> + sg_set_buf(&sg[i++], data, len);
> + sg_set_buf(&sg[i], &ctrl_status, sizeof(ctrl_status));
> +
> + ctrl_cmd.class = class;
> + ctrl_cmd.cmd = cmd;
> +
> + ctrl_status = ~0;
> +
> + if (vi->cvq->vq_ops->add_buf(vi->cvq, sg, i, 1, vi) != 0)
> + BUG();
> +
> + vi->cvq->vq_ops->kick(vi->cvq);
> +
> + while (!vi->cvq->vq_ops->get_buf(vi->cvq, &tmp))
> + cpu_relax();
> +
> + if (ctrl_status == VIRTIO_NET_OK)
> + return 0;
> + else
> + return -EFAULT;
Could be all on one line:
return ctrl_status ? -EFAULT : 0;
Cheers,
Mark.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists