From bec771b879c2eae31ecef61891405c1570aae2b1 Mon Sep 17 00:00:00 2001 From: Aloys Augustin Date: Fri, 12 Jul 2019 11:05:35 +0200 Subject: [PATCH] tls quic: reduce default segment sizes This reduces the memory required by tls and quic, allowing to run them (and their tests) in more constrained environments by default. Change-Id: I954081c725fb4f5f173db1f8e76922d957c5b0a2 Signed-off-by: Aloys Augustin Type: fix --- src/plugins/quic/quic.c | 4 ++-- src/vnet/tls/tls.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index a96cb8546f4..8e29e74e965 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -2483,7 +2483,7 @@ static const transport_proto_vft_t quic_proto = { static clib_error_t * quic_init (vlib_main_t * vm) { - u32 add_segment_size = (4096ULL << 20) - 1, segment_size = 512 << 20; + u32 segment_size = 256 << 20; vlib_thread_main_t *vtm = vlib_get_thread_main (); tw_timer_wheel_1t_3w_1024sl_ov_t *tw; vnet_app_attach_args_t _a, *a = &_a; @@ -2502,7 +2502,7 @@ quic_init (vlib_main_t * vm) a->options = options; a->name = format (0, "quic"); a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size; - a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = add_segment_size; + a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = 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; diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c index 8d38be4ef8e..6769fd254b6 100644 --- a/src/vnet/tls/tls.c +++ b/src/vnet/tls/tls.c @@ -789,7 +789,7 @@ 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; + u32 add_segment_size = 256 << 20, 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; -- 2.16.6