X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fclassify%2Fvnet_classify.h;h=c08cedf6b0322c550718814e23a6667e924598dc;hb=f58571ee6f7b0460392ee6a7f86be2e07e747390;hp=6cbbf10aa2e89c6da71ccd0ad98057b68b793f61;hpb=927b0714d758356f03c0b3402fe87dc934154d95;p=vpp.git

diff --git a/src/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h
index 6cbbf10aa2e..c08cedf6b03 100644
--- a/src/vnet/classify/vnet_classify.h
+++ b/src/vnet/classify/vnet_classify.h
@@ -15,20 +15,7 @@
 #ifndef __included_vnet_classify_h__
 #define __included_vnet_classify_h__
 
-#include <stdarg.h>
-
-#include <vlib/vlib.h>
 #include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vlib/cli.h>
-#include <vnet/l2/l2_input.h>
-#include <vnet/l2/l2_output.h>
-#include <vnet/l2/feat_bitmap.h>
 #include <vnet/api_errno.h>	/* for API error numbers */
 
 #include <vppinfra/error.h>
@@ -41,12 +28,6 @@ extern vlib_node_registration_t ip6_classify_node;
 
 #define CLASSIFY_TRACE 0
 
-#ifdef CLIB_HAVE_VEC128
-#define CLASSIFY_USE_SSE	//Allow usage of SSE operations
-#endif
-
-#define U32X4_ALIGNED(p) PREDICT_TRUE((((intptr_t)p) & 0xf) == 0)
-
 /*
  * Classify table option to process packets
  *  CLASSIFY_FLAG_USE_CURR_DATA:
@@ -156,6 +137,7 @@ typedef struct
 
 typedef struct
 {
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   /* Mask to apply after skipping N vectors */
   u32x4 *mask;
   /* Buckets and entries */
@@ -193,10 +175,16 @@ typedef struct
   void *mheap;
 
   /* Writer (only) lock for this table */
-  volatile u32 *writer_lock;
+  clib_spinlock_t writer_lock;
 
 } vnet_classify_table_t;
 
