static reply

X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Fbuiltin_http_server.c;h=5510f8ad34c9b874030dab17609efaaabf872e11;hb=b384b543313b6b47a277c903e9d4fcd4343054fa;hp=4e61fbd1aa8fcb3dba2978144ca222fbff66b08a;hpb=1015a1ef1355b1160dcf2a3c0cbe0cfe340be653;p=vpp.git diff --git a/src/vnet/tcp/builtin_http_server.c b/src/vnet/tcp/builtin_http_server.c index 4e61fbd1aa8..5510f8ad34c 100644 --- a/src/vnet/tcp/builtin_http_server.c +++ b/src/vnet/tcp/builtin_http_server.c @@ -14,29 +14,9 @@ */ #include -#include #include #include -/* define message IDs */ -#include - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun - typedef enum { EVENT_WAKEUP = 1, @@ -44,8 +24,15 @@ typedef enum typedef struct { - u8 *rx_buf; - unix_shared_memory_queue_t **vpp_queue; + u64 session_handle; + u64 node_index; + u8 *data; +} builtin_http_server_args; + +typedef struct +{ + u8 **rx_buf; + svm_queue_t **vpp_queue; u64 byte_index; uword *handler_by_get_request; @@ -53,7 +40,7 @@ typedef struct u32 *free_http_cli_process_node_indices; /* Sever's event queue */ - unix_shared_memory_queue_t *vl_input_queue; + svm_queue_t *vl_input_queue; /* API client handle */ u32 my_client_index; @@ -62,32 +49,35 @@ typedef struct /* process node index for evnt scheduling */ u32 node_index; + + u32 prealloc_fifos; + u32 private_segment_size; + u32 fifo_size; vlib_main_t *vlib_main; } http_server_main_t; http_server_main_t http_server_main; static void -free_http_process (stream_session_t * s) +free_http_process (builtin_http_server_args * args) { vlib_node_runtime_t *rt; vlib_main_t *vm = &vlib_global_main; http_server_main_t *hsm = &http_server_main; vlib_node_t *n; u32 node_index; - stream_session_t **save_s; + builtin_http_server_args **save_args; - node_index = (u64) (s->opaque[0]); + node_index = args->node_index; ASSERT (node_index != 0); n = vlib_get_node (vm, node_index); - rt = vlib_node_get_runtime (vm, n->runtime_index); - save_s = (stream_session_t **) vlib_node_get_runtime (vm, n->runtime_index); + rt = vlib_node_get_runtime (vm, n->index); + save_args = vlib_node_get_runtime_data (vm, n->index); - /* Reset session saved node index */ - s->opaque[0] = 0; /* Reset process session pointer */ - *save_s = 0; + clib_mem_free (*save_args); + *save_args = 0; /* Turn off the process node */ vlib_node_set_state (vm, rt->node_index, VLIB_NODE_STATE_DISABLED); @@ -116,6 +106,13 @@ static const char static const char *html_footer = "\r\n"; +static const char + *html_header_static = "static reply" + "

hello

" + "\r\n"; + +static u8 *static_http; + static void http_cli_output (uword arg, u8 * buffer, uword buffer_bytes) { @@ -177,11 +174,9 @@ send_data (stream_session_t * s, u8 * data) /* Fabricate TX event, send to vpp */ evt.fifo = s->server_tx_fifo; evt.event_type = FIFO_EVENT_APP_TX; - evt.event_id = 0; - unix_shared_memory_queue_add (hsm->vpp_queue[s->thread_index], - (u8 *) & evt, - 0 /* do wait for mutex */ ); + svm_queue_add (hsm->vpp_queue[s->thread_index], + (u8 *) & evt, 0 /* do wait for mutex */ ); } delay = 10e-3; } @@ -204,18 +199,19 @@ http_cli_process (vlib_main_t * vm, { http_server_main_t *hsm = &http_server_main; u8 *request = 0, *reply = 0; - stream_session_t **save_s; + builtin_http_server_args **save_args; + builtin_http_server_args *args; stream_session_t *s; unformat_input_t input; int i; u8 *http = 0, *html = 0; - save_s = vlib_node_get_runtime_data (hsm->vlib_main, rt->node_index); - s = *save_s; - - request = (u8 *) (void *) (s->opaque[1]); - s->opaque[1] = 0; + save_args = vlib_node_get_runtime_data (hsm->vlib_main, rt->node_index); + args = *save_args; + s = session_get_from_handle (args->session_handle); + ASSERT (s); + request = (u8 *) (void *) (args->data); if (vec_len (request) < 7) { send_error (s, "400 Bad Request"); @@ -280,26 +276,24 @@ out: vec_free (html); vec_free (http); - free_http_process (s); + free_http_process (args); return (0); } static void -alloc_http_process (stream_session_t * s) +alloc_http_process (builtin_http_server_args * args) { char *name; vlib_node_t *n; http_server_main_t *hsm = &http_server_main; vlib_main_t *vm = hsm->vlib_main; uword l = vec_len (hsm->free_http_cli_process_node_indices); - stream_session_t **save_s; + builtin_http_server_args **save_args; if (vec_len (hsm->free_http_cli_process_node_indices) > 0) { n = vlib_get_node (vm, hsm->free_http_cli_process_node_indices[l - 1]); - vlib_node_set_state (vm, n->index, VLIB_NODE_STATE_POLLING); - _vec_len (hsm->free_http_cli_process_node_indices) = l - 1; } else @@ -312,7 +306,6 @@ alloc_http_process (stream_session_t * s) }; name = (char *) format (0, "http-cli-%d", l); - r.name = name; vlib_register_node (vm, &r); vec_free (name); @@ -320,16 +313,119 @@ alloc_http_process (stream_session_t * s) n = vlib_get_node (vm, r.index); } - /* Save the node index in the stream_session_t. It won't be zero. */ - s->opaque[0] = (u64) n->index; + /* Save the node index in the args. It won't be zero. */ + args->node_index = n->index; - /* Save the stream_session_t (pointer) in the node runtime */ - save_s = vlib_node_get_runtime_data (vm, n->index); - *save_s = s; + /* Save the args (pointer) in the node runtime */ + save_args = vlib_node_get_runtime_data (vm, n->index); + *save_args = args; vlib_start_process (vm, n->runtime_index); } +static void +alloc_http_process_callback (void *cb_args) +{ + alloc_http_process ((builtin_http_server_args *) cb_args); +} + +static int +session_rx_request (stream_session_t * s) +{ + http_server_main_t *hsm = &http_server_main; + svm_fifo_t *rx_fifo; + u32 max_dequeue; + int actual_transfer; + + rx_fifo = s->server_rx_fifo; + max_dequeue = svm_fifo_max_dequeue (rx_fifo); + svm_fifo_unset_event (rx_fifo); + if (PREDICT_FALSE (max_dequeue == 0)) + return -1; + + vec_validate (hsm->rx_buf[s->thread_index], max_dequeue - 1); + _vec_len (hsm->rx_buf[s->thread_index]) = max_dequeue; + + actual_transfer = svm_fifo_dequeue_nowait (rx_fifo, max_dequeue, + hsm->rx_buf[s->thread_index]); + ASSERT (actual_transfer > 0); + _vec_len (hsm->rx_buf[s->thread_index]) = actual_transfer; + return 0; +} + +static int +http_server_rx_callback (stream_session_t * s) +{ + http_server_main_t *hsm = &http_server_main; + builtin_http_server_args *args; + int rv; + + rv = session_rx_request (s); + if (rv) + return rv; + + /* send the command to a new/recycled vlib process */ + args = clib_mem_alloc (sizeof (*args)); + args->data = vec_dup (hsm->rx_buf[s->thread_index]); + args->session_handle = session_handle (s); + + /* Send an RPC request via the thread-0 input node */ + if (vlib_get_thread_index () != 0) + { + session_fifo_event_t evt; + evt.rpc_args.fp = alloc_http_process_callback; + evt.rpc_args.arg = args; + evt.event_type = FIFO_EVENT_RPC; + svm_queue_add + (session_manager_get_vpp_event_queue (0 /* main thread */ ), + (u8 *) & evt, 0 /* do wait for mutex */ ); + } + else + alloc_http_process (args); + return 0; +} + +static int +http_server_rx_callback_static (stream_session_t * s) +{ + http_server_main_t *hsm = &http_server_main; + u8 *request = 0; + int i; + int rv; + + rv = session_rx_request (s); + if (rv) + return rv; + + request = hsm->rx_buf[s->thread_index]; + if (vec_len (request) < 7) + { + send_error (s, "400 Bad Request"); + goto out; + } + + for (i = 0; i < vec_len (request) - 4; i++) + { + if (request[i] == 'G' && + request[i + 1] == 'E' && + request[i + 2] == 'T' && request[i + 3] == ' ') + goto found; + } + send_error (s, "400 Bad Request"); + goto out; + +found: + + /* Send it */ + send_data (s, static_http); + +out: + /* Cleanup */ + vec_free (request); + hsm->rx_buf[s->thread_index] = request; + return 0; +} + static int builtin_session_accept_callback (stream_session_t * s) { @@ -348,7 +444,7 @@ builtin_session_disconnect_callback (stream_session_t * s) http_server_main_t *bsm = &http_server_main; vnet_disconnect_args_t _a, *a = &_a; - a->handle = stream_session_handle (s); + a->handle = session_handle (s); a->app_index = bsm->app_index; vnet_disconnect_session (a); } @@ -361,7 +457,6 @@ builtin_session_reset_callback (stream_session_t * s) stream_session_cleanup (s); } - static int builtin_session_connected_callback (u32 app_index, u32 api_context, stream_session_t * s, u8 is_fail) @@ -371,8 +466,7 @@ builtin_session_connected_callback (u32 app_index, u32 api_context, } static int -builtin_add_segment_callback (u32 client_index, - const u8 * seg_name, u32 seg_size) +builtin_add_segment_callback (u32 client_index, const ssvm_private_t * sp) { clib_warning ("called..."); return -1; @@ -385,39 +479,6 @@ builtin_redirect_connect_callback (u32 client_index, void *mp) return -1; } -static int -http_server_rx_callback (stream_session_t * s) -{ - u32 max_dequeue; - int actual_transfer; - http_server_main_t *hsm = &http_server_main; - svm_fifo_t *rx_fifo; - - rx_fifo = s->server_rx_fifo; - - max_dequeue = svm_fifo_max_dequeue (rx_fifo); - - svm_fifo_unset_event (rx_fifo); - - if (PREDICT_FALSE (max_dequeue == 0)) - return 0; - - vec_validate (hsm->rx_buf, max_dequeue - 1); - _vec_len (hsm->rx_buf) = max_dequeue; - - actual_transfer = svm_fifo_dequeue_nowait (rx_fifo, max_dequeue, - hsm->rx_buf); - ASSERT (actual_transfer > 0); - - _vec_len (hsm->rx_buf) = actual_transfer; - - /* send the command to a new/recycled vlib process */ - s->opaque[1] = (u64) vec_dup (hsm->rx_buf); - - alloc_http_process (s); - return 0; -} - static session_cb_vft_t builtin_session_cb_vft = { .session_accept_callback = builtin_session_accept_callback, .session_disconnect_callback = builtin_session_disconnect_callback, @@ -433,46 +494,13 @@ static int create_api_loopback (vlib_main_t * vm) { http_server_main_t *hsm = &http_server_main; - vl_api_memclnt_create_t _m, *mp = &_m; - extern void vl_api_memclnt_create_t_handler (vl_api_memclnt_create_t *); api_main_t *am = &api_main; vl_shmem_hdr_t *shmem_hdr; - uword *event_data = 0, event_type; - int resolved = 0; - - /* - * Create a "loopback" API client connection - * Don't do things like this unless you know what you're doing... - */ shmem_hdr = am->shmem_hdr; hsm->vl_input_queue = shmem_hdr->vl_input_queue; - memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = VL_API_MEMCLNT_CREATE; - mp->context = 0xFEEDFACE; - mp->input_queue = (u64) hsm->vl_input_queue; - strncpy ((char *) mp->name, "tcp_http_server", sizeof (mp->name) - 1); - - vl_api_memclnt_create_t_handler (mp); - - /* Wait for reply */ - hsm->node_index = vlib_get_current_process (vm)->node_runtime.node_index; - vlib_process_wait_for_event_or_clock (vm, 1.0); - event_type = vlib_process_get_events (vm, &event_data); - switch (event_type) - { - case 1: - resolved = 1; - break; - case ~0: - /* timed out */ - break; - default: - clib_warning ("unknown event_type %d", event_type); - } - if (!resolved) - return -1; - + hsm->my_client_index = + vl_api_memclnt_create_internal ("test_http_server", hsm->vl_input_queue); return 0; } @@ -480,22 +508,26 @@ static int server_attach () { http_server_main_t *hsm = &http_server_main; - u8 segment_name[128]; - u64 options[SESSION_OPTIONS_N_OPTIONS]; + u64 options[APP_OPTIONS_N_OPTIONS]; vnet_app_attach_args_t _a, *a = &_a; + u32 segment_size = 128 << 20; memset (a, 0, sizeof (*a)); memset (options, 0, sizeof (options)); + if (hsm->private_segment_size) + segment_size = hsm->private_segment_size; + a->api_client_index = hsm->my_client_index; a->session_cb_vft = &builtin_session_cb_vft; a->options = options; - a->options[SESSION_OPTIONS_SEGMENT_SIZE] = 128 << 20; - a->options[SESSION_OPTIONS_RX_FIFO_SIZE] = 8 << 10; - a->options[SESSION_OPTIONS_TX_FIFO_SIZE] = 32 << 10; - a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_BUILTIN_APP; - a->segment_name = segment_name; - a->segment_name_length = ARRAY_LEN (segment_name); + a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size; + a->options[APP_OPTIONS_RX_FIFO_SIZE] = + hsm->fifo_size ? hsm->fifo_size : 8 << 10; + a->options[APP_OPTIONS_TX_FIFO_SIZE] = + hsm->fifo_size ? hsm->fifo_size : 32 << 10; + a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; + a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = hsm->prealloc_fifos; if (vnet_application_attach (a)) { @@ -524,11 +556,9 @@ server_create (vlib_main_t * vm) u32 num_threads; vlib_thread_main_t *vtm = vlib_get_thread_main (); - if (hsm->my_client_index == (u32) ~ 0) - { - if (create_api_loopback (vm)) - return -1; - } + ASSERT (hsm->my_client_index == (u32) ~ 0); + if (create_api_loopback (vm)) + return -1; num_threads = 1 /* main thread */ + vtm->n_threads; vec_validate (http_server_main.vpp_queue, num_threads - 1); @@ -546,53 +576,53 @@ server_create (vlib_main_t * vm) return 0; } -/* Get our api client index */ -static void -vl_api_memclnt_create_reply_t_handler (vl_api_memclnt_create_reply_t * mp) -{ - vlib_main_t *vm = vlib_get_main (); - http_server_main_t *hsm = &http_server_main; - hsm->my_client_index = mp->index; - vlib_process_signal_event (vm, hsm->node_index, 1 /* evt */ , - 0 /* data */ ); -} - -#define foreach_tcp_http_server_api_msg \ -_(MEMCLNT_CREATE_REPLY, memclnt_create_reply) \ - -static clib_error_t * -tcp_http_server_api_hookup (vlib_main_t * vm) -{ - vl_msg_api_msg_config_t _c, *c = &_c; - - /* Hook up client-side static APIs to our handlers */ -#define _(N,n) do { \ - c->id = VL_API_##N; \ - c->name = #n; \ - c->handler = vl_api_##n##_t_handler; \ - c->cleanup = vl_noop_handler; \ - c->endian = vl_api_##n##_t_endian; \ - c->print = vl_api_##n##_t_print; \ - c->size = sizeof(vl_api_##n##_t); \ - c->traced = 1; /* trace, so these msgs print */ \ - c->replay = 0; /* don't replay client create/delete msgs */ \ - c->message_bounce = 0; /* don't bounce this message */ \ - vl_msg_api_config(c);} while (0); - - foreach_tcp_http_server_api_msg; -#undef _ - - return 0; -} - static clib_error_t * server_create_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - int rv; + http_server_main_t *hsm = &http_server_main; + int rv, is_static = 0; + u64 seg_size; + u8 *html; + + hsm->prealloc_fifos = 0; + hsm->private_segment_size = 0; + hsm->fifo_size = 0; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "static")) + is_static = 1; + else if (unformat (input, "prealloc-fifos %d", &hsm->prealloc_fifos)) + ; + else if (unformat (input, "private-segment-size %U", + unformat_memory_size, &seg_size)) + { + if (seg_size >= 0x100000000ULL) + { + vlib_cli_output (vm, "private segment size %llu, too large", + seg_size); + return 0; + } + hsm->private_segment_size = seg_size; + } + else if (unformat (input, "fifo-size %d", &hsm->fifo_size)) + hsm->fifo_size <<= 10; + else + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, input); + } + if (hsm->my_client_index != (u32) ~ 0) + return clib_error_return (0, "test http server is already running"); - tcp_http_server_api_hookup (vm); vnet_session_enable_disable (vm, 1 /* turn on TCP, etc. */ ); + + if (is_static) + { + builtin_session_cb_vft.builtin_server_rx_callback = + http_server_rx_callback_static; + html = format (0, html_header_static); + static_http = format (0, http_response, vec_len (html), html); + } rv = server_create (vm); switch (rv) { @@ -617,9 +647,13 @@ static clib_error_t * builtin_http_server_main_init (vlib_main_t * vm) { http_server_main_t *hsm = &http_server_main; + vlib_thread_main_t *vtm = vlib_get_thread_main (); + u32 num_threads; + hsm->my_client_index = ~0; hsm->vlib_main = vm; - + num_threads = 1 /* main thread */ + vtm->n_threads; + vec_validate (hsm->rx_buf, num_threads - 1); return 0; }