1 files changed, 106 insertions, 116 deletions

diff --git a/src/plugins/odp/node.c b/src/plugins/odp/node.c
index 79892ce3..d03480c1 100755
--- a/src/plugins/odp/node.c
+++ b/src/plugins/odp/node.c
@@ -1,18 +1,7 @@
-/*
- *------------------------------------------------------------------
- * Copyright (c) 2016 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+/* Copyright (c) 2017, Linaro Limited
+ * All rights reserved.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
+ * SPDX-License-Identifier:     BSD-3-Clause
  */
 
 #include <linux/if_packet.h>
@@ -55,7 +44,7 @@ format_odp_packet_input_trace (u8 * s, va_list * args)
   odp_packet_input_trace_t *t = va_arg (*args, odp_packet_input_trace_t *);
 
   s = format (s, "odp_packet: hw_if_index %d next-index %d",
-          t->hw_if_index, t->next_index);
+	      t->hw_if_index, t->next_index);
 
   return s;
 }
@@ -86,34 +75,35 @@ odp_packet_queue_mode (odp_pktio_t pktio, u32 mode, odp_packet_t pkt_tbl[])
   u32 num_evts = 0, num_pkts = 0, i = 0;
   odp_queue_t inq;
   odp_event_t evt_tbl[VLIB_FRAME_SIZE];
-  u64 sched_wait = odp_schedule_wait_time(ODP_TIME_MSEC_IN_NS * 100);
+  u64 sched_wait = odp_schedule_wait_time (ODP_TIME_MSEC_IN_NS * 100);
 
   if (pktio == ODP_PKTIO_INVALID)
     {
-      clib_warning("odp_pktio_lookup() failed");
+      clib_warning ("odp_pktio_lookup() failed");
       return -1;
     }
 
   inq = ODP_QUEUE_INVALID;
   if ((mode == APPL_MODE_PKT_QUEUE) &&
-      (odp_pktin_event_queue(pktio, &inq, 1) != 1))
+      (odp_pktin_event_queue (pktio, &inq, 1) != 1))
     {
-      clib_warning("Error:no input queue");
+      clib_warning ("Error:no input queue");
       return -1;
     }
 
   if (inq != ODP_QUEUE_INVALID)
-        num_evts = odp_queue_deq_multi(inq, evt_tbl, VLIB_FRAME_SIZE);
+    num_evts = odp_queue_deq_multi (inq, evt_tbl, VLIB_FRAME_SIZE);
   else
-        num_evts = odp_schedule_multi(NULL, sched_wait, evt_tbl, VLIB_FRAME_SIZE);
+    num_evts =
+      odp_schedule_multi (NULL, sched_wait, evt_tbl, VLIB_FRAME_SIZE);
 
   /* convert events to packets, discarding any non-packet events */
   for (i = 0; i < num_evts; ++i)
     {
-       if (odp_event_type(evt_tbl[i]) == ODP_EVENT_PACKET)
-            pkt_tbl[num_pkts++] = odp_packet_from_event(evt_tbl[i]);
-        else
-            odp_event_free(evt_tbl[i]);
+      if (odp_event_type (evt_tbl[i]) == ODP_EVENT_PACKET)
+	pkt_tbl[num_pkts++] = odp_packet_from_event (evt_tbl[i]);
+      else
+	odp_event_free (evt_tbl[i]);
     }
 
   return num_pkts;
@@ -121,17 +111,18 @@ odp_packet_queue_mode (odp_pktio_t pktio, u32 mode, odp_packet_t pkt_tbl[])
 }
 
 always_inline int
