X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Facl%2Facl.h;h=310f80bfddca9375757b09dd6d32322d54d77ee8;hb=bdc0e6b7;hp=d38c12990debaf1139581a4616488057c1bf41d5;hpb=8daa80a4adfd82a19017c2c12554a8a43dddccd7;p=vpp.git diff --git a/src/plugins/acl/acl.h b/src/plugins/acl/acl.h index d38c12990de..310f80bfddc 100644 --- a/src/plugins/acl/acl.h +++ b/src/plugins/acl/acl.h @@ -26,9 +26,12 @@ #include #include #include +#include +#include "types.h" #include "fa_node.h" #include "hash_lookup_types.h" +#include "lookup_context.h" #define ACL_PLUGIN_VERSION_MAJOR 1 #define ACL_PLUGIN_VERSION_MINOR 3 @@ -37,7 +40,7 @@ #define TCP_SESSION_IDLE_TIMEOUT_SEC (3600*24) #define TCP_SESSION_TRANSIENT_TIMEOUT_SEC 120 -#define ACL_FA_DEFAULT_HEAP_SIZE (2 << 29) +#define SESSION_PURGATORY_TIMEOUT_USEC 10 #define ACL_PLUGIN_HASH_LOOKUP_HEAP_SIZE (2 << 25) #define ACL_PLUGIN_HASH_LOOKUP_HASH_BUCKETS 65536 @@ -50,9 +53,12 @@ void input_acl_packet_match(u32 sw_if_index, vlib_buffer_t * b0, u32 *nextp, u32 void output_acl_packet_match(u32 sw_if_index, vlib_buffer_t * b0, u32 *nextp, u32 *acl_match_p, u32 *rule_match_p, u32 *trace_bitmap); enum acl_timeout_e { - ACL_TIMEOUT_UDP_IDLE = 0, + ACL_TIMEOUT_UNUSED = 0, + ACL_TIMEOUT_UDP_IDLE, ACL_TIMEOUT_TCP_IDLE, ACL_TIMEOUT_TCP_TRANSIENT, + ACL_N_USER_TIMEOUTS, + ACL_TIMEOUT_PURGATORY = ACL_N_USER_TIMEOUTS, /* a special-case queue for deletion-in-progress sessions */ ACL_N_TIMEOUTS }; @@ -67,26 +73,6 @@ typedef struct } addr; } address_t; -/* - * ACL rules - */ -typedef struct -{ - u8 is_permit; - u8 is_ipv6; - ip46_address_t src; - u8 src_prefixlen; - ip46_address_t dst; - u8 dst_prefixlen; - u8 proto; - u16 src_port_or_type_first; - u16 src_port_or_type_last; - u16 dst_port_or_code_first; - u16 dst_port_or_code_last; - u8 tcp_flags_value; - u8 tcp_flags_mask; -} acl_rule_t; - typedef struct { u8 is_permit; @@ -102,6 +88,8 @@ typedef struct */ typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); u8 tag[64]; u32 count; acl_rule_t *rules; @@ -109,6 +97,8 @@ typedef struct typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); u8 tag[64]; u32 count; macip_acl_rule_t *rules; @@ -116,6 +106,10 @@ typedef struct u32 ip4_table_index; u32 ip6_table_index; u32 l2_table_index; + /* outacl classifier tables */ + u32 out_ip4_table_index; + u32 out_ip6_table_index; + u32 out_l2_table_index; } macip_acl_list_t; /* @@ -124,18 +118,26 @@ typedef struct */ typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); fa_5tuple_t mask; u32 refcount; + u8 from_tm; } ace_mask_type_entry_t; typedef struct { /* mheap to hold all the ACL module related allocations, other than hash */ void *acl_mheap; - u32 acl_mheap_size; + uword acl_mheap_size; /* API message ID base */ u16 msg_id_base; + /* The pool of users of ACL lookup contexts */ + acl_lookup_context_user_t *acl_users; + /* The pool of ACL lookup contexts */ + acl_lookup_context_t *acl_lookup_contexts; + acl_list_t *acls; /* Pool of ACLs */ hash_acl_info_t *hash_acl_infos; /* corresponding hash matching housekeeping info */ clib_bihash_48_8_t acl_lookup_hash; /* ACL lookup hash table. */ @@ -144,12 +146,22 @@ typedef struct { /* mheap to hold all the miscellaneous allocations related to hash-based lookups */ void *hash_lookup_mheap; - u32 hash_lookup_mheap_size; + uword hash_lookup_mheap_size; int acl_lookup_hash_initialized; +/* applied_hash_ace_entry_t **input_hash_entry_vec_by_sw_if_index; applied_hash_ace_entry_t **output_hash_entry_vec_by_sw_if_index; applied_hash_acl_info_t *input_applied_hash_acl_info_by_sw_if_index; applied_hash_acl_info_t *output_applied_hash_acl_info_by_sw_if_index; +*/ + applied_hash_ace_entry_t **hash_entry_vec_by_lc_index; + applied_hash_acl_info_t *applied_hash_acl_info_by_lc_index; + + /* Corresponding lookup context indices for in/out lookups per sw_if_index */ + u32 *input_lc_index_by_sw_if_index; + u32 *output_lc_index_by_sw_if_index; + /* context user id for interface ACLs */ + u32 interface_acl_user_id; macip_acl_list_t *macip_acls; /* Pool of MAC-IP ACLs */ @@ -161,15 +173,41 @@ typedef struct { u32 **input_sw_if_index_vec_by_acl; u32 **output_sw_if_index_vec_by_acl; + /* bitmaps 1=sw_if_index has in/out ACL processing enabled */ + uword *in_acl_on_sw_if_index; + uword *out_acl_on_sw_if_index; + + /* lookup contexts where a given ACL is used */ + u32 **lc_index_vec_by_acl; + + /* input and output policy epochs by interface */ + u32 *input_policy_epoch_by_sw_if_index; + u32 *output_policy_epoch_by_sw_if_index; + + /* whether we need to take the epoch of the session into account */ + int reclassify_sessions; + + + /* Total count of interface+direction pairs enabled */ u32 fa_total_enabled_count; /* Do we use hash-based ACL matching or linear */ int use_hash_acl_matching; + /* Do we use the TupleMerge for hash ACLs or not */ + int use_tuple_merge; + + /* Max collision vector length before splitting the tuple */ +#define TM_SPLIT_THRESHOLD 39 + int tuple_merge_split_threshold; + /* a pool of all mask types present in all ACEs */ ace_mask_type_entry_t *ace_mask_type_pool; + /* vec of vectors of all info of all mask types present in ACEs contained in each lc_index */ + hash_applied_mask_info_t **hash_applied_mask_info_vec_by_lc_index; + /* * Classify tables used to grab the packets for the ACL check, * and serving as the 5-tuple session tables at the same time @@ -184,22 +222,34 @@ typedef struct { u32 *acl_dot1q_output_classify_table_by_sw_if_index; u32 *acl_dot1ad_output_classify_table_by_sw_if_index; + u32 *acl_etype_input_classify_table_by_sw_if_index; + u32 *acl_etype_output_classify_table_by_sw_if_index; + + u16 **input_etype_whitelist_by_sw_if_index; + u16 **output_etype_whitelist_by_sw_if_index; + /* MACIP (input) ACLs associated with the interfaces */ u32 *macip_acl_by_sw_if_index; + /* Vector of interfaces on which given MACIP ACLs are applied */ + u32 **sw_if_index_vec_by_macip_acl; + /* bitmaps when set the processing is enabled on the interface */ uword *fa_in_acl_on_sw_if_index; uword *fa_out_acl_on_sw_if_index; /* bihash holding all of the sessions */ int fa_sessions_hash_is_initialized; - clib_bihash_40_8_t fa_sessions_hash; - /* The process node which orcherstrates the cleanup */ + clib_bihash_40_8_t fa_ip6_sessions_hash; + clib_bihash_16_8_t fa_ip4_sessions_hash; + /* The process node which orchestrates the cleanup */ u32 fa_cleaner_node_index; /* FA session timeouts, in seconds */ u32 session_timeout_sec[ACL_N_TIMEOUTS]; /* total session adds/dels */ u64 fa_session_total_adds; u64 fa_session_total_dels; + /* how many sessions went into purgatory */ + u64 fa_session_total_deactivations; /* L2 datapath glue */ @@ -225,6 +275,9 @@ typedef struct { uword fa_conn_table_hash_memory_size; u64 fa_conn_table_max_entries; + int trace_sessions; + int trace_acl; + /* * If the cleaner has to delete more than this number * of connections, it halves the sleep time. @@ -273,8 +326,21 @@ typedef struct { /* convenience */ vlib_main_t * vlib_main; vnet_main_t * vnet_main; + /* logging */ + vlib_log_class_t log_default; } acl_main_t; +#define acl_log_err(...) \ + vlib_log(VLIB_LOG_LEVEL_ERR, acl_main.log_default, __VA_ARGS__) +#define acl_log_warn(...) \ + vlib_log(VLIB_LOG_LEVEL_WARNING, acl_main.log_default, __VA_ARGS__) +#define acl_log_notice(...) \ + vlib_log(VLIB_LOG_LEVEL_NOTICE, acl_main.log_default, __VA_ARGS__) +#define acl_log_info(...) \ + vlib_log(VLIB_LOG_LEVEL_INFO, acl_main.log_default, __VA_ARGS__) + + + #define foreach_acl_eh \ _(HOPBYHOP , 0 , "IPv6ExtHdrHopByHop") \ _(ROUTING , 43 , "IPv6ExtHdrRouting") \ @@ -317,5 +383,6 @@ AH has a special treatment of its length, it is in 32-bit words, not 64-bit word extern acl_main_t acl_main; +void *acl_plugin_set_heap(); #endif