Skip to contentSkip to conversation

e1000: ring buffers resources cleanup

PATCH In review Vasily Averin 1 participant 2 messages Aug 18, 2006 – Aug 19, 2006 1 message not in the archive

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Vasily Averin

author
#0 lore raw

PATCH 1/1 e1000: ring buffers resources cleanup

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.

Signed-off-by Vasily Averin <[email protected]>

Thank you,
Vasily Averin
SWsoft Virtuozzo/OpenVZ Linux kernel team

drivers/net/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c.irsrs +6 -0
@@ -1398,6 +1398,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;
 		}
 	}

@@ -1656,6 +1659,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;
 		}
 	}

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel

author
#2 lore raw
In reply to a message not in the archive

Hello Joe,

Quoted 9 lines · Joe Perches
Quoted 2 lines · Vasily Averin

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 <[email protected]>

Thank you,
Vasily Averin
SWsoft Virtuozzo/OpenVZ Linux kernel team

drivers/net/e1000/e1000_main.c renamed from drivers/net/e1000/e1000_main.c.irsrs +6 -8
@@ -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;
 		}
 	}