diff options
| -rw-r--r-- | src/vnet/ipsec/ipsec.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c index e181e0f3229..26761a432dd 100644 --- a/src/vnet/ipsec/ipsec.c +++ b/src/vnet/ipsec/ipsec.c @@ -26,6 +26,7 @@ #include <vnet/ipsec/ah.h> #include <vnet/ipsec/ipsec_tun.h> #include <vnet/ipsec/ipsec_itf.h> +#include <vnet/ipsec/ipsec_spd_fp_lookup.h> /* Flow cache is sized for 1 million flows with a load factor of .25. */ @@ -36,6 +37,7 @@ #define IPSEC4_SPD_DEFAULT_HASH_NUM_BUCKETS (1 << 22) ipsec_main_t ipsec_main; + esp_async_post_next_t esp_encrypt_async_next; esp_async_post_next_t esp_decrypt_async_next; @@ -635,11 +637,26 @@ ipsec_config (vlib_main_t *vm, unformat_input_t *input) u32 ipsec4_out_spd_hash_num_buckets; u32 ipsec4_in_spd_hash_num_buckets; + u32 ipsec_spd_fp_num_buckets; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ipv4-outbound-spd-flow-cache on")) - im->output_flow_cache_flag = 1; + if (unformat (input, "ipv4-outbound-spd-fast-path on")) + { + im->fp_spd_is_enabled = 1; + im->output_flow_cache_flag = 0; + } + else if (unformat (input, "ipv4-outbound-spd-fast-path off")) + im->fp_spd_is_enabled = 0; + else if (unformat (input, "spd-fast-path-num-buckets %d", + &ipsec_spd_fp_num_buckets)) + { + /* Number of bihash buckets is power of 2 >= input */ + im->fp_lookup_hash_buckets = 1ULL + << max_log2 (ipsec_spd_fp_num_buckets); + } + else if (unformat (input, "ipv4-outbound-spd-flow-cache on")) + im->output_flow_cache_flag = im->fp_spd_is_enabled ? 0 : 1; else if (unformat (input, "ipv4-outbound-spd-flow-cache off")) im->output_flow_cache_flag = 0; else if (unformat (input, "ipv4-outbound-spd-hash-buckets %d", |