X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Facl%2Ffa_node.h;h=74b71b93cd91d642c30505d5086d545accbd55f2;hb=608f95cddc4e1e78b4d3ac3b2c3f1ae86f1fa632;hp=dc4f87f0eb1208a745a8417e0fb5c5f99d18add0;hpb=94f9a6de3f706243d138e05b63fef1d5c8174f6c;p=vpp.git diff --git a/src/plugins/acl/fa_node.h b/src/plugins/acl/fa_node.h index dc4f87f0eb1..74b71b93cd9 100644 --- a/src/plugins/acl/fa_node.h +++ b/src/plugins/acl/fa_node.h @@ -2,8 +2,11 @@ #define _FA_NODE_H_ #include +#include #include +#include + // #define FA_NODE_VERBOSE_DEBUG 3 #define TCP_FLAG_FIN 0x01 @@ -18,8 +21,8 @@ #define TCP_FLAGS_ACKSYN (TCP_FLAG_SYN + TCP_FLAG_ACK) #define ACL_FA_CONN_TABLE_DEFAULT_HASH_NUM_BUCKETS (64 * 1024) -#define ACL_FA_CONN_TABLE_DEFAULT_HASH_MEMORY_SIZE (1<<30) -#define ACL_FA_CONN_TABLE_DEFAULT_MAX_ENTRIES 1000000 +#define ACL_FA_CONN_TABLE_DEFAULT_HASH_MEMORY_SIZE (1ULL<<30) +#define ACL_FA_CONN_TABLE_DEFAULT_MAX_ENTRIES 500000 typedef union { u64 as_u64; @@ -39,26 +42,43 @@ typedef union { u64 as_u64; struct { u16 port[2]; - u16 proto; - u16 lsb_of_sw_if_index; + union { + struct { + u8 proto; + u8 is_input: 1; + u8 is_slowpath: 1; + u8 reserved0: 6; + u16 lsb_of_sw_if_index; + }; + u32 non_port_l4_data; + }; }; } fa_session_l4_key_t; typedef union { struct { - ip46_address_t addr[2]; + union { + struct { + /* we put the IPv4 addresses + after padding so we can still + use them as (shorter) key together with + L4 info */ + u32 l3_zero_pad[6]; + ip4_address_t ip4_addr[2]; + }; + ip6_address_t ip6_addr[2]; + }; fa_session_l4_key_t l4; - /* This field should align with u64 value in bihash_40_8 keyvalue struct */ + /* This field should align with u64 value in bihash_40_8 and bihash_16_8 keyvalue struct */ fa_packet_info_t pkt; }; - clib_bihash_kv_40_8_t kv; + clib_bihash_kv_40_8_t kv_40_8; + struct { + u64 padding_for_kv_16_8[3]; + clib_bihash_kv_16_8_t kv_16_8; + }; } fa_5tuple_t; -typedef struct { - u8 opaque[sizeof(fa_5tuple_t)]; -} fa_5tuple_opaque_t; - - typedef struct { fa_5tuple_t info; /* (5+1)*8 = 48 bytes */ u64 last_active_time; /* +8 bytes = 56 */ @@ -72,10 +92,16 @@ typedef struct { u32 link_prev_idx; /* +4 bytes = 12 */ u32 link_next_idx; /* +4 bytes = 16 */ u8 link_list_id; /* +1 bytes = 17 */ - u8 reserved1[7]; /* +7 bytes = 24 */ + u8 deleted; /* +1 bytes = 18 */ + u8 is_ip6; /* +1 bytes = 19 */ + u8 reserved1[5]; /* +5 bytes = 24 */ u64 reserved2[5]; /* +5*8 bytes = 64 */ } fa_session_t; +#define FA_POLICY_EPOCH_MASK 0x7fff +/* input policy epochs have the MSB set */ +#define FA_POLICY_EPOCH_IS_INPUT 0x8000 + /* This structure is used to fill in the u64 value in the per-sw-if-index hash table */ @@ -85,7 +111,7 @@ typedef struct { struct { u32 session_index; u16 thread_index; - u16 reserved0; + u16 intf_policy_epoch; }; }; } fa_full_session_id_t; @@ -97,26 +123,44 @@ typedef struct { #define CT_ASSERT_EQUAL(name, x,y) typedef int assert_ ## name ## _compile_time_assertion_failed[((x) == (y))-1] CT_ASSERT_EQUAL(fa_l3_key_size_is_40, offsetof(fa_5tuple_t, pkt), offsetof(clib_bihash_kv_40_8_t, value)); +CT_ASSERT_EQUAL(fa_ip6_kv_val_at_pkt, offsetof(fa_5tuple_t, pkt), offsetof(fa_5tuple_t, kv_40_8.value)); +CT_ASSERT_EQUAL(fa_ip4_kv_val_at_pkt, offsetof(fa_5tuple_t, pkt), offsetof(fa_5tuple_t, kv_16_8.value)); CT_ASSERT_EQUAL(fa_l4_key_t_is_8, sizeof(fa_session_l4_key_t), sizeof(u64)); CT_ASSERT_EQUAL(fa_packet_info_t_is_8, sizeof(fa_packet_info_t), sizeof(u64)); CT_ASSERT_EQUAL(fa_l3_kv_size_is_48, sizeof(fa_5tuple_t), sizeof(clib_bihash_kv_40_8_t)); +CT_ASSERT_EQUAL(fa_ip4_starts_at_kv16_key, offsetof(fa_5tuple_t, ip4_addr), offsetof(fa_5tuple_t, kv_16_8)); +CT_ASSERT_EQUAL(fa_ip4_and_ip6_kv_value_match, offsetof(fa_5tuple_t, kv_16_8.value), offsetof(fa_5tuple_t, kv_40_8.value)); /* Let's try to fit within two cachelines */ CT_ASSERT_EQUAL(fa_session_t_size_is_128, sizeof(fa_session_t), 128); /* Session ID MUST be the same as u64 */ CT_ASSERT_EQUAL(fa_full_session_id_size_is_64, sizeof(fa_full_session_id_t), sizeof(u64)); + +CT_ASSERT_EQUAL(fa_5tuple_opaque_t_must_match_5tuple, sizeof(fa_5tuple_opaque_t), sizeof(fa_5tuple_t)); #undef CT_ASSERT_EQUAL +#define FA_SESSION_BOGUS_INDEX ~0 + typedef struct { /* The pool of sessions managed by this worker */ fa_session_t *fa_sessions_pool; + /* incoming session change requests from other workers */ + clib_spinlock_t pending_session_change_request_lock; + u64 *pending_session_change_requests; + u64 *wip_session_change_requests; + u64 rcvd_session_change_requests; + u64 sent_session_change_requests; /* per-worker ACL_N_TIMEOUTS of conn lists */ u32 *fa_conn_list_head; u32 *fa_conn_list_tail; + /* expiry time set whenever an element is enqueued */ + u64 *fa_conn_list_head_expiry_time; /* adds and deletes per-worker-per-interface */ u64 *fa_session_dels_by_sw_if_index; u64 *fa_session_adds_by_sw_if_index; + /* sessions deleted due to epoch change */ + u64 *fa_session_epoch_change_by_sw_if_index; /* Vector of expired connections retrieved from lists */ u32 *expired; /* the earliest next expiry time */