-odp_packet_burst_mode (odp_pktio_t pktio, odp_pktin_queue_t pktin, odp_packet_t pkt_tbl[])
+odp_packet_burst_mode (odp_pktio_t pktio, odp_pktin_queue_t pktin,
+		       odp_packet_t pkt_tbl[])
 {
   u32 num_pkts;
 
-  if (odp_pktin_queue(pktio, &pktin, 1) != 1)
+  if (odp_pktin_queue (pktio, &pktin, 1) != 1)
     {
-      clib_warning("odp_pktio_open() failed: no pktin queue");
+      clib_warning ("odp_pktio_open() failed: no pktin queue");
       return -1;
     }
 
-  num_pkts = odp_pktin_recv(pktin, pkt_tbl, VLIB_FRAME_SIZE);
+  num_pkts = odp_pktin_recv (pktin, pkt_tbl, VLIB_FRAME_SIZE);
 
   return num_pkts;
 
@@ -139,7 +130,7 @@ odp_packet_burst_mode (odp_pktio_t pktio, odp_pktin_queue_t pktin, odp_packet_t
 
 always_inline uword
 odp_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-			     vlib_frame_t * frame, odp_packet_if_t *oif)
+			    vlib_frame_t * frame, odp_packet_if_t * oif)
 {
   u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
   uword n_trace = vlib_get_trace_count (vm, node);
@@ -148,15 +139,15 @@ odp_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   u32 n_rx_bytes = 0;
   u32 *to_next = 0;
   u32 n_free_bufs;
-  u32 thread_index = vlib_get_thread_index();
+  u32 thread_index = vlib_get_thread_index ();
   odp_pktin_queue_t pktin = { 0 };
-  odp_packet_t pkt,pkt_tbl[VLIB_FRAME_SIZE];
+  odp_packet_t pkt, pkt_tbl[VLIB_FRAME_SIZE];
   u32 pkts = 0, pkts_ok = 0;
   u32 n_buffer_bytes = vlib_buffer_free_list_buffer_size (vm,
-                             VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+							  VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
 
   if (oif->per_interface_next_index != ~0)
-   next_index = oif->per_interface_next_index;
+    next_index = oif->per_interface_next_index;
 
   n_free_bufs = vec_len (om->rx_buffers[thread_index]);
   if (PREDICT_FALSE (n_free_bufs < VLIB_FRAME_SIZE))
@@ -170,76 +161,74 @@ odp_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
     }
 
-  if ((oif->mode ==( APPL_MODE_PKT_QUEUE)) ||
-      (oif->mode ==(APPL_MODE_PKT_SCHED)))
+  if ((oif->mode == (APPL_MODE_PKT_QUEUE)) ||
+      (oif->mode == (APPL_MODE_PKT_SCHED)))
     {
-      pkts = odp_packet_queue_mode(oif->pktio, oif->mode, pkt_tbl);
+      pkts = odp_packet_queue_mode (oif->pktio, oif->mode, pkt_tbl);
     }
   else
     {
-      pkts = odp_packet_burst_mode(oif->pktio, pktin, pkt_tbl);
+      pkts = odp_packet_burst_mode (oif->pktio, pktin, pkt_tbl);
     }
 
   if (pkts > 0)
     {
-      u32 n_left_to_next,i = 0;
+      u32 n_left_to_next, i = 0;
       u32 next0 = next_index;
-      pkts_ok = drop_err_pkts(pkt_tbl, pkts);
+      pkts_ok = drop_err_pkts (pkt_tbl, pkts);
       vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
 
-     while((i < pkts_ok) && (n_left_to_next) && (n_free_bufs))
-       {
-            vlib_buffer_t *first_b0 = 0;
-            u32 offset = 0;
-            u32 bi0 = 0, first_bi0 = 0, prev_bi0;
-            uint8_t *data_buf;
-            pkt = pkt_tbl[i];
-            u32 data_len = odp_packet_len(pkt);
-            data_buf = malloc(data_len);
-            memset(data_buf, 0, data_len);
-            odp_packet_copy_to_mem(pkt, 0, data_len, data_buf);
-
-            while (data_len && n_free_bufs)
-              {
-                   vlib_buffer_t *b0;
-                   /* grab free buffer */
-                   u32 last_empty_buffer =
-                   vec_len (om->rx_buffers[thread_index]) - 1;
-                   prev_bi0 = bi0;
-                   bi0 = om->rx_buffers[thread_index][last_empty_buffer];
-                   b0 = vlib_get_buffer (vm, bi0);
-                   _vec_len (om->rx_buffers[thread_index]) = last_empty_buffer;
-                   n_free_bufs--;
-                   /* copy data */
-                   u32 bytes_to_copy =
-                   data_len > n_buffer_bytes ? n_buffer_bytes : data_len;
-                   b0->current_data = 0;
-                   clib_memcpy (vlib_buffer_get_current (b0),
-                   (u8 *) data_buf + offset,
-                    bytes_to_copy);
-
-                    /* fill buffer header */
-                   b0->current_length = bytes_to_copy;
-
-                   if (offset == 0)
-                     {
-		       b0->total_length_not_including_first_buffer = 0;
-		       b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
-		       vnet_buffer (b0)->sw_if_index[VLIB_RX] =
-		       oif->sw_if_index;
-		       vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-		       first_bi0 = bi0;
-		       first_b0 = vlib_get_buffer (vm, first_bi0);
-	             }
-                   else
-                     {
-                       buffer_add_to_chain (vm, bi0, first_bi0, prev_bi0);
-                     }
-
-		   offset += bytes_to_copy;
-		   data_len -= bytes_to_copy;
-           }
-          /* trace */
+      while ((i < pkts_ok) && (n_left_to_next) && (n_free_bufs))
+	{
+	  vlib_buffer_t *first_b0 = 0;
+	  u32 offset = 0;
+	  u32 bi0 = 0, first_bi0 = 0, prev_bi0;
+	  uint8_t *data_buf;
+	  pkt = pkt_tbl[i];
+	  u32 data_len = odp_packet_len (pkt);
+	  data_buf = malloc (data_len);
+	  memset (data_buf, 0, data_len);
+	  odp_packet_copy_to_mem (pkt, 0, data_len, data_buf);
+
+	  while (data_len && n_free_bufs)
+	    {
+	      vlib_buffer_t *b0;
+	      /* grab free buffer */
+	      u32 last_empty_buffer =
+		vec_len (om->rx_buffers[thread_index]) - 1;
+	      prev_bi0 = bi0;
+	      bi0 = om->rx_buffers[thread_index][last_empty_buffer];
+	      b0 = vlib_get_buffer (vm, bi0);
+	      _vec_len (om->rx_buffers[thread_index]) = last_empty_buffer;
+	      n_free_bufs--;
+	      /* copy data */
+	      u32 bytes_to_copy =
+		data_len > n_buffer_bytes ? n_buffer_bytes : data_len;
+	      b0->current_data = 0;
+	      clib_memcpy (vlib_buffer_get_current (b0),
+			   (u8 *) data_buf + offset, bytes_to_copy);
+
+	      /* fill buffer header */
+	      b0->current_length = bytes_to_copy;
+
+	      if (offset == 0)
+		{
+		  b0->total_length_not_including_first_buffer = 0;
+		  b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
+		  vnet_buffer (b0)->sw_if_index[VLIB_RX] = oif->sw_if_index;
+		  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+		  first_bi0 = bi0;
+		  first_b0 = vlib_get_buffer (vm, first_bi0);
+		}
+	      else
+		{
+		  buffer_add_to_chain (vm, bi0, first_bi0, prev_bi0);
+		}
+
+	      offset += bytes_to_copy;
+	      data_len -= bytes_to_copy;
+	    }
+	  /* trace */
 	  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (first_b0);
 	  if (PREDICT_FALSE (n_trace > 0))
 	    {
@@ -251,33 +240,34 @@ odp_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      tr->hw_if_index = oif->hw_if_index;
 	    }
 
-          /* redirect if feature path enabled */
+	  /* redirect if feature path enabled */
 	  vnet_feature_start_device_input_x1 (oif->sw_if_index, &next0,
-						  first_b0);
+					      first_b0);
 
-          /* enque and take next packet */
+	  /* enque and take next packet */
 	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
-					       n_left_to_next, first_bi0,
-					       next0);
+					   n_left_to_next, first_bi0, next0);
 
-          /* next packet */
+	  /* next packet */
 	  n_rx_packets++;
-	  n_rx_bytes += odp_packet_len(pkt);
+	  n_rx_bytes += odp_packet_len (pkt);
 	  to_next[0] = first_bi0;
 	  to_next += 1;
-          n_left_to_next--;
-          free(data_buf);
-          odp_packet_free(pkt_tbl[i]);
-          i++;
-        }
+	  n_left_to_next--;
+	  free (data_buf);
+	  odp_packet_free (pkt_tbl[i]);
+	  i++;
+	}
 
