Implement Hyper-V netvsc_get_channels() ethool op
Subsystems (3)
PATCH 1/1 Implement Hyper-V netvsc_get_channels() ethool op
This adds support for reporting the combined channels count of the hv_netvsc driver via 'ethtool --show-channels'.
This required adding 'max_chn' to 'struct netvsc_device', and assigning it 'rsscap.num_recv_que' in 'rndis_filter_device_add'. Now we can access the combined maximum channel count via 'struct netvsc_device' in the ethtool callback.
--- drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/hyperv/netvsc_drv.c | 14 ++++++++++++++ drivers/net/hyperv/rndis_filter.c | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-)
drivers/net/hyperv/hyperv_net.h +1 -0
@@ -635,6 +635,7 @@ struct netvsc_device {struct vmbus_channel *chn_table[NR_CPUS ];u32 send_table[VRSS_SEND_TAB_SIZE ];u32 num_chn; +u32 max_chn;atomic_t queue_sends[NR_CPUS ];/* Holds rndis device info */
drivers/net/hyperv/netvsc_drv.c +14 -0
@@ -687,6 +687,19 @@ static void netvsc_get_drvinfo(struct net_device *net,strlcpy (info->fw_version,"N/A" ,sizeof (info->fw_version)); } +static void netvsc_get_channels (struct net_device *net, +struct ethtool_channels *channel) +{ +struct net_device_context *net_device_ctx =netdev_priv (net); +struct hv_device *dev = net_device_ctx->device_ctx; +struct netvsc_device *nvdev =hv_get_drvdata (dev); + +if (nvdev) { + channel->max_combined = nvdev->max_chn; + channel->combined_count = nvdev->num_chn; + } +} +static int netvsc_change_mtu (struct net_device *ndev,int mtu) {struct net_device_context *ndevctx =netdev_priv (ndev);
@@ -760,6 +773,7 @@ static void netvsc_poll_controller(struct net_device *net)static const struct ethtool_ops ethtool_ops = { .get_drvinfo = netvsc_get_drvinfo, .get_link = ethtool_op_get_link, + .get_channels = netvsc_get_channels, };static const struct net_device_ops device_ops = {
drivers/net/hyperv/rndis_filter.c +4 -1
@@ -1094,6 +1094,7 @@ int rndis_filter_device_add(struct hv_device *dev,if (ret || rsscap.num_recv_que <2 ) goto out; + net_device->max_chn = rsscap.num_recv_que; net_device->num_chn = (num_online_cpus () < rsscap.num_recv_que) ?num_online_cpus () : rsscap.num_recv_que;if (net_device->num_chn ==1 )
@@ -1140,8 +1141,10 @@ int rndis_filter_device_add(struct hv_device *dev, ret =rndis_filter_set_rss_param (rndis_device, net_device->num_chn); out: -if (ret) +if (ret) { + net_device->max_chn =1 ; net_device->num_chn =1 ; + }return 0 ;/* return 0 because primary channel can be used alone */ err_dev_remv:
Signature · 1 line
2.3.0
Haiyang Zhang
maintainerQuoted 3 lines
-----Original Message-----
From: Andrew Schwartzmeyer [mailto:[email protected]]
Subject: [PATCH] Implement Hyper-Vnetvsc_get_channels()ethool op
Please add net-next to the subject (the patch should also be based on that tree). Also the "hyperv: " word should come first.
Like this:
[PATCH net-next] hyperv: Implement netvsc_get_channels() ethool op
drivers/net/hyperv/rndis_filter.c int rndis_filter_device_add(struct hv_device *dev,
Quoted 3 lines
drivers/net/hyperv/rndis_filter.c +0
-0@@ -1094,6 +1094,7 @@ int rndis_filter_device_add(struct hv_device *dev,
On top part of this function, you also need to initialize max_chn = 1 around here:
/* Initialize the rndis device */
net_device = hv_get_drvdata(dev);
net_device->num_chn = 1;because the query for rsscap.num_recv_que is not done on all VSP versions.
Thanks,
- Haiyang