Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
acl-plugin: performance optimizations for established connections
[vpp.git]
/
src
/
plugins
/
acl
/
fa_node.h
diff --git
a/src/plugins/acl/fa_node.h
b/src/plugins/acl/fa_node.h
index
263cf14
..
83a1984
100644
(file)
--- a/
src/plugins/acl/fa_node.h
+++ b/
src/plugins/acl/fa_node.h
@@
-2,8
+2,11
@@
#define _FA_NODE_H_
#include <stddef.h>
#define _FA_NODE_H_
#include <stddef.h>
+#include <vppinfra/bihash_16_8.h>
#include <vppinfra/bihash_40_8.h>
#include <vppinfra/bihash_40_8.h>
+#include <plugins/acl/exported_types.h>
+
// #define FA_NODE_VERBOSE_DEBUG 3
#define TCP_FLAG_FIN 0x01
// #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 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
10
00000
+#define ACL_FA_CONN_TABLE_DEFAULT_HASH_MEMORY_SIZE (1
ULL
<<30)
+#define ACL_FA_CONN_TABLE_DEFAULT_MAX_ENTRIES
5
00000
typedef union {
u64 as_u64;
typedef union {
u64 as_u64;
@@
-35,29
+38,69
@@
typedef union {
};
} fa_packet_info_t;
};
} fa_packet_info_t;
+typedef enum {
+ FA_SK_L4_FLAG_IS_INPUT = (1 << 0),
+ FA_SK_L4_FLAG_IS_SLOWPATH = (1 << 1),
+} fa_session_l4_key_l4_flags_t;
+
typedef union {
u64 as_u64;
struct {
u16 port[2];
typedef union {
u64 as_u64;
struct {
u16 port[2];
- u16 proto;
- u16 lsb_of_sw_if_index;
+ union {
+ struct {
+ u8 proto;
+ u8 l4_flags;
+ u16 lsb_of_sw_if_index;
+ };
+ u32 non_port_l4_data;
+ };
};
} fa_session_l4_key_t;
};
} fa_session_l4_key_t;
+
+static_always_inline
+int is_session_l4_key_u64_slowpath(u64 l4key) {
+ fa_session_l4_key_t k = { .as_u64 = l4key };
+ return (k.l4_flags & FA_SK_L4_FLAG_IS_SLOWPATH) ? 1 : 0;
+}
+
typedef union {
struct {
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;
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;
};
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;
} fa_5tuple_t;
-typedef struct {
- u8 opaque[sizeof(fa_5tuple_t)];
-} fa_5tuple_opaque_t;
+static_always_inline u8 *
+format_fa_session_l4_key(u8 * s, va_list * args)
+{
+ fa_session_l4_key_t *l4 = va_arg (*args, fa_session_l4_key_t *);
+ int is_input = (l4->l4_flags & FA_SK_L4_FLAG_IS_INPUT) ? 1 : 0;
+ int is_slowpath = (l4->l4_flags & FA_SK_L4_FLAG_IS_SLOWPATH) ? 1 : 0;
+ return (format (s, "l4 lsb_of_sw_if_index %d proto %d l4_is_input %d l4_slow_path %d l4_flags 0x%02x port %d -> %d",
+ l4->lsb_of_sw_if_index,
+ l4->proto, is_input, is_slowpath,
+ l4->l4_flags, l4->port[0], l4->port[1]));
+}
typedef struct {
fa_5tuple_t info; /* (5+1)*8 = 48 bytes */
typedef struct {
fa_5tuple_t info; /* (5+1)*8 = 48 bytes */
@@
-72,7
+115,9
@@
typedef struct {
u32 link_prev_idx; /* +4 bytes = 12 */
u32 link_next_idx; /* +4 bytes = 16 */
u8 link_list_id; /* +1 bytes = 17 */
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;
u64 reserved2[5]; /* +5*8 bytes = 64 */
} fa_session_t;
@@
-101,23
+146,39
@@
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));
#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_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));
/* 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
#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;
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;
/* 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;
/* adds and deletes per-worker-per-interface */
u64 *fa_session_dels_by_sw_if_index;
u64 *fa_session_adds_by_sw_if_index;
@@
-162,6
+223,15
@@
typedef struct {
* Set to copy of a "generation" counter in main thread so we can sync the interrupts.
*/
int interrupt_generation;
* Set to copy of a "generation" counter in main thread so we can sync the interrupts.
*/
int interrupt_generation;
+ /*
+ * work in progress data for the pipelined node operation
+ */
+ vlib_buffer_t *bufs[VLIB_FRAME_SIZE];
+ u32 sw_if_indices[VLIB_FRAME_SIZE];
+ fa_5tuple_t fa_5tuples[VLIB_FRAME_SIZE];
+ u64 hashes[VLIB_FRAME_SIZE];
+ u16 nexts[VLIB_FRAME_SIZE];
+
} acl_fa_per_worker_data_t;
} acl_fa_per_worker_data_t;