aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-03-25 08:30:53 -0700
committerDamjan Marion <dmarion@me.com>2019-03-25 20:04:23 +0000
commitddd98f348305d0e0aadb4169567d163d32b94ef9 (patch)
tree8dffe1a215148d5188b89a67110f70d072a7a919
parent3833ffd6c648c5066448e598976810c85c66bd58 (diff)
tls: make first segment and fifo size configurable
Change-Id: I6169ebdd3ac2d5d77fd2e12068c8aab6d8072c03 Signed-off-by: Florin Coras <fcoras@cisco.com>
-rw-r--r--src/vnet/tls/tls.c17
-rw-r--r--src/vnet/tls/tls.h2
2 files changed, 14 insertions, 5 deletions
diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c
index 714ebfe4c13..a5e08721fdd 100644
--- a/src/vnet/tls/tls.c
+++ b/src/vnet/tls/tls.c
@@ -757,14 +757,15 @@ tls_register_engine (const tls_engine_vft_t * vft, tls_engine_type_t type)
static clib_error_t *
tls_init (vlib_main_t * vm)
{
+ u32 add_segment_size = (4096ULL << 20) - 1, first_seg_size = 32 << 20;
vlib_thread_main_t *vtm = vlib_get_thread_main ();
+ u32 num_threads, fifo_size = 128 << 10;
vnet_app_attach_args_t _a, *a = &_a;
u64 options[APP_OPTIONS_N_OPTIONS];
- u32 segment_size = 2048 << 20;
tls_main_t *tm = &tls_main;
- u32 fifo_size = 128 << 10;
- u32 num_threads;
+ first_seg_size = tm->first_seg_size ? tm->first_seg_size : first_seg_size;
+ fifo_size = tm->fifo_size ? tm->fifo_size : fifo_size;
num_threads = 1 /* main thread */ + vtm->n_threads;
clib_memset (a, 0, sizeof (*a));
@@ -774,8 +775,8 @@ tls_init (vlib_main_t * vm)
a->api_client_index = APP_INVALID_INDEX;
a->options = options;
a->name = format (0, "tls");
- a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size;
- a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = segment_size;
+ a->options[APP_OPTIONS_SEGMENT_SIZE] = first_seg_size;
+ a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = add_segment_size;
a->options[APP_OPTIONS_RX_FIFO_SIZE] = fifo_size;
a->options[APP_OPTIONS_TX_FIFO_SIZE] = fifo_size;
a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
@@ -817,6 +818,12 @@ tls_config_fn (vlib_main_t * vm, unformat_input_t * input)
tm->use_test_cert_in_ca = 1;
else if (unformat (input, "ca-cert-path %s", &tm->ca_cert_path))
;
+ else if (unformat (input, "first-segment-size %U", unformat_memory_size,
+ &tm->first_seg_size))
+ ;
+ else if (unformat (input, "fifo-size %U", unformat_memory_size,
+ &tm->fifo_size))
+ ;
else
return clib_error_return (0, "unknown input `%U'",
format_unformat_error, input);
diff --git a/src/vnet/tls/tls.h b/src/vnet/tls/tls.h
index 8d1fff3537f..fffffec9422 100644
--- a/src/vnet/tls/tls.h
+++ b/src/vnet/tls/tls.h
@@ -92,6 +92,8 @@ typedef struct tls_main_
*/
u8 use_test_cert_in_ca;
char *ca_cert_path;
+ u64 first_seg_size;
+ u32 fifo_size;
} tls_main_t;
typedef struct tls_engine_vft_