Commit 9a6cdf52 authored by Igor Druzhinin's avatar Igor Druzhinin Committed by David S. Miller
Browse files

xen-netback: fix memory leaks on XenBus disconnect



Eliminate memory leaks introduced several years ago by cleaning the
queue resources which are allocated on XenBus connection event. Namely, queue
structure array and pages used for IO rings.
Signed-off-by: default avatarIgor Druzhinin <igor.druzhinin@citrix.com>
Reviewed-by: default avatarPaul Durrant <paul.durrant@citrix.com>
Acked-by: default avatarWei Liu <wei.liu2@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6acbe371
...@@ -493,11 +493,20 @@ static int backend_create_xenvif(struct backend_info *be) ...@@ -493,11 +493,20 @@ static int backend_create_xenvif(struct backend_info *be)
static void backend_disconnect(struct backend_info *be) static void backend_disconnect(struct backend_info *be)
{ {
if (be->vif) { if (be->vif) {
unsigned int queue_index;
xen_unregister_watchers(be->vif); xen_unregister_watchers(be->vif);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
xenvif_debugfs_delif(be->vif); xenvif_debugfs_delif(be->vif);
#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_DEBUG_FS */
xenvif_disconnect_data(be->vif); xenvif_disconnect_data(be->vif);
for (queue_index = 0; queue_index < be->vif->num_queues; ++queue_index)
xenvif_deinit_queue(&be->vif->queues[queue_index]);
vfree(be->vif->queues);
be->vif->num_queues = 0;
be->vif->queues = NULL;
xenvif_disconnect_ctrl(be->vif); xenvif_disconnect_ctrl(be->vif);
} }
} }
...@@ -1034,6 +1043,8 @@ static void connect(struct backend_info *be) ...@@ -1034,6 +1043,8 @@ static void connect(struct backend_info *be)
err: err:
if (be->vif->num_queues > 0) if (be->vif->num_queues > 0)
xenvif_disconnect_data(be->vif); /* Clean up existing queues */ xenvif_disconnect_data(be->vif); /* Clean up existing queues */
for (queue_index = 0; queue_index < be->vif->num_queues; ++queue_index)
xenvif_deinit_queue(&be->vif->queues[queue_index]);
vfree(be->vif->queues); vfree(be->vif->queues);
be->vif->queues = NULL; be->vif->queues = NULL;
be->vif->num_queues = 0; be->vif->num_queues = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment