lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ixgbe: refactor ixgbe_alloc_queues()

Browse Source 
I noticed ring variable was initialized before allocations, and that
memory node management was a bit ugly. We also leak memory in case of
ring allocations error.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Eric Dumazet
2010-11-16 19:27:18 -08:00
committed by Jeff Kirsher
parent b93a22260f
commit e2ddeba95c
1 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
drivers/net/ixgbe/ixgbe_main.c
View File

@@ -4676,71 +4676,55 @@ static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
**/ **/
static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter) static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter)
{ {
int i; int rx = 0, tx = 0, nid = adapter->node;
int rx_count;
int orig_node = adapter->node;
for (i = 0; i < adapter->num_tx_queues; i++) { if (nid < 0 || !node_online(nid))
struct ixgbe_ring *ring = adapter->tx_ring[i]; nid = first_online_node;
if (orig_node == -1) {
int cur_node = next_online_node(adapter->node); for (; tx < adapter->num_tx_queues; tx++) {
if (cur_node == MAX_NUMNODES) struct ixgbe_ring *ring;
cur_node = first_online_node;
adapter->node = cur_node; ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, nid);
}
ring = kzalloc_node(sizeof(struct ixgbe_ring), GFP_KERNEL,
adapter->node);
if (!ring) if (!ring)
ring = kzalloc(sizeof(struct ixgbe_ring), GFP_KERNEL); ring = kzalloc(sizeof(*ring), GFP_KERNEL);
if (!ring) if (!ring)
goto err_tx_ring_allocation; goto err_allocation;
ring->count = adapter->tx_ring_count; ring->count = adapter->tx_ring_count;
ring->queue_index = i; ring->queue_index = tx;
ring->numa_node = nid;
ring->dev = &adapter->pdev->dev; ring->dev = &adapter->pdev->dev;
ring->netdev = adapter->netdev; ring->netdev = adapter->netdev;
ring->numa_node = adapter->node;
adapter->tx_ring[i] = ring; adapter->tx_ring[tx] = ring;
} }
/* Restore the adapter's original node */ for (; rx < adapter->num_rx_queues; rx++) {
adapter->node = orig_node; struct ixgbe_ring *ring;
rx_count = adapter->rx_ring_count; ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, nid);
for (i = 0; i < adapter->num_rx_queues; i++) {
struct ixgbe_ring *ring = adapter->rx_ring[i];
if (orig_node == -1) {
int cur_node = next_online_node(adapter->node);
if (cur_node == MAX_NUMNODES)
cur_node = first_online_node;
adapter->node = cur_node;
}
ring = kzalloc_node(sizeof(struct ixgbe_ring), GFP_KERNEL,
adapter->node);
if (!ring) if (!ring)
ring = kzalloc(sizeof(struct ixgbe_ring), GFP_KERNEL); ring = kzalloc(sizeof(*ring), GFP_KERNEL);
if (!ring) if (!ring)
goto err_rx_ring_allocation; goto err_allocation;
ring->count = rx_count; ring->count = adapter->rx_ring_count;
ring->queue_index = i; ring->queue_index = rx;
ring->numa_node = nid;
ring->dev = &adapter->pdev->dev; ring->dev = &adapter->pdev->dev;
ring->netdev = adapter->netdev; ring->netdev = adapter->netdev;
ring->numa_node = adapter->node;
adapter->rx_ring[i] = ring; adapter->rx_ring[rx] = ring;
} }
/* Restore the adapter's original node */
adapter->node = orig_node;
ixgbe_cache_ring_register(adapter); ixgbe_cache_ring_register(adapter);
return 0; return 0;
err_rx_ring_allocation: err_allocation:
for (i = 0; i < adapter->num_tx_queues; i++) while (tx)
kfree(adapter->tx_ring[i]); kfree(adapter->tx_ring[--tx]);
err_tx_ring_allocation:
while (rx)
kfree(adapter->rx_ring[--rx]);
return -ENOMEM; return -ENOMEM;
} }