X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp.h;h=32e660be12f429ffbb155e2f1a4ffb51294e14bf;hb=a039620c2eec19a6c2e525645eeb0728a1c18c8d;hp=af6c6b82c6a43436349670a532c1f6fb066846f9;hpb=9128637ee8f7b0d903551f165a1447d427e8dd19;p=vpp.git diff --git a/src/vnet/udp/udp.h b/src/vnet/udp/udp.h index af6c6b82c6a..32e660be12f 100644 --- a/src/vnet/udp/udp.h +++ b/src/vnet/udp/udp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -34,11 +34,20 @@ typedef enum UDP_N_ERROR, } udp_error_t; +typedef enum +{ + UDP_CONN_F_CONNECTED = 1 << 0, /**< connected mode */ + UDP_CONN_F_OWNS_PORT = 1 << 1, /**< port belong to conn (UDPC) */ + UDP_CONN_F_CLOSING = 1 << 2, /**< conn closed with data */ +} udp_conn_flags_t; + typedef struct { - transport_connection_t connection; /** must be first */ - /** ersatz MTU to limit fifo pushes to test data size */ - u32 mtu; + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + transport_connection_t connection; /**< must be first */ + clib_spinlock_t rx_lock; /**< rx fifo lock */ + u8 flags; /**< connection flags */ } udp_connection_t; #define foreach_udp4_dst_port \ @@ -51,9 +60,11 @@ _ (3784, bfd4) \ _ (3785, bfd_echo4) \ _ (4341, lisp_gpe) \ _ (4342, lisp_cp) \ +_ (4500, ipsec) \ _ (4739, ipfix) \ _ (4789, vxlan) \ _ (4789, vxlan6) \ +_ (48879, vxlan_gbp) \ _ (4790, VXLAN_GPE) \ _ (6633, vpath_3) \ _ (6081, geneve) \ @@ -69,6 +80,7 @@ _ (3784, bfd6) \ _ (3785, bfd_echo6) \ _ (4341, lisp_gpe6) \ _ (4342, lisp_cp6) \ +_ (48879, vxlan6_gbp) \ _ (4790, VXLAN6_GPE) \ _ (6633, vpath6_3) \ _ (6081, geneve6) \ @@ -94,7 +106,7 @@ typedef struct /* Name (a c string). */ char *name; - /* GRE protocol type in host byte order. */ + /* Port number in host byte order. */ udp_dst_port_t dst_port; /* Node which handles this type. */ @@ -102,6 +114,12 @@ typedef struct /* Next index for this type. */ u32 next_index; + + /* UDP sessions refcount (not tunnels) */ + u32 n_connections; + + /* Parser for packet generator edits for this protocol */ + unformat_function_t *unformat_pg_edit; } udp_dst_port_info_t; typedef enum @@ -126,6 +144,9 @@ typedef struct u8 punt_unknown4; u8 punt_unknown6; + /* Udp local to input arc index */ + u32 local_to_input_edge[N_UDP_AF]; + /* * Per-worker thread udp connection pools used with session layer */ @@ -140,6 +161,8 @@ typedef struct extern udp_main_t udp_main; extern vlib_node_registration_t udp4_input_node; extern vlib_node_registration_t udp6_input_node; +extern vlib_node_registration_t udp4_local_node; +extern vlib_node_registration_t udp6_local_node; always_inline udp_connection_t * udp_connection_get (u32 conn_index, u32 thread_index) @@ -207,7 +230,7 @@ udp_pool_remove_peeker (u32 thread_index) } always_inline udp_connection_t * -udp_conenction_clone_safe (u32 connection_index, u32 thread_index) +udp_connection_clone_safe (u32 connection_index, u32 thread_index) { udp_connection_t *old_c, *new_c; u32 current_thread_index = vlib_get_thread_index (); @@ -220,10 +243,11 @@ udp_conenction_clone_safe (u32 connection_index, u32 thread_index) */ udp_pool_add_peeker (thread_index); old_c = udp_main.connections[thread_index] + connection_index; - clib_memcpy (new_c, old_c, sizeof (*new_c)); + clib_memcpy_fast (new_c, old_c, sizeof (*new_c)); udp_pool_remove_peeker (thread_index); new_c->c_thread_index = current_thread_index; new_c->c_c_index = udp_connection_index (new_c); + new_c->c_fib_index = old_c->c_fib_index; return new_c; } @@ -239,11 +263,16 @@ format_function_t format_udp_header; format_function_t format_udp_rx_trace; unformat_function_t unformat_udp_header; +void udp_add_dst_port (udp_main_t * um, udp_dst_port_t dst_port, + char *dst_port_name, u8 is_ip4); void udp_register_dst_port (vlib_main_t * vm, udp_dst_port_t dst_port, u32 node_index, u8 is_ip4); void udp_unregister_dst_port (vlib_main_t * vm, udp_dst_port_t dst_port, u8 is_ip4); +bool udp_is_valid_dst_port (udp_dst_port_t dst_port, u8 is_ip4); + +void udp_connection_share_port (u16 lcl_port, u8 is_ip4); void udp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add); @@ -251,12 +280,15 @@ always_inline void * vlib_buffer_push_udp (vlib_buffer_t * b, u16 sp, u16 dp, u8 offload_csum) { udp_header_t *uh; + u16 udp_len = sizeof (udp_header_t) + b->current_length; + if (PREDICT_FALSE (b->flags & VLIB_BUFFER_TOTAL_LENGTH_VALID)) + udp_len += b->total_length_not_including_first_buffer; uh = vlib_buffer_push_uninit (b, sizeof (udp_header_t)); uh->src_port = sp; uh->dst_port = dp; uh->checksum = 0; - uh->length = clib_host_to_net_u16 (b->current_length); + uh->length = clib_host_to_net_u16 (udp_len); if (offload_csum) { b->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM; @@ -332,7 +364,7 @@ ip_udp_encap_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 * ec0, word ec_len, ip0 = vlib_buffer_get_current (b0); /* Apply the encap string. */ - clib_memcpy (ip0, ec0, ec_len); + clib_memcpy_fast (ip0, ec0, ec_len); ip_udp_fixup_one (vm, b0, 1); } else @@ -342,7 +374,7 @@ ip_udp_encap_one (vlib_main_t * vm, vlib_buffer_t * b0, u8 * ec0, word ec_len, ip0 = vlib_buffer_get_current (b0); /* Apply the encap string. */ - clib_memcpy (ip0, ec0, ec_len); + clib_memcpy_fast (ip0, ec0, ec_len); ip_udp_fixup_one (vm, b0, 0); } } @@ -369,8 +401,8 @@ ip_udp_encap_two (vlib_main_t * vm, vlib_buffer_t * b0, vlib_buffer_t * b1, ip1 = vlib_buffer_get_current (b1); /* Apply the encap string */ - clib_memcpy (ip0, ec0, ec_len); - clib_memcpy (ip1, ec1, ec_len); + clib_memcpy_fast (ip0, ec0, ec_len); + clib_memcpy_fast (ip1, ec1, ec_len); /* fix the ing outer-IP checksum */ sum0 = ip0->checksum; @@ -413,8 +445,8 @@ ip_udp_encap_two (vlib_main_t * vm, vlib_buffer_t * b0, vlib_buffer_t * b1, ip1 = vlib_buffer_get_current (b1); /* Apply the encap string. */ - clib_memcpy (ip0, ec0, ec_len); - clib_memcpy (ip1, ec1, ec_len); + clib_memcpy_fast (ip0, ec0, ec_len); + clib_memcpy_fast (ip1, ec1, ec_len); new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0) - sizeof (*ip0));