Jason Baron
2017-Dec-22 22:31 UTC
[PATCH net-next v2 1/3] virtio_net: propagate linkspeed/duplex settings from the hypervisor
The ability to set speed and duplex for virtio_net in useful in various scenarios as described here: 16032be virtio_net: add ethtool support for set and get of settings However, it would be nice to be able to set this from the hypervisor, such that virtio_net doesn't require custom guest ethtool commands. Introduce a new feature flag, VIRTIO_NET_F_SPEED_DUPLEX, which allows the hypervisor to export a linkspeed and duplex setting. The user can subsequently overwrite it later if desired via: 'ethtool -s'. Signed-off-by: Jason Baron <jbaron at akamai.com> Cc: "Michael S. Tsirkin" <mst at redhat.com> Cc: Jason Wang <jasowang at redhat.com> --- drivers/net/virtio_net.c | 17 ++++++++++++++++- include/uapi/linux/virtio_net.h | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 511f833..4168d82 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2621,6 +2621,20 @@ static int virtnet_probe(struct virtio_device *vdev) netif_set_real_num_rx_queues(dev, vi->curr_queue_pairs); virtnet_init_settings(dev); + if (virtio_has_feature(vdev, VIRTIO_NET_F_SPEED_DUPLEX)) { + u32 speed; + u8 duplex; + + speed = virtio_cread32(vdev, offsetof(struct virtio_net_config, + speed)); + if (ethtool_validate_speed(speed)) + vi->speed = speed; + duplex = virtio_cread8(vdev, + offsetof(struct virtio_net_config, + duplex)); + if (ethtool_validate_duplex(duplex)) + vi->duplex = duplex; + } err = register_netdev(dev); if (err) { @@ -2746,7 +2760,8 @@ static struct virtio_device_id id_table[] = { 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, \ - VIRTIO_NET_F_MTU, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS + VIRTIO_NET_F_MTU, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, \ + VIRTIO_NET_F_SPEED_DUPLEX static unsigned int features[] = { VIRTNET_FEATURES, diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h index fc353b5..0f1548e 100644 --- a/include/uapi/linux/virtio_net.h +++ b/include/uapi/linux/virtio_net.h @@ -57,6 +57,8 @@ * Steering */ #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ +#define VIRTIO_NET_F_SPEED_DUPLEX 63 /* Host set linkspeed and duplex */ + #ifndef VIRTIO_NET_NO_LEGACY #define VIRTIO_NET_F_GSO 6 /* Host handles pkts w/ any GSO type */ #endif /* VIRTIO_NET_NO_LEGACY */ @@ -76,6 +78,9 @@ struct virtio_net_config { __u16 max_virtqueue_pairs; /* Default maximum transmit unit advice */ __u16 mtu; + /* Host exported linkspeed and duplex */ + __u32 speed; + __u8 duplex; } __attribute__((packed)); /* -- 2.6.1
Jason Baron
2017-Dec-28 15:53 UTC
[PATCH net-next v2 1/3] virtio_net: propagate linkspeed/duplex settings from the hypervisor
On 12/27/2017 04:43 PM, David Miller wrote:> From: Jason Baron <jbaron at akamai.com> > Date: Fri, 22 Dec 2017 16:54:01 -0500 > >> The ability to set speed and duplex for virtio_net in useful in various >> scenarios as described here: >> >> 16032be virtio_net: add ethtool support for set and get of settings >> >> However, it would be nice to be able to set this from the hypervisor, >> such that virtio_net doesn't require custom guest ethtool commands. >> >> Introduce a new feature flag, VIRTIO_NET_F_SPEED_DUPLEX, which allows >> the hypervisor to export a linkspeed and duplex setting. The user can >> subsequently overwrite it later if desired via: 'ethtool -s'. >> >> Signed-off-by: Jason Baron <jbaron at akamai.com> >> Cc: "Michael S. Tsirkin" <mst at redhat.com> >> Cc: Jason Wang <jasowang at redhat.com> > > Looks mostly fine to me but need some virtio_net reviewers on this one. > >> @@ -57,6 +57,8 @@ >> * Steering */ >> #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ >> >> +#define VIRTIO_NET_F_SPEED_DUPLEX 63 /* Host set linkspeed and duplex */ >> + > > Why use a value so far away from the largest existing one? > > Just curious. >So that came from a discussion with Michael about which bit to use for this, and he suggested using 63: " Transports started from bit 24 and are growing up. So I would say devices should start from bit 63 and grow down. " patchwork.ozlabs.org/patch/848814/#1826669 I will add a comment to explain it. Thanks, -Jason
Seemingly Similar Threads
- [PATCH net-next v2 1/3] virtio_net: propagate linkspeed/duplex settings from the hypervisor
- [PATCH net-next v3 1/3] virtio_net: propagate linkspeed/duplex settings from the hypervisor
- [PATCH net-next v3 1/3] virtio_net: propagate linkspeed/duplex settings from the hypervisor
- [PATCH net-next v3 1/3] virtio_net: propagate linkspeed/duplex settings from the hypervisor
- [PATCH net-next v3 1/3] virtio_net: propagate linkspeed/duplex settings from the hypervisor