[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5a55d0748e7945539b9ee49f4c7f7084@AMSPEX02CL03.citrite.net>
Date: Wed, 18 Jan 2017 09:27:06 +0000
From: Paul Durrant <Paul.Durrant@...rix.com>
To: Igor Druzhinin <igor.druzhinin@...rix.com>,
Wei Liu <wei.liu2@...rix.com>
CC: "xen-devel@...ts.xenproject.org" <xen-devel@...ts.xenproject.org>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Igor Druzhinin <igor.druzhinin@...rix.com>
Subject: RE: [PATCH v2 1/2] xen-netback: fix memory leaks on XenBus disconnect
> -----Original Message-----
> From: Igor Druzhinin [mailto:igor.druzhinin@...rix.com]
> Sent: 17 January 2017 20:50
> To: Wei Liu <wei.liu2@...rix.com>
> Cc: Paul Durrant <Paul.Durrant@...rix.com>; xen-devel@...ts.xenproject.org;
> netdev@...r.kernel.org; linux-kernel@...r.kernel.org; Igor Druzhinin
> <igor.druzhinin@...rix.com>
> Subject: [PATCH v2 1/2] 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: Igor Druzhinin <igor.druzhinin@...rix.com>
Reviewed-by: Paul Durrant <paul.durrant@...rix.com>
> ---
> drivers/net/xen-netback/xenbus.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-
> netback/xenbus.c
> index 6c57b02..3e99071 100644
> --- a/drivers/net/xen-netback/xenbus.c
> +++ b/drivers/net/xen-netback/xenbus.c
> @@ -493,11 +493,20 @@ static int backend_create_xenvif(struct
> backend_info *be)
> static void backend_disconnect(struct backend_info *be)
> {
> if (be->vif) {
> + unsigned int queue_index;
> +
> xen_unregister_watchers(be->vif);
> #ifdef CONFIG_DEBUG_FS
> xenvif_debugfs_delif(be->vif);
> #endif /* CONFIG_DEBUG_FS */
> 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);
> }
> }
> @@ -1026,6 +1035,8 @@ static void connect(struct backend_info *be)
> err:
> if (be->vif->num_queues > 0)
> 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);
> be->vif->queues = NULL;
> be->vif->num_queues = 0;
> --
> 1.8.3.1
Powered by blists - more mailing lists