+typedef struct
+{
+  int refcnt;
+  u32 *table_indices;
+} vnet_classify_filter_set_t;
+
 struct _vnet_classify_main
 {
   /* Table pool */
@@ -209,6 +197,12 @@ struct _vnet_classify_main
   unformat_function_t **unformat_policer_next_index_fns;
   unformat_function_t **unformat_opaque_index_fns;
 
+  /* Pool of filter sets */
+  vnet_classify_filter_set_t *filter_sets;
+
+  /* Per-interface filter set map. [0] is used for pcap */
+  u32 *filter_set_by_sw_if_index;
+
   /* convenience variables */
   vlib_main_t *vlib_main;
   vnet_main_t *vnet_main;
@@ -233,63 +227,58 @@ vnet_classify_hash_packet_inline (vnet_classify_table_t * t, u8 * h)
 
   ASSERT (t);
   mask = t->mask;
-#ifdef CLASSIFY_USE_SSE
-  if (U32X4_ALIGNED (h))
-    {				//SSE can't handle unaligned data
-      u32x4 *data = (u32x4 *) h;
-      xor_sum.as_u32x4 = data[0 + t->skip_n_vectors] & mask[0];
-      switch (t->match_n_vectors)
-	{
-	case 5:
-	  xor_sum.as_u32x4 ^= data[4 + t->skip_n_vectors] & mask[4];
-	  /* FALLTHROUGH */
-	case 4:
-	  xor_sum.as_u32x4 ^= data[3 + t->skip_n_vectors] & mask[3];
-	  /* FALLTHROUGH */
-	case 3:
-	  xor_sum.as_u32x4 ^= data[2 + t->skip_n_vectors] & mask[2];
-	  /* FALLTHROUGH */
-	case 2:
-	  xor_sum.as_u32x4 ^= data[1 + t->skip_n_vectors] & mask[1];
-	  /* FALLTHROUGH */
-	case 1:
-	  break;
-	default:
-	  abort ();
-	}
+#ifdef CLIB_HAVE_VEC128
+  u32x4u *data = (u32x4u *) h;
+  xor_sum.as_u32x4 = data[0 + t->skip_n_vectors] & mask[0];
+  switch (t->match_n_vectors)
+    {
+    case 5:
+      xor_sum.as_u32x4 ^= data[4 + t->skip_n_vectors] & mask[4];
+      /* FALLTHROUGH */
+    case 4:
+      xor_sum.as_u32x4 ^= data[3 + t->skip_n_vectors] & mask[3];
+      /* FALLTHROUGH */
+    case 3:
+      xor_sum.as_u32x4 ^= data[2 + t->skip_n_vectors] & mask[2];
+      /* FALLTHROUGH */
+    case 2:
+      xor_sum.as_u32x4 ^= data[1 + t->skip_n_vectors] & mask[1];
+      /* FALLTHROUGH */
+    case 1:
+      break;
+    default:
+      abort ();
     }
-  else
-#endif /* CLASSIFY_USE_SSE */
+#else
+  u32 skip_u64 = t->skip_n_vectors * 2;
+  u64 *data64 = (u64 *) h;
+  xor_sum.as_u64[0] = data64[0 + skip_u64] & ((u64 *) mask)[0];
+  xor_sum.as_u64[1] = data64[1 + skip_u64] & ((u64 *) mask)[1];
+  switch (t->match_n_vectors)
     {
-      u32 skip_u64 = t->skip_n_vectors * 2;
-      u64 *data64 = (u64 *) h;
-      xor_sum.as_u64[0] = data64[0 + skip_u64] & ((u64 *) mask)[0];
-      xor_sum.as_u64[1] = data64[1 + skip_u64] & ((u64 *) mask)[1];
-      switch (t->match_n_vectors)
-	{
-	case 5:
-	  xor_sum.as_u64[0] ^= data64[8 + skip_u64] & ((u64 *) mask)[8];
-	  xor_sum.as_u64[1] ^= data64[9 + skip_u64] & ((u64 *) mask)[9];
-	  /* FALLTHROUGH */
-	case 4:
-	  xor_sum.as_u64[0] ^= data64[6 + skip_u64] & ((u64 *) mask)[6];
-	  xor_sum.as_u64[1] ^= data64[7 + skip_u64] & ((u64 *) mask)[7];
-	  /* FALLTHROUGH */
-	case 3:
-	  xor_sum.as_u64[0] ^= data64[4 + skip_u64] & ((u64 *) mask)[4];
-	  xor_sum.as_u64[1] ^= data64[5 + skip_u64] & ((u64 *) mask)[5];
-	  /* FALLTHROUGH */
-	case 2:
-	  xor_sum.as_u64[0] ^= data64[2 + skip_u64] & ((u64 *) mask)[2];
-	  xor_sum.as_u64[1] ^= data64[3 + skip_u64] & ((u64 *) mask)[3];
-	  /* FALLTHROUGH */
-	case 1:
-	  break;
-
-	default:
-	  abort ();
-	}
+    case 5:
+      xor_sum.as_u64[0] ^= data64[8 + skip_u64] & ((u64 *) mask)[8];
+      xor_sum.as_u64[1] ^= data64[9 + skip_u64] & ((u64 *) mask)[9];
+      /* FALLTHROUGH */
+    case 4:
+      xor_sum.as_u64[0] ^= data64[6 + skip_u64] & ((u64 *) mask)[6];
+      xor_sum.as_u64[1] ^= data64[7 + skip_u64] & ((u64 *) mask)[7];
+      /* FALLTHROUGH */
+    case 3:
+      xor_sum.as_u64[0] ^= data64[4 + skip_u64] & ((u64 *) mask)[4];
+      xor_sum.as_u64[1] ^= data64[5 + skip_u64] & ((u64 *) mask)[5];
+      /* FALLTHROUGH */
+    case 2:
+      xor_sum.as_u64[0] ^= data64[2 + skip_u64] & ((u64 *) mask)[2];
+      xor_sum.as_u64[1] ^= data64[3 + skip_u64] & ((u64 *) mask)[3];
+      /* FALLTHROUGH */
+    case 1:
+      break;
+
+    default:
+      abort ();
     }
+#endif /* CLIB_HAVE_VEC128 */
 
   return clib_xxhash (xor_sum.as_u64[0] ^ xor_sum.as_u64[1]);
 }
@@ -407,108 +396,99 @@ vnet_classify_find_entry_inline (vnet_classify_table_t * t,
 
   v = vnet_classify_entry_at_index (t, v, value_index);
 
-#ifdef CLASSIFY_USE_SSE
-  if (U32X4_ALIGNED (h))
+#ifdef CLIB_HAVE_VEC128
+  u32x4u *data = (u32x4u *) h;
+  for (i = 0; i < limit; i++)
     {
-      u32x4 *data = (u32x4 *) h;
-      for (i = 0; i < limit; i++)
+      key = v->key;
+      result.as_u32x4 = (data[0 + t->skip_n_vectors] & mask[0]) ^ key[0];
+      switch (t->match_n_vectors)
 	{
-	  key = v->key;
-	  result.as_u32x4 = (data[0 + t->skip_n_vectors] & mask[0]) ^ key[0];
-	  switch (t->match_n_vectors)
-	    {
-	    case 5:
-	      result.as_u32x4 |=
-		(data[4 + t->skip_n_vectors] & mask[4]) ^ key[4];
-	      /* FALLTHROUGH */
-	    case 4:
-	      result.as_u32x4 |=
-		(data[3 + t->skip_n_vectors] & mask[3]) ^ key[3];
-	      /* FALLTHROUGH */
-	    case 3:
-	      result.as_u32x4 |=
-		(data[2 + t->skip_n_vectors] & mask[2]) ^ key[2];
-	      /* FALLTHROUGH */
-	    case 2:
-	      result.as_u32x4 |=
-		(data[1 + t->skip_n_vectors] & mask[1]) ^ key[1];
-	      /* FALLTHROUGH */
-	    case 1:
-	      break;
-	    default:
-	      abort ();
-	    }
+	case 5:
+	  result.as_u32x4 |= (data[4 + t->skip_n_vectors] & mask[4]) ^ key[4];
+	  /* FALLTHROUGH */
+	case 4:
+	  result.as_u32x4 |= (data[3 + t->skip_n_vectors] & mask[3]) ^ key[3];
+	  /* FALLTHROUGH */
+	case 3:
+	  result.as_u32x4 |= (data[2 + t->skip_n_vectors] & mask[2]) ^ key[2];
+	  /* FALLTHROUGH */
+	case 2:
+	  result.as_u32x4 |= (data[1 + t->skip_n_vectors] & mask[1]) ^ key[1];
+	  /* FALLTHROUGH */
+	case 1:
+	  break;
+	default:
+	  abort ();
+	}
 
-	  if (u32x4_zero_byte_mask (result.as_u32x4) == 0xffff)
+      if (u32x4_zero_byte_mask (result.as_u32x4) == 0xffff)
+	{
+	  if (PREDICT_TRUE (now))
 	    {
-	      if (PREDICT_TRUE (now))
-		{
-		  v->hits++;
-		  v->last_heard = now;
-		}
-	      return (v);
+	      v->hits++;
+	      v->last_heard = now;
 	    }
-	  v = vnet_classify_entry_at_index (t, v, 1);
+	  return (v);
 	}
+      v = vnet_classify_entry_at_index (t, v, 1);
     }
-  else
-#endif /* CLASSIFY_USE_SSE */
+#else
+  u32 skip_u64 = t->skip_n_vectors * 2;
+  u64 *data64 = (u64 *) h;
+  for (i = 0; i < limit; i++)
     {
-      u32 skip_u64 = t->skip_n_vectors * 2;
-      u64 *data64 = (u64 *) h;
-      for (i = 0; i < limit; i++)
-	{
-	  key = v->key;
+      key = v->key;
 
-	  result.as_u64[0] =
-	    (data64[0 + skip_u64] & ((u64 *) mask)[0]) ^ ((u64 *) key)[0];
-	  result.as_u64[1] =
-	    (data64[1 + skip_u64] & ((u64 *) mask)[1]) ^ ((u64 *) key)[1];
-	  switch (t->match_n_vectors)
-	    {
-	    case 5:
-	      result.as_u64[0] |=
-		(data64[8 + skip_u64] & ((u64 *) mask)[8]) ^ ((u64 *) key)[8];
-	      result.as_u64[1] |=
-		(data64[9 + skip_u64] & ((u64 *) mask)[9]) ^ ((u64 *) key)[9];
-	      /* FALLTHROUGH */
-	    case 4:
-	      result.as_u64[0] |=
-		(data64[6 + skip_u64] & ((u64 *) mask)[6]) ^ ((u64 *) key)[6];
-	      result.as_u64[1] |=
-		(data64[7 + skip_u64] & ((u64 *) mask)[7]) ^ ((u64 *) key)[7];
-	      /* FALLTHROUGH */
-	    case 3:
-	      result.as_u64[0] |=
-		(data64[4 + skip_u64] & ((u64 *) mask)[4]) ^ ((u64 *) key)[4];
-	      result.as_u64[1] |=
-		(data64[5 + skip_u64] & ((u64 *) mask)[5]) ^ ((u64 *) key)[5];
-	      /* FALLTHROUGH */
-	    case 2:
-	      result.as_u64[0] |=
-		(data64[2 + skip_u64] & ((u64 *) mask)[2]) ^ ((u64 *) key)[2];
-	      result.as_u64[1] |=
-		(data64[3 + skip_u64] & ((u64 *) mask)[3]) ^ ((u64 *) key)[3];
-	      /* FALLTHROUGH */
-	    case 1:
-	      break;
-	    default:
-	      abort ();
-	    }
+      result.as_u64[0] =
+	(data64[0 + skip_u64] & ((u64 *) mask)[0]) ^ ((u64 *) key)[0];
+      result.as_u64[1] =
+	(data64[1 + skip_u64] & ((u64 *) mask)[1]) ^ ((u64 *) key)[1];
+      switch (t->match_n_vectors)
+	{
+	case 5:
+	  result.as_u64[0] |=
+	    (data64[8 + skip_u64] & ((u64 *) mask)[8]) ^ ((u64 *) key)[8];
+	  result.as_u64[1] |=
+	    (data64[9 + skip_u64] & ((u64 *) mask)[9]) ^ ((u64 *) key)[9];
+	  /* FALLTHROUGH */
+	case 4:
+	  result.as_u64[0] |=
+	    (data64[6 + skip_u64] & ((u64 *) mask)[6]) ^ ((u64 *) key)[6];
+	  result.as_u64[1] |=
+	    (data64[7 + skip_u64] & ((u64 *) mask)[7]) ^ ((u64 *) key)[7];
+	  /* FALLTHROUGH */
+	case 3:
+	  result.as_u64[0] |=
+	    (data64[4 + skip_u64] & ((u64 *) mask)[4]) ^ ((u64 *) key)[4];
+	  result.as_u64[1] |=
+	    (data64[5 + skip_u64] & ((u64 *) mask)[5]) ^ ((u64 *) key)[5];
+	  /* FALLTHROUGH */
+	case 2:
+	  result.as_u64[0] |=
+	    (data64[2 + skip_u64] & ((u64 *) mask)[2]) ^ ((u64 *) key)[2];
+	  result.as_u64[1] |=
+	    (data64[3 + skip_u64] & ((u64 *) mask)[3]) ^ ((u64 *) key)[3];
+	  /* FALLTHROUGH */
+	case 1:
+	  break;
+	default:
+	  abort ();
+	}
 
-	  if (result.as_u64[0] == 0 && result.as_u64[1] == 0)
+      if (result.as_u64[0] == 0 && result.as_u64[1] == 0)
+	{
+	  if (PREDICT_TRUE (now))
 	    {
-	      if (PREDICT_TRUE (now))
-		{
-		  v->hits++;
-		  v->last_heard = now;
-		}
-	      return (v);
+	      v->hits++;
+	      v->last_heard = now;
 	    }
-
-	  v = vnet_classify_entry_at_index (t, v, 1);
+	  return (v);
 	}
+
+      v = vnet_classify_entry_at_index (t, v, 1);
     }
+#endif /* CLIB_HAVE_VEC128 */
   return 0;
 }