From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751885AbdARJ1w convert rfc822-to-8bit (ORCPT ); Wed, 18 Jan 2017 04:27:52 -0500 Received: from smtp.ctxuk.citrix.com ([185.25.65.24]:59470 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751551AbdARJ1u (ORCPT ); Wed, 18 Jan 2017 04:27:50 -0500 X-IronPort-AV: E=Sophos;i="5.33,248,1477958400"; d="scan'208";a="38804806" From: Paul Durrant To: Igor Druzhinin , Wei Liu CC: "xen-devel@lists.xenproject.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Igor Druzhinin Subject: RE: [PATCH v2 1/2] xen-netback: fix memory leaks on XenBus disconnect Thread-Topic: [PATCH v2 1/2] xen-netback: fix memory leaks on XenBus disconnect Thread-Index: AQHScQM84SAZrycK4kCcxHz1DEFaeKE99+uA Date: Wed, 18 Jan 2017 09:27:06 +0000 Message-ID: <5a55d0748e7945539b9ee49f4c7f7084@AMSPEX02CL03.citrite.net> References: <1484686178-76959-1-git-send-email-igor.druzhinin@citrix.com> <1484686178-76959-2-git-send-email-igor.druzhinin@citrix.com> In-Reply-To: <1484686178-76959-2-git-send-email-igor.druzhinin@citrix.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: Igor Druzhinin [mailto:igor.druzhinin@citrix.com] > Sent: 17 January 2017 20:50 > To: Wei Liu > Cc: Paul Durrant ; xen-devel@lists.xenproject.org; > netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Igor Druzhinin > > 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 Reviewed-by: Paul Durrant > --- > 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