X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Ftap.c;h=4f3066a69165891e97de4b4a78147b191602a423;hb=d6c15af33;hp=e6a7ba518a665313bee7566609bd5e909421fa6b;hpb=7866c4595b65f54f491ffc4e92b1f8cf94d6f142;p=vpp.git diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c index e6a7ba518a6..4f3066a6916 100644 --- a/src/vnet/devices/tap/tap.c +++ b/src/vnet/devices/tap/tap.c @@ -75,11 +75,13 @@ open_netns_fd (char *netns) return fd; } +#define TAP_MAX_INSTANCE 1024 void tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) { vnet_main_t *vnm = vnet_get_main (); + vlib_thread_main_t *thm = vlib_get_thread_main (); virtio_main_t *vim = &virtio_main; tap_main_t *tm = &tap_main; vnet_sw_interface_t *sw; @@ -91,12 +93,10 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) struct vhost_memory *vhost_mem = 0; virtio_if_t *vif = 0; clib_error_t *err = 0; - uword *p; if (args->id != ~0) { - p = hash_get (tm->dev_instance_by_interface_id, args->id); - if (p) + if (clib_bitmap_get (tm->tap_ids, args->id)) { args->rv = VNET_API_ERROR_INVALID_INTERFACE; args->error = clib_error_return (0, "interface already exists"); @@ -105,32 +105,22 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) } else { - int tries = 1000; - while (--tries) - { - args->id = tm->last_used_interface_id++; - p = hash_get (tm->dev_instance_by_interface_id, args->id); - if (!p) - break; - } + args->id = clib_bitmap_first_clear (tm->tap_ids); + } - if (!tries) - { - args->rv = VNET_API_ERROR_UNSPECIFIED; - args->error = - clib_error_return (0, "cannot find free interface id"); - return; - } + if (args->id > TAP_MAX_INSTANCE) + { + args->rv = VNET_API_ERROR_UNSPECIFIED; + args->error = clib_error_return (0, "cannot find free interface id"); + return; } - memset (&ifr, 0, sizeof (ifr)); + clib_memset (&ifr, 0, sizeof (ifr)); pool_get (vim->interfaces, vif); vif->dev_instance = vif - vim->interfaces; vif->tap_fd = -1; vif->id = args->id; - hash_set (tm->dev_instance_by_interface_id, vif->id, vif->dev_instance); - if ((vif->fd = open ("/dev/vhost-net", O_RDWR | O_NONBLOCK)) < 0) { args->rv = VNET_API_ERROR_SYSCALL_ERROR_1; @@ -140,7 +130,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) _IOCTL (vif->fd, VHOST_GET_FEATURES, &vif->remote_features); - if ((vif->remote_features & (1ULL << VIRTIO_NET_F_MRG_RXBUF)) == 0) + if ((vif->remote_features & VIRTIO_FEATURE (VIRTIO_NET_F_MRG_RXBUF)) == 0) { args->rv = VNET_API_ERROR_UNSUPPORTED; args->error = clib_error_return (0, "vhost-net backend doesn't support " @@ -148,7 +138,8 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) goto error; } - if ((vif->remote_features & (1ULL << VIRTIO_RING_F_INDIRECT_DESC)) == 0) + if ((vif->remote_features & VIRTIO_FEATURE (VIRTIO_RING_F_INDIRECT_DESC)) == + 0) { args->rv = VNET_API_ERROR_UNSUPPORTED; args->error = clib_error_return (0, "vhost-net backend doesn't support " @@ -156,7 +147,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) goto error; } - if ((vif->remote_features & (1ULL << VIRTIO_F_VERSION_1)) == 0) + if ((vif->remote_features & VIRTIO_FEATURE (VIRTIO_F_VERSION_1)) == 0) { args->rv = VNET_API_ERROR_UNSUPPORTED; args->error = clib_error_return (0, "vhost-net backend doesn't support " @@ -164,9 +155,11 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) goto error; } - vif->features |= 1ULL << VIRTIO_NET_F_MRG_RXBUF; - vif->features |= 1ULL << VIRTIO_F_VERSION_1; - vif->features |= 1ULL << VIRTIO_RING_F_INDIRECT_DESC; + vif->features |= VIRTIO_FEATURE (VIRTIO_NET_F_MRG_RXBUF); + vif->features |= VIRTIO_FEATURE (VIRTIO_F_VERSION_1); + vif->features |= VIRTIO_FEATURE (VIRTIO_RING_F_INDIRECT_DESC); + + virtio_set_net_hdr_size (vif); _IOCTL (vif->fd, VHOST_SET_FEATURES, &vif->features); @@ -192,6 +185,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) if (args->host_namespace) { int fd; + int rc; old_netns_fd = open ("/proc/self/ns/net", O_RDONLY); if ((fd = open_netns_fd ((char *) args->host_namespace)) == -1) { @@ -207,14 +201,15 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) args->rv = VNET_API_ERROR_NETLINK_ERROR; goto error; } - if (setns (fd, CLONE_NEWNET) == -1) + rc = setns (fd, CLONE_NEWNET); + close (fd); + if (rc == -1) { args->rv = VNET_API_ERROR_SYSCALL_ERROR_3; args->error = clib_error_return_unix (0, "setns '%s'", args->host_namespace); goto error; } - close (fd); if ((vif->ifindex = if_nametoindex ((char *) args->host_if_name)) == 0) { args->rv = VNET_API_ERROR_SYSCALL_ERROR_3; @@ -327,7 +322,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) /* Set vhost memory table */ i = sizeof (struct vhost_memory) + sizeof (struct vhost_memory_region); vhost_mem = clib_mem_alloc (i); - memset (vhost_mem, 0, i); + clib_memset (vhost_mem, 0, i); vhost_mem->nregions = 1; vhost_mem->regions[0].memory_size = (1ULL << 47) - 4096; _IOCTL (vif->fd, VHOST_SET_MEM_TABLE, vhost_mem); @@ -357,6 +352,8 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) } vif->rx_ring_sz = args->rx_ring_sz != 0 ? args->rx_ring_sz : 256; vif->tx_ring_sz = args->tx_ring_sz != 0 ? args->tx_ring_sz : 256; + clib_memcpy (vif->mac_addr, args->mac_addr, 6); + vif->host_if_name = args->host_if_name; args->host_if_name = 0; vif->net_ns = args->host_namespace; @@ -371,9 +368,10 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) if (args->host_ip6_prefix_len) clib_memcpy (&vif->host_ip6_addr, &args->host_ip6_addr, 16); + vif->type = VIRTIO_IF_TYPE_TAP; args->error = ethernet_register_interface (vnm, virtio_device_class.index, vif->dev_instance, - args->mac_addr, + vif->mac_addr, &vif->hw_if_index, virtio_eth_flag_change); if (args->error) @@ -382,6 +380,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) goto error; } + tm->tap_ids = clib_bitmap_set (tm->tap_ids, vif->id, 1); sw = vnet_get_hw_sw_interface (vnm, vif->hw_if_index); vif->sw_if_index = sw->sw_if_index; args->sw_if_index = vif->sw_if_index; @@ -393,10 +392,11 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) vnet_hw_interface_set_rx_mode (vnm, vif->hw_if_index, 0, VNET_HW_INTERFACE_RX_MODE_DEFAULT); vif->per_interface_next_index = ~0; - vif->type = VIRTIO_IF_TYPE_TAP; vif->flags |= VIRTIO_IF_FLAG_ADMIN_UP; vnet_hw_interface_set_flags (vnm, vif->hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP); + if (thm->n_vlib_mains > 1) + clib_spinlock_init (&vif->lockp); goto done; error: @@ -411,7 +411,8 @@ error: if (vif->fd != -1) close (vif->fd); vec_foreach_index (i, vif->vrings) virtio_vring_free (vm, vif, i); - memset (vif, 0, sizeof (virtio_if_t)); + vec_free (vif->vrings); + clib_memset (vif, 0, sizeof (virtio_if_t)); pool_put (vim->interfaces, vif); done: @@ -437,9 +438,13 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index) vif = pool_elt_at_index (mm->interfaces, hw->dev_instance); + if (vif->type != VIRTIO_IF_TYPE_TAP) + return VNET_API_ERROR_INVALID_INTERFACE; + /* bring down the interface */ vnet_hw_interface_set_flags (vnm, vif->hw_if_index, 0); vnet_sw_interface_set_flags (vnm, vif->sw_if_index, 0); + vnet_hw_interface_unassign_rx_thread (vnm, vif->hw_if_index, 0); ethernet_delete_interface (vnm, vif->hw_if_index); vif->hw_if_index = ~0; @@ -452,8 +457,9 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index) vec_foreach_index (i, vif->vrings) virtio_vring_free (vm, vif, i); vec_free (vif->vrings); - hash_unset (tm->dev_instance_by_interface_id, vif->id); - memset (vif, 0, sizeof (*vif)); + tm->tap_ids = clib_bitmap_set (tm->tap_ids, vif->id, 0); + clib_spinlock_free (&vif->lockp); + clib_memset (vif, 0, sizeof (*vif)); pool_put (mm->interfaces, vif); return 0; @@ -471,8 +477,10 @@ tap_dump_ifs (tap_interface_details_t ** out_tapids) /* *INDENT-OFF* */ pool_foreach (vif, mm->interfaces, + if (vif->type != VIRTIO_IF_TYPE_TAP) + continue; vec_add2(r_tapids, tapid, 1); - memset (tapid, 0, sizeof (*tapid)); + clib_memset (tapid, 0, sizeof (*tapid)); tapid->id = vif->id; tapid->sw_if_index = vif->sw_if_index; hi = vnet_get_hw_interface (vnm, vif->hw_if_index); @@ -518,8 +526,12 @@ static clib_error_t * tap_init (vlib_main_t * vm) { tap_main_t *tm = &tap_main; - tm->dev_instance_by_interface_id = hash_create (0, sizeof (uword)); - return 0; + clib_error_t *error = 0; + + tm->log_default = vlib_log_register_class ("tap", 0); + vlib_log_debug (tm->log_default, "initialized"); + + return error; } VLIB_INIT_FUNCTION (tap_init);