leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hv_netvsc: netvsc_teardown_gpadl() split

Browse Source 
It was found that in some cases host refuses to teardown GPADL for send/
receive buffers (probably when some work with these buffere is scheduled or
ongoing). Change the teardown logic to be:
1) Send NVSP_MSG1_TYPE_REVOKE_* messages
2) Close the channel
3) Teardown GPADLs.
This seems to work reliably.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vitaly Kuznetsov 2017-11-02 11:35:30 +01:00 committed by David S. Miller
parent 3928ee6485
commit 0cf737808a
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/net/hyperv/netvsc.c
View File

@ -100,12 +100,11 @@ static void free_netvsc_device_rcu(struct netvsc_device *nvdev)
call_rcu(&nvdev->rcu, free_netvsc_device); call_rcu(&nvdev->rcu, free_netvsc_device);
} }
static void netvsc_destroy_buf(struct hv_device *device) static void netvsc_revoke_buf(struct hv_device *device,
struct netvsc_device *net_device)
{ {
struct nvsp_message *revoke_packet; struct nvsp_message *revoke_packet;
struct net_device *ndev = hv_get_drvdata(device); struct net_device *ndev = hv_get_drvdata(device);
struct net_device_context *ndc = netdev_priv(ndev);
struct netvsc_device *net_device = rtnl_dereference(ndc->nvdev);
int ret; int ret;
/* /*
@ -148,28 +147,6 @@ static void netvsc_destroy_buf(struct hv_device *device)
net_device->recv_section_cnt = 0; net_device->recv_section_cnt = 0;
} }
/* Teardown the gpadl on the vsp end */
if (net_device->recv_buf_gpadl_handle) {
ret = vmbus_teardown_gpadl(device->channel,
net_device->recv_buf_gpadl_handle);
/* If we failed here, we might as well return and have a leak
* rather than continue and a bugchk
*/
if (ret != 0) {
netdev_err(ndev,
"unable to teardown receive buffer's gpadl\n");
return;
}
net_device->recv_buf_gpadl_handle = 0;
}
if (net_device->recv_buf) {
/* Free up the receive buffer */
vfree(net_device->recv_buf);
net_device->recv_buf = NULL;
}
/* Deal with the send buffer we may have setup. /* Deal with the send buffer we may have setup.
* If we got a send section size, it means we received a * If we got a send section size, it means we received a
* NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE msg (ie sent * NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE msg (ie sent
@ -210,7 +187,35 @@ static void netvsc_destroy_buf(struct hv_device *device)
} }
net_device->send_section_cnt = 0; net_device->send_section_cnt = 0;
} }
/* Teardown the gpadl on the vsp end */ }
static void netvsc_teardown_gpadl(struct hv_device *device,
struct netvsc_device *net_device)
{
struct net_device *ndev = hv_get_drvdata(device);
int ret;
if (net_device->recv_buf_gpadl_handle) {
ret = vmbus_teardown_gpadl(device->channel,
net_device->recv_buf_gpadl_handle);
/* If we failed here, we might as well return and have a leak
* rather than continue and a bugchk
*/
if (ret != 0) {
netdev_err(ndev,
"unable to teardown receive buffer's gpadl\n");
return;
}
net_device->recv_buf_gpadl_handle = 0;
}
if (net_device->recv_buf) {
/* Free up the receive buffer */
vfree(net_device->recv_buf);
net_device->recv_buf = NULL;
}
if (net_device->send_buf_gpadl_handle) { if (net_device->send_buf_gpadl_handle) {
ret = vmbus_teardown_gpadl(device->channel, ret = vmbus_teardown_gpadl(device->channel,
net_device->send_buf_gpadl_handle); net_device->send_buf_gpadl_handle);
@ -420,7 +425,8 @@ static int netvsc_init_buf(struct hv_device *device,
goto exit; goto exit;
cleanup: cleanup:
netvsc_destroy_buf(device); netvsc_revoke_buf(device, net_device);
netvsc_teardown_gpadl(device, net_device);
exit: exit:
return ret; return ret;
@ -539,11 +545,6 @@ cleanup:
return ret; return ret;
} }
static void netvsc_disconnect_vsp(struct hv_device *device)
{
netvsc_destroy_buf(device);
}
/* /*
* netvsc_device_remove - Callback when the root bus device is removed * netvsc_device_remove - Callback when the root bus device is removed
*/ */
@ -557,7 +558,7 @@ void netvsc_device_remove(struct hv_device *device)
cancel_work_sync(&net_device->subchan_work); cancel_work_sync(&net_device->subchan_work);
netvsc_disconnect_vsp(device); netvsc_revoke_buf(device, net_device);
RCU_INIT_POINTER(net_device_ctx->nvdev, NULL); RCU_INIT_POINTER(net_device_ctx->nvdev, NULL);
@ -570,6 +571,8 @@ void netvsc_device_remove(struct hv_device *device)
/* Now, we can close the channel safely */ /* Now, we can close the channel safely */
vmbus_close(device->channel); vmbus_close(device->channel);
netvsc_teardown_gpadl(device, net_device);
/* And dissassociate NAPI context from device */ /* And dissassociate NAPI context from device */
for (i = 0; i < net_device->num_chn; i++) for (i = 0; i < net_device->num_chn; i++)
netif_napi_del(&net_device->chan_table[i].napi); netif_napi_del(&net_device->chan_table[i].napi);