octeon: fix buffer free in port stop

This patch fixes buffer free in port stop and updates
input node to poll on started rx-queue.

Type: fix
JIRA: https://essjira.marvell.com/browse/IPBUSW-62952

Signed-off-by: Monendra Singh Kushwaha <[email protected]>
Change-Id: Id6c78eaa0eea597c554074543f27a204cb9629aa
Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/toolkits/vpp/+/147723
Reviewed-by: Nithin Kumar Dabilpuram <[email protected]>
Tested-by: Nithin Kumar Dabilpuram <[email protected]>
Klocwork: Nithin Kumar Dabilpuram <[email protected]>
(cherry picked from commit 6d4d94470d0a7c5622d51611a01d7b0fb90de1aa)
Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/toolkits/vpp/+/148020
Tested-by: sa_ip-sw-jenkins <[email protected]>

Author: kmonendra

src/plugins/dev_octeon/common.h

@@ -12,7 +12,8 @@
 #include <base/roc_api.h>
 
 static_always_inline u32
-oct_aura_free_all_buffers (vlib_main_t *vm, u64 aura_handle, u16 hdr_off)
+oct_aura_free_all_buffers (vlib_main_t *vm, u64 aura_handle, u16 hdr_off,
+			   u32 num_buffers)
 {
   u32 n = 0;
   u64 iova;
@@ -22,6 +23,8 @@ oct_aura_free_all_buffers (vlib_main_t *vm, u64 aura_handle, u16 hdr_off)
       vlib_buffer_t *b = (void *) iova + hdr_off;
       vlib_buffer_free_one (vm, vlib_get_buffer_index (vm, b));
       n++;
+      if (num_buffers && n == num_buffers)
+	break;
     }
   return n;
 }

src/plugins/dev_octeon/port.c

@@ -475,7 +475,8 @@ oct_rxq_stop (vlib_main_t *vm, vnet_dev_rx_queue_t *rxq)
   if ((rrv = roc_nix_rq_ena_dis (&crq->rq, 0)))
     oct_roc_err (dev, rrv, "roc_nix_rq_ena_dis() failed");
 
-  n = oct_aura_free_all_buffers (vm, crq->aura_handle, crq->hdr_off);
+  n =
+    oct_aura_free_all_buffers (vm, crq->aura_handle, crq->hdr_off, crq->n_enq);
 
   if (crq->n_enq - n > 0)
     log_err (dev, "%u buffers leaked on rx queue %u stop", crq->n_enq - n,
@@ -494,10 +495,7 @@ oct_txq_stop (vlib_main_t *vm, vnet_dev_tx_queue_t *txq)
   oct_npa_batch_alloc_cl128_t *cl;
   u32 n, off = ctq->hdr_off;
 
-  n = oct_aura_free_all_buffers (vm, ctq->aura_handle, off);
-  ctq->n_enq -= n;
-
-  if (ctq->n_enq > 0 && ctq->ba_num_cl > 0)
+  if (ctq->ba_num_cl > 0)
     for (n = ctq->ba_num_cl, cl = ctq->ba_buffer + ctq->ba_first_cl; n;
 	 cl++, n--)
       {
@@ -513,6 +511,9 @@ oct_txq_stop (vlib_main_t *vm, vnet_dev_tx_queue_t *txq)
 	    }
       }
 
+  n = oct_aura_free_all_buffers (vm, ctq->aura_handle, off, 0);
+  ctq->n_enq -= n;
+
   if (ctq->n_enq > 0)
     log_err (dev, "%u buffers leaked on tx queue %u stop", ctq->n_enq,
 	     txq->queue_id);
@@ -530,7 +531,6 @@ oct_port_start (vlib_main_t *vm, vnet_dev_port_t *port)
   oct_device_t *cd = vnet_dev_get_data (dev);
   oct_port_t *cp = vnet_dev_get_port_data (port);
   struct roc_nix *nix = cd->nix;
-  struct roc_nix_eeprom_info eeprom_info = {};
   vnet_dev_rv_t rv;
   int rrv;
 
@@ -569,11 +569,6 @@ oct_port_start (vlib_main_t *vm, vnet_dev_port_t *port)
 
   vnet_dev_poll_port_add (vm, port, 0.5, oct_port_poll);
 
-  if (roc_nix_eeprom_info_get (nix, &eeprom_info) == 0)
-    {
-      log_debug (dev, "sff_id %u data %U", eeprom_info.sff_id, format_hexdump,
-		 eeprom_info.buf, sizeof (eeprom_info.buf));
-    }
 done:
   if (rv != VNET_DEV_OK)
     oct_port_stop (vm, port);

src/plugins/dev_octeon/rx_node.c

@@ -1883,6 +1883,10 @@ VNET_DEV_NODE_FN (oct_rx_node)
   foreach_vnet_dev_rx_queue_runtime (rxq, node)
     {
       vnet_dev_port_t *port = rxq->port;
+
+      if (!rxq->started)
+	continue;
+
       n_rx += oct_rx_node_inline (vm, node, frame, port, rxq, 0);
     }