mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
hyperv: Implement netvsc_get_channels() ethool op
This adds support for reporting the actual and maximum 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. Signed-off-by: Andrew Schwartzmeyer <andrew@schwartzmeyer.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f9c7ce1853
commit
59995370db
@ -634,6 +634,7 @@ struct netvsc_device {
|
||||
|
||||
struct vmbus_channel *chn_table[NR_CPUS];
|
||||
u32 send_table[VRSS_SEND_TAB_SIZE];
|
||||
u32 max_chn;
|
||||
u32 num_chn;
|
||||
atomic_t queue_sends[NR_CPUS];
|
||||
|
||||
|
@ -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 = {
|
||||
|
@ -1027,6 +1027,7 @@ int rndis_filter_device_add(struct hv_device *dev,
|
||||
|
||||
/* Initialize the rndis device */
|
||||
net_device = hv_get_drvdata(dev);
|
||||
net_device->max_chn = 1;
|
||||
net_device->num_chn = 1;
|
||||
|
||||
net_device->extension = rndis_device;
|
||||
@ -1094,6 +1095,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 +1142,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:
|
||||
|
Loading…
Reference in New Issue
Block a user