From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752477AbdARJqy convert rfc822-to-8bit (ORCPT ); Wed, 18 Jan 2017 04:46:54 -0500 Received: from smtp.ctxuk.citrix.com ([185.25.65.24]:47874 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120AbdARJql (ORCPT ); Wed, 18 Jan 2017 04:46:41 -0500 X-IronPort-AV: E=Sophos;i="5.33,249,1477958400"; d="scan'208";a="38806705" 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 2/2] xen-netback: protect resource cleaning on XenBus disconnect Thread-Topic: [PATCH v2 2/2] xen-netback: protect resource cleaning on XenBus disconnect Thread-Index: AQHScQM9hMj18vGehUOm4p5xbC5XyqE9/WJg Date: Wed, 18 Jan 2017 09:46:39 +0000 Message-ID: <6da8d5a45b1d496dadd0b2d647b97264@AMSPEX02CL03.citrite.net> References: <1484686178-76959-1-git-send-email-igor.druzhinin@citrix.com> <1484686178-76959-3-git-send-email-igor.druzhinin@citrix.com> In-Reply-To: <1484686178-76959-3-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 2/2] xen-netback: protect resource cleaning on XenBus > disconnect > > vif->lock is used to protect statistics gathering agents from using the > queue structure during cleaning. > > Signed-off-by: Igor Druzhinin Reviewed-by: Paul Durrant > --- > drivers/net/xen-netback/interface.c | 6 ++++-- > drivers/net/xen-netback/xenbus.c | 2 ++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen- > netback/interface.c > index 41c69b3..c48252a 100644 > --- a/drivers/net/xen-netback/interface.c > +++ b/drivers/net/xen-netback/interface.c > @@ -230,18 +230,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; > @@ -250,6 +250,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 3e99071..d82cd71 100644 > --- a/drivers/net/xen-netback/xenbus.c > +++ b/drivers/net/xen-netback/xenbus.c > @@ -503,9 +503,11 @@ static void backend_disconnect(struct backend_info > *be) > 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); > } > -- > 1.8.3.1