PHYP returns an RX buffer on the queue it was posted to, so each RX
queue needs its own buffer pools. Allocate and free the pools per
queue through ibmveth_alloc_buffer_pools() and
ibmveth_free_buffer_pools().

The free path now releases what was allocated rather than what is
marked active. close() frees the pools before the RX queues and the
filter list; the IRQ and NAPI are gone by then.

Signed-off-by: Mingming Cao <[email protected]>
Reviewed-by: Dave Marquardt <[email protected]>
Tested-by: Shaik Abdulla <[email protected]>
---
 drivers/net/ethernet/ibm/ibmveth.c | 119 ++++++++++++++++++++++++-----
 1 file changed, 99 insertions(+), 20 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmveth.c 
b/drivers/net/ethernet/ibm/ibmveth.c
index 559c4d2d957b..20273240d8fe 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -658,6 +658,100 @@ static void ibmveth_rxq_no_skb(struct ibmveth_adapter 
*adapter,
        schedule_work(&adapter->work);
 }
 
+/**
+ * ibmveth_free_queue_buffer_pools - Free buffer pools for a single queue
+ * @adapter: ibmveth adapter structure
+ * @queue: queue index
+ *
+ * Frees every pool on @queue regardless of the active flag;
+ * ibmveth_free_buffer_pool() skips what was never allocated.
+ */
+static void ibmveth_free_queue_buffer_pools(struct ibmveth_adapter *adapter,
+                                           int queue)
+{
+       int i;
+
+       for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++)
+               ibmveth_free_buffer_pool(adapter,
+                                        &adapter->rx_buff_pool[queue][i]);
+}
+
+/**
+ * ibmveth_alloc_queue_buffer_pools - Allocate buffer pools for a single queue
+ * @adapter: ibmveth adapter structure
+ * @queue: queue index
+ *
+ * Allocates backing storage for each active pool on @queue.
+ *
+ * Return: 0 on success, -ENOMEM on failure
+ */
+static int ibmveth_alloc_queue_buffer_pools(struct ibmveth_adapter *adapter,
+                                           int queue)
+{
+       struct net_device *netdev = adapter->netdev;
+       int i;
+
+       for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
+               struct ibmveth_buff_pool *bpool =
+                       &adapter->rx_buff_pool[queue][i];
+
+               if (!bpool->active)
+                       continue;
+
+               if (ibmveth_alloc_buffer_pool(bpool)) {
+                       netdev_err(netdev,
+                                  "queue %d pool %d alloc failed (size=%u 
count=%u)\n",
+                                  queue, i,
+                                  bpool->buff_size,
+                                  bpool->size);
+                       bpool->active = 0;
+                       /* Undo the pools this queue already allocated; the
+                        * failed one freed its own partial allocation.
+                        */
+                       ibmveth_free_queue_buffer_pools(adapter, queue);
+                       return -ENOMEM;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ * ibmveth_alloc_buffer_pools - Allocate buffer pools for all queues
+ * @adapter: ibmveth adapter structure
+ *
+ * Return: 0 on success, -ENOMEM on failure
+ */
+static int
+ibmveth_alloc_buffer_pools(struct ibmveth_adapter *adapter)
+{
+       int q, rc;
+
+       for (q = 0; q < adapter->num_rx_queues; q++) {
+               rc = ibmveth_alloc_queue_buffer_pools(adapter, q);
+               if (rc) {
+                       while (--q >= 0)
+                               ibmveth_free_queue_buffer_pools(adapter, q);
+                       return rc;
+               }
+       }
+
+       return 0;
+}
+
+/**
+ * ibmveth_free_buffer_pools - Free buffer pools for all queues
+ * @adapter: ibmveth adapter structure
+ */
+static void
+ibmveth_free_buffer_pools(struct ibmveth_adapter *adapter)
+{
+       int q;
+
+       for (q = 0; q < adapter->num_rx_queues; q++)
+               ibmveth_free_queue_buffer_pools(adapter, q);
+}
+
 /**
  * ibmveth_remove_buffer_from_pool - remove a buffer from a pool
  * @adapter: adapter instance
@@ -887,16 +981,9 @@ static int ibmveth_open(struct net_device *netdev)
                goto out_free_tx_ltb;
        }
 
-       for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
-               if (!adapter->rx_buff_pool[0][i].active)
-                       continue;
-               if (ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[0][i])) {
-                       netdev_err(netdev, "unable to alloc pool\n");
-                       adapter->rx_buff_pool[0][i].active = 0;
-                       rc = -ENOMEM;
-                       goto out_free_buffer_pools;
-               }
-       }
+       rc = ibmveth_alloc_buffer_pools(adapter);
+       if (rc)
+               goto out_free_buffer_pools;
 
        /* NAPI can run as soon as it is enabled, from netpoll during the
         * direct close()/open() pairs or from a direct ibmveth_interrupt()
@@ -930,11 +1017,7 @@ static int ibmveth_open(struct net_device *netdev)
        do {
                lpar_rc = h_free_logical_lan(adapter->vdev->unit_address);
        } while (H_IS_LONG_BUSY(lpar_rc) || (lpar_rc == H_BUSY));
-       while (--i >= 0) {
-               if (adapter->rx_buff_pool[0][i].active)
-                       ibmveth_free_buffer_pool(adapter,
-                                                &adapter->rx_buff_pool[0][i]);
-       }
+       ibmveth_free_buffer_pools(adapter);
 out_free_tx_ltb:
        for (i = netdev->real_num_tx_queues - 1; i >= 0; i--)
                ibmveth_free_tx_ltb(adapter, i);
@@ -985,14 +1068,10 @@ static int ibmveth_close(struct net_device *netdev)
 
        ibmveth_update_rx_no_buffer(adapter);
 
+       ibmveth_free_buffer_pools(adapter);
        ibmveth_cleanup_rx_resources(adapter);
        ibmveth_free_filter_list(adapter);
 
-       for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++)
-               if (adapter->rx_buff_pool[0][i].active)
-                       ibmveth_free_buffer_pool(adapter,
-                                                &adapter->rx_buff_pool[0][i]);
-
        for (i = 0; i < netdev->real_num_tx_queues; i++)
                ibmveth_free_tx_ltb(adapter, i);
 
-- 
2.50.1 (Apple Git-155)


Reply via email to