vec_validate (rewrite, n_bytes - 1);
h = (ethernet_header_t *) rewrite;
ei = pool_elt_at_index (em->interfaces, hw->hw_instance);
- clib_memcpy (h->src_address, ei->address, sizeof (h->src_address));
+ clib_memcpy (h->src_address, &ei->address, sizeof (h->src_address));
if (is_p2p)
{
clib_memcpy (h->dst_address, sub_sw->p2p.client_mac,
adj_glean_update_rewrite (ai);
break;
case IP_LOOKUP_NEXT_ARP:
+ case IP_LOOKUP_NEXT_REWRITE:
ip_neighbor_update (vnm, ai);
break;
case IP_LOOKUP_NEXT_BCAST:
case IP_LOOKUP_NEXT_DROP:
case IP_LOOKUP_NEXT_PUNT:
case IP_LOOKUP_NEXT_LOCAL:
- case IP_LOOKUP_NEXT_REWRITE:
case IP_LOOKUP_NEXT_MCAST_MIDCHAIN:
case IP_LOOKUP_NEXT_MIDCHAIN:
case IP_LOOKUP_NEXT_ICMP_ERROR:
}
}
+static void
+ethernet_interface_address_copy (ethernet_interface_address_t * dst,
+ const u8 * mac)
+{
+ clib_memcpy (&dst->mac, (u8 *) mac, sizeof (dst->mac));
+ /*
+ * ethernet dataplane loads mac as u64, makes sure the last 2 bytes are 0
+ * for comparison purpose
+ */
+ dst->zero = 0;
+}
+
+static void
+ethernet_set_mac (vnet_hw_interface_t * hi, ethernet_interface_t * ei,
+ const u8 * mac_address)
+{
+ vec_validate (hi->hw_address, sizeof (mac_address_t) - 1);
+ clib_memcpy (hi->hw_address, mac_address, sizeof (mac_address_t));
+ ethernet_interface_address_copy (&ei->address, mac_address);
+}
+
static clib_error_t *
ethernet_mac_change (vnet_hw_interface_t * hi,
const u8 * old_address, const u8 * mac_address)
em = ðernet_main;
ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
- vec_validate (hi->hw_address,
- STRUCT_SIZE_OF (ethernet_header_t, src_address) - 1);
- clib_memcpy (hi->hw_address, mac_address, vec_len (hi->hw_address));
-
- clib_memcpy (ei->address, (u8 *) mac_address, sizeof (ei->address));
+ ethernet_set_mac (hi, ei, mac_address);
{
ethernet_address_change_ctx_t *cb;
+ u32 id, sw_if_index;
vec_foreach (cb, em->address_change_callbacks)
- cb->function (em, hi->sw_if_index, cb->function_opaque);
+ {
+ cb->function (em, hi->sw_if_index, cb->function_opaque);
+ /* clang-format off */
+ hash_foreach (id, sw_if_index, hi->sub_interface_sw_if_index_by_id,
+ ({
+ cb->function (em, sw_if_index, cb->function_opaque);
+ }));
+ /* clang-format on */
+ }
}
return (NULL);
}
-/* *INDENT-OFF* */
+static clib_error_t *
+ethernet_set_max_frame_size (vnet_main_t *vnm, vnet_hw_interface_t *hi,
+ u32 frame_size)
+{
+ ethernet_interface_t *ei =
+ pool_elt_at_index (ethernet_main.interfaces, hi->hw_instance);
+
+ if (ei->cb.set_max_frame_size)
+ return ei->cb.set_max_frame_size (vnm, hi, frame_size);
+
+ return vnet_error (
+ VNET_ERR_UNSUPPORTED,
+ "underlying driver doesn't support changing Max Frame Size");
+}
+
VNET_HW_INTERFACE_CLASS (ethernet_hw_interface_class) = {
.name = "Ethernet",
+ .tx_hash_fn_type = VNET_HASH_FN_TYPE_ETHERNET,
.format_address = format_ethernet_address,
.format_header = format_ethernet_header_with_length,
.unformat_hw_address = unformat_ethernet_address,
.build_rewrite = ethernet_build_rewrite,
.update_adjacency = ethernet_update_adjacency,
.mac_addr_change_function = ethernet_mac_change,
+ .set_max_frame_size = ethernet_set_max_frame_size,
};
-/* *INDENT-ON* */
uword
unformat_ethernet_interface (unformat_input_t * input, va_list * args)
return 0;
}
-clib_error_t *
-ethernet_register_interface (vnet_main_t * vnm,
- u32 dev_class_index,
- u32 dev_instance,
- const u8 * address,
- u32 * hw_if_index_return,
- ethernet_flag_change_function_t flag_change)
+u32
+vnet_eth_register_interface (vnet_main_t *vnm,
+ vnet_eth_interface_registration_t *r)
{
ethernet_main_t *em = ðernet_main;
ethernet_interface_t *ei;
vnet_hw_interface_t *hi;
- clib_error_t *error = 0;
u32 hw_if_index;
pool_get (em->interfaces, ei);
- ei->flag_change = flag_change;
+ clib_memcpy (&ei->cb, &r->cb, sizeof (vnet_eth_if_callbacks_t));
- hw_if_index = vnet_register_interface
- (vnm,
- dev_class_index, dev_instance,
- ethernet_hw_interface_class.index, ei - em->interfaces);
- *hw_if_index_return = hw_if_index;
+ hw_if_index = vnet_register_interface (
+ vnm, r->dev_class_index, r->dev_instance,
+ ethernet_hw_interface_class.index, ei - em->interfaces);
hi = vnet_get_hw_interface (vnm, hw_if_index);
ethernet_setup_node (vnm->vlib_main, hi->output_node_index);
- hi->min_packet_bytes = hi->min_supported_packet_bytes =
- ETHERNET_MIN_PACKET_BYTES;
- hi->max_packet_bytes = hi->max_supported_packet_bytes =
- ETHERNET_MAX_PACKET_BYTES;
+ hi->min_frame_size = ETHERNET_MIN_PACKET_BYTES;
+ hi->frame_overhead =
+ r->frame_overhead ?
+ r->frame_overhead :
+ sizeof (ethernet_header_t) + 2 * sizeof (ethernet_vlan_header_t);
+ hi->max_frame_size = r->max_frame_size ?
+ r->max_frame_size :
+ ethernet_main.default_mtu + hi->frame_overhead;
+ ;
/* Default ethernet MTU, 9000 unless set by ethernet_config see below */
vnet_sw_interface_set_mtu (vnm, hi->sw_if_index, em->default_mtu);
- clib_memcpy (ei->address, address, sizeof (ei->address));
- vec_add (hi->hw_address, address, sizeof (ei->address));
- CLIB_MEM_UNPOISON (hi->hw_address, 8);
-
- if (error)
- {
- pool_put (em->interfaces, ei);
- return error;
- }
- return error;
+ ethernet_set_mac (hi, ei, r->address);
+ return hw_if_index;
}
void
ethernet_main_t *em = ðernet_main;
vnet_hw_interface_t *hi;
ethernet_interface_t *ei;
+ u32 opn_flags = flags & ETHERNET_INTERFACE_FLAGS_SET_OPN_MASK;
hi = vnet_get_hw_interface (vnm, hw_if_index);
ASSERT (hi->hw_class_index == ethernet_hw_interface_class.index);
ei = pool_elt_at_index (em->interfaces, hi->hw_instance);
- ei->flags = flags;
- if (ei->flag_change)
- return ei->flag_change (vnm, hi, flags);
- return (u32) ~ 0;
+
+ /* preserve status bits and update last set operation bits */
+ ei->flags = (ei->flags & ETHERNET_INTERFACE_FLAGS_STATUS_MASK) | opn_flags;
+
+ if (ei->cb.flag_change)
+ {
+ switch (opn_flags)
+ {
+ case ETHERNET_INTERFACE_FLAG_DEFAULT_L3:
+ if (hi->caps & VNET_HW_IF_CAP_MAC_FILTER)
+ {
+ if (ei->cb.flag_change (vnm, hi, opn_flags) != ~0)
+ {
+ ei->flags |= ETHERNET_INTERFACE_FLAG_STATUS_L3;
+ return 0;
+ }
+ ei->flags &= ~ETHERNET_INTERFACE_FLAG_STATUS_L3;
+ return ~0;
+ }
+ /* fall through */
+ case ETHERNET_INTERFACE_FLAG_ACCEPT_ALL:
+ ei->flags &= ~ETHERNET_INTERFACE_FLAG_STATUS_L3;
+ return ei->cb.flag_change (vnm, hi, opn_flags);
+ default:
+ return ~0;
+ }
+ }
+ return ~0;
}
/**
/* Ordinarily, this is the only config lookup. */
config = l2input_intf_config (vnet_buffer (b[0])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
new_rx_sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX];
while (n_left_from >= 4)
{
u32 sw_if_index0, sw_if_index1, sw_if_index2, sw_if_index3;
- u32 not_all_match_config;
+ u32x4 xor_ifx4;
/* Prefetch next iteration. */
if (PREDICT_TRUE (n_left_from >= 8))
sw_if_index2 = vnet_buffer (b[2])->sw_if_index[VLIB_TX];
sw_if_index3 = vnet_buffer (b[3])->sw_if_index[VLIB_TX];
- not_all_match_config = (sw_if_index0 ^ sw_if_index1)
- ^ (sw_if_index2 ^ sw_if_index3);
- not_all_match_config += sw_if_index0 ^ new_rx_sw_if_index;
+ xor_ifx4 = u32x4_gather (&sw_if_index0, &sw_if_index1, &sw_if_index2,
+ &sw_if_index3);
/* Speed path / expected case: all pkts on the same intfc */
- if (PREDICT_TRUE (not_all_match_config == 0))
+ if (PREDICT_TRUE (u32x4_is_all_equal (xor_ifx4, new_rx_sw_if_index)))
{
next[0] = next_index;
next[1] = next_index;
{
config = l2input_intf_config
(vnet_buffer (b[0])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
new_rx_sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX];
}
next[0] = next_index;
{
config = l2input_intf_config
(vnet_buffer (b[1])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
new_rx_sw_if_index = vnet_buffer (b[1])->sw_if_index[VLIB_TX];
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
}
next[1] = next_index;
vnet_buffer (b[1])->sw_if_index[VLIB_RX] = new_rx_sw_if_index;
{
config = l2input_intf_config
(vnet_buffer (b[2])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
new_rx_sw_if_index = vnet_buffer (b[2])->sw_if_index[VLIB_TX];
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
}
next[2] = next_index;
vnet_buffer (b[2])->sw_if_index[VLIB_RX] = new_rx_sw_if_index;
{
config = l2input_intf_config
(vnet_buffer (b[3])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
new_rx_sw_if_index = vnet_buffer (b[3])->sw_if_index[VLIB_TX];
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
}
next[3] = next_index;
vnet_buffer (b[3])->sw_if_index[VLIB_RX] = new_rx_sw_if_index;
{
config = l2input_intf_config
(vnet_buffer (b[0])->sw_if_index[VLIB_TX]);
- next_index =
- config->bridge ? VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
- VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT;
- new_tx_sw_if_index = config->bvi ? L2INPUT_BVI : ~0;
+ next_index = (l2_input_is_bridge (config) ?
+ VNET_SIMULATED_ETHERNET_TX_NEXT_L2_INPUT :
+ VNET_SIMULATED_ETHERNET_TX_NEXT_ETHERNET_INPUT);
+ new_tx_sw_if_index = l2_input_is_bvi (config) ? L2INPUT_BVI : ~0;
new_rx_sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX];
}
next[0] = next_index;
}
-/* *INDENT-OFF* */
VNET_DEVICE_CLASS (ethernet_simulated_device_class) = {
.name = "Loopback",
.format_device_name = format_simulated_ethernet_name,
.admin_up_down_function = simulated_ethernet_admin_up_down,
.mac_addr_change_function = simulated_ethernet_mac_change,
};
-/* *INDENT-ON* */
/*
* Maintain a bitmap of allocated loopback instance numbers.
{
vnet_main_t *vnm = vnet_get_main ();
vlib_main_t *vm = vlib_get_main ();
- clib_error_t *error;
u32 instance;
u8 address[6];
u32 hw_if_index;
vnet_hw_interface_t *hw_if;
u32 slot;
- int rv = 0;
ASSERT (sw_if_indexp);
address[5] = instance;
}
- error = ethernet_register_interface
- (vnm,
- ethernet_simulated_device_class.index, instance, address, &hw_if_index,
- /* flag change */ 0);
-
- if (error)
- {
- rv = VNET_API_ERROR_INVALID_REGISTRATION;
- clib_error_report (error);
- return rv;
- }
-
+ vnet_eth_interface_registration_t eir = {};
+ eir.dev_class_index = ethernet_simulated_device_class.index;
+ eir.dev_instance = instance;
+ eir.address = address;
+ hw_if_index = vnet_eth_register_interface (vnm, &eir);
hw_if = vnet_get_hw_interface (vnm, hw_if_index);
slot = vlib_node_add_named_next_with_slot
(vm, hw_if->tx_node_index,
* Example of how to create a loopback interface:
* @cliexcmd{loopback create-interface}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (create_simulated_ethernet_interface_command, static) = {
.path = "loopback create-interface",
.short_help = "loopback create-interface [mac <mac-addr>] [instance <instance>]",
.function = create_simulated_ethernet_interfaces,
};
-/* *INDENT-ON* */
/*?
* Create a loopback interface. Optionally, a MAC Address can be
* Example of how to create a loopback interface:
* @cliexcmd{create loopback interface}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (create_loopback_interface_command, static) = {
.path = "create loopback interface",
.short_help = "create loopback interface [mac <mac-addr>] [instance <instance>]",
.function = create_simulated_ethernet_interfaces,
};
-/* *INDENT-ON* */
ethernet_interface_t *
ethernet_get_interface (ethernet_main_t * em, u32 hw_if_index)
u8 is_add)
{
ethernet_interface_t *ei = ethernet_get_interface (em, hw_if_index);
- mac_address_t *if_addr = 0;
+ ethernet_interface_address_t *if_addr = 0;
+ int found = 0;
/* return if there is not an ethernet interface for this hw interface */
if (!ei)
/* determine whether the address is configured on the interface */
vec_foreach (if_addr, ei->secondary_addrs)
{
- if (!ethernet_mac_address_equal (if_addr->bytes, address))
- continue;
-
- break;
+ if (ethernet_mac_address_equal (if_addr->mac.bytes, address))
+ {
+ found = 1;
+ break;
+ }
}
- if (if_addr && vec_is_member (ei->secondary_addrs, if_addr))
+ if (is_add)
{
- /* delete found address */
- if (!is_add)
- {
- vec_delete (ei->secondary_addrs, 1, if_addr - ei->secondary_addrs);
- if_addr = 0;
- }
- /* address already found, so nothing needs to be done if adding */
- }
- else
- {
- /* if_addr could be 0 or past the end of the vector. reset to 0 */
- if_addr = 0;
-
- /* add new address */
- if (is_add)
+ if (!found)
{
+ /* address not found yet: add it */
vec_add2 (ei->secondary_addrs, if_addr, 1);
- clib_memcpy (&if_addr->bytes, address, sizeof (if_addr->bytes));
+ ethernet_interface_address_copy (if_addr, address);
}
+ return &if_addr->mac;
}
- return if_addr;
+ /* delete case */
+ if (found)
+ vec_delete (ei->secondary_addrs, 1, if_addr - ei->secondary_addrs);
+
+ return 0;
}
int
* Example of how to delete a loopback interface:
* @cliexcmd{loopback delete-interface intfc loop0}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (delete_simulated_ethernet_interface_command, static) = {
.path = "loopback delete-interface",
.short_help = "loopback delete-interface intfc <interface>",
.function = delete_simulated_ethernet_interfaces,
};
-/* *INDENT-ON* */
/*?
* Delete a loopback interface.
* Example of how to delete a loopback interface:
* @cliexcmd{delete loopback interface intfc loop0}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (delete_loopback_interface_command, static) = {
.path = "delete loopback interface",
.short_help = "delete loopback interface intfc <interface>",
.function = delete_simulated_ethernet_interfaces,
};
-/* *INDENT-ON* */
/*?
* Delete a sub-interface.
* Example of how to delete a sub-interface:
* @cliexcmd{delete sub-interface GigabitEthernet0/8/0.200}
?*/
-/* *INDENT-OFF* */
VLIB_CLI_COMMAND (delete_sub_interface_command, static) = {
.path = "delete sub-interface",
.short_help = "delete sub-interface <interface>",
.function = delete_sub_interface,
};
-/* *INDENT-ON* */
/* ethernet { ... } configuration. */
/*?
Code Review / vpp.git / blobdiff