X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Fvirtio%2Fvhost_user_api.c;h=ec335c529f20be5cf617621f52ef2db1f86dd2b4;hb=a7a2281732b926df139b0fd946a084299d813654;hp=8142cf352ed1b1dbc278e1de8f067db58b30800f;hpb=f324dec0a371431f9326f67e920630579741da3c;p=vpp.git diff --git a/src/vnet/devices/virtio/vhost_user_api.c b/src/vnet/devices/virtio/vhost_user_api.c index 8142cf352ed..ec335c529f2 100644 --- a/src/vnet/devices/virtio/vhost_user_api.c +++ b/src/vnet/devices/virtio/vhost_user_api.c @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include #include @@ -48,26 +51,6 @@ _(MODIFY_VHOST_USER_IF, modify_vhost_user_if) \ _(DELETE_VHOST_USER_IF, delete_vhost_user_if) \ _(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump) -/* - * WARNING: replicated pending api refactor completion - */ -static void -send_sw_interface_event_deleted (vpe_api_main_t * am, - vl_api_registration_t * reg, u32 sw_if_index) -{ - vl_api_sw_interface_event_t *mp; - - mp = vl_msg_api_alloc (sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_EVENT); - mp->sw_if_index = ntohl (sw_if_index); - - mp->admin_up_down = 0; - mp->link_up_down = 0; - mp->deleted = 1; - vl_api_send_msg (reg, (u8 *) mp); -} - static void vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp) { @@ -78,19 +61,34 @@ vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp) vlib_main_t *vm = vlib_get_main (); u64 features = (u64) ~ (0ULL); u64 disabled_features = (u64) (0ULL); + mac_address_t mac; + u8 *mac_p = NULL; if (mp->disable_mrg_rxbuf) - disabled_features = (1ULL << FEAT_VIRTIO_NET_F_MRG_RXBUF); + disabled_features = VIRTIO_FEATURE (VIRTIO_NET_F_MRG_RXBUF); if (mp->disable_indirect_desc) - disabled_features |= (1ULL << FEAT_VIRTIO_F_INDIRECT_DESC); + disabled_features |= VIRTIO_FEATURE (VIRTIO_RING_F_INDIRECT_DESC); + /* + * GSO and PACKED are not supported by feature mask via binary API. We + * disable GSO and PACKED feature in the feature mask. They may be enabled + * explicitly via enable_gso and enable_packed argument + */ + disabled_features |= FEATURE_VIRTIO_NET_F_HOST_GUEST_TSO_FEATURE_BITS | + VIRTIO_FEATURE (VIRTIO_F_RING_PACKED); features &= ~disabled_features; + if (mp->use_custom_mac) + { + mac_address_decode (mp->mac_address, &mac); + mac_p = (u8 *) & mac; + } + rv = vhost_user_create_if (vnm, vm, (char *) mp->sock_filename, mp->is_server, &sw_if_index, features, mp->renumber, ntohl (mp->custom_dev_instance), - (mp->use_custom_mac) ? mp->mac_address : NULL); + mac_p, mp->enable_gso, mp->enable_packed); /* Remember an interface tag for the new interface */ if (rv == 0) @@ -119,13 +117,25 @@ vl_api_modify_vhost_user_if_t_handler (vl_api_modify_vhost_user_if_t * mp) int rv = 0; vl_api_modify_vhost_user_if_reply_t *rmp; u32 sw_if_index = ntohl (mp->sw_if_index); + u64 features = (u64) ~ (0ULL); + u64 disabled_features = (u64) (0ULL); vnet_main_t *vnm = vnet_get_main (); vlib_main_t *vm = vlib_get_main (); + /* + * GSO and PACKED are not supported by feature mask via binary API. We + * disable GSO and PACKED feature in the feature mask. They may be enabled + * explicitly via enable_gso and enable_packed argument + */ + disabled_features |= FEATURE_VIRTIO_NET_F_HOST_GUEST_TSO_FEATURE_BITS | + VIRTIO_FEATURE (VIRTIO_F_RING_PACKED); + features &= ~disabled_features; + rv = vhost_user_modify_if (vnm, vm, (char *) mp->sock_filename, - mp->is_server, sw_if_index, (u64) ~ 0, - mp->renumber, ntohl (mp->custom_dev_instance)); + mp->is_server, sw_if_index, features, + mp->renumber, ntohl (mp->custom_dev_instance), + mp->enable_gso, mp->enable_packed); REPLY_MACRO (VL_API_MODIFY_VHOST_USER_IF_REPLY); } @@ -135,7 +145,6 @@ vl_api_delete_vhost_user_if_t_handler (vl_api_delete_vhost_user_if_t * mp) { int rv = 0; vl_api_delete_vhost_user_if_reply_t *rmp; - vpe_api_main_t *vam = &vpe_api_main; u32 sw_if_index = ntohl (mp->sw_if_index); vl_api_registration_t *reg; @@ -152,7 +161,6 @@ vl_api_delete_vhost_user_if_t_handler (vl_api_delete_vhost_user_if_t * mp) return; vnet_clear_sw_interface_tag (vnm, sw_if_index); - send_sw_interface_event_deleted (vam, reg, sw_if_index); } } @@ -169,7 +177,8 @@ send_sw_interface_vhost_user_details (vpe_api_main_t * am, mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_VHOST_USER_DETAILS); mp->sw_if_index = ntohl (vui->sw_if_index); mp->virtio_net_hdr_sz = ntohl (vui->virtio_net_hdr_sz); - mp->features = clib_net_to_host_u64 (vui->features); + virtio_features_encode (vui->features, (u32 *) & mp->features_first_32, + (u32 *) & mp->features_last_32); mp->is_server = vui->is_server; mp->num_regions = ntohl (vui->num_regions); mp->sock_errno = ntohl (vui->sock_errno); @@ -194,19 +203,27 @@ static void vhost_user_intf_details_t *ifaces = NULL; vhost_user_intf_details_t *vuid = NULL; vl_api_registration_t *reg; + u32 filter_sw_if_index; reg = vl_api_client_index_to_registration (mp->client_index); if (!reg) return; + filter_sw_if_index = htonl (mp->sw_if_index); + if (filter_sw_if_index != ~0) + VALIDATE_SW_IF_INDEX (mp); + rv = vhost_user_dump_ifs (vnm, vm, &ifaces); if (rv) return; vec_foreach (vuid, ifaces) { - send_sw_interface_vhost_user_details (am, reg, vuid, mp->context); + if ((filter_sw_if_index == ~0) || + (vuid->sw_if_index == filter_sw_if_index)) + send_sw_interface_vhost_user_details (am, reg, vuid, mp->context); } + BAD_SW_IF_INDEX_LABEL; vec_free (ifaces); } @@ -232,7 +249,7 @@ setup_message_id_table (api_main_t * am) static clib_error_t * vhost_user_api_hookup (vlib_main_t * vm) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); #define _(N,n) \ vl_msg_api_set_handlers(VL_API_##N, #n, \