X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fpunt.c;h=a979803bc1c49e59916504a1d6b7d6024d5af3ec;hp=831ece25415471924b975a61a661e4470a9a6512;hb=3ffe6cadf;hpb=26ea14eeade802b8b4993f60506f2b5c9b976433 diff --git a/src/vnet/ip/punt.c b/src/vnet/ip/punt.c index 831ece25415..a979803bc1c 100644 --- a/src/vnet/ip/punt.c +++ b/src/vnet/ip/punt.c @@ -27,9 +27,7 @@ #include #include #include -#include #include -#include #include #include @@ -38,37 +36,6 @@ #include #include -#define foreach_punt_next \ - _ (PUNT4, "ip4-punt") \ - _ (PUNT6, "ip6-punt") - -typedef enum -{ -#define _(s,n) PUNT_NEXT_##s, - foreach_punt_next -#undef _ - PUNT_N_NEXT, -} punt_next_t; - -enum punt_socket_rx_next_e -{ - PUNT_SOCKET_RX_NEXT_INTERFACE_OUTPUT, - PUNT_SOCKET_RX_NEXT_IP4_LOOKUP, - PUNT_SOCKET_RX_NEXT_IP6_LOOKUP, - PUNT_SOCKET_RX_N_NEXT -}; - -#define punt_next_punt(is_ip4) (is_ip4 ? PUNT_NEXT_PUNT4 : PUNT_NEXT_PUNT6) - -extern vlib_node_registration_t udp4_punt_node; -extern vlib_node_registration_t udp6_punt_node; -extern vlib_node_registration_t udp4_punt_socket_node; -extern vlib_node_registration_t udp6_punt_socket_node; -static vlib_node_registration_t punt_socket_rx_node; - -extern punt_main_t punt_main; - -#ifndef CLIB_MARCH_VARIANT punt_main_t punt_main; char * @@ -77,571 +44,251 @@ vnet_punt_get_server_pathname (void) punt_main_t *pm = &punt_main; return pm->sun_path; } -#endif /* CLIB_MARCH_VARIANT */ - -/** @brief IPv4/IPv6 UDP punt node main loop. - - This is the main loop inline function for IPv4/IPv6 UDP punt - transition node. - - @param vm vlib_main_t corresponding to the current thread - @param node vlib_node_runtime_t - @param frame vlib_frame_t whose contents should be dispatched - @param is_ipv4 indicates if called for IPv4 or IPv6 node -*/ -always_inline uword -udp46_punt_inline (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * from_frame, int is_ip4) -{ - u32 n_left_from, *from, *to_next; - word advance; - - from = vlib_frame_vector_args (from_frame); - n_left_from = from_frame->n_vectors; - - /* udp[46]_lookup hands us the data payload, not the IP header */ - if (is_ip4) - advance = -(sizeof (ip4_header_t) + sizeof (udp_header_t)); - else - advance = -(sizeof (ip6_header_t) + sizeof (udp_header_t)); - - while (n_left_from > 0) - { - u32 n_left_to_next; - vlib_get_next_frame (vm, node, punt_next_punt (is_ip4), to_next, - n_left_to_next); - - while (n_left_from > 0 && n_left_to_next > 0) - { - u32 bi0; - vlib_buffer_t *b0; - - bi0 = from[0]; - to_next[0] = bi0; - from += 1; - to_next += 1; - n_left_from -= 1; - n_left_to_next -= 1; - - b0 = vlib_get_buffer (vm, bi0); - vlib_buffer_advance (b0, advance); - b0->error = node->errors[PUNT_ERROR_UDP_PORT]; - } - - vlib_put_next_frame (vm, node, punt_next_punt (is_ip4), n_left_to_next); - } +static void +punt_client_l4_db_add (ip_address_family_t af, u16 port, u32 index) +{ + punt_main_t *pm = &punt_main; - return from_frame->n_vectors; + pm->db.clients_by_l4_port = hash_set (pm->db.clients_by_l4_port, + punt_client_l4_mk_key (af, port), + index); } -static char *punt_error_strings[] = { -#define punt_error(n,s) s, -#include "punt_error.def" -#undef punt_error -}; - -/** @brief IPv4 UDP punt node. - @node ip4-udp-punt - - This is the IPv4 UDP punt transition node. It is registered as a next - node for the "ip4-udp-lookup" handling UDP port(s) requested for punt. - The buffer's current data pointer is adjusted to the original packet - IPv4 header. All buffers are dispatched to "error-punt". - - @param vm vlib_main_t corresponding to the current thread - @param node vlib_node_runtime_t - @param frame vlib_frame_t whose contents should be dispatched - - @par Graph mechanics: next index usage - - @em Sets: - - vnet_buffer(b)->current_data - - vnet_buffer(b)->current_len - - Next Index: - - Dispatches the packet to the "error-punt" node -*/ -VLIB_NODE_FN (udp4_punt_node) (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +static u32 +punt_client_l4_db_remove (ip_address_family_t af, u16 port) { - return udp46_punt_inline (vm, node, from_frame, 1 /* is_ip4 */ ); -} - -/** @brief IPv6 UDP punt node. - @node ip6-udp-punt - - This is the IPv6 UDP punt transition node. It is registered as a next - node for the "ip6-udp-lookup" handling UDP port(s) requested for punt. - The buffer's current data pointer is adjusted to the original packet - IPv6 header. All buffers are dispatched to "error-punt". + punt_main_t *pm = &punt_main; + u32 key, index = ~0; + uword *p; - @param vm vlib_main_t corresponding to the current thread - @param node vlib_node_runtime_t - @param frame vlib_frame_t whose contents should be dispatched + key = punt_client_l4_mk_key (af, port); + p = hash_get (pm->db.clients_by_l4_port, key); - @par Graph mechanics: next index usage + if (p) + index = p[0]; - @em Sets: - - vnet_buffer(b)->current_data - - vnet_buffer(b)->current_len + hash_unset (pm->db.clients_by_l4_port, key); - Next Index: - - Dispatches the packet to the "error-punt" node -*/ -VLIB_NODE_FN (udp6_punt_node) (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * from_frame) -{ - return udp46_punt_inline (vm, node, from_frame, 0 /* is_ip4 */ ); + return (index); } -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (udp4_punt_node) = { - .name = "ip4-udp-punt", - /* Takes a vector of packets. */ - .vector_size = sizeof (u32), - - .n_errors = PUNT_N_ERROR, - .error_strings = punt_error_strings, - - .n_next_nodes = PUNT_N_NEXT, - .next_nodes = { -#define _(s,n) [PUNT_NEXT_##s] = n, - foreach_punt_next -#undef _ - }, -}; - -VLIB_REGISTER_NODE (udp6_punt_node) = { - .name = "ip6-udp-punt", - /* Takes a vector of packets. */ - .vector_size = sizeof (u32), - - .n_errors = PUNT_N_ERROR, - .error_strings = punt_error_strings, - - .n_next_nodes = PUNT_N_NEXT, - .next_nodes = { -#define _(s,n) [PUNT_NEXT_##s] = n, - foreach_punt_next -#undef _ - }, -}; +static void +punt_client_ip_proto_db_add (ip_address_family_t af, + ip_protocol_t proto, u32 index) +{ + punt_main_t *pm = &punt_main; -/* *INDENT-ON* */ + pm->db.clients_by_ip_proto = hash_set (pm->db.clients_by_ip_proto, + punt_client_ip_proto_mk_key (af, + proto), + index); +} -static punt_client_t * -punt_client_get (bool is_ip4, u16 port) +static u32 +punt_client_ip_proto_db_remove (ip_address_family_t af, ip_protocol_t proto) { punt_main_t *pm = &punt_main; - punt_client_t *v = - is_ip4 ? pm->clients_by_dst_port4 : pm->clients_by_dst_port6; + u32 key, index = ~0; + uword *p; - u16 i = sparse_vec_index (v, port); - if (i == SPARSE_VEC_INVALID_INDEX) - return 0; + key = punt_client_ip_proto_mk_key (af, proto); + p = hash_get (pm->db.clients_by_ip_proto, key); - return &vec_elt (v, i); -} + if (p) + index = p[0]; -static struct sockaddr_un * -punt_socket_get (bool is_ip4, u16 port) -{ - punt_client_t *v = punt_client_get (is_ip4, port); - if (v) - return &v->caddr; + hash_unset (pm->db.clients_by_ip_proto, key); - return NULL; + return (index); } -#ifndef CLIB_MARCH_VARIANT -static int -punt_socket_register (bool is_ip4, u8 protocol, u16 port, - char *client_pathname) +static void +punt_client_exception_db_add (vlib_punt_reason_t reason, u32 pci) { punt_main_t *pm = &punt_main; - punt_client_t c, *n; - punt_client_t *v = is_ip4 ? pm->clients_by_dst_port4 : - pm->clients_by_dst_port6; - if (strncmp (client_pathname, vnet_punt_get_server_pathname (), - UNIX_PATH_MAX) == 0) - return -1; - - clib_memset (&c, 0, sizeof (c)); - memcpy (c.caddr.sun_path, client_pathname, sizeof (c.caddr.sun_path)); - c.caddr.sun_family = AF_UNIX; - c.port = port; - c.protocol = protocol; - n = sparse_vec_validate (v, port); - n[0] = c; - return 0; -} + vec_validate_init_empty (pm->db.clients_by_exception, reason, ~0); -/* $$$$ Just leaves the mapping in place for now */ -static void -punt_socket_unregister (bool is_ip4, u8 protocol, u16 port) -{ - return; + pm->db.clients_by_exception[reason] = pci; } -#endif /* CLIB_MARCH_VARIANT */ -typedef struct +static u32 +punt_client_exception_db_remove (vlib_punt_reason_t reason) { - punt_client_t client; - u8 is_midchain; -} udp_punt_trace_t; + punt_main_t *pm = &punt_main; + u32 pci = ~0; -static u8 * -format_udp_punt_trace (u8 * s, va_list * args) -{ - CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); - CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); - udp_punt_trace_t *t = va_arg (*args, udp_punt_trace_t *); - u32 indent = format_get_indent (s); - s = format (s, "to: %s", t->client.caddr.sun_path); - if (t->is_midchain) + if (punt_client_exception_get (reason)) { - s = format (s, "\n%U(buffer is part of chain)", format_white_space, - indent); + pci = pm->db.clients_by_exception[reason]; + pm->db.clients_by_exception[reason] = ~0; } - return s; + + return pci; } -always_inline uword -udp46_punt_socket_inline (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame, bool is_ip4) +static clib_error_t * +punt_socket_read_ready (clib_file_t * uf) { - u32 *buffers = vlib_frame_vector_args (frame); - uword n_packets = frame->n_vectors; - struct iovec *iovecs = 0; + vlib_main_t *vm = vlib_get_main (); punt_main_t *pm = &punt_main; - int i; - - u32 node_index = is_ip4 ? udp4_punt_socket_node.index : - udp6_punt_socket_node.index; - for (i = 0; i < n_packets; i++) - { - struct iovec *iov; - vlib_buffer_t *b; - uword l; - punt_packetdesc_t packetdesc; - - b = vlib_get_buffer (vm, buffers[i]); - - /* Reverse UDP Punt advance */ - udp_header_t *udp; - if (is_ip4) - { - vlib_buffer_advance (b, -(sizeof (ip4_header_t) + - sizeof (udp_header_t))); - ip4_header_t *ip = vlib_buffer_get_current (b); - udp = (udp_header_t *) (ip + 1); - } - else - { - vlib_buffer_advance (b, -(sizeof (ip6_header_t) + - sizeof (udp_header_t))); - ip6_header_t *ip = vlib_buffer_get_current (b); - udp = (udp_header_t *) (ip + 1); - } - - u16 port = clib_net_to_host_u16 (udp->dst_port); - - /* - * Find registerered client - * If no registered client, drop packet and count - */ - struct sockaddr_un *caddr; - caddr = punt_socket_get (is_ip4, port); - if (!caddr) - { - vlib_node_increment_counter (vm, node_index, - PUNT_ERROR_SOCKET_TX_ERROR, 1); - goto error; - } + /** Schedule the rx node */ + vlib_node_set_interrupt_pending (vm, punt_socket_rx_node.index); + vec_add1 (pm->ready_fds, uf->file_descriptor); - punt_client_t *c = NULL; - if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED)) - { - c = punt_client_get (is_ip4, port); - udp_punt_trace_t *t; - t = vlib_add_trace (vm, node, b, sizeof (t[0])); - clib_memcpy_fast (&t->client, c, sizeof (t->client)); - } + return 0; +} - /* Re-set iovecs if present. */ - if (iovecs) - _vec_len (iovecs) = 0; +static clib_error_t * +punt_socket_register_l4 (vlib_main_t * vm, + ip_address_family_t af, + u8 protocol, u16 port, char *client_pathname) +{ + punt_main_t *pm = &punt_main; + punt_client_t *c; - /* Add packet descriptor */ - packetdesc.sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX]; - packetdesc.action = 0; - vec_add2 (iovecs, iov, 1); - iov->iov_base = &packetdesc; - iov->iov_len = sizeof (packetdesc); + /* For now we only support UDP punt */ + if (protocol != IP_PROTOCOL_UDP) + return clib_error_return (0, + "only UDP protocol (%d) is supported, got %d", + IP_PROTOCOL_UDP, protocol); - /** VLIB buffer chain -> Unix iovec(s). */ - vlib_buffer_advance (b, -(sizeof (ethernet_header_t))); - vec_add2 (iovecs, iov, 1); - iov->iov_base = b->data + b->current_data; - iov->iov_len = l = b->current_length; + if (port == (u16) ~ 0) + return clib_error_return (0, "UDP port number required"); - if (PREDICT_FALSE (b->flags & VLIB_BUFFER_NEXT_PRESENT)) - { - do - { - b = vlib_get_buffer (vm, b->next_buffer); - if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED)) - { - if (PREDICT_FALSE (!c)) - { - c = punt_client_get (is_ip4, port); - } - udp_punt_trace_t *t; - t = vlib_add_trace (vm, node, b, sizeof (t[0])); - clib_memcpy_fast (&t->client, c, sizeof (t->client)); - t->is_midchain = 1; - } - - vec_add2 (iovecs, iov, 1); - - iov->iov_base = b->data + b->current_data; - iov->iov_len = b->current_length; - l += b->current_length; - } - while (b->flags & VLIB_BUFFER_NEXT_PRESENT); - } + c = punt_client_l4_get (af, port); - struct msghdr msg = { - .msg_name = caddr, - .msg_namelen = sizeof (*caddr), - .msg_iov = iovecs, - .msg_iovlen = vec_len (iovecs), - }; + if (NULL == c) + { + pool_get_zero (pm->punt_client_pool, c); + punt_client_l4_db_add (af, port, c - pm->punt_client_pool); + } - if (sendmsg (pm->socket_fd, &msg, 0) < (ssize_t) l) - vlib_node_increment_counter (vm, node_index, - PUNT_ERROR_SOCKET_TX_ERROR, 1); - else - vlib_node_increment_counter (vm, node_index, PUNT_ERROR_SOCKET_TX, 1); + memcpy (c->caddr.sun_path, client_pathname, sizeof (c->caddr.sun_path)); + c->caddr.sun_family = AF_UNIX; + c->reg.type = PUNT_TYPE_L4; + c->reg.punt.l4.port = port; + c->reg.punt.l4.protocol = protocol; + c->reg.punt.l4.af = af; - } + u32 node_index = (af == AF_IP4 ? + udp4_punt_socket_node.index : + udp6_punt_socket_node.index); -error: - vlib_buffer_free (vm, buffers, n_packets); + udp_register_dst_port (vm, port, node_index, af == AF_IP4); - return n_packets; + return (NULL); } -static uword -udp4_punt_socket (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * from_frame) +static clib_error_t * +punt_socket_register_ip_proto (vlib_main_t * vm, + ip_address_family_t af, + ip_protocol_t proto, char *client_pathname) { - return udp46_punt_socket_inline (vm, node, from_frame, true /* is_ip4 */ ); -} + punt_main_t *pm = &punt_main; + punt_client_t *c; -static uword -udp6_punt_socket (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * from_frame) -{ - return udp46_punt_socket_inline (vm, node, from_frame, false /* is_ip4 */ ); -} + c = punt_client_ip_proto_get (af, proto); + if (NULL == c) + { + pool_get_zero (pm->punt_client_pool, c); + punt_client_ip_proto_db_add (af, proto, c - pm->punt_client_pool); + } -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (udp4_punt_socket_node) = { - .function = udp4_punt_socket, - .name = "ip4-udp-punt-socket", - .format_trace = format_udp_punt_trace, - .flags = VLIB_NODE_FLAG_IS_DROP, - /* Takes a vector of packets. */ - .vector_size = sizeof (u32), - .n_errors = PUNT_N_ERROR, - .error_strings = punt_error_strings, -}; -VLIB_REGISTER_NODE (udp6_punt_socket_node) = { - .function = udp6_punt_socket, - .name = "ip6-udp-punt-socket", - .format_trace = format_udp_punt_trace, - .flags = VLIB_NODE_FLAG_IS_DROP, - .vector_size = sizeof (u32), - .n_errors = PUNT_N_ERROR, - .error_strings = punt_error_strings, -}; -/* *INDENT-ON* */ + memcpy (c->caddr.sun_path, client_pathname, sizeof (c->caddr.sun_path)); + c->caddr.sun_family = AF_UNIX; + c->reg.type = PUNT_TYPE_IP_PROTO; + c->reg.punt.ip_proto.protocol = proto; + c->reg.punt.ip_proto.af = af; -typedef struct -{ - enum punt_action_e action; - u32 sw_if_index; -} punt_trace_t; + if (af == AF_IP4) + ip4_register_protocol (proto, ip4_proto_punt_socket_node.index); + else + ip6_register_protocol (proto, ip6_proto_punt_socket_node.index); -static u8 * -format_punt_trace (u8 * s, va_list * va) -{ - CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *); - CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *); - vnet_main_t *vnm = vnet_get_main (); - punt_trace_t *t = va_arg (*va, punt_trace_t *); - s = format (s, "%U Action: %d", format_vnet_sw_if_index_name, - vnm, t->sw_if_index, t->action); - return s; + return (NULL); } -static uword -punt_socket_rx_fd (vlib_main_t * vm, vlib_node_runtime_t * node, u32 fd) +static clib_error_t * +punt_socket_register_exception (vlib_main_t * vm, + vlib_punt_reason_t reason, + char *client_pathname) { - const uword buffer_size = vlib_buffer_get_default_data_size (vm); - u32 n_trace = vlib_get_trace_count (vm, node); - u32 next = node->cached_next_index; - u32 n_left_to_next, next_index; - u32 *to_next; - u32 error = PUNT_ERROR_NONE; - vlib_get_next_frame (vm, node, next, to_next, n_left_to_next); - - /* $$$$ Only dealing with one buffer at the time for now */ - - u32 bi; - vlib_buffer_t *b; - punt_packetdesc_t packetdesc; - ssize_t size; - struct iovec io[2]; - - if (vlib_buffer_alloc (vm, &bi, 1) != 1) - { - error = PUNT_ERROR_NOBUFFER; - goto error; - } + punt_main_t *pm = &punt_main; + punt_client_t *pc; - b = vlib_get_buffer (vm, bi); - io[0].iov_base = &packetdesc; - io[0].iov_len = sizeof (packetdesc); - io[1].iov_base = b->data; - io[1].iov_len = buffer_size; + pc = punt_client_exception_get (reason); - size = readv (fd, io, 2); - /* We need at least the packet descriptor plus a header */ - if (size <= (int) (sizeof (packetdesc) + sizeof (ip4_header_t))) + if (NULL == pc) { - vlib_buffer_free (vm, &bi, 1); - error = PUNT_ERROR_READV; - goto error; + pool_get_zero (pm->punt_client_pool, pc); + punt_client_exception_db_add (reason, pc - pm->punt_client_pool); } - b->flags = VNET_BUFFER_F_LOCALLY_ORIGINATED; - b->current_length = size - sizeof (packetdesc); - - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b); + memcpy (pc->caddr.sun_path, client_pathname, sizeof (pc->caddr.sun_path)); + pc->caddr.sun_family = AF_UNIX; + pc->reg.type = PUNT_TYPE_EXCEPTION; + pc->reg.punt.exception.reason = reason; - switch (packetdesc.action) - { - case PUNT_L2: - vnet_buffer (b)->sw_if_index[VLIB_TX] = packetdesc.sw_if_index; - next_index = PUNT_SOCKET_RX_NEXT_INTERFACE_OUTPUT; - break; - - case PUNT_IP4_ROUTED: - vnet_buffer (b)->sw_if_index[VLIB_RX] = packetdesc.sw_if_index; - vnet_buffer (b)->sw_if_index[VLIB_TX] = ~0; - next_index = PUNT_SOCKET_RX_NEXT_IP4_LOOKUP; - break; + vlib_punt_register (pm->hdl, + pc->reg.punt.exception.reason, "exception-punt-socket"); - case PUNT_IP6_ROUTED: - vnet_buffer (b)->sw_if_index[VLIB_RX] = packetdesc.sw_if_index; - vnet_buffer (b)->sw_if_index[VLIB_TX] = ~0; - next_index = PUNT_SOCKET_RX_NEXT_IP6_LOOKUP; - break; + return (NULL); +} - default: - error = PUNT_ERROR_ACTION; - vlib_buffer_free (vm, &bi, 1); - goto error; - } +static clib_error_t * +punt_socket_unregister_l4 (ip_address_family_t af, + ip_protocol_t protocol, u16 port) +{ + u32 pci; - if (PREDICT_FALSE (n_trace > 0)) - { - punt_trace_t *t; - vlib_trace_buffer (vm, node, next_index, b, 1 /* follow_chain */ ); - vlib_set_trace_count (vm, node, --n_trace); - t = vlib_add_trace (vm, node, b, sizeof (*t)); - t->sw_if_index = packetdesc.sw_if_index; - t->action = packetdesc.action; - } + udp_unregister_dst_port (vlib_get_main (), port, af == AF_IP4); - to_next[0] = bi; - to_next++; - n_left_to_next--; + pci = punt_client_l4_db_remove (af, port); - vlib_validate_buffer_enqueue_x1 (vm, node, next, to_next, n_left_to_next, - bi, next_index); - vlib_put_next_frame (vm, node, next, n_left_to_next); - return 1; + if (~0 != pci) + pool_put_index (punt_main.punt_client_pool, pci); -error: - vlib_node_increment_counter (vm, punt_socket_rx_node.index, error, 1); - return 0; + return (NULL); } -static uword -punt_socket_rx (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +static clib_error_t * +punt_socket_unregister_ip_proto (ip_address_family_t af, ip_protocol_t proto) { - punt_main_t *pm = &punt_main; - u32 total_count = 0; - int i; + u32 pci; - for (i = 0; i < vec_len (pm->ready_fds); i++) - { - total_count += punt_socket_rx_fd (vm, node, pm->ready_fds[i]); - vec_del1 (pm->ready_fds, i); - } - return total_count; -} + if (af == AF_IP4) + ip4_unregister_protocol (proto); + else + ip6_unregister_protocol (proto); -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (punt_socket_rx_node, static) = -{ - .function = punt_socket_rx, - .name = "punt-socket-rx", - .type = VLIB_NODE_TYPE_INPUT, - .state = VLIB_NODE_STATE_INTERRUPT, - .vector_size = 1, - .n_errors = PUNT_N_ERROR, - .error_strings = punt_error_strings, - .n_next_nodes = PUNT_SOCKET_RX_N_NEXT, - .next_nodes = { - [PUNT_SOCKET_RX_NEXT_INTERFACE_OUTPUT] = "interface-output", - [PUNT_SOCKET_RX_NEXT_IP4_LOOKUP] = "ip4-lookup", - [PUNT_SOCKET_RX_NEXT_IP6_LOOKUP] = "ip6-lookup", - }, - .format_trace = format_punt_trace, -}; -/* *INDENT-ON* */ + pci = punt_client_ip_proto_db_remove (af, proto); + + if (~0 != pci) + pool_put_index (punt_main.punt_client_pool, pci); + + return (NULL); +} static clib_error_t * -punt_socket_read_ready (clib_file_t * uf) +punt_socket_unregister_exception (vlib_punt_reason_t reason) { - vlib_main_t *vm = vlib_get_main (); - punt_main_t *pm = &punt_main; + u32 pci; - /** Schedule the rx node */ - vlib_node_set_interrupt_pending (vm, punt_socket_rx_node.index); - vec_add1 (pm->ready_fds, uf->file_descriptor); + pci = punt_client_exception_db_remove (reason); - return 0; + if (~0 != pci) + pool_put_index (punt_main.punt_client_pool, pci); + + return (NULL); } -#ifndef CLIB_MARCH_VARIANT clib_error_t * vnet_punt_socket_add (vlib_main_t * vm, u32 header_version, - bool is_ip4, u8 protocol, u16 port, - char *client_pathname) + const punt_reg_t * pr, char *client_pathname) { punt_main_t *pm = &punt_main; @@ -651,39 +298,54 @@ vnet_punt_socket_add (vlib_main_t * vm, u32 header_version, if (header_version != PUNT_PACKETDESC_VERSION) return clib_error_return (0, "Invalid packet descriptor version"); - /* For now we only support UDP punt */ - if (protocol != IP_PROTOCOL_UDP) - return clib_error_return (0, - "only UDP protocol (%d) is supported, got %d", - IP_PROTOCOL_UDP, protocol); - - if (port == (u16) ~ 0) - return clib_error_return (0, "UDP port number required"); - - /* Register client */ - if (punt_socket_register (is_ip4, protocol, port, client_pathname) < 0) + if (strncmp (client_pathname, vnet_punt_get_server_pathname (), + UNIX_PATH_MAX) == 0) return clib_error_return (0, "Punt socket: Invalid client path: %s", client_pathname); - u32 node_index = is_ip4 ? udp4_punt_socket_node.index : - udp6_punt_socket_node.index; - - udp_register_dst_port (vm, port, node_index, is_ip4); + /* Register client */ + switch (pr->type) + { + case PUNT_TYPE_L4: + return (punt_socket_register_l4 (vm, + pr->punt.l4.af, + pr->punt.l4.protocol, + pr->punt.l4.port, client_pathname)); + case PUNT_TYPE_IP_PROTO: + return (punt_socket_register_ip_proto (vm, + pr->punt.ip_proto.af, + pr->punt.ip_proto.protocol, + client_pathname)); + case PUNT_TYPE_EXCEPTION: + return (punt_socket_register_exception (vm, + pr->punt.exception.reason, + client_pathname)); + } return 0; } clib_error_t * -vnet_punt_socket_del (vlib_main_t * vm, bool is_ip4, u8 l4_protocol, u16 port) +vnet_punt_socket_del (vlib_main_t * vm, const punt_reg_t * pr) { punt_main_t *pm = &punt_main; if (!pm->is_configured) return clib_error_return (0, "socket is not configured"); - punt_socket_unregister (is_ip4, l4_protocol, port); - udp_unregister_dst_port (vm, port, is_ip4); + switch (pr->type) + { + case PUNT_TYPE_L4: + return (punt_socket_unregister_l4 (pr->punt.l4.af, + pr->punt.l4.protocol, + pr->punt.l4.port)); + case PUNT_TYPE_IP_PROTO: + return (punt_socket_unregister_ip_proto (pr->punt.ip_proto.af, + pr->punt.ip_proto.protocol)); + case PUNT_TYPE_EXCEPTION: + return (punt_socket_unregister_exception (pr->punt.exception.reason)); + } return 0; } @@ -695,8 +357,7 @@ vnet_punt_socket_del (vlib_main_t * vm, bool is_ip4, u8 l4_protocol, u16 port) * - UDP and TCP are the only protocols supported in the current implementation * * @param vm vlib_main_t corresponding to the current thread - * @param ipv IP protcol version. - * 4 - IPv4, 6 - IPv6, ~0 for both IPv6 and IPv4 + * @param af IP address family. * @param protocol 8-bits L4 protocol value * UDP is 17 * TCP is 1 @@ -704,98 +365,97 @@ vnet_punt_socket_del (vlib_main_t * vm, bool is_ip4, u8 l4_protocol, u16 port) * * @returns 0 on success, non-zero value otherwise */ -clib_error_t * -vnet_punt_add_del (vlib_main_t * vm, u8 ipv, u8 protocol, u16 port, - bool is_add) +static clib_error_t * +punt_l4_add_del (vlib_main_t * vm, + ip_address_family_t af, + ip_protocol_t protocol, u16 port, bool is_add) { - - /* For now we only support TCP, UDP and SCTP punt */ - if (protocol != IP_PROTOCOL_UDP && - protocol != IP_PROTOCOL_TCP && protocol != IP_PROTOCOL_SCTP) + /* For now we only support TCP and UDP punt */ + if (protocol != IP_PROTOCOL_UDP && protocol != IP_PROTOCOL_TCP) return clib_error_return (0, - "only UDP (%d), TCP (%d) and SCTP (%d) protocols are supported, got %d", - IP_PROTOCOL_UDP, IP_PROTOCOL_TCP, - IP_PROTOCOL_SCTP, protocol); - - if (ipv != (u8) ~ 0 && ipv != 4 && ipv != 6) - return clib_error_return (0, "IP version must be 4 or 6, got %d", ipv); + "only UDP (%d) and TCP (%d) protocols are supported, got %d", + IP_PROTOCOL_UDP, IP_PROTOCOL_TCP, protocol); if (port == (u16) ~ 0) { - if ((ipv == 4) || (ipv == (u8) ~ 0)) - { - if (protocol == IP_PROTOCOL_UDP) - udp_punt_unknown (vm, 1, is_add); - else if (protocol == IP_PROTOCOL_TCP) - tcp_punt_unknown (vm, 1, is_add); - else if (protocol == IP_PROTOCOL_SCTP) - sctp_punt_unknown (vm, 1, is_add); - } - - if ((ipv == 6) || (ipv == (u8) ~ 0)) - { - if (protocol == IP_PROTOCOL_UDP) - udp_punt_unknown (vm, 0, is_add); - else if (protocol == IP_PROTOCOL_TCP) - tcp_punt_unknown (vm, 0, is_add); - else if (protocol == IP_PROTOCOL_SCTP) - sctp_punt_unknown (vm, 0, is_add); - } + if (protocol == IP_PROTOCOL_UDP) + udp_punt_unknown (vm, af == AF_IP4, is_add); + else if (protocol == IP_PROTOCOL_TCP) + tcp_punt_unknown (vm, af == AF_IP4, is_add); return 0; } else if (is_add) { - if (protocol == IP_PROTOCOL_TCP || protocol == IP_PROTOCOL_SCTP) - return clib_error_return (0, - "punt TCP/SCTP ports is not supported yet"); + if (protocol == IP_PROTOCOL_TCP) + return clib_error_return (0, "punt TCP ports is not supported yet"); - if (ipv == 4 || ipv == (u8) ~ 0) - udp_register_dst_port (vm, port, udp4_punt_node.index, 1); - - if (ipv == 6 || ipv == (u8) ~ 0) - udp_register_dst_port (vm, port, udp6_punt_node.index, 0); + udp_register_dst_port (vm, port, udp4_punt_node.index, af == AF_IP4); return 0; } else { - if (protocol == IP_PROTOCOL_TCP || protocol == IP_PROTOCOL_SCTP) - return clib_error_return (0, - "punt TCP/SCTP ports is not supported yet"); - if (ipv == 4 || ipv == (u8) ~ 0) - udp_unregister_dst_port (vm, port, 1); + if (protocol == IP_PROTOCOL_TCP) + return clib_error_return (0, "punt TCP ports is not supported yet"); - if (ipv == 6 || ipv == (u8) ~ 0) - udp_unregister_dst_port (vm, port, 0); + udp_unregister_dst_port (vm, port, af == AF_IP4); return 0; } } -#endif /* CLIB_MARCH_VARIANT */ + +clib_error_t * +vnet_punt_add_del (vlib_main_t * vm, const punt_reg_t * pr, bool is_add) +{ + switch (pr->type) + { + case PUNT_TYPE_L4: + return (punt_l4_add_del (vm, pr->punt.l4.af, pr->punt.l4.protocol, + pr->punt.l4.port, is_add)); + case PUNT_TYPE_EXCEPTION: + case PUNT_TYPE_IP_PROTO: + break; + } + + return (clib_error_return (0, "Unsupported punt type: %d", pr->type)); +} static clib_error_t * punt_cli (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - u32 port = ~0; - bool is_add = true; - u32 protocol = ~0; clib_error_t *error = NULL; + bool is_add = true; + /* *INDENT-OFF* */ + punt_reg_t pr = { + .punt = { + .l4 = { + .af = AF_IP4, + .port = ~0, + .protocol = ~0, + }, + }, + .type = PUNT_TYPE_L4, + }; + u32 port; + /* *INDENT-ON* */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "del")) is_add = false; - else if (unformat (input, "all")) - ; + else if (unformat (input, "ipv6")) + pr.punt.l4.af = AF_IP6; + else if (unformat (input, "ip6")) + pr.punt.l4.af = AF_IP6; else if (unformat (input, "%d", &port)) - ; + pr.punt.l4.port = port; else if (unformat (input, "udp")) - protocol = IP_PROTOCOL_UDP; + pr.punt.l4.protocol = IP_PROTOCOL_UDP; else if (unformat (input, "tcp")) - protocol = IP_PROTOCOL_TCP; + pr.punt.l4.protocol = IP_PROTOCOL_TCP; else { error = clib_error_return (0, "parse error: '%U'", @@ -805,7 +465,7 @@ punt_cli (vlib_main_t * vm, } /* punt both IPv6 and IPv4 when used in CLI */ - error = vnet_punt_add_del (vm, ~0, protocol, port, is_add); + error = vnet_punt_add_del (vm, &pr, is_add); if (error) { clib_error_report (error); @@ -843,28 +503,36 @@ VLIB_CLI_COMMAND (punt_command, static) = { }; /* *INDENT-ON* */ -#ifndef CLIB_MARCH_VARIANT static clib_error_t * punt_socket_register_cmd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - bool is_ipv4 = true; - u32 protocol = ~0; - u32 port = ~0; u8 *socket_name = 0; clib_error_t *error = NULL; + /* *INDENT-OFF* */ + punt_reg_t pr = { + .punt = { + .l4 = { + .af = AF_IP4, + .port = ~0, + .protocol = ~0, + }, + }, + .type = PUNT_TYPE_L4, + }; + /* *INDENT-ON* */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "ipv4")) ; else if (unformat (input, "ipv6")) - is_ipv4 = false; + pr.punt.l4.af = AF_IP6; else if (unformat (input, "udp")) - protocol = IP_PROTOCOL_UDP; + pr.punt.l4.protocol = IP_PROTOCOL_UDP; else if (unformat (input, "tcp")) - protocol = IP_PROTOCOL_TCP; - else if (unformat (input, "%d", &port)) + pr.punt.l4.protocol = IP_PROTOCOL_TCP; + else if (unformat (input, "%d", &pr.punt.l4.port)) ; else if (unformat (input, "socket %s", &socket_name)) ; @@ -876,9 +544,11 @@ punt_socket_register_cmd (vlib_main_t * vm, } } - error = - vnet_punt_socket_add (vm, 1, is_ipv4, protocol, port, - (char *) socket_name); + if (!socket_name) + error = clib_error_return (0, "socket name not specified"); + else + error = vnet_punt_socket_add (vm, 1, &pr, (char *) socket_name); + done: return error; } @@ -903,22 +573,31 @@ punt_socket_deregister_cmd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - bool is_ipv4 = true; - u32 protocol = ~0; - u32 port = ~0; clib_error_t *error = NULL; + /* *INDENT-OFF* */ + punt_reg_t pr = { + .punt = { + .l4 = { + .af = AF_IP4, + .port = ~0, + .protocol = ~0, + }, + }, + .type = PUNT_TYPE_L4, + }; + /* *INDENT-ON* */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "ipv4")) ; else if (unformat (input, "ipv6")) - is_ipv4 = false; + pr.punt.l4.af = AF_IP6; else if (unformat (input, "udp")) - protocol = IP_PROTOCOL_UDP; + pr.punt.l4.protocol = IP_PROTOCOL_UDP; else if (unformat (input, "tcp")) - protocol = IP_PROTOCOL_TCP; - else if (unformat (input, "%d", &port)) + pr.punt.l4.protocol = IP_PROTOCOL_TCP; + else if (unformat (input, "%d", &pr.punt.l4.port)) ; else { @@ -928,7 +607,7 @@ punt_socket_deregister_cmd (vlib_main_t * vm, } } - error = vnet_punt_socket_del (vm, is_ipv4, protocol, port); + error = vnet_punt_socket_del (vm, &pr); done: return error; } @@ -948,85 +627,108 @@ VLIB_CLI_COMMAND (punt_socket_deregister_command, static) = }; /* *INDENT-ON* */ -punt_socket_detail_t * -punt_socket_entries (u8 ipv) +void +punt_client_walk (punt_type_t pt, punt_client_walk_cb_t cb, void *ctx) { punt_main_t *pm = &punt_main; - punt_client_t *pc; - punt_socket_detail_t *ps = 0; - bool is_valid; - punt_client_t *v = !ipv ? pm->clients_by_dst_port4 : - pm->clients_by_dst_port6; - - vec_foreach (pc, v) - { - if (pc && pc->port != 0) + switch (pt) + { + case PUNT_TYPE_L4: + { + u32 pci, key; + + /* *INDENT-OFF* */ + hash_foreach(key, pci, pm->db.clients_by_l4_port, + ({ + cb (pool_elt_at_index(pm->punt_client_pool, pci), ctx); + })); + /* *INDENT-ON* */ + break; + } + case PUNT_TYPE_IP_PROTO: { - is_valid = false; - if (pc->protocol == IP_PROTOCOL_UDP) - { - is_valid = udp_is_valid_dst_port (pc->port, !ipv); - } - if (is_valid) - { - punt_socket_detail_t detail = { - .ipv = ipv, - .l4_protocol = pc->protocol, - .l4_port = pc->port - }; - memcpy (detail.pathname, pc->caddr.sun_path, - sizeof (pc->caddr.sun_path)); - vec_add1 (ps, detail); - } + u32 pci, key; + + /* *INDENT-OFF* */ + hash_foreach(key, pci, pm->db.clients_by_ip_proto, + ({ + cb (pool_elt_at_index(pm->punt_client_pool, pci), ctx); + })); + /* *INDENT-ON* */ + break; } - } - return ps; + case PUNT_TYPE_EXCEPTION: + { + u32 *pci; + + vec_foreach (pci, pm->db.clients_by_exception) + { + if (~0 != *pci) + cb (pool_elt_at_index (pm->punt_client_pool, *pci), ctx); + } + + break; + } + } } -u8 * -format_punt_socket (u8 * s, va_list * args) +static u8 * +format_punt_client (u8 * s, va_list * args) { - punt_client_t *clients = va_arg (*args, punt_client_t *); - u8 *is_ipv6 = va_arg (*args, u8 *); - punt_client_t *pc; - bool is_valid; + punt_client_t *pc = va_arg (*args, punt_client_t *); - vec_foreach (pc, clients) - { - if (pc && pc->port != 0) - { - is_valid = false; - if (pc->protocol == IP_PROTOCOL_UDP) - { - is_valid = udp_is_valid_dst_port (pc->port, !(*is_ipv6)); - } - if (is_valid) - { - s = format (s, " punt %s port %d to socket %s \n", - (pc->protocol == IP_PROTOCOL_UDP) ? "UDP" : "TCP", - pc->port, pc->caddr.sun_path); - } - } - } + s = format (s, " punt "); + + switch (pc->reg.type) + { + case PUNT_TYPE_L4: + s = format (s, "%U %U port %d", + format_ip_address_family, pc->reg.punt.l4.af, + format_ip_protocol, pc->reg.punt.l4.protocol, + pc->reg.punt.l4.port); + break; + case PUNT_TYPE_IP_PROTO: + s = format (s, "%U %U", + format_ip_address_family, pc->reg.punt.ip_proto.af, + format_ip_protocol, pc->reg.punt.ip_proto.protocol); + break; + case PUNT_TYPE_EXCEPTION: + s = format (s, " %U", format_vlib_punt_reason, + pc->reg.punt.exception.reason); + break; + } + + s = format (s, " to socket %s \n", pc->caddr.sun_path); return (s); } +static walk_rc_t +punt_client_show_one (const punt_client_t * pc, void *ctx) +{ + vlib_cli_output (ctx, "%U", format_punt_client, pc); + + return (WALK_CONTINUE); +} + static clib_error_t * punt_socket_show_cmd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - u8 is_ipv6; - punt_main_t *pm = &punt_main; clib_error_t *error = NULL; + punt_type_t pt; + + pt = PUNT_TYPE_L4; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "ipv4")) - is_ipv6 = 0; - else if (unformat (input, "ipv6")) - is_ipv6 = 1; + if (unformat (input, "exception")) + pt = PUNT_TYPE_EXCEPTION; + else if (unformat (input, "l4")) + pt = PUNT_TYPE_L4; + else if (unformat (input, "ip")) + pt = PUNT_TYPE_IP_PROTO; else { error = clib_error_return (0, "parse error: '%U'", @@ -1035,9 +737,7 @@ punt_socket_show_cmd (vlib_main_t * vm, } } - punt_client_t *v = - is_ipv6 ? pm->clients_by_dst_port6 : pm->clients_by_dst_port4; - vlib_cli_output (vm, "%U", format_punt_socket, v, &is_ipv6); + punt_client_walk (pt, punt_client_show_one, vm); done: return (error); @@ -1053,32 +753,30 @@ VLIB_CLI_COMMAND (show_punt_socket_registration_command, static) = { .path = "show punt socket registrations", .function = punt_socket_show_cmd, - .short_help = "show punt socket registrations [ipv4|ipv6]", + .short_help = "show punt socket registrations [l4|exception]", .is_mp_safe = 1, }; /* *INDENT-ON* */ clib_error_t * -punt_init (vlib_main_t * vm) +ip_punt_init (vlib_main_t * vm) { + clib_error_t *error = NULL; punt_main_t *pm = &punt_main; - pm->clients_by_dst_port6 = sparse_vec_new - (sizeof (pm->clients_by_dst_port6[0]), - BITS (((udp_header_t *) 0)->dst_port)); - pm->clients_by_dst_port4 = sparse_vec_new - (sizeof (pm->clients_by_dst_port4[0]), - BITS (((udp_header_t *) 0)->dst_port)); - pm->is_configured = false; - pm->interface_output_node = vlib_get_node_by_name (vm, - (u8 *) - "interface-output"); - return 0; + pm->interface_output_node = + vlib_get_node_by_name (vm, (u8 *) "interface-output"); + + if ((error = vlib_call_init_function (vm, punt_init))) + return error; + + pm->hdl = vlib_punt_client_register ("ip-punt"); + + return (error); } -VLIB_INIT_FUNCTION (punt_init); -#endif /* CLIB_MARCH_VARIANT */ +VLIB_INIT_FUNCTION (ip_punt_init); static clib_error_t * punt_config (vlib_main_t * vm, unformat_input_t * input) @@ -1124,6 +822,15 @@ punt_config (vlib_main_t * vm, unformat_input_t * input) return clib_error_return (0, "bind error"); } + int n_bytes = 0x10000; + + if (setsockopt + (pm->socket_fd, SOL_SOCKET, SO_SNDBUF, &n_bytes, + sizeof (n_bytes)) == -1) + { + return clib_error_return (0, "setsockopt error"); + } + /* Register socket */ clib_file_main_t *fm = &file_main; clib_file_t template = { 0 };