X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_funcs.h;h=3db5a2d8c11628ecd15e5313b6964db1f3619e24;hb=625a1f1824e4b21e8343e1dc50c4f5400080d0ed;hp=c4dd3b72e517d823297984bfa08a37986a6107c2;hpb=d723161e038d00e59766aa67a6a0dcc350227e4b;p=vpp.git diff --git a/src/vnet/interface_funcs.h b/src/vnet/interface_funcs.h index c4dd3b72e51..3db5a2d8c11 100644 --- a/src/vnet/interface_funcs.h +++ b/src/vnet/interface_funcs.h @@ -47,7 +47,7 @@ vnet_get_hw_interface (vnet_main_t * vnm, u32 hw_if_index) } always_inline vnet_hw_interface_t * -vnet_get_hw_interface_safe (vnet_main_t * vnm, u32 hw_if_index) +vnet_get_hw_interface_or_null (vnet_main_t * vnm, u32 hw_if_index) { if (!pool_is_free_index (vnm->interface_main.hw_interfaces, hw_if_index)) return pool_elt_at_index (vnm->interface_main.hw_interfaces, hw_if_index); @@ -61,7 +61,7 @@ vnet_get_sw_interface (vnet_main_t * vnm, u32 sw_if_index) } always_inline vnet_sw_interface_t * -vnet_get_sw_interface_safe (vnet_main_t * vnm, u32 sw_if_index) +vnet_get_sw_interface_or_null (vnet_main_t * vnm, u32 sw_if_index) { if (!pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index)) return pool_elt_at_index (vnm->interface_main.sw_interfaces, sw_if_index); @@ -82,6 +82,7 @@ vnet_get_sup_sw_interface (vnet_main_t * vnm, u32 sw_if_index) { vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index); if (sw->type == VNET_SW_INTERFACE_TYPE_SUB || + sw->type == VNET_SW_INTERFACE_TYPE_PIPE || sw->type == VNET_SW_INTERFACE_TYPE_P2P) sw = vnet_get_sw_interface (vnm, sw->sup_sw_if_index); return sw; @@ -91,10 +92,27 @@ always_inline vnet_hw_interface_t * vnet_get_sup_hw_interface (vnet_main_t * vnm, u32 sw_if_index) { vnet_sw_interface_t *sw = vnet_get_sup_sw_interface (vnm, sw_if_index); - ASSERT (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE); + ASSERT ((sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE) || + (sw->type == VNET_SW_INTERFACE_TYPE_PIPE)); return vnet_get_hw_interface (vnm, sw->hw_if_index); } +always_inline vnet_hw_interface_t * +vnet_get_sup_hw_interface_api_visible_or_null (vnet_main_t * vnm, + u32 sw_if_index) +{ + vnet_sw_interface_t *si; + if (PREDICT_FALSE (pool_is_free_index (vnm->interface_main.sw_interfaces, + sw_if_index))) + return NULL; + si = vnet_get_sup_sw_interface (vnm, sw_if_index); + if (PREDICT_FALSE (si->flags & VNET_SW_INTERFACE_FLAG_HIDDEN)) + return NULL; + ASSERT ((si->type == VNET_SW_INTERFACE_TYPE_HARDWARE) || + (si->type == VNET_SW_INTERFACE_TYPE_PIPE)); + return vnet_get_hw_interface (vnm, si->hw_if_index); +} + always_inline vnet_hw_interface_class_t * vnet_get_hw_interface_class (vnet_main_t * vnm, u32 hw_class_index) { @@ -185,6 +203,20 @@ typedef walk_rc_t (*vnet_sw_interface_walk_t) (vnet_main_t * vnm, void vnet_sw_interface_walk (vnet_main_t * vnm, vnet_sw_interface_walk_t fn, void *ctx); + +/** + * Call back walk type for walking all HW indices + */ +typedef walk_rc_t (*vnet_hw_interface_walk_t) (vnet_main_t * vnm, + u32 hw_if_index, void *ctx); + +/** + * @brief + * Walk all the HW interface + */ +void vnet_hw_interface_walk (vnet_main_t * vnm, + vnet_hw_interface_walk_t fn, void *ctx); + /* Register a hardware interface instance. */ u32 vnet_register_interface (vnet_main_t * vnm, u32 dev_class_index, @@ -207,8 +239,9 @@ clib_error_t *vnet_create_sw_interface (vnet_main_t * vnm, void vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index); void vnet_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index); int vnet_sw_interface_is_p2p (vnet_main_t * vnm, u32 sw_if_index); +int vnet_sw_interface_is_nbma (vnet_main_t * vnm, u32 sw_if_index); -always_inline uword +always_inline vnet_sw_interface_flags_t vnet_sw_interface_get_flags (vnet_main_t * vnm, u32 sw_if_index) { vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index); @@ -255,6 +288,13 @@ vnet_sw_interface_is_api_valid (vnet_main_t * vnm, u32 sw_if_index) && vnet_sw_interface_is_api_visible (vnm, sw_if_index); } +always_inline const u8 * +vnet_sw_interface_get_hw_address (vnet_main_t * vnm, u32 sw_if_index) +{ + vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index); + return hw->hw_address; +} + always_inline uword vnet_hw_interface_get_flags (vnet_main_t * vnm, u32 hw_if_index) { @@ -283,8 +323,31 @@ vnet_sw_interface_get_mtu (vnet_main_t * vnm, u32 sw_if_index, vnet_mtu_t af) always_inline uword vnet_hw_interface_is_link_up (vnet_main_t * vnm, u32 hw_if_index) { - return (vnet_hw_interface_get_flags (vnm, hw_if_index) & - VNET_HW_INTERFACE_FLAG_LINK_UP) != 0; + return ((vnet_hw_interface_get_flags (vnm, hw_if_index) & + VNET_HW_INTERFACE_FLAG_LINK_UP) != 0); +} + +always_inline uword +vnet_sw_interface_is_link_up (vnet_main_t * vnm, u32 sw_if_index) +{ + vnet_sw_interface_t *sw = vnet_get_sup_sw_interface (vnm, sw_if_index); + + return (vnet_hw_interface_is_link_up (vnm, sw->hw_if_index)); +} + +always_inline uword +vnet_sw_interface_is_up (vnet_main_t * vnm, u32 sw_if_index) +{ + return (vnet_sw_interface_is_admin_up (vnm, sw_if_index) && + vnet_sw_interface_is_link_up (vnm, sw_if_index)); +} + +always_inline uword +vnet_sw_interface_is_sub (vnet_main_t *vnm, u32 sw_if_index) +{ + vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index); + + return (sw->sw_if_index != sw->sup_sw_if_index); } always_inline vlib_frame_t * @@ -302,13 +365,24 @@ vnet_put_frame_to_sw_interface (vnet_main_t * vnm, u32 sw_if_index, return vlib_put_frame_to_node (vlib_get_main (), hw->output_node_index, f); } +always_inline void +vnet_hw_interface_set_link_speed (vnet_main_t * vnm, u32 hw_if_index, + u32 link_speed) +{ + vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index); + hw->link_speed = link_speed; +} + /* Change interface flags (e.g. up, down, enable, disable). */ clib_error_t *vnet_hw_interface_set_flags (vnet_main_t * vnm, u32 hw_if_index, - u32 flags); + vnet_hw_interface_flags_t flags); /* Change interface flags (e.g. up, down, enable, disable). */ clib_error_t *vnet_sw_interface_set_flags (vnet_main_t * vnm, u32 sw_if_index, - u32 flags); + vnet_sw_interface_flags_t flags); + +void vnet_sw_interface_admin_up (vnet_main_t * vnm, u32 sw_if_index); +void vnet_sw_interface_admin_down (vnet_main_t * vnm, u32 sw_if_index); /* Change interface class. */ clib_error_t *vnet_hw_interface_set_class (vnet_main_t * vnm, u32 hw_if_index, @@ -325,18 +399,27 @@ void vnet_hw_interface_init_for_class (vnet_main_t * vnm, u32 hw_if_index, clib_error_t *vnet_rename_interface (vnet_main_t * vnm, u32 hw_if_index, char *new_name); +/* Add/delete secondary interface mac address*/ +clib_error_t *vnet_hw_interface_add_del_mac_address (vnet_main_t * vnm, + u32 hw_if_index, + const u8 * mac_address, + u8 is_add); + /* Change interface mac address*/ clib_error_t *vnet_hw_interface_change_mac_address (vnet_main_t * vnm, u32 hw_if_index, - u8 * mac_address); + const u8 * mac_address); /* Change rx-mode */ clib_error_t *set_hw_interface_change_rx_mode (vnet_main_t * vnm, u32 hw_if_index, u8 queue_id_valid, u32 queue_id, - vnet_hw_interface_rx_mode - mode); + vnet_hw_if_rx_mode mode); + +/* Set rx-placement on the interface */ +clib_error_t *set_hw_interface_rx_placement (u32 hw_if_index, u32 queue_id, + u32 thread_index, u8 is_main); /* Set the MTU on the HW interface */ void vnet_hw_interface_set_mtu (vnet_main_t * vnm, u32 hw_if_index, u32 mtu); @@ -347,15 +430,24 @@ void vnet_sw_interface_set_protocol_mtu (vnet_main_t * vnm, u32 sw_if_index, u32 mtu[]); /* update the unnumbered state of an interface */ -void vnet_sw_interface_update_unnumbered (u32 sw_if_index, - u32 ip_sw_if_index, u8 enable); +int vnet_sw_interface_update_unnumbered (u32 sw_if_index, u32 ip_sw_if_index, + u8 enable); int vnet_sw_interface_stats_collect_enable_disable (u32 sw_if_index, u8 enable); +void vnet_sw_interface_ip_directed_broadcast (vnet_main_t * vnm, + u32 sw_if_index, u8 enable); + +/* set interface rss queues */ +clib_error_t *vnet_hw_interface_set_rss_queues (vnet_main_t * vnm, + vnet_hw_interface_t * hi, + clib_bitmap_t * bitmap); + +void vnet_hw_if_update_runtime_data (vnet_main_t *vnm, u32 hw_if_index); /* Formats sw/hw interface. */ format_function_t format_vnet_hw_interface; -format_function_t format_vnet_hw_interface_rx_mode; +format_function_t format_vnet_hw_if_rx_mode; format_function_t format_vnet_hw_if_index_name; format_function_t format_vnet_sw_interface; format_function_t format_vnet_sw_interface_name; @@ -366,11 +458,16 @@ format_function_t format_vnet_sw_interface_flags; /* Parses sw/hw interface name -> index. */ unformat_function_t unformat_vnet_sw_interface; unformat_function_t unformat_vnet_hw_interface; +unformat_function_t unformat_vnet_buffer_flags; +unformat_function_t unformat_vnet_buffer_offload_flags; /* Parses interface flags (up, down, enable, disable, etc.) */ unformat_function_t unformat_vnet_hw_interface_flags; unformat_function_t unformat_vnet_sw_interface_flags; +/* VLAN tag-rewrite */ +format_function_t format_vtr; + /* Node runtime for interface output function. */ typedef struct { @@ -381,8 +478,6 @@ typedef struct } vnet_interface_output_runtime_t; /* Interface output function. */ -void *vnet_interface_output_node_multiarch_select (void); - word vnet_sw_interface_compare (vnet_main_t * vnm, uword sw_if_index0, uword sw_if_index1); word vnet_hw_interface_compare (vnet_main_t * vnm, uword hw_if_index0, @@ -401,6 +496,7 @@ typedef enum } vnet_interface_tx_next_t; #define VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT VNET_INTERFACE_TX_N_NEXT +#define VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT (VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT + 1) typedef enum { @@ -414,6 +510,43 @@ u8 *format_vnet_interface_output_trace (u8 * s, va_list * va); serialize_function_t serialize_vnet_interface_state, unserialize_vnet_interface_state; +/** + * @brief Add buffer (vlib_buffer_t) to the trace + * + * @param *pm - pcap_main_t + * @param *vm - vlib_main_t + * @param buffer_index - u32 + * @param n_bytes_in_trace - u32 + * + */ +static inline void +pcap_add_buffer (pcap_main_t *pm, struct vlib_main_t *vm, u32 buffer_index, + u32 n_bytes_in_trace) +{ + vlib_buffer_t *b = vlib_get_buffer (vm, buffer_index); + u32 n = vlib_buffer_length_in_chain (vm, b); + i32 n_left = clib_min (n_bytes_in_trace, n); + f64 time_now = vlib_time_now (vm); + void *d; + + if (PREDICT_TRUE (pm->n_packets_captured < pm->n_packets_to_capture)) + { + clib_spinlock_lock_if_init (&pm->lock); + d = pcap_add_packet (pm, time_now, n_left, n); + while (1) + { + u32 copy_length = clib_min ((u32) n_left, b->current_length); + clib_memcpy_fast (d, b->data + b->current_data, copy_length); + n_left -= b->current_length; + if (n_left <= 0) + break; + d += b->current_length; + ASSERT (b->flags & VLIB_BUFFER_NEXT_PRESENT); + b = vlib_get_buffer (vm, b->next_buffer); + } + clib_spinlock_unlock_if_init (&pm->lock); + } +} #endif /* included_vnet_interface_funcs_h */ /*