Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f9f4668 authored by Rick Jones's avatar Rick Jones Committed by David S. Miller
Browse files

Add ethtool -g support to virtio_net 



Add support for reporting ring sizes via ethtool -g to the virtio_net
driver.

Signed-off-by: default avatarRick Jones <rick.jones2@hp.com>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca35a0ef

drivers/net/virtio_net.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -877,8 +877,21 @@ static void virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid) 
		dev_warn(&dev->dev, "Failed to kill VLAN ID %d.\n", vid);

		dev_warn(&dev->dev, "Failed to kill VLAN ID %d.\n", vid);

}

}





static void virtnet_get_ringparam(struct net_device *dev,

				struct ethtool_ringparam *ring)

{

	struct virtnet_info *vi = netdev_priv(dev);



	ring->rx_max_pending = virtqueue_get_vring_size(vi->rvq);

	ring->tx_max_pending = virtqueue_get_vring_size(vi->svq);

	ring->rx_pending = ring->rx_max_pending;

	ring->tx_pending = ring->tx_max_pending;



}



static const struct ethtool_ops virtnet_ethtool_ops = {

static const struct ethtool_ops virtnet_ethtool_ops = {

	.get_link = ethtool_op_get_link,

	.get_link = ethtool_op_get_link,

	.get_ringparam = virtnet_get_ringparam,

};

};





#define MIN_MTU 68

#define MIN_MTU 68

drivers/virtio/virtio_ring.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -529,4 +529,14 @@ void vring_transport_features(struct virtio_device *vdev) 
}

}

EXPORT_SYMBOL_GPL(vring_transport_features);

EXPORT_SYMBOL_GPL(vring_transport_features);





/* return the size of the vring within the virtqueue */

unsigned int virtqueue_get_vring_size(struct virtqueue *_vq)

{



	struct vring_virtqueue *vq = to_vvq(_vq);



	return vq->vring.num;

}

EXPORT_SYMBOL_GPL(virtqueue_get_vring_size);



MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");

include/linux/virtio.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,9 @@ struct virtqueue { 
 * virtqueue_detach_unused_buf: detach first unused buffer

 * virtqueue_detach_unused_buf: detach first unused buffer

 * 	vq: the struct virtqueue we're talking about.

 * 	vq: the struct virtqueue we're talking about.

 * 	Returns NULL or the "data" token handed to add_buf

 * 	Returns NULL or the "data" token handed to add_buf

 * virtqueue_get_vring_size: return the size of the virtqueue's vring

 *	vq: the struct virtqueue containing the vring of interest.

 *	Returns the size of the vring.

 *

 *

 * Locking rules are straightforward: the driver is responsible for

 * Locking rules are straightforward: the driver is responsible for

 * locking.  No two operations may be invoked simultaneously, with the exception

 * locking.  No two operations may be invoked simultaneously, with the exception
@@ -97,6 +100,8 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *vq); 




void *virtqueue_detach_unused_buf(struct virtqueue *vq);

void *virtqueue_detach_unused_buf(struct virtqueue *vq);





unsigned int virtqueue_get_vring_size(struct virtqueue *vq);



/**

/**

 * virtio_device - representation of a device using virtio

 * virtio_device - representation of a device using virtio

 * @index: unique position on the virtio bus

 * @index: unique position on the virtio bus