X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Ftap.c;h=e17d01d88b1655faf98dcdd84e34a448c2ea9395;hp=5f6d720c645e6e2e26dc8a2d515fe2bfd1db4dbe;hb=b49bc1ae6;hpb=7c6102b1aabb13ad489aa10ebd5fc71665b7c665 diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c index 5f6d720c645..e17d01d88b1 100644 --- a/src/vnet/devices/tap/tap.c +++ b/src/vnet/devices/tap/tap.c @@ -91,6 +91,7 @@ tap_free (vlib_main_t * vm, virtio_if_t * vif) { virtio_main_t *mm = &virtio_main; tap_main_t *tm = &tap_main; + clib_error_t *err = 0; int i; /* *INDENT-OFF* */ @@ -102,6 +103,9 @@ tap_free (vlib_main_t * vm, virtio_if_t * vif) virtio_vring_free_tx (vm, vif, TX_QUEUE (i)); /* *INDENT-ON* */ + _IOCTL (vif->tap_fd, TUNSETPERSIST, (void *) (uintptr_t) 0); + tap_log_dbg (vif, "TUNSETPERSIST: unset"); +error: if (vif->tap_fd != -1) close (vif->tap_fd); @@ -131,6 +135,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) int i; int old_netns_fd = -1; struct ifreq ifr = {.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_VNET_HDR }; + struct ifreq get_ifr = {.ifr_flags = 0 }; size_t hdrsz; struct vhost_memory *vhost_mem = 0; virtio_if_t *vif = 0; @@ -170,10 +175,39 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) vif->num_rxqs = args->num_rx_queues; num_q_pairs = clib_max (vif->num_rxqs, vif->num_txqs); - if (ethernet_mac_address_is_zero (args->host_mac_addr)) - ethernet_mac_address_generate (args->host_mac_addr); - clib_memcpy (vif->host_mac_addr, args->host_mac_addr, 6); - + if (args->tap_flags & TAP_FLAG_ATTACH) + { + if (args->host_if_name != NULL) + { + host_if_name = (char *) args->host_if_name; + clib_memcpy (ifr.ifr_name, host_if_name, + clib_min (IFNAMSIZ, strlen (host_if_name))); + } + else + { + args->rv = VNET_API_ERROR_NO_MATCHING_INTERFACE; + err = clib_error_return (0, "host_if_name is not provided"); + goto error; + } + if (args->host_namespace) + { + old_netns_fd = open ("/proc/self/ns/net", O_RDONLY); + if ((nfd = open_netns_fd ((char *) args->host_namespace)) == -1) + { + args->rv = VNET_API_ERROR_SYSCALL_ERROR_2; + args->error = clib_error_return_unix (0, "open_netns_fd '%s'", + args->host_namespace); + goto error; + } + if (setns (nfd, CLONE_NEWNET) == -1) + { + args->rv = VNET_API_ERROR_SYSCALL_ERROR_3; + args->error = clib_error_return_unix (0, "setns '%s'", + args->host_namespace); + goto error; + } + } + } if ((vif->tap_fd = tfd = open ("/dev/net/tun", O_RDWR | O_NONBLOCK)) < 0) { args->rv = VNET_API_ERROR_SYSCALL_ERROR_2; @@ -210,6 +244,11 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6; vif->gso_enabled = 1; } + else if (args->tap_flags & TAP_FLAG_CSUM_OFFLOAD) + { + offload = TUN_F_CSUM; + vif->csum_offload_enabled = 1; + } _IOCTL (tfd, TUNSETIFF, (void *) &ifr); tap_log_dbg (vif, "TUNSETIFF fd %d name %s flags 0x%x", tfd, @@ -223,7 +262,39 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) else host_if_name = (char *) args->host_if_name; - fcntl (tfd, F_SETFL, O_NONBLOCK); + if (fcntl (tfd, F_SETFL, O_NONBLOCK) < 0) + { + err = clib_error_return_unix (0, "fcntl(tfd, F_SETFL, O_NONBLOCK)"); + tap_log_err (vif, "set nonblocking: %U", format_clib_error, err); + goto error; + } + + /* + * unset the persistence when attaching to existing + * interface + */ + if (args->tap_flags & TAP_FLAG_ATTACH) + { + _IOCTL (tfd, TUNSETPERSIST, (void *) (uintptr_t) 0); + tap_log_dbg (vif, "TUNSETPERSIST: unset"); + } + + /* set the persistence */ + if (args->tap_flags & TAP_FLAG_PERSIST) + { + _IOCTL (tfd, TUNSETPERSIST, (void *) (uintptr_t) 1); + tap_log_dbg (vif, "TUNSETPERSIST: set"); + + /* verify persistence is set, read the flags */ + _IOCTL (tfd, TUNGETIFF, (void *) &get_ifr); + tap_log_dbg (vif, "TUNGETIFF: flags 0x%lx", get_ifr.ifr_flags); + if ((get_ifr.ifr_flags & IFF_PERSIST) == 0) + { + args->rv = VNET_API_ERROR_SYSCALL_ERROR_2; + args->error = clib_error_return (0, "persistence not supported"); + goto error; + } + } tap_log_dbg (vif, "TUNSETVNETHDRSZ: fd %d vnet_hdr_sz %u", tfd, hdrsz); _IOCTL (tfd, TUNSETVNETHDRSZ, &hdrsz); @@ -235,13 +306,6 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) tap_log_dbg (vif, "TUNSETOFFLOAD: fd %d offload 0x%lx", tfd, offload); _IOCTL (tfd, TUNSETOFFLOAD, offload); - clib_memset (&ifr, 0, sizeof (ifr)); - ifr.ifr_addr.sa_family = ARPHRD_ETHER; - clib_memcpy (ifr.ifr_hwaddr.sa_data, vif->host_mac_addr, 6); - tap_log_dbg (vif, "SIOCSIFHWADDR: fd %d hwaddr %U", tfd, - format_hex_bytes, ifr.ifr_hwaddr.sa_data, 6); - _IOCTL (tfd, SIOCSIFHWADDR, (void *) &ifr); - /* open vhost-net fd for each queue pair and set ownership */ for (i = 0; i < num_q_pairs; i++) { @@ -292,46 +356,46 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) virtio_set_net_hdr_size (vif); - /* if namespace is specified, all further netlink messages should be executed - after we change our net namespace */ - if (args->host_namespace) + if (!(args->tap_flags & TAP_FLAG_ATTACH)) { - old_netns_fd = open ("/proc/self/ns/net", O_RDONLY); - if ((nfd = open_netns_fd ((char *) args->host_namespace)) == -1) + /* if namespace is specified, all further netlink messages should be executed + after we change our net namespace */ + if (args->host_namespace) { - args->rv = VNET_API_ERROR_SYSCALL_ERROR_2; - args->error = clib_error_return_unix (0, "open_netns_fd '%s'", - args->host_namespace); - goto error; - } - args->error = vnet_netlink_set_link_netns (vif->ifindex, nfd, - host_if_name); - if (args->error) - { - args->rv = VNET_API_ERROR_NETLINK_ERROR; - goto error; - } - if (setns (nfd, CLONE_NEWNET) == -1) - { - args->rv = VNET_API_ERROR_SYSCALL_ERROR_3; - args->error = clib_error_return_unix (0, "setns '%s'", - args->host_namespace); - goto error; - } - 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'", - host_if_name); - goto error; + old_netns_fd = open ("/proc/self/ns/net", O_RDONLY); + if ((nfd = open_netns_fd ((char *) args->host_namespace)) == -1) + { + args->rv = VNET_API_ERROR_SYSCALL_ERROR_2; + args->error = clib_error_return_unix (0, "open_netns_fd '%s'", + args->host_namespace); + goto error; + } + args->error = vnet_netlink_set_link_netns (vif->ifindex, nfd, + host_if_name); + if (args->error) + { + args->rv = VNET_API_ERROR_NETLINK_ERROR; + goto error; + } + if (setns (nfd, CLONE_NEWNET) == -1) + { + args->rv = VNET_API_ERROR_SYSCALL_ERROR_3; + args->error = clib_error_return_unix (0, "setns '%s'", + args->host_namespace); + goto error; + } + 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'", + host_if_name); + goto error; + } } - } - else - { - if (host_if_name) + else if (host_if_name) { - args->error = vnet_netlink_set_link_name (vif->ifindex, - host_if_name); + args->error = + vnet_netlink_set_link_name (vif->ifindex, host_if_name); if (args->error) { args->rv = VNET_API_ERROR_NETLINK_ERROR; @@ -340,6 +404,16 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) } } + if (ethernet_mac_address_is_zero (args->host_mac_addr.bytes)) + ethernet_mac_address_generate (args->host_mac_addr.bytes); + args->error = vnet_netlink_set_link_addr (vif->ifindex, + args->host_mac_addr.bytes); + if (args->error) + { + args->rv = VNET_API_ERROR_NETLINK_ERROR; + goto error; + } + if (args->host_bridge) { args->error = vnet_netlink_set_link_master (vif->ifindex, @@ -402,18 +476,6 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) } } - /* switch back to old net namespace */ - if (args->host_namespace) - { - if (setns (old_netns_fd, CLONE_NEWNET) == -1) - { - args->rv = VNET_API_ERROR_SYSCALL_ERROR_2; - args->error = clib_error_return_unix (0, "setns '%s'", - args->host_namespace); - goto error; - } - } - if (args->host_mtu_set) { args->error = @@ -437,6 +499,18 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) args->host_mtu_size = tm->host_mtu_size; } + /* switch back to old net namespace */ + if (args->host_namespace) + { + if (setns (old_netns_fd, CLONE_NEWNET) == -1) + { + args->rv = VNET_API_ERROR_SYSCALL_ERROR_2; + args->error = clib_error_return_unix (0, "setns '%s'", + args->host_namespace); + goto error; + } + } + for (i = 0; i < num_q_pairs; i++) { if (i < vif->num_rxqs && (args->error = @@ -542,14 +616,15 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) } if (!args->mac_addr_set) - ethernet_mac_address_generate (args->mac_addr); + ethernet_mac_address_generate (args->mac_addr.bytes); - clib_memcpy (vif->mac_addr, args->mac_addr, 6); + clib_memcpy (vif->mac_addr, args->mac_addr.bytes, 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.bytes, 6); vif->host_ip4_prefix_len = args->host_ip4_prefix_len; vif->host_ip6_prefix_len = args->host_ip6_prefix_len; if (args->host_ip4_prefix_len) @@ -577,8 +652,12 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) 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++; + hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO | + VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD; + } + else if (args->tap_flags & TAP_FLAG_CSUM_OFFLOAD) + { + hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD; } vnet_hw_interface_set_input_node (vnm, vif->hw_if_index, virtio_input_node.index); @@ -607,6 +686,7 @@ error: args->rv = VNET_API_ERROR_SYSCALL_ERROR_3; } + tap_log_err (vif, "%U", format_clib_error, args->error); tap_free (vm, vif); done: if (vhost_mem) @@ -635,10 +715,6 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index) 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); @@ -653,6 +729,62 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index) return 0; } +int +tap_csum_offload_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 csum_offload_on = TUN_F_CSUM; + const unsigned int csum_offload_off = 0; + unsigned int offload = enable_disable ? csum_offload_on : csum_offload_off; + _IOCTL (vif->tap_fd, TUNSETOFFLOAD, offload); + vif->gso_enabled = 0; + vif->csum_offload_enabled = enable_disable ? 1 : 0; + + if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO) != 0) + { + hw->flags &= ~VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO; + } + + if (enable_disable) + { + if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD) == + 0) + { + hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD; + } + } + else + { + if ((hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD) != + 0) + { + hw->flags &= ~VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD; + } + } + +error: + if (err) + { + clib_warning ("Error %s checksum offload on sw_if_index %d", + enable_disable ? "enabling" : "disabling", sw_if_index); + return VNET_API_ERROR_SYSCALL_ERROR_3; + } + return 0; +} + int tap_gso_enable_disable (vlib_main_t * vm, u32 sw_if_index, int enable_disable) { @@ -674,20 +806,21 @@ tap_gso_enable_disable (vlib_main_t * vm, u32 sw_if_index, int enable_disable) unsigned int offload = enable_disable ? gso_on : gso_off; _IOCTL (vif->tap_fd, TUNSETOFFLOAD, offload); vif->gso_enabled = enable_disable ? 1 : 0; + vif->csum_offload_enabled = 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; + hw->flags |= VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO | + VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD; } } 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; + hw->flags &= ~(VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO | + VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD); } } @@ -728,7 +861,7 @@ tap_dump_ifs (tap_interface_details_t ** out_tapids) 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); + clib_memcpy(&tapid->host_mac_addr, vif->host_mac_addr, 6); if (vif->host_if_name) { clib_memcpy(tapid->host_if_name, vif->host_if_name, @@ -748,10 +881,10 @@ tap_dump_ifs (tap_interface_details_t ** out_tapids) strlen ((const char *) vif->host_bridge))); } if (vif->host_ip4_prefix_len) - clib_memcpy(tapid->host_ip4_addr, &vif->host_ip4_addr, 4); + clib_memcpy(tapid->host_ip4_addr.as_u8, &vif->host_ip4_addr, 4); tapid->host_ip4_prefix_len = vif->host_ip4_prefix_len; if (vif->host_ip6_prefix_len) - clib_memcpy(tapid->host_ip6_addr, &vif->host_ip6_addr, 16); + clib_memcpy(tapid->host_ip6_addr.as_u8, &vif->host_ip6_addr, 16); tapid->host_ip6_prefix_len = vif->host_ip6_prefix_len; tapid->host_mtu_size = vif->host_mtu_size; );