From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtJZF-0004d3-Fk for qemu-devel@nongnu.org; Thu, 10 Jan 2013 09:57:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtJZ9-0008PI-Qc for qemu-devel@nongnu.org; Thu, 10 Jan 2013 09:57:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtJZ9-0008P8-Iu for qemu-devel@nongnu.org; Thu, 10 Jan 2013 09:57:11 -0500 Message-ID: <50EED6C1.1040608@redhat.com> Date: Thu, 10 Jan 2013 22:57:05 +0800 From: Jason Wang MIME-Version: 1.0 References: <1357829141-25455-1-git-send-email-akong@redhat.com> <1357829141-25455-3-git-send-email-akong@redhat.com> In-Reply-To: <1357829141-25455-3-git-send-email-akong@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH 2/2] virtio-net: introduce a new control to set macaddr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: akong@redhat.com Cc: rusty@rustcorp.com.au, virtualization@lists.linux-foundation.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, mst@redhat.com On 01/10/2013 10:45 PM, akong@redhat.com wrote: > From: Amos Kong > > Currently we write MAC address to pci config space byte by byte, > this means that we have an intermediate step where mac is wrong. > This patch introduced a new control command to set MAC address > in one time. > > VIRTIO_NET_F_CTRL_MAC_ADDR is a new feature bit for compatibility. > > Signed-off-by: Amos Kong > --- > drivers/net/virtio_net.c | 16 +++++++++++++++- > include/uapi/linux/virtio_net.h | 8 +++++++- > 2 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 395ab4f..ff22bcd 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -803,13 +803,26 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p) > struct virtio_device *vdev = vi->vdev; > int ret; > > + struct scatterlist sg; > + > ret = eth_mac_addr(dev, p); > if (ret) > return ret; > > - if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) > + if (virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR)) { > + /* Set MAC address by sending vq command */ > + sg_init_one(&sg, dev->dev_addr, dev->addr_len); > + virtnet_send_command(vi, VIRTIO_NET_CTRL_MAC, > + VIRTIO_NET_CTRL_MAC_ADDR_SET, > + &sg, 1, 0); > + return 0; > + } > + Better to check the return of virtnet_send_command() and give a warn like other command. Btw, need we fail back to try the old way then? > + if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) { > + /* Set MAC address by writing config space */ > vdev->config->set(vdev, offsetof(struct virtio_net_config, mac), > dev->dev_addr, dev->addr_len); > + } > > return 0; > } > @@ -1627,6 +1640,7 @@ static unsigned int features[] = { > VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ, > VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN, > VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, > + VIRTIO_NET_F_CTRL_MAC_ADDR, > }; > > static struct virtio_driver virtio_net_driver = { > diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h > index 848e358..a5a8c88 100644 > --- a/include/uapi/linux/virtio_net.h > +++ b/include/uapi/linux/virtio_net.h > @@ -53,6 +53,7 @@ > * network */ > #define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow > * Steering */ > +#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ > > #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ > #define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */ > @@ -127,7 +128,7 @@ typedef __u8 virtio_net_ctrl_ack; > #define VIRTIO_NET_CTRL_RX_NOBCAST 5 > > /* > - * Control the MAC filter table. > + * Control the MAC > * > * The MAC filter table is managed by the hypervisor, the guest should > * assume the size is infinite. Filtering should be considered > @@ -140,6 +141,10 @@ typedef __u8 virtio_net_ctrl_ack; > * first sg list contains unicast addresses, the second is for multicast. > * This functionality is present if the VIRTIO_NET_F_CTRL_RX feature > * is available. > + * > + * The ADDR_SET command requests one out scatterlist, it contains a > + * 6 bytes MAC address. This functionality is present if the > + * VIRTIO_NET_F_CTRL_MAC_ADDR feature is available. > */ > struct virtio_net_ctrl_mac { > __u32 entries; > @@ -148,6 +153,7 @@ struct virtio_net_ctrl_mac { > > #define VIRTIO_NET_CTRL_MAC 1 > #define VIRTIO_NET_CTRL_MAC_TABLE_SET 0 > + #define VIRTIO_NET_CTRL_MAC_ADDR_SET 1 > > /* > * Control VLAN filtering