X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvnet%2Fethernet%2Fethernet.h;h=94322a715f9ae4438c9d3070821e877fff4f11e2;hb=192b13f96;hp=80c6ccd3c3b00e0015624f6359881d3ca0b5f55d;hpb=547ecf631e0d9a7f556cac6462e2e79d49a91a27;p=vpp.git diff --git a/src/vnet/ethernet/ethernet.h b/src/vnet/ethernet/ethernet.h index 80c6ccd3c3b..94322a715f9 100644 --- a/src/vnet/ethernet/ethernet.h +++ b/src/vnet/ethernet/ethernet.h @@ -42,50 +42,43 @@ #include #include +#include #include #include -always_inline u64 -ethernet_mac_address_u64 (u8 * a) -{ - return (((u64) a[0] << (u64) (5 * 8)) - | ((u64) a[1] << (u64) (4 * 8)) - | ((u64) a[2] << (u64) (3 * 8)) - | ((u64) a[3] << (u64) (2 * 8)) - | ((u64) a[4] << (u64) (1 * 8)) | ((u64) a[5] << (u64) (0 * 8))); -} +/* ethernet-input frame flags and scalar data */ -static inline int -ethernet_mac_address_is_multicast_u64 (u64 a) -{ - return (a & (1ULL << (5 * 8))) != 0; -} +/* all packets in frame share same sw_if_index */ +#define ETH_INPUT_FRAME_F_SINGLE_SW_IF_IDX (1 << 0) + +/* all ip4 packets in frame have correct ip4 checksum */ +#define ETH_INPUT_FRAME_F_IP4_CKSUM_OK (1 << 1) -static inline int -ethernet_mac_address_is_zero (u8 * mac) +typedef struct { - return ((*((u32 *) mac) == 0) && (*((u16 *) (mac + 4)) == 0)); -} + u32 sw_if_index; + u32 hw_if_index; +} ethernet_input_frame_t; + +#ifdef CLIB_HAVE_VEC128 +static const u16x8 tagged_ethertypes = { + (u16) ETHERNET_TYPE_VLAN, + (u16) ETHERNET_TYPE_DOT1AD, + (u16) ETHERNET_TYPE_VLAN_9100, + (u16) ETHERNET_TYPE_VLAN_9200, + /* duplicate last one to fill register */ + (u16) ETHERNET_TYPE_VLAN_9200, + (u16) ETHERNET_TYPE_VLAN_9200, + (u16) ETHERNET_TYPE_VLAN_9200, + (u16) ETHERNET_TYPE_VLAN_9200 +}; +#endif static_always_inline int ethernet_frame_is_tagged (u16 type) { -#if __SSE4_2__ - const __m128i ethertype_mask = _mm_set_epi16 ((u16) ETHERNET_TYPE_VLAN, - (u16) ETHERNET_TYPE_DOT1AD, - (u16) ETHERNET_TYPE_VLAN_9100, - (u16) ETHERNET_TYPE_VLAN_9200, - /* duplicate last one to - fill register */ - (u16) ETHERNET_TYPE_VLAN_9200, - (u16) ETHERNET_TYPE_VLAN_9200, - (u16) ETHERNET_TYPE_VLAN_9200, - (u16) - ETHERNET_TYPE_VLAN_9200); - - __m128i r = _mm_set1_epi16 (type); - r = _mm_cmpeq_epi16 (ethertype_mask, r); - return !_mm_test_all_zeros (r, r); +#ifdef CLIB_HAVE_VEC128 + return !u16x8_is_all_zero (tagged_ethertypes == u16x8_splat (type)); #else if ((type == ETHERNET_TYPE_VLAN) || (type == ETHERNET_TYPE_DOT1AD) || @@ -95,6 +88,33 @@ ethernet_frame_is_tagged (u16 type) return 0; } +static_always_inline int +ethernet_frame_is_any_tagged_x2 (u16 type0, u16 type1) +{ +#ifdef CLIB_HAVE_VEC128 + u16x8 r0 = (tagged_ethertypes == u16x8_splat (type0)); + u16x8 r1 = (tagged_ethertypes == u16x8_splat (type1)); + return !u16x8_is_all_zero (r0 | r1); +#else + return ethernet_frame_is_tagged (type0) || ethernet_frame_is_tagged (type1); +#endif +} + +static_always_inline int +ethernet_frame_is_any_tagged_x4 (u16 type0, u16 type1, u16 type2, u16 type3) +{ +#ifdef CLIB_HAVE_VEC128 + u16x8 r0 = (tagged_ethertypes == u16x8_splat (type0)); + u16x8 r1 = (tagged_ethertypes == u16x8_splat (type1)); + u16x8 r2 = (tagged_ethertypes == u16x8_splat (type2)); + u16x8 r3 = (tagged_ethertypes == u16x8_splat (type3)); + return !u16x8_is_all_zero (r0 | r1 | r2 | r3); +#else + return ethernet_frame_is_tagged (type0) || ethernet_frame_is_tagged (type1) + || ethernet_frame_is_tagged (type2) || ethernet_frame_is_tagged (type3); +#endif +} + /* Max. sized ethernet/vlan header for parsing. */ typedef struct { @@ -115,6 +135,7 @@ typedef u32 (ethernet_flag_change_function_t) /* Ethernet interface instance. */ typedef struct ethernet_interface { + u32 flags; /* Accept all packets (promiscuous mode). */ #define ETHERNET_INTERFACE_FLAG_ACCEPT_ALL (1 << 0) @@ -293,7 +314,7 @@ ethernet_interface_t *ethernet_get_interface (ethernet_main_t * em, clib_error_t *ethernet_register_interface (vnet_main_t * vnm, u32 dev_class_index, u32 dev_instance, - u8 * address, + const u8 * address, u32 * hw_if_index_return, ethernet_flag_change_function_t flag_change); @@ -312,6 +333,7 @@ void ethernet_register_l2_input (vlib_main_t * vm, u32 node_index); void ethernet_register_l3_redirect (vlib_main_t * vm, u32 node_index); /* Formats ethernet address X:X:X:X:X:X */ +u8 *format_mac_address (u8 * s, va_list * args); u8 *format_ethernet_address (u8 * s, va_list * args); u8 *format_ethernet_type (u8 * s, va_list * args); u8 *format_ethernet_vlan_tci (u8 * s, va_list * va); @@ -320,6 +342,7 @@ u8 *format_ethernet_header_with_length (u8 * s, va_list * args); /* Parse ethernet address in either X:X:X:X:X:X unix or X.X.X cisco format. */ uword unformat_ethernet_address (unformat_input_t * input, va_list * args); +uword unformat_mac_address (unformat_input_t * input, va_list * args); /* Parse ethernet type as 0xXXXX or type name from ethernet/types.def. In either host or network byte order. */ @@ -408,17 +431,6 @@ void ethernet_sw_interface_set_l2_mode_noport (vnet_main_t * vnm, void ethernet_set_rx_redirect (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 enable); -int -vnet_arp_set_ip4_over_ethernet (vnet_main_t * vnm, - u32 sw_if_index, void *a_arg, - int is_static, int is_no_fib_entry); - -int -vnet_arp_unset_ip4_over_ethernet (vnet_main_t * vnm, - u32 sw_if_index, void *a_arg); - -int vnet_proxy_arp_fib_reset (u32 fib_id); - clib_error_t *next_by_ethertype_init (next_by_ethertype_t * l3_next); clib_error_t *next_by_ethertype_register (next_by_ethertype_t * l3_next, u32 ethertype, u32 next_index); @@ -472,7 +484,6 @@ eth_vlan_table_lookups (ethernet_main_t * em, // Returns 1 if a matching subinterface was found, otherwise returns 0. always_inline u32 eth_identify_subint (vnet_hw_interface_t * hi, - vlib_buffer_t * b0, u32 match_flags, main_intf_t * main_intf, vlan_intf_t * vlan_intf, @@ -499,13 +510,13 @@ eth_identify_subint (vnet_hw_interface_t * hi, if ((subint->flags & match_flags) == match_flags) goto matched; - // check for untagged interface - subint = &main_intf->untagged_subint; + // check for default interface + subint = &main_intf->default_subint; if ((subint->flags & match_flags) == match_flags) goto matched; - // check for default interface - subint = &main_intf->default_subint; + // check for untagged interface + subint = &main_intf->untagged_subint; if ((subint->flags & match_flags) == match_flags) goto matched; @@ -521,42 +532,12 @@ matched: return 1; } -// Compare two ethernet macs. Return 1 if they are the same, 0 if different -always_inline u32 -eth_mac_equal (u8 * mac1, u8 * mac2) -{ - return (*((u32 *) (mac1 + 0)) == *((u32 *) (mac2 + 0)) && - *((u32 *) (mac1 + 2)) == *((u32 *) (mac2 + 2))); -} - - always_inline ethernet_main_t * vnet_get_ethernet_main (void) { return ðernet_main; } -void vnet_register_ip4_arp_resolution_event (vnet_main_t * vnm, - void *address_arg, - uword node_index, - uword type_opaque, uword data); - - -int vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm, - void *data_callback, - u32 pid, - void *address_arg, - uword node_index, - uword type_opaque, - uword data, int is_add); - -void wc_arp_set_publisher_node (uword inode_index, uword event_type); - -void ethernet_arp_change_mac (u32 sw_if_index); -void ethernet_ndp_change_mac (u32 sw_if_index); - -void arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai); - void ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai); u8 *ethernet_build_rewrite (vnet_main_t * vnm, u32 sw_if_index, @@ -566,13 +547,6 @@ const u8 *ethernet_ip6_mcast_dst_addr (void); extern vlib_node_registration_t ethernet_input_node; -typedef struct -{ - u32 sw_if_index; - u32 ip4; - u8 mac[6]; -} wc_arp_report_t; - #endif /* included_ethernet_h */ /*