X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Ftap.c;h=8dc798a3cb3830e64a59307862ee07b8c51e47c1;hb=97d54ed43eb69f6ea731c02305ebe0ca0b1a5cc4;hp=35f1f2a345175a3c60107aad8080680bddcfb4ef;hpb=3a9f11e6d93c9839c7bb0aaa62662299165123d8;p=vpp.git diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c index 35f1f2a3451..8dc798a3cb3 100644 --- a/src/vnet/devices/tap/tap.c +++ b/src/vnet/devices/tap/tap.c @@ -361,6 +361,29 @@ 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); @@ -396,6 +419,7 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args) args->host_namespace = 0; vif->host_bridge = args->host_bridge; 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; @@ -627,6 +651,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* */ @@ -635,6 +660,26 @@ tap_dump_ifs (tap_interface_details_t ** out_tapids) return 0; } +static clib_error_t * +tap_mtu_config (vlib_main_t * vm, unformat_input_t * input) +{ + tap_main_t *tm = &tap_main; + + 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) { @@ -644,6 +689,8 @@ tap_init (vlib_main_t * vm) tm->log_default = vlib_log_register_class ("tap", 0); vlib_log_debug (tm->log_default, "initialized"); + tm->host_mtu_size = 0; + return error; }