#include <vlib/vlib.h>
#include <vnet/pg/pg.h>
-#include <vnet/mpls/mpls.h>
+#include <vnet/mpls/mpls_lookup.h>
#include <vnet/fib/mpls_fib.h>
#include <vnet/dpo/load_balance_map.h>
#include <vnet/dpo/replicate_dpo.h>
/**
* The arc/edge from the MPLS lookup node to the MPLS replicate node
*/
-static u32 mpls_lookup_to_replicate_edge;
+u32 mpls_lookup_to_replicate_edge;
typedef struct {
u32 next_index;
t->next_index, t->lfib_index, t->lb_index, t->hash,
vnet_mpls_uc_get_label(
clib_net_to_host_u32(t->label_net_byte_order)),
- vnet_mpls_uc_get_s(t->label_net_byte_order));
+ vnet_mpls_uc_get_s(
+ clib_net_to_host_u32(t->label_net_byte_order)));
return s;
}
-/*
- * Compute flow hash.
- * We'll use it to select which adjacency to use for this flow. And other things.
- */
-always_inline u32
-mpls_compute_flow_hash (const mpls_unicast_header_t * hdr,
- flow_hash_config_t flow_hash_config)
-{
- /*
- * We need to byte swap so we use the numerical value. i.e. an odd label
- * leads to an odd bucket. as opposed to a label above and below value X.
- */
- u8 next_label_is_entropy;
- mpls_label_t ho_label;
- u32 hash, value;
-
- ho_label = clib_net_to_host_u32(hdr->label_exp_s_ttl);
- hash = vnet_mpls_uc_get_label(ho_label);
- next_label_is_entropy = 0;
-
- while (MPLS_EOS != vnet_mpls_uc_get_s(ho_label))
- {
- hdr++;
- ho_label = clib_net_to_host_u32(hdr->label_exp_s_ttl);
- value = vnet_mpls_uc_get_label(ho_label);
-
- if (1 == next_label_is_entropy)
- {
- /*
- * The label is an entropy value, use it alone as the hash
- */
- return (ho_label);
- }
- if (MPLS_IETF_ENTROPY_LABEL == value)
- {
- /*
- * we've met a label in the stack indicating that tha next
- * label is an entropy value
- */
- next_label_is_entropy = 1;
- }
- else
- {
- /*
- * XOR the label values in the stack together to
- * build up the hash value
- */
- hash ^= value;
- }
- }
-
- /*
- * check the top nibble for v4 and v6
- */
- hdr++;
-
- switch (((u8*)hdr)[0] >> 4)
- {
- case 4:
- /* incorporate the v4 flow-hash */
- hash ^= ip4_compute_flow_hash ((const ip4_header_t *)hdr,
- IP_FLOW_HASH_DEFAULT);
- break;
- case 6:
- /* incorporate the v6 flow-hash */
- hash ^= ip6_compute_flow_hash ((const ip6_header_t *)hdr,
- IP_FLOW_HASH_DEFAULT);
- break;
- default:
- break;
- }
-
- return (hash);
-}
-
static inline uword
mpls_lookup (vlib_main_t * vm,
vlib_node_runtime_t * node,
/* Prefetch next iteration. */
{
- vlib_buffer_t * p2, * p3, *p4, *p5;
+ vlib_buffer_t *p4, *p5, *p6, *p7;
- 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]);
+ p6 = vlib_get_buffer (vm, from[6]);
+ p7 = vlib_get_buffer (vm, from[7]);
- vlib_prefetch_buffer_header (p2, STORE);
- vlib_prefetch_buffer_header (p3, STORE);
vlib_prefetch_buffer_header (p4, STORE);
vlib_prefetch_buffer_header (p5, STORE);
+ vlib_prefetch_buffer_header (p6, STORE);
+ vlib_prefetch_buffer_header (p7, STORE);
- CLIB_PREFETCH (p2->data, sizeof (h0[0]), STORE);
- CLIB_PREFETCH (p3->data, sizeof (h0[0]), STORE);
- CLIB_PREFETCH (p4->data, sizeof (h0[0]), STORE);
- CLIB_PREFETCH (p5->data, sizeof (h0[0]), STORE);
+ CLIB_PREFETCH (p4->data, sizeof (h0[0]), LOAD);
+ CLIB_PREFETCH (p5->data, sizeof (h0[0]), LOAD);
+ CLIB_PREFETCH (p6->data, sizeof (h0[0]), LOAD);
+ CLIB_PREFETCH (p7->data, sizeof (h0[0]), LOAD);
}
bi0 = to_next[0] = from[0];
return s;
}
-always_inline uword
+static uword
mpls_load_balance (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
vlib_prefetch_buffer_header (p2, STORE);
vlib_prefetch_buffer_header (p3, STORE);
- CLIB_PREFETCH (p2->data, sizeof (mpls0[0]), STORE);
- CLIB_PREFETCH (p3->data, sizeof (mpls0[0]), STORE);
+ CLIB_PREFETCH (p2->data, sizeof (mpls0[0]), LOAD);
+ CLIB_PREFETCH (p3->data, sizeof (mpls0[0]), LOAD);
}
pi0 = to_next[0] = from[0];
.n_next_nodes = 1,
.next_nodes =
{
- [0] = "mpls-drop",
+ [MPLS_LOOKUP_NEXT_DROP] = "mpls-drop",
},
};