From 5c954c4641c7894636aa0533634ef4f5a6bed615 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 6 Jan 2022 20:36:14 +0100 Subject: ethernet: new interface registration function Prep for supporting multiple callbacks, optional args, etc. Type: improvement Change-Id: I96244c098712e8213374678623f12527b0e7f387 Signed-off-by: Damjan Marion --- src/vnet/devices/af_packet/af_packet.c | 21 ++++++--------------- src/vnet/devices/pipe/pipe.c | 14 +++++--------- src/vnet/devices/tap/tap.c | 16 ++++++---------- src/vnet/devices/virtio/pci.c | 18 ++++++------------ src/vnet/devices/virtio/vhost_user.c | 15 +++++---------- 5 files changed, 28 insertions(+), 56 deletions(-) (limited to 'src/vnet/devices') diff --git a/src/vnet/devices/af_packet/af_packet.c b/src/vnet/devices/af_packet/af_packet.c index 2e044472736..4c52cf1d5f4 100644 --- a/src/vnet/devices/af_packet/af_packet.c +++ b/src/vnet/devices/af_packet/af_packet.c @@ -252,7 +252,6 @@ af_packet_create_if (af_packet_create_if_arg_t *arg) u8 *ring = 0; af_packet_if_t *apif = 0; u8 hw_addr[6]; - clib_error_t *error; vnet_sw_interface_t *sw; vnet_hw_interface_t *hw; vlib_thread_main_t *tm = vlib_get_thread_main (); @@ -386,6 +385,7 @@ af_packet_create_if (af_packet_create_if_arg_t *arg) if (apif->mode != AF_PACKET_IF_MODE_IP) { + vnet_eth_interface_registration_t eir = {}; /*use configured or generate random MAC address */ if (arg->hw_addr) clib_memcpy (hw_addr, arg->hw_addr, 6); @@ -401,20 +401,11 @@ af_packet_create_if (af_packet_create_if_arg_t *arg) hw_addr[1] = 0xfe; } - error = ethernet_register_interface ( - vnm, af_packet_device_class.index, if_index, hw_addr, - &apif->hw_if_index, af_packet_eth_flag_change); - - if (error) - { - clib_memset (apif, 0, sizeof (*apif)); - pool_put (apm->interfaces, apif); - vlib_log_err (apm->log_class, "Unable to register interface: %U", - format_clib_error, error); - clib_error_free (error); - ret = VNET_API_ERROR_SYSCALL_ERROR_1; - goto error; - } + eir.dev_class_index = af_packet_device_class.index; + eir.dev_instance = if_index; + eir.address = hw_addr; + eir.cb.flag_change = af_packet_eth_flag_change; + apif->hw_if_index = vnet_eth_register_interface (vnm, &eir); } else { diff --git a/src/vnet/devices/pipe/pipe.c b/src/vnet/devices/pipe/pipe.c index 56e54defab7..26b01970b6c 100644 --- a/src/vnet/devices/pipe/pipe.c +++ b/src/vnet/devices/pipe/pipe.c @@ -533,6 +533,7 @@ vnet_create_pipe_interface (u8 is_specified, { vnet_main_t *vnm = vnet_get_main (); vlib_main_t *vm = vlib_get_main (); + vnet_eth_interface_registration_t eir = {}; u8 address[6] = { [0] = 0x22, [1] = 0x22, @@ -563,15 +564,10 @@ vnet_create_pipe_interface (u8 is_specified, */ address[5] = instance; - error = ethernet_register_interface (vnm, pipe_device_class.index, - instance, address, &hw_if_index, - /* flag change */ 0); - - if (error) - { - rv = VNET_API_ERROR_INVALID_REGISTRATION; - goto oops; - } + eir.dev_class_index = pipe_device_class.index; + eir.dev_instance = instance; + eir.address = address; + hw_if_index = vnet_eth_register_interface (vnm, &eir); hi = vnet_get_hw_interface (vnm, hw_if_index); *parent_sw_if_index = hi->sw_if_index; diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c index 93140ec0c3f..19333f0ab10 100644 --- a/src/vnet/devices/tap/tap.c +++ b/src/vnet/devices/tap/tap.c @@ -643,17 +643,13 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) if (vif->type != VIRTIO_IF_TYPE_TUN) { - args->error = - ethernet_register_interface (vnm, virtio_device_class.index, - vif->dev_instance, vif->mac_addr, - &vif->hw_if_index, - virtio_eth_flag_change); - if (args->error) - { - args->rv = VNET_API_ERROR_INVALID_REGISTRATION; - goto error; - } + vnet_eth_interface_registration_t eir = {}; + eir.dev_class_index = virtio_device_class.index; + eir.dev_instance = vif->dev_instance; + eir.address = vif->mac_addr; + eir.cb.flag_change = virtio_eth_flag_change; + vif->hw_if_index = vnet_eth_register_interface (vnm, &eir); } else { diff --git a/src/vnet/devices/virtio/pci.c b/src/vnet/devices/virtio/pci.c index efa1b88a2b0..b32f72bc66b 100644 --- a/src/vnet/devices/virtio/pci.c +++ b/src/vnet/devices/virtio/pci.c @@ -1462,18 +1462,12 @@ virtio_pci_create_if (vlib_main_t * vm, virtio_pci_create_if_args_t * args) } /* create interface */ - error = ethernet_register_interface (vnm, virtio_device_class.index, - vif->dev_instance, vif->mac_addr, - &vif->hw_if_index, - virtio_pci_flag_change); - - if (error) - { - args->rv = VNET_API_ERROR_INVALID_REGISTRATION; - virtio_log_error (vif, - "error encountered on ethernet register interface"); - goto error; - } + vnet_eth_interface_registration_t eir = {}; + eir.dev_class_index = virtio_device_class.index; + eir.dev_instance = vif->dev_instance; + eir.address = vif->mac_addr; + eir.cb.flag_change = virtio_pci_flag_change; + vif->hw_if_index = vnet_eth_register_interface (vnm, &eir); vnet_sw_interface_t *sw = vnet_get_hw_sw_interface (vnm, vif->hw_if_index); vif->sw_if_index = sw->sw_if_index; diff --git a/src/vnet/devices/virtio/vhost_user.c b/src/vnet/devices/virtio/vhost_user.c index 85c39b9de8b..2d8cad8da43 100644 --- a/src/vnet/devices/virtio/vhost_user.c +++ b/src/vnet/devices/virtio/vhost_user.c @@ -1563,8 +1563,8 @@ vhost_user_create_ethernet (vnet_main_t *vnm, vlib_main_t *vm, vhost_user_create_if_args_t *args) { vhost_user_main_t *vum = &vhost_user_main; + vnet_eth_interface_registration_t eir = {}; u8 hwaddr[6]; - clib_error_t *error; /* create hw and sw interface */ if (args->use_custom_mac) @@ -1579,15 +1579,10 @@ vhost_user_create_ethernet (vnet_main_t *vnm, vlib_main_t *vm, hwaddr[1] = 0xfe; } - error = ethernet_register_interface - (vnm, - vhost_user_device_class.index, - vui - vum->vhost_user_interfaces /* device instance */ , - hwaddr /* ethernet address */ , - &vui->hw_if_index, 0 /* flag change */ ); - - if (error) - clib_error_report (error); + eir.dev_class_index = vhost_user_device_class.index; + eir.dev_instance = vui - vum->vhost_user_interfaces /* device instance */, + eir.address = hwaddr; + vui->hw_if_index = vnet_eth_register_interface (vnm, &eir); } /* -- cgit 1.2.3-korg