Re: [PATCH] xen-netback: fix memory leaks on XenBus disconnect

Path	csiph.com!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Igor Druzhinin <igor.druzhinin@citrix.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH] xen-netback: fix memory leaks on XenBus disconnect
Date	Thu, 12 Jan 2017 19:20:02 +0100
Message-ID	<sYS8G-7eZ-9@gated-at.bofh.it> (permalink)
References	<sYRPk-6SY-31@gated-at.bofh.it>
X-Original-To	<wei.liu2@citrix.com>, <xen-devel@lists.xenproject.org>, <paul.durrant@citrix.com>
X-Ironport-Av	E=Sophos;i="5.33,219,1477958400"; d="scan'208";a="38446465"
User-Agent	Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1
MIME-Version	1.0
Content-Type	text/plain; charset="windows-1252"
Content-Transfer-Encoding	7bit
X-Clientproxiedby	FTLPEX02CAS02.citrite.net (10.13.99.123) To AMSPEX02CL03.citrite.net (10.69.22.127)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	88
Organization	linux.* mail to news gateway
X-Original-Cc	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <jgross@suse.com>
X-Original-Date	Thu, 12 Jan 2017 18:05:36 +0000
X-Original-Message-ID	<ac2136fd-a1c7-d990-a79b-ec5e24daa543@citrix.com>
X-Original-References	<1484243516-141100-1-git-send-email-igor.druzhinin@citrix.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1557689

Show key headers only | View raw

On 12/01/17 17:51, Igor Druzhinin wrote:
> 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.
> vif->lock is used to protect statistics gathering agents from using the
> queue structure during cleaning.
> 
> Signed-off-by: Igor Druzhinin <igor.druzhinin@citrix.com>
> ---
>  drivers/net/xen-netback/interface.c |  6 ++++--
>  drivers/net/xen-netback/xenbus.c    | 13 +++++++++++++
>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
> index e30ffd2..5795213 100644
> --- a/drivers/net/xen-netback/interface.c
> +++ b/drivers/net/xen-netback/interface.c
> @@ -221,18 +221,18 @@ static struct net_device_stats *xenvif_get_stats(struct net_device *dev)
>  {
>  	struct xenvif *vif = netdev_priv(dev);
>  	struct xenvif_queue *queue = NULL;
> -	unsigned int num_queues = vif->num_queues;
>  	unsigned long rx_bytes = 0;
>  	unsigned long rx_packets = 0;
>  	unsigned long tx_bytes = 0;
>  	unsigned long tx_packets = 0;
>  	unsigned int index;
>  
> +	spin_lock(&vif->lock);
>  	if (vif->queues == NULL)
>  		goto out;
>  
>  	/* Aggregate tx and rx stats from each queue */
> -	for (index = 0; index < num_queues; ++index) {
> +	for (index = 0; index < vif->num_queues; ++index) {
>  		queue = &vif->queues[index];
>  		rx_bytes += queue->stats.rx_bytes;
>  		rx_packets += queue->stats.rx_packets;
> @@ -241,6 +241,8 @@ static struct net_device_stats *xenvif_get_stats(struct net_device *dev)
>  	}
>  
>  out:
> +	spin_unlock(&vif->lock);
> +
>  	vif->dev->stats.rx_bytes = rx_bytes;
>  	vif->dev->stats.rx_packets = rx_packets;
>  	vif->dev->stats.tx_bytes = tx_bytes;
> diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
> index 3124eae..85b742e 100644
> --- a/drivers/net/xen-netback/xenbus.c
> +++ b/drivers/net/xen-netback/xenbus.c
> @@ -493,11 +493,22 @@ 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]);
> +
> +		spin_lock(&be->vif->lock);
> +		vfree(be->vif->queues);
> +		be->vif->num_queues = 0;
> +		be->vif->queues = NULL;
> +		spin_unlock(&be->vif->lock);
> +
>  		xenvif_disconnect_ctrl(be->vif);
>  	}
>  }
> @@ -1034,6 +1045,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;
> 

Add Juergen Gross to CC.

Igor

Thread

[PATCH] xen-netback: fix memory leaks on XenBus disconnect Igor Druzhinin <igor.druzhinin@citrix.com> - 2017-01-12 19:00 +0100
  Re: [PATCH] xen-netback: fix memory leaks on XenBus disconnect Igor Druzhinin <igor.druzhinin@citrix.com> - 2017-01-12 19:20 +0100
  RE: [PATCH] xen-netback: fix memory leaks on XenBus disconnect Paul Durrant <Paul.Durrant@citrix.com> - 2017-01-13 10:10 +0100
  Re: [PATCH] xen-netback: fix memory leaks on XenBus disconnect Wei Liu <wei.liu2@citrix.com> - 2017-01-13 11:40 +0100
    RE: [PATCH] xen-netback: fix memory leaks on XenBus disconnect Paul Durrant <Paul.Durrant@citrix.com> - 2017-01-13 11:50 +0100
    Re: [PATCH] xen-netback: fix memory leaks on XenBus disconnect Igor Druzhinin <igor.druzhinin@citrix.com> - 2017-01-13 12:10 +0100

csiph-web