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

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Wei Liu <wei.liu2@citrix.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH] xen-netback: fix memory leaks on XenBus disconnect
Date	Fri, 13 Jan 2017 11:40:02 +0100
Message-ID	<sZ7r4-8a3-9@gated-at.bofh.it> (permalink)
References	<sYRPk-6SY-31@gated-at.bofh.it>
X-Original-To	Igor Druzhinin <igor.druzhinin@citrix.com>
X-Ironport-Av	E=Sophos;i="5.33,221,1477958400"; d="scan'208";a="408495865"
MIME-Version	1.0
Content-Type	text/plain; charset="us-ascii"
Content-Disposition	inline
User-Agent	Mutt/1.5.23 (2014-03-12)
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	54
Organization	linux.* mail to news gateway
X-Original-Cc	<wei.liu2@citrix.com>, <xen-devel@lists.xenproject.org>, <paul.durrant@citrix.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
X-Original-Date	Fri, 13 Jan 2017 10:38:00 +0000
X-Original-Message-ID	<20170113103800.GA5089@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:1558196

Show key headers only | View raw

On Thu, Jan 12, 2017 at 05:51:56PM +0000, 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.
> 

There is code in netback_remove which eventually calls xenvif_free to
free up the resources, maybe you should modify xenvif_free instead? That
seems more symmetric to me. What do you think?

> 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);
> +

Good catch, this is definitely needed. And it would probably be in a
separate patch.

Wei.

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