From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vasily Averin Subject: Re: [PATCH] e1000: ring buffers resources cleanup Date: Sun, 20 Aug 2006 00:14:09 +0400 Message-ID: <44E77111.60103@sw.ru> References: <44E5D68A.2080804@sw.ru> <1155917427.24835.57.camel@localhost> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060301030607010205030703" Return-path: Received: from mailhub.sw.ru ([195.214.233.200]:39758 "EHLO relay.sw.ru") by vger.kernel.org with ESMTP id S1751504AbWHSUOH (ORCPT ); Sat, 19 Aug 2006 16:14:07 -0400 To: Joe Perches , netdev@vger.kernel.org, Jeb Cramer , John Ronciak , Jesse Brandeburg , Jeff Kirsher , Auke Kok , Andrew Morton , Jeff Garzik , devel@openvz.org, e1000-devel@lists.sourceforge.net In-Reply-To: <1155917427.24835.57.camel@localhost> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org This is a multi-part message in MIME format. --------------060301030607010205030703 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hello Joe, Joe Perches wrote: > On Fri, 2006-08-18 at 19:02 +0400, Vasily Averin wrote: >>Memory leak was found in 2.6.18-rc4 and e1000 7.2.7 from sourceforge: >>We should free resources allocated for previous rings if following allocation fails. > > Did you read the comment headers in the function? > > * If this function returns with an error, then it's possible one or > * more of the rings is populated (while the rest are not). It is the > * callers duty to clean those orphaned rings. Thank you for your notice. I believe this comment is incorrect: if some function returns an error it should restore original state on exit, otherwise can lead to resource leaks. Also I would note that this requirements is not accomplished in current driver version: e1000_setup_all_Xx_resources functions are called in two places: in e1000_set_ringparam() and in e1000_open() and in both cases nobody cleans those orphaned rings. Therefore I think it make sense to remove these comments too. Andrew, could you please use attached patch instead previous version? --- Memory leak was found in 2.6.18-rc4 and e1000 7.2.7 from sourceforge: We should free resources allocated for previous rings if following allocation fails. Also incorrect comments in e1000_setup_all_Xx_resources() are removed Signed-off-by: Vasily Averin Thank you, Vasily Averin SWsoft Virtuozzo/OpenVZ Linux kernel team --------------060301030607010205030703 Content-Type: text/plain; name="diff-e1000-ringresources-20060819" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diff-e1000-ringresources-20060819" --- linux-2.6.18-rc4/drivers/net/e1000/e1000_main.c.irsrs 2006-08-18 16:58:51.000000000 +0400 +++ linux-2.6.18-rc4/drivers/net/e1000/e1000_main.c 2006-08-19 22:54:00.000000000 +0400 @@ -1381,10 +1381,6 @@ setup_tx_desc_die: * (Descriptors) for all queues * @adapter: board private structure * - * If this function returns with an error, then it's possible one or - * more of the rings is populated (while the rest are not). It is the - * callers duty to clean those orphaned rings. - * * Return 0 on success, negative on failure **/ @@ -1398,6 +1394,9 @@ e1000_setup_all_tx_resources(struct e100 if (err) { DPRINTK(PROBE, ERR, "Allocation for Tx Queue %u failed\n", i); + for (i-- ; i >= 0; i--) + e1000_free_tx_resources(adapter, + &adapter->tx_ring[i]); break; } } @@ -1639,10 +1638,6 @@ setup_rx_desc_die: * (Descriptors) for all queues * @adapter: board private structure * - * If this function returns with an error, then it's possible one or - * more of the rings is populated (while the rest are not). It is the - * callers duty to clean those orphaned rings. - * * Return 0 on success, negative on failure **/ @@ -1656,6 +1651,9 @@ e1000_setup_all_rx_resources(struct e100 if (err) { DPRINTK(PROBE, ERR, "Allocation for Rx Queue %u failed\n", i); + for (i-- ; i >= 0; i--) + e1000_free_rx_resources(adapter, + &adapter->rx_ring[i]); break; } } --------------060301030607010205030703--