add vlib_prefetch_buffer_data(...) macro

[vpp.git] / src / vnet / l2 / l2_rw.c

diff --git a/src/vnet/l2/l2_rw.c b/src/vnet/l2/l2_rw.c
index c54509d..ac83483 100644 (file)
--- a/src/vnet/l2/l2_rw.c
+++ b/src/vnet/l2/l2_rw.c
@@ -22,7 +22,7 @@
  * @brief Layer 2 Rewrite.
  *
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  */
 
 
@@ -164,7 +164,6 @@ l2_rw_node_fn (vlib_main_t * vm,
   u32 n_left_from, *from, *to_next, next_index;
   vnet_classify_main_t *vcm = &vnet_classify_main;
   f64 now = vlib_time_now (vlib_get_main ());
-  u32 prefetch_size = 0;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;      /* number of packets to process */
@@ -177,10 +176,10 @@ l2_rw_node_fn (vlib_main_t * vm,
       /* get space to enqueue frame to graph node "next_index" */
       vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
 
-      while (n_left_from >= 4 && n_left_to_next >= 2)
+      while (n_left_from >= 6 && n_left_to_next >= 2)
        {
-         u32 bi0, next0, sw_if_index0, feature_bitmap0, rwe_index0;
-         u32 bi1, next1, sw_if_index1, feature_bitmap1, rwe_index1;
+         u32 bi0, next0, sw_if_index0, rwe_index0;
+         u32 bi1, next1, sw_if_index1, rwe_index1;
          vlib_buffer_t *b0, *b1;
          ethernet_header_t *h0, *h1;
          l2_rw_config_t *config0, *config1;
@@ -190,14 +189,16 @@ l2_rw_node_fn (vlib_main_t * vm,
          l2_rw_entry_t *rwe0, *rwe1;
 
          {
-           vlib_buffer_t *p2, *p3;
+           vlib_buffer_t *p2, *p3, *p4, *p5;
            p2 = vlib_get_buffer (vm, from[2]);
            p3 = vlib_get_buffer (vm, from[3]);
+           p4 = vlib_get_buffer (vm, from[4]);
+           p5 = vlib_get_buffer (vm, from[5]);
 
-           vlib_prefetch_buffer_header (p2, LOAD);
-           vlib_prefetch_buffer_header (p3, LOAD);
-           CLIB_PREFETCH (vlib_buffer_get_current (p2), prefetch_size, LOAD);
-           CLIB_PREFETCH (vlib_buffer_get_current (p3), prefetch_size, LOAD);
+           vlib_prefetch_buffer_header (p4, LOAD);
+           vlib_prefetch_buffer_header (p5, LOAD);
+           vlib_prefetch_buffer_data (p2, LOAD);
+           vlib_prefetch_buffer_data (p3, LOAD);
          }
 
          bi0 = from[0];
@@ -220,8 +221,6 @@ l2_rw_node_fn (vlib_main_t * vm,
          config1 = l2_rw_get_config (sw_if_index1);    /*TODO: check sw_if_index0 value */
          t0 = pool_elt_at_index (vcm->tables, config0->table_index);
          t1 = pool_elt_at_index (vcm->tables, config1->table_index);
-         prefetch_size =
-           (t1->skip_n_vectors + t1->match_n_vectors) * sizeof (u32x4);
 
          hash0 = vnet_classify_hash_packet (t0, (u8 *) h0);
          hash1 = vnet_classify_hash_packet (t1, (u8 *) h1);
@@ -273,16 +272,10 @@ l2_rw_node_fn (vlib_main_t * vm,
            }
 
          /* Update feature bitmap and get next feature index */
-         feature_bitmap0 =
-           vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
-         feature_bitmap1 =
-           vnet_buffer (b1)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
-         vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
-         vnet_buffer (b1)->l2.feature_bitmap = feature_bitmap1;
-         next0 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
-                                                  feature_bitmap0);
-         next1 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
-                                                  feature_bitmap1);
+         next0 = vnet_l2_feature_next (b0, rw->feat_next_node_index,
+                                       L2INPUT_FEAT_RW);
+         next1 = vnet_l2_feature_next (b1, rw->feat_next_node_index,
+                                       L2INPUT_FEAT_RW);
 
          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
                                           to_next, n_left_to_next,
@@ -291,7 +284,7 @@ l2_rw_node_fn (vlib_main_t * vm,
 
       while (n_left_from > 0 && n_left_to_next > 0)
        {
-         u32 bi0, next0, sw_if_index0, feature_bitmap0, rwe_index0;
+         u32 bi0, next0, sw_if_index0, rwe_index0;
          vlib_buffer_t *b0;
          ethernet_header_t *h0;
          l2_rw_config_t *config0;
@@ -341,11 +334,8 @@ l2_rw_node_fn (vlib_main_t * vm,
            }
 
          /* Update feature bitmap and get next feature index */
-         feature_bitmap0 =
-           vnet_buffer (b0)->l2.feature_bitmap & ~L2INPUT_FEAT_RW;
-         vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap0;
-         next0 = feat_bitmap_get_next_node_index (rw->feat_next_node_index,
-                                                  feature_bitmap0);
+         next0 = vnet_l2_feature_next (b0, rw->feat_next_node_index,
+                                       L2INPUT_FEAT_RW);
 
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
                                           to_next, n_left_to_next,
@@ -390,9 +380,9 @@ l2_rw_mod_entry (u32 * index,
   skip -= e->skip_n_vectors * sizeof (u32x4);
   e->rewrite_n_vectors = (skip + len - 1) / sizeof (u32x4) + 1;
   vec_alloc_aligned (e->mask, e->rewrite_n_vectors, sizeof (u32x4));
-  memset (e->mask, 0, e->rewrite_n_vectors * sizeof (u32x4));
+  clib_memset (e->mask, 0, e->rewrite_n_vectors * sizeof (u32x4));
   vec_alloc_aligned (e->value, e->rewrite_n_vectors, sizeof (u32x4));
-  memset (e->value, 0, e->rewrite_n_vectors * sizeof (u32x4));
+  clib_memset (e->value, 0, e->rewrite_n_vectors * sizeof (u32x4));
 
   clib_memcpy (((u8 *) e->value) + skip, value, len);
   clib_memcpy (((u8 *) e->mask) + skip, mask, len);
@@ -448,7 +438,7 @@ l2_rw_entry_cli_fn (vlib_main_t * vm,
 
 /*?
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  *
  * @cliexpar
  * @todo This is incomplete. This needs a detailed description and a
@@ -520,7 +510,7 @@ l2_rw_interface_cli_fn (vlib_main_t * vm,
 
 /*?
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  *
  * @cliexpar
  * @todo This is incomplete. This needs a detailed description and a
@@ -555,7 +545,7 @@ l2_rw_show_interfaces_cli_fn (vlib_main_t * vm,
 
 /*?
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  *
  * @cliexpar
  * @todo This is incomplete. This needs a detailed description and a
@@ -589,7 +579,7 @@ l2_rw_show_entries_cli_fn (vlib_main_t * vm,
 
 /*?
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  *
  * @cliexpar
  * @todo This is incomplete. This needs a detailed description and a