Patchwork virtio_net: implements ethtool_ops.get_drvinfo

login
register
mail settings
Submitter Taku Izumi
Date June 11, 2010, 1:29 a.m.
Message ID <4C11915E.6090201@jp.fujitsu.com>
Download mbox | patch
Permalink /patch/55280/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

Taku Izumi - June 11, 2010, 1:29 a.m.
This patch implements ethtool_ops.get_drvinfo interface of virtio_net driver.

Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
---
 drivers/net/virtio_net.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rusty Russell - June 15, 2010, 4:28 a.m.
On Fri, 11 Jun 2010 10:59:02 am Taku Izumi wrote:
> This patch implements ethtool_ops.get_drvinfo interface of virtio_net driver.
> 
> Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>

Hi Taku!

   Does this have any useful effect?

Thanks,
Rusty.

> ---
>  drivers/net/virtio_net.c |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> Index: net-next.35/drivers/net/virtio_net.c
> ===================================================================
> --- net-next.35.orig/drivers/net/virtio_net.c
> +++ net-next.35/drivers/net/virtio_net.c
> @@ -701,6 +701,18 @@ static int virtnet_close(struct net_devi
>  	return 0;
>  }
> 
> +static void virtnet_get_drvinfo(struct net_device *dev,
> +				struct ethtool_drvinfo *drvinfo)
> +{
> +	struct virtnet_info *vi = netdev_priv(dev);
> +	struct virtio_device *vdev = vi->vdev;
> +
> +	strncpy(drvinfo->driver, KBUILD_MODNAME, 32);
> +	strncpy(drvinfo->version, "N/A", 32);
> +	strncpy(drvinfo->fw_version, "N/A", 32);
> +	strncpy(drvinfo->bus_info, dev_name(&vdev->dev), 32);
> +}
> +
>  static int virtnet_set_tx_csum(struct net_device *dev, u32 data)
>  {
>  	struct virtnet_info *vi = netdev_priv(dev);
> @@ -813,6 +825,7 @@ static void virtnet_vlan_rx_kill_vid(str
>  }
> 
>  static const struct ethtool_ops virtnet_ethtool_ops = {
> +	.get_drvinfo = virtnet_get_drvinfo,
>  	.set_tx_csum = virtnet_set_tx_csum,
>  	.set_sg = ethtool_op_set_sg,
>  	.set_tso = ethtool_op_set_tso,
> 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Taku Izumi - June 15, 2010, 5:20 a.m.
Hi Rusty,

(2010/06/15 13:28), Rusty Russell wrote:
> On Fri, 11 Jun 2010 10:59:02 am Taku Izumi wrote:
>> This patch implements ethtool_ops.get_drvinfo interface of virtio_net driver.
>>
>> Signed-off-by: Taku Izumi<izumi.taku@jp.fujitsu.com>
> 
> Hi Taku!
> 
>     Does this have any useful effect?

I often use "ethtool -i" command to check what driver controls the ehternet device.
But because current virtio_net driver doesn't support "ethtool -i", it becomes the
following:

	# ethtool -i eth3
	Cannot get driver information: Operation not supported

My patch simply adds the "ethtool -i" support. The following is the result when
using the virtio_net driver with my patch applied to.

	# ethtool -i eth3
	driver: virtio_net
	version: N/A
	firmware-version: N/A
	bus-info: virtio0

Personally, "-i" is one of the most frequently-used option, and
most network drivers support "ethtool -i", so I think virtio_net also should do.

Taku Izumi <izumi.taku@jp.fujitsu.com>





--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: net-next.35/drivers/net/virtio_net.c
===================================================================
--- net-next.35.orig/drivers/net/virtio_net.c
+++ net-next.35/drivers/net/virtio_net.c
@@ -701,6 +701,18 @@  static int virtnet_close(struct net_devi
 	return 0;
 }

+static void virtnet_get_drvinfo(struct net_device *dev,
+				struct ethtool_drvinfo *drvinfo)
+{
+	struct virtnet_info *vi = netdev_priv(dev);
+	struct virtio_device *vdev = vi->vdev;
+
+	strncpy(drvinfo->driver, KBUILD_MODNAME, 32);
+	strncpy(drvinfo->version, "N/A", 32);
+	strncpy(drvinfo->fw_version, "N/A", 32);
+	strncpy(drvinfo->bus_info, dev_name(&vdev->dev), 32);
+}
+
 static int virtnet_set_tx_csum(struct net_device *dev, u32 data)
 {
 	struct virtnet_info *vi = netdev_priv(dev);
@@ -813,6 +825,7 @@  static void virtnet_vlan_rx_kill_vid(str
 }

 static const struct ethtool_ops virtnet_ethtool_ops = {
+	.get_drvinfo = virtnet_get_drvinfo,
 	.set_tx_csum = virtnet_set_tx_csum,
 	.set_sg = ethtool_op_set_sg,
 	.set_tso = ethtool_op_set_tso,