hv_netvsc: Use the num_online_cpus() for channel limit

[ Commit 25a39f7f975c3c26a0052fbf9b59201c06744332 upstream. ]

Since we no longer localize channel/CPU affiliation within one NUMA
node, num_online_cpus() is used as the number of channel cap, instead of
the number of processors in a NUMA node.

This patch allows a bigger range for tuning the number of channels.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 0c99d99260852c7d0b1fe3d96651642cff9a884d..05109ed5377c4a5b19195db9d7ffe18f9aebca69 100644 (file)
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -1221,7 +1221,6 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
        struct ndis_recv_scale_cap rsscap;
        u32 rsscap_size = sizeof(struct ndis_recv_scale_cap);
        u32 mtu, size;
-       const struct cpumask *node_cpu_mask;
        u32 num_possible_rss_qs;
        int i, ret;
 
@@ -1290,14 +1289,8 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
        if (ret || rsscap.num_recv_que < 2)
                goto out;
 
-       /*
-        * We will limit the VRSS channels to the number CPUs in the NUMA node
-        * the primary channel is currently bound to.
-        *
-        * This also guarantees that num_possible_rss_qs <= num_online_cpus
-        */
-       node_cpu_mask = cpumask_of_node(cpu_to_node(dev->channel->target_cpu));
-       num_possible_rss_qs = min_t(u32, cpumask_weight(node_cpu_mask),
+       /* This guarantees that num_possible_rss_qs <= num_online_cpus */
+       num_possible_rss_qs = min_t(u32, num_online_cpus(),
                                    rsscap.num_recv_que);
 
        net_device->max_chn = min_t(u32, VRSS_CHANNEL_MAX, num_possible_rss_qs);