X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Ftap.c;h=3739561cc592a031c37fa63ff9986543cebf400b;hb=6a7cff7ec234af8529ff72a530076e191cc8d759;hp=101576c274b9532fb7ddbccbf4008bb16a9d3cb6;hpb=be30fea370ed7cfe6a4a1b154a944411ec3eabd0;p=vpp.git diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c index 101576c274b..3739561cc59 100644 --- a/src/vnet/devices/tap/tap.c +++ b/src/vnet/devices/tap/tap.c @@ -176,6 +176,16 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) 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); @@ -386,6 +396,11 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) args->sw_if_index = vif->sw_if_index; 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); @@ -442,6 +457,10 @@ 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); @@ -466,6 +485,52 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index) 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 = vnet_get_sup_hw_interface (vnm, sw_if_index); + clib_error_t *err = 0; + + 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) {