From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 439832A5E for ; Wed, 22 Feb 2017 03:22:02 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP; 21 Feb 2017 18:22:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,191,1484035200"; d="scan'208";a="936665595" Received: from yliu-dev.sh.intel.com (HELO yliu-dev) ([10.239.67.162]) by orsmga003.jf.intel.com with ESMTP; 21 Feb 2017 18:22:01 -0800 Date: Wed, 22 Feb 2017 10:24:13 +0800 From: Yuanhan Liu To: hanxueluo@126.com Cc: dev@dpdk.org, Huanle Han Message-ID: <20170222022413.GM18844@yliu-dev.sh.intel.com> References: <1487599487-12574-1-git-send-email-hanxueluo@126.com> <1487599487-12574-2-git-send-email-hanxueluo@126.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1487599487-12574-2-git-send-email-hanxueluo@126.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-dev] [PATCH 2/3] net/virtio: fix crash when close virtio dev twice X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2017 02:22:03 -0000 On Mon, Feb 20, 2017 at 10:04:46PM +0800, hanxueluo@126.com wrote: > From: Huanle Han > > This commit fixs segment fault when rte_eth_dev_close() > is called on a virtio dev more than once. > Assigning zero after free to avoids freed memory to > be accessed again. Thanks for the fix! And here are few more minor nits you might want be awre of: - a fix patch needs a fixline (check http://dpdk.org/dev for howto just in case you don't know) - if it fixes a fatal bug (like this one), it should also be picked (or backported) to a specific stable release. In this case, you should add Cc: stable@dpdk.org just before your SoB (Signed-off-by). --yliu > > Signed-off-by: Huanle Han > --- > drivers/net/virtio/virtio_ethdev.c | 5 +++++ > lib/librte_ether/rte_ethdev.c | 2 ++ > 2 files changed, 7 insertions(+) > > diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c > index 8465e1a..b9565db 100644 > --- a/drivers/net/virtio/virtio_ethdev.c > +++ b/drivers/net/virtio/virtio_ethdev.c > @@ -545,6 +545,9 @@ virtio_free_queues(struct virtio_hw *hw) > int queue_type; > uint16_t i; > > + if (hw->vqs == NULL) > + return; > + > for (i = 0; i < nr_vq; i++) { > vq = hw->vqs[i]; > if (!vq) > @@ -563,9 +566,11 @@ virtio_free_queues(struct virtio_hw *hw) > } > > rte_free(vq); > + hw->vqs[i] = NULL; > } > > rte_free(hw->vqs); > + hw->vqs = NULL; > } > > static int > diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c > index eb0a94a..24f82dc 100644 > --- a/lib/librte_ether/rte_ethdev.c > +++ b/lib/librte_ether/rte_ethdev.c > @@ -1074,8 +1074,10 @@ rte_eth_dev_close(uint8_t port_id) > dev->data->dev_started = 0; > (*dev->dev_ops->dev_close)(dev); > > + dev->data->nb_rx_queues = 0; > rte_free(dev->data->rx_queues); > dev->data->rx_queues = NULL; > + dev->data->nb_tx_queues = 0; > rte_free(dev->data->tx_queues); > dev->data->tx_queues = NULL; > } > -- > 2.7.4 >