octeon: fix batch free from tx aura

Type: fix

Signed-off-by: Monendra Singh Kushwaha <[email protected]>
Change-Id: Ia545cc239f99a7f1c508e4b30a0497886763a7b2
Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/toolkits/vpp/+/147328
Reviewed-by: Nithin Kumar Dabilpuram <[email protected]>
Tested-by: sa_ip-toolkits-Jenkins <[email protected]>
(cherry picked from commit c828509321608ffb6369b42bab480a3b1a8ce120)
Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/toolkits/vpp/+/147526
Tested-by: sa_ip-sw-jenkins <[email protected]>

Author: kmonendra

src/plugins/dev_octeon/tx_node.c

@@ -16,6 +16,9 @@
 #include <dev_octeon/octeon.h>
 #include <dev_octeon/ipsec.h>
 
+#define OCT_TX_NODE	     (1 << 0)
+#define OCT_TX_IPSEC_TM_NODE (1 << 1)
+
 #define OCT_LMT_GET_LINE_ADDR(lmt_addr, lmt_num)                              \
   (void *) ((u64) (lmt_addr) + ((u64) (lmt_num) << ROC_LMT_LINE_SIZE_LOG2))
 
@@ -47,7 +50,8 @@ typedef struct
 
 #ifdef PLATFORM_OCTEON9
 static_always_inline u32
-oct_batch_free (vlib_main_t *vm, oct_tx_ctx_t *ctx, vnet_dev_tx_queue_t *txq)
+oct_batch_free (vlib_main_t *vm, oct_tx_ctx_t *ctx, vnet_dev_tx_queue_t *txq,
+		const u64 flags)
 {
   oct_txq_t *ctq = vnet_dev_get_tx_queue_data (txq);
   u16 off = ctq->hdr_off;
@@ -61,6 +65,8 @@ oct_batch_free (vlib_main_t *vm, oct_tx_ctx_t *ctx, vnet_dev_tx_queue_t *txq)
       u64 buffers[n];
       u32 bi[n];
 
+      if (flags & OCT_TX_NODE)
+	n = clib_min (n, ctq->n_enq);
       n_freed = roc_npa_aura_op_bulk_alloc (ah, buffers, n, 0, 1);
       vlib_get_buffer_indices_with_offset (vm, (void **) &buffers, bi, n_freed,
 					   off);
@@ -84,13 +90,19 @@ oct_lmt_copy (void *lmt_addr, u64 io_addr, void *desc, u64 dwords)
 }
 #else
 static_always_inline u32
-oct_batch_free (vlib_main_t *vm, oct_tx_ctx_t *ctx, vnet_dev_tx_queue_t *txq)
+oct_batch_free (vlib_main_t *vm, oct_tx_ctx_t *ctx, vnet_dev_tx_queue_t *txq,
+		const u64 flags)
 {
   oct_txq_t *ctq = vnet_dev_get_tx_queue_data (txq);
+  oct_npa_batch_alloc_cl128_t *cl;
+  u32 n_freed = 0, n, n_alloc;
   u8 num_cl;
   u64 ah;
-  u32 n_freed = 0, n;
-  oct_npa_batch_alloc_cl128_t *cl;
+
+  if (flags & OCT_TX_NODE)
+    n_alloc = clib_min (ctq->n_enq, ROC_CN10K_NPA_BATCH_ALLOC_MAX_PTRS);
+  else
+    n_alloc = ROC_CN10K_NPA_BATCH_ALLOC_MAX_PTRS;
 
   num_cl = ctq->ba_num_cl;
   if (num_cl)
@@ -162,7 +174,7 @@ oct_batch_free (vlib_main_t *vm, oct_tx_ctx_t *ctx, vnet_dev_tx_queue_t *txq)
     {
       u64 addr, res;
 
-      n = clib_min (n, ROC_CN10K_NPA_BATCH_ALLOC_MAX_PTRS);
+      n = clib_min (n, n_alloc);
 
       oct_npa_batch_alloc_compare_t cmp = {
 	.compare_s = { .aura = roc_npa_aura_handle_to_aura (ah),
@@ -1690,7 +1702,7 @@ VNET_DEV_NODE_FN (oct_tx_ipsec_tm_node)
     .lmt_lines = ctq->lmt_addr + (lmt_id << ROC_LMT_LINE_SIZE_LOG2),
   };
 
-  oct_batch_free (vm, &ctx, txq);
+  oct_batch_free (vm, &ctx, txq, OCT_TX_IPSEC_TM_NODE);
 
   vlib_get_buffers (vm, vlib_frame_vector_args (frame), b, n_pkts);
   n_left = n_pkts;
@@ -1759,7 +1771,7 @@ VNET_DEV_NODE_FN (oct_tx_node)
   vnet_dev_tx_queue_lock_if_needed (txq);
 
   n_enq = ctq->n_enq;
-  n_enq -= oct_batch_free (vm, &ctx, txq);
+  n_enq -= oct_batch_free (vm, &ctx, txq, OCT_TX_NODE);
 
   if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE))
     {