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: tm: add tuplemerge algorithm for relaxing the hashtable masks
[vpp.git]
/
src
/
plugins
/
acl
/
acl.h
diff --git
a/src/plugins/acl/acl.h
b/src/plugins/acl/acl.h
index
0c0a6db
..
b994b85
100644
(file)
--- a/
src/plugins/acl/acl.h
+++ b/
src/plugins/acl/acl.h
@@
-26,7
+26,9
@@
#include <vppinfra/elog.h>
#include <vppinfra/bihash_48_8.h>
#include <vppinfra/bihash_40_8.h>
#include <vppinfra/elog.h>
#include <vppinfra/bihash_48_8.h>
#include <vppinfra/bihash_40_8.h>
+#include <vppinfra/bihash_16_8.h>
+#include "types.h"
#include "fa_node.h"
#include "hash_lookup_types.h"
#include "lookup_context.h"
#include "fa_node.h"
#include "hash_lookup_types.h"
#include "lookup_context.h"
@@
-71,26
+73,6
@@
typedef struct
} addr;
} address_t;
} 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;
typedef struct
{
u8 is_permit;
@@
-212,9
+194,19
@@
typedef struct {
/* Do we use hash-based ACL matching or linear */
int use_hash_acl_matching;
/* 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;
/* 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
/*
* Classify tables used to grab the packets for the ACL check,
* and serving as the 5-tuple session tables at the same time
@@
-246,7
+238,8
@@
typedef struct {
uword *fa_out_acl_on_sw_if_index;
/* bihash holding all of the sessions */
int fa_sessions_hash_is_initialized;
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;
+ clib_bihash_40_8_t fa_ip6_sessions_hash;
+ clib_bihash_16_8_t fa_ip4_sessions_hash;
/* The process node which orcherstrates the cleanup */
u32 fa_cleaner_node_index;
/* FA session timeouts, in seconds */
/* The process node which orcherstrates the cleanup */
u32 fa_cleaner_node_index;
/* FA session timeouts, in seconds */
@@
-388,15
+381,7
@@
AH has a special treatment of its length, it is in 32-bit words, not 64-bit word
extern acl_main_t acl_main;
extern acl_main_t acl_main;
-/*
- * pointer to the above.
- * Needed for some gymnastics to be able to provide
- * the inline functions from this plugin to other plugins.
- */
-
-extern acl_main_t *p_acl_main;
void *acl_plugin_set_heap();
void *acl_plugin_set_heap();
-
#endif
#endif