-        vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
 
-     }
+    }
 
-  vlib_increment_combined_counter(vnet_get_main ()->interface_main.combined_sw_if_counters
-     + VNET_INTERFACE_COUNTER_RX,
-     vlib_get_thread_index (), oif->hw_if_index, n_rx_packets, n_rx_bytes);
+  vlib_increment_combined_counter (vnet_get_main ()->
+				   interface_main.combined_sw_if_counters +
+				   VNET_INTERFACE_COUNTER_RX,
+				   vlib_get_thread_index (), oif->hw_if_index,
+				   n_rx_packets, n_rx_bytes);
 
   return n_rx_packets;
 
@@ -285,7 +275,7 @@ odp_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 static uword
 odp_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		    vlib_frame_t * frame)
+		     vlib_frame_t * frame)
 {
 
   int i;
@@ -299,11 +289,11 @@ odp_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
       oif = vec_elt_at_index (om->interfaces, i);
 
       if (oif->is_admin_up &&
-         (i % om->input_cpu_count) ==
-         (thread_index - om->input_cpu_first_index))
-        {
-           n_rx_packets += odp_packet_device_input_fn (vm, node, frame, oif);
-        }
+	  (i % om->input_cpu_count) ==
+	  (thread_index - om->input_cpu_first_index))
+	{
+	  n_rx_packets += odp_packet_device_input_fn (vm, node, frame, oif);
+	}
     }
 
   return n_rx_packets;