From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 3339AC89C for ; Fri, 26 Jun 2015 13:02:40 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 26 Jun 2015 04:02:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,684,1427785200"; d="scan'208";a="595203308" Received: from irsmsx106.ger.corp.intel.com ([163.33.3.31]) by orsmga003.jf.intel.com with ESMTP; 26 Jun 2015 04:02:38 -0700 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.201]) by IRSMSX106.ger.corp.intel.com ([169.254.8.121]) with mapi id 14.03.0224.002; Fri, 26 Jun 2015 12:02:37 +0100 From: "Iremonger, Bernard" To: "Qiu, Michael" , "dev@dpdk.org" Thread-Topic: [PATCH 1/2 v4] fm10k: Free queues when close port Thread-Index: AQHQr+pOhDH3p8OC1UKRV8lH0r1/P52+m9gw Date: Fri, 26 Jun 2015 11:02:36 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C204A422AD@IRSMSX108.ger.corp.intel.com> References: <1434702717-11877-1-git-send-email-michael.qiu@intel.com> <1435307390-20140-1-git-send-email-michael.qiu@intel.com> <1435307390-20140-2-git-send-email-michael.qiu@intel.com> In-Reply-To: <1435307390-20140-2-git-send-email-michael.qiu@intel.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.180] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: "He, Shaopeng" Subject: Re: [dpdk-dev] [PATCH 1/2 v4] fm10k: Free queues when close port X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2015 11:02:40 -0000 > -----Original Message----- > From: Qiu, Michael > Sent: Friday, June 26, 2015 9:30 AM > To: dev@dpdk.org > Cc: Chen, Jing D; He, Shaopeng; Iremonger, Bernard; Qiu, Michael > Subject: [PATCH 1/2 v4] fm10k: Free queues when close port >=20 > When close a port, lots of memory should be released, such as software > rings, queues, etc. >=20 > Signed-off-by: Michael Qiu > --- Hi Michael, There are 2 comments inline=20 > drivers/net/fm10k/fm10k_ethdev.c | 37 > +++++++++++++++++++++++++++++++++---- > 1 file changed, 33 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/net/fm10k/fm10k_ethdev.c > b/drivers/net/fm10k/fm10k_ethdev.c > index 406c350..eba7228 100644 > --- a/drivers/net/fm10k/fm10k_ethdev.c > +++ b/drivers/net/fm10k/fm10k_ethdev.c > @@ -65,6 +65,8 @@ static void > fm10k_MAC_filter_set(struct rte_eth_dev *dev, const u8 *mac, bool add); > static void fm10k_MACVLAN_remove_all(struct rte_eth_dev *dev); > +static void fm10k_tx_queue_release(void *queue); static void > +fm10k_rx_queue_release(void *queue); >=20 > static void > fm10k_mbx_initlock(struct fm10k_hw *hw) @@ -809,11 +811,37 @@ > fm10k_dev_stop(struct rte_eth_dev *dev) >=20 > PMD_INIT_FUNC_TRACE(); >=20 > - for (i =3D 0; i < dev->data->nb_tx_queues; i++) > - fm10k_dev_tx_queue_stop(dev, i); > + if (dev->data->tx_queues) > + for (i =3D 0; i < dev->data->nb_tx_queues; i++) > + fm10k_dev_tx_queue_stop(dev, i); >=20 > - for (i =3D 0; i < dev->data->nb_rx_queues; i++) > - fm10k_dev_rx_queue_stop(dev, i); > + if (dev->data->rx_queues) > + for (i =3D 0; i < dev->data->nb_rx_queues; i++) > + fm10k_dev_rx_queue_stop(dev, i); > +} > + > +static void > +fm10k_dev_queue_release(struct rte_eth_dev *dev) { > + int i; > + > + PMD_INIT_FUNC_TRACE(); > + > + if (dev->data->tx_queues) { > + for (i =3D 0; i < dev->data->nb_tx_queues; i++) > + fm10k_tx_queue_release(dev->data- > >tx_queues[i]); > + rte_free(dev->data->tx_queues); > + dev->data->tx_queues =3D NULL; The memory for dev->data->tx_queues is not allocated in the fm10k PMD, so it should probably not be released here. I have submitted a patch today for rte_eth_dev.c to do this. =20 /dev/patchwork/patch/5829/ > + dev->data->nb_tx_queues =3D 0; > + } > + > + if (dev->data->rx_queues) { > + for (i =3D 0; i < dev->data->nb_rx_queues; i++) > + fm10k_rx_queue_release(dev->data- > >rx_queues[i]); > + rte_free(dev->data->rx_queues); > + dev->data->rx_queues =3D NULL; The memory for dev->data->rx_queues is not allocated in the fm10k PMD, so it should probably not be released here. I have submitted a patch today for rte_eth_dev.c to do this. =20 /dev/patchwork/patch/5829/ Regards, Bernard. > + dev->data->nb_rx_queues =3D 0; > + } > } >=20 > static void > @@ -828,6 +856,7 @@ fm10k_dev_close(struct rte_eth_dev *dev) > /* Stop mailbox service first */ > fm10k_close_mbx_service(hw); > fm10k_dev_stop(dev); > + fm10k_dev_queue_release(dev); > fm10k_stop_hw(hw); > } >=20 > -- > 1.9.3