Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve l2_macs_events API to provide MAC move information
[vpp.git]
/
src
/
vnet
/
l2
/
l2_fib.h
diff --git
a/src/vnet/l2/l2_fib.h
b/src/vnet/l2/l2_fib.h
index
6346826
..
ad7035b
100644
(file)
--- a/
src/vnet/l2/l2_fib.h
+++ b/
src/vnet/l2/l2_fib.h
@@
-118,7
+118,8
@@
typedef struct
u8 bvi:1; /* mac is for a bridged virtual interface */
u8 filter:1; /* drop packets to/from this mac */
u8 lrn_evt:1; /* MAC learned to be sent in L2 MAC event */
u8 bvi:1; /* mac is for a bridged virtual interface */
u8 filter:1; /* drop packets to/from this mac */
u8 lrn_evt:1; /* MAC learned to be sent in L2 MAC event */
- u8 unused:3;
+ u8 lrn_mov:1; /* MAC learned is a MAC move */
+ u8 unused:2;
u8 timestamp; /* timestamp for aging */
l2fib_seq_num_t sn; /* bd/int seq num */
u8 timestamp; /* timestamp for aging */
l2fib_seq_num_t sn; /* bd/int seq num */
@@
-129,6
+130,14
@@
typedef struct
STATIC_ASSERT_SIZEOF (l2fib_entry_result_t, 8);
STATIC_ASSERT_SIZEOF (l2fib_entry_result_t, 8);
+/* L2 MAC event entry action enums (see mac_entry definition in l2.api) */
+typedef enum
+{
+ MAC_EVENT_ACTION_ADD = 0,
+ MAC_EVENT_ACTION_DELETE = 1,
+ MAC_EVENT_ACTION_MOVE = 2,
+} l2_mac_event_action_t;
+
/**
* Compute the hash for the given key and return
* the corresponding bucket index
/**
* Compute the hash for the given key and return
* the corresponding bucket index
@@
-148,7
+157,12
@@
l2fib_compute_hash_bucket (l2fib_entry_key_t * key)
return result % L2FIB_NUM_BUCKETS;
}
return result % L2FIB_NUM_BUCKETS;
}
-always_inline u64
+/**
+ * make address sanitizer skip this:
+ * The 6-Bytes mac-address is cast into an 8-Bytes u64, with 2 additional Bytes.
+ * l2fib_make_key() does read those two Bytes but does not use them.
+ */
+always_inline u64 __attribute__ ((no_sanitize_address))
l2fib_make_key (u8 * mac_address, u16 bd_index)
{
u64 temp;
l2fib_make_key (u8 * mac_address, u16 bd_index)
{
u64 temp;