]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
netvsc: no need to allocate send/receive on numa node
authorstephen hemminger <stephen@networkplumber.org>
Thu, 10 Aug 2017 00:46:07 +0000 (17:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Aug 2017 20:59:43 +0000 (13:59 -0700)
The send and receive buffers are both per-device (not per-channel).
The associated NUMA node is a property of the CPU which is per-channel
therefore it makes no sense to force the receive/send buffer to be
allocated on a particular node (since it is a shared resource).

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hyperv/netvsc.c

index b5fc8fb56b8846994b0222042967d8b103b8a0ec..7407006f4e22765ba9752802f4930de6551130bd 100644 (file)
@@ -246,20 +246,13 @@ int netvsc_alloc_recv_comp_ring(struct netvsc_device *net_device, u32 q_idx)
 static int netvsc_init_buf(struct hv_device *device,
                           struct netvsc_device *net_device)
 {
-       int ret = 0;
-       struct nvsp_message *init_packet;
        struct nvsp_1_message_send_receive_buffer_complete *resp;
-       struct net_device *ndev;
+       struct net_device *ndev = hv_get_drvdata(device);
+       struct nvsp_message *init_packet;
        size_t map_words;
-       int node;
-
-       ndev = hv_get_drvdata(device);
-
-       node = cpu_to_node(device->channel->target_cpu);
-       net_device->recv_buf = vzalloc_node(net_device->recv_buf_size, node);
-       if (!net_device->recv_buf)
-               net_device->recv_buf = vzalloc(net_device->recv_buf_size);
+       int ret = 0;
 
+       net_device->recv_buf = vzalloc(net_device->recv_buf_size);
        if (!net_device->recv_buf) {
                netdev_err(ndev, "unable to allocate receive "
                        "buffer of size %d\n", net_device->recv_buf_size);
@@ -340,9 +333,7 @@ static int netvsc_init_buf(struct hv_device *device,
                goto cleanup;
 
        /* Now setup the send buffer. */
-       net_device->send_buf = vzalloc_node(net_device->send_buf_size, node);
-       if (!net_device->send_buf)
-               net_device->send_buf = vzalloc(net_device->send_buf_size);
+       net_device->send_buf = vzalloc(net_device->send_buf_size);
        if (!net_device->send_buf) {
                netdev_err(ndev, "unable to allocate send "
                           "buffer of size %d\n", net_device->send_buf_size);