X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Ftap.c;h=bc790adae758ab967a56c6906619e5668ddaee9e;hb=97c998c28;hp=eb5a7a9eb2e667afcfdc5b68db061960edd6f6cd;hpb=0b8567331c3edf8b6aee51c849b8391a2922d9ab;p=vpp.git diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c index eb5a7a9eb2e..bc790adae75 100644 --- a/src/vnet/devices/tap/tap.c +++ b/src/vnet/devices/tap/tap.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -75,12 +76,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) { + vlib_physmem_main_t *vpm = &vm->physmem_main; 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; @@ -92,12 +94,12 @@ 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; + int fd = -1; + char *host_if_name = 0; 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"); @@ -106,32 +108,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; @@ -141,7 +133,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 " @@ -149,7 +141,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 " @@ -157,7 +150,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 " @@ -165,9 +158,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); @@ -182,17 +177,31 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) _IOCTL (vif->tap_fd, TUNSETIFF, (void *) &ifr); vif->ifindex = if_nametoindex (ifr.ifr_ifrn.ifrn_name); + if (!args->host_if_name) + host_if_name = ifr.ifr_ifrn.ifrn_name; + else + host_if_name = (char *) args->host_if_name; + unsigned int offload = 0; hdrsz = sizeof (struct virtio_net_hdr_v1); + if (args->tap_flags & TAP_FLAG_GSO) + { + offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6; + vif->gso_enabled = 1; + } + else + { + vif->gso_enabled = 0; + } + _IOCTL (vif->tap_fd, TUNSETOFFLOAD, offload); _IOCTL (vif->tap_fd, TUNSETVNETHDRSZ, &hdrsz); _IOCTL (vif->fd, VHOST_SET_OWNER, 0); - /* if namespace is specified, all further netlink messages should be excuted + /* if namespace is specified, all further netlink messages should be executed after we change our net namespace */ if (args->host_namespace) { - int fd; old_netns_fd = open ("/proc/self/ns/net", O_RDONLY); if ((fd = open_netns_fd ((char *) args->host_namespace)) == -1) { @@ -202,7 +211,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) goto error; } args->error = vnet_netlink_set_link_netns (vif->ifindex, fd, - (char *) args->host_if_name); + host_if_name); if (args->error) { args->rv = VNET_API_ERROR_NETLINK_ERROR; @@ -215,22 +224,20 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) args->host_namespace); goto error; } - close (fd); - if ((vif->ifindex = if_nametoindex ((char *) args->host_if_name)) == 0) + if ((vif->ifindex = if_nametoindex (host_if_name)) == 0) { args->rv = VNET_API_ERROR_SYSCALL_ERROR_3; args->error = clib_error_return_unix (0, "if_nametoindex '%s'", - args->host_if_name); + host_if_name); goto error; } } else { - if (args->host_if_name) + if (host_if_name) { args->error = vnet_netlink_set_link_name (vif->ifindex, - (char *) - args->host_if_name); + host_if_name); if (args->error) { args->rv = VNET_API_ERROR_NETLINK_ERROR; @@ -325,45 +332,65 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) } } + if (args->host_mtu_set) + { + args->error = + vnet_netlink_set_link_mtu (vif->ifindex, args->host_mtu_size); + if (args->error) + { + args->rv = VNET_API_ERROR_NETLINK_ERROR; + goto error; + } + } + else if (tm->host_mtu_size != 0) + { + args->error = + vnet_netlink_set_link_mtu (vif->ifindex, tm->host_mtu_size); + if (args->error) + { + args->rv = VNET_API_ERROR_NETLINK_ERROR; + goto error; + } + args->host_mtu_set = 1; + args->host_mtu_size = tm->host_mtu_size; + } + /* 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; + vhost_mem->regions[0].memory_size = vpm->max_size; + vhost_mem->regions[0].guest_phys_addr = vpm->base_addr; + vhost_mem->regions[0].userspace_addr = + vhost_mem->regions[0].guest_phys_addr; _IOCTL (vif->fd, VHOST_SET_MEM_TABLE, vhost_mem); - if ((args->error = virtio_vring_init (vm, vif, 0, args->rx_ring_sz))) + if ((args->error = + virtio_vring_init (vm, vif, RX_QUEUE (0), args->rx_ring_sz))) { args->rv = VNET_API_ERROR_INIT_FAILED; goto error; } + vif->num_rxqs = 1; - if ((args->error = virtio_vring_init (vm, vif, 1, args->tx_ring_sz))) + if ((args->error = + virtio_vring_init (vm, vif, TX_QUEUE (0), args->tx_ring_sz))) { args->rv = VNET_API_ERROR_INIT_FAILED; goto error; } + vif->num_txqs = 1; if (!args->mac_addr_set) - { - f64 now = vlib_time_now (vm); - u32 rnd; - rnd = (u32) (now * 1e6); - rnd = random_u32 (&rnd); - - memcpy (args->mac_addr + 2, &rnd, sizeof (rnd)); - args->mac_addr[0] = 2; - args->mac_addr[1] = 0xfe; - } - 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; - vif->host_if_name = args->host_if_name; - args->host_if_name = 0; - vif->net_ns = args->host_namespace; - args->host_namespace = 0; - vif->host_bridge = args->host_bridge; - args->host_bridge = 0; + ethernet_mac_address_generate (args->mac_addr); + + clib_memcpy (vif->mac_addr, args->mac_addr, 6); + + vif->host_if_name = format (0, "%s%c", host_if_name, 0); + vif->net_ns = format (0, "%s%c", args->host_namespace, 0); + vif->host_bridge = format (0, "%s%c", args->host_bridge, 0); + vif->host_mtu_size = args->host_mtu_size; clib_memcpy (vif->host_mac_addr, args->host_mac_addr, 6); vif->host_ip4_prefix_len = args->host_ip4_prefix_len; vif->host_ip6_prefix_len = args->host_ip6_prefix_len; @@ -372,9 +399,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) @@ -383,23 +411,30 @@ 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; + args->rv = 0; hw = vnet_get_hw_interface (vnm, vif->hw_if_index); hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE; + if (args->tap_flags & TAP_FLAG_GSO) + { + hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO; + vnm->interface_main.gso_interface_count++; + } vnet_hw_interface_set_input_node (vnm, vif->hw_if_index, virtio_input_node.index); vnet_hw_interface_assign_rx_thread (vnm, vif->hw_if_index, 0, ~0); 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; + virtio_vring_set_numa_node (vm, vif, RX_QUEUE (0)); 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); + vif->cxq_vring = NULL; + goto done; error: @@ -413,8 +448,18 @@ error: close (vif->tap_fd); 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_foreach_index (i, vif->rxq_vrings) virtio_vring_free_rx (vm, vif, + RX_QUEUE (i)); + vec_foreach_index (i, vif->txq_vrings) virtio_vring_free_tx (vm, vif, + TX_QUEUE (i)); + vec_free (vif->rxq_vrings); + vec_free (vif->txq_vrings); + + vec_free (vif->host_if_name); + vec_free (vif->net_ns); + vec_free (vif->host_bridge); + + clib_memset (vif, 0, sizeof (virtio_if_t)); pool_put (vim->interfaces, vif); done: @@ -422,6 +467,8 @@ done: clib_mem_free (vhost_mem); if (old_netns_fd != -1) close (old_netns_fd); + if (fd != -1) + close (fd); } int @@ -434,16 +481,23 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index) virtio_if_t *vif; vnet_hw_interface_t *hw; - hw = vnet_get_sup_hw_interface (vnm, sw_if_index); + hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index); if (hw == NULL || virtio_device_class.index != hw->dev_class_index) return VNET_API_ERROR_INVALID_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; + + /* decrement if this was a GSO interface */ + if (hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO) + vnm->interface_main.gso_interface_count--; + /* 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); + vnet_hw_interface_unassign_rx_thread (vnm, vif->hw_if_index, RX_QUEUE (0)); ethernet_delete_interface (vnm, vif->hw_if_index); vif->hw_if_index = ~0; @@ -453,39 +507,99 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index) if (vif->fd != -1) close (vif->fd); - vec_foreach_index (i, vif->vrings) virtio_vring_free (vm, vif, i); - vec_free (vif->vrings); + vec_foreach_index (i, vif->rxq_vrings) virtio_vring_free_rx (vm, vif, + RX_QUEUE (i)); + vec_foreach_index (i, vif->txq_vrings) virtio_vring_free_tx (vm, vif, + TX_QUEUE (i)); + vec_free (vif->rxq_vrings); + vec_free (vif->txq_vrings); + + vec_free (vif->host_if_name); + vec_free (vif->net_ns); + vec_free (vif->host_bridge); - hash_unset (tm->dev_instance_by_interface_id, vif->id); - clib_spinlock_free (&vif->lockp); - memset (vif, 0, sizeof (*vif)); + tm->tap_ids = clib_bitmap_set (tm->tap_ids, vif->id, 0); + clib_memset (vif, 0, sizeof (*vif)); pool_put (mm->interfaces, vif); return 0; } +int +tap_gso_enable_disable (vlib_main_t * vm, u32 sw_if_index, int enable_disable) +{ + vnet_main_t *vnm = vnet_get_main (); + virtio_main_t *mm = &virtio_main; + virtio_if_t *vif; + vnet_hw_interface_t *hw; + clib_error_t *err = 0; + + hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index); + + if (hw == NULL || virtio_device_class.index != hw->dev_class_index) + return VNET_API_ERROR_INVALID_SW_IF_INDEX; + + vif = pool_elt_at_index (mm->interfaces, hw->dev_instance); + + const unsigned int gso_on = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6; + const unsigned int gso_off = 0; + unsigned int offload = enable_disable ? gso_on : gso_off; + _IOCTL (vif->tap_fd, TUNSETOFFLOAD, offload); + vif->gso_enabled = enable_disable ? 1 : 0; + if (enable_disable) + { + if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO) == 0) + { + vnm->interface_main.gso_interface_count++; + hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO; + } + } + else + { + if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO) != 0) + { + vnm->interface_main.gso_interface_count--; + hw->flags &= ~VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO; + } + } + +error: + if (err) + { + clib_warning ("Error %s gso on sw_if_index %d", + enable_disable ? "enabling" : "disabling", sw_if_index); + return VNET_API_ERROR_SYSCALL_ERROR_3; + } + return 0; +} + int tap_dump_ifs (tap_interface_details_t ** out_tapids) { vnet_main_t *vnm = vnet_get_main (); virtio_main_t *mm = &virtio_main; virtio_if_t *vif; + virtio_vring_t *vring; vnet_hw_interface_t *hi; tap_interface_details_t *r_tapids = NULL; tap_interface_details_t *tapid = NULL; /* *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); clib_memcpy(tapid->dev_name, hi->name, MIN (ARRAY_LEN (tapid->dev_name) - 1, strlen ((const char *) hi->name))); - tapid->rx_ring_sz = vif->rx_ring_sz; - tapid->tx_ring_sz = vif->tx_ring_sz; + vring = vec_elt_at_index (vif->rxq_vrings, RX_QUEUE_ACCESS(0)); + tapid->rx_ring_sz = vring->size; + vring = vec_elt_at_index (vif->txq_vrings, TX_QUEUE_ACCESS(0)); + tapid->tx_ring_sz = vring->size; clib_memcpy(tapid->host_mac_addr, vif->host_mac_addr, 6); if (vif->host_if_name) { @@ -511,6 +625,7 @@ tap_dump_ifs (tap_interface_details_t ** out_tapids) if (vif->host_ip6_prefix_len) clib_memcpy(tapid->host_ip6_addr, &vif->host_ip6_addr, 16); tapid->host_ip6_prefix_len = vif->host_ip6_prefix_len; + tapid->host_mtu_size = vif->host_mtu_size; ); /* *INDENT-ON* */ @@ -520,13 +635,39 @@ tap_dump_ifs (tap_interface_details_t ** out_tapids) } static clib_error_t * -tap_init (vlib_main_t * vm) +tap_mtu_config (vlib_main_t * vm, unformat_input_t * input) { tap_main_t *tm = &tap_main; - tm->dev_instance_by_interface_id = hash_create (0, sizeof (uword)); + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "host-mtu %d", &tm->host_mtu_size)) + ; + else + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, input); + } + return 0; } +/* tap { host-mtu } configuration. */ +VLIB_CONFIG_FUNCTION (tap_mtu_config, "tap"); + +static clib_error_t * +tap_init (vlib_main_t * vm) +{ + tap_main_t *tm = &tap_main; + clib_error_t *error = 0; + + tm->log_default = vlib_log_register_class ("tap", 0); + vlib_log_debug (tm->log_default, "initialized"); + + tm->host_mtu_size = 0; + + return error; +} + VLIB_INIT_FUNCTION (tap_init); /*