diff options
| -rw-r--r-- | vlib/vlib/dpdk_buffer.c | 37 | ||||
| -rw-r--r-- | vnet/Makefile.am | 1 | ||||
| -rw-r--r-- | vnet/vnet/devices/dpdk/cli.c | 5 | ||||
| -rw-r--r-- | vnet/vnet/devices/dpdk/device.c | 178 | ||||
| -rw-r--r-- | vnet/vnet/devices/dpdk/dpdk.h | 101 | ||||
| -rw-r--r-- | vnet/vnet/devices/dpdk/dpdk_priv.h | 5 | ||||
| -rw-r--r-- | vnet/vnet/devices/dpdk/format.c | 69 | ||||
| -rw-r--r-- | vnet/vnet/devices/dpdk/init.c | 40 | ||||
| -rw-r--r-- | vnet/vnet/devices/dpdk/node.c | 64 | ||||
| -rw-r--r-- | vnet/vnet/devices/dpdk/vhost_user.c | 2140 | ||||
| -rw-r--r-- | vnet/vnet/devices/virtio/vhost-user.c | 2 | ||||
| -rw-r--r-- | vpp/vpp-api/api.c | 32 |
12 files changed, 10 insertions, 2664 deletions
diff --git a/vlib/vlib/dpdk_buffer.c b/vlib/vlib/dpdk_buffer.c index e617be2ab0a..edb1430d0ca 100644 --- a/vlib/vlib/dpdk_buffer.c +++ b/vlib/vlib/dpdk_buffer.c @@ -971,9 +971,6 @@ vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, vlib_buffer_main_t *bm = vm->buffer_main; vlib_physmem_main_t *vpm = &vm->physmem_main; struct rte_mempool *rmp; -#if RTE_VERSION < RTE_VERSION_NUM(16, 7, 0, 0) - uword new_start, new_size; -#endif int i; if (!rte_pktmbuf_pool_create) @@ -996,7 +993,6 @@ vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, if (rmp) { -#if RTE_VERSION >= RTE_VERSION_NUM(16, 7, 0, 0) { uword this_pool_end; uword this_pool_start; @@ -1063,39 +1059,6 @@ vlib_buffer_pool_create (vlib_main_t * vm, unsigned num_mbufs, return 0; } } -#else - new_start = pointer_to_uword (rmp); - new_size = rmp->elt_va_end - new_start; - - if (vpm->virtual.size > 0) - { - ASSERT (new_start != vpm->virtual.start); - if (new_start < vpm->virtual.start) - { - new_size = vpm->virtual.size + vpm->virtual.start - new_start; - } - else - { - new_size += new_start - vpm->virtual.start; - new_start = vpm->virtual.start; - } - - /* check if fits into buffer index range */ - if ((u64) new_size > ((u64) 1 << (32 + CLIB_LOG2_CACHE_LINE_BYTES))) - rmp = 0; - } - } - - if (rmp) - { - bm->pktmbuf_pools[socket_id] = rmp; - vpm->virtual.start = new_start; - vpm->virtual.size = new_size; - vpm->virtual.end = new_start + new_size; - vec_free (pool_name); - return 0; - } -#endif vec_free (pool_name); diff --git a/vnet/Makefile.am b/vnet/Makefile.am index 56baf40715b..1c5d5b51781 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -660,7 +660,6 @@ libvnet_la_SOURCES += \ vnet/devices/dpdk/init.c \ vnet/devices/dpdk/node.c \ vnet/devices/dpdk/hqos.c \ - vnet/devices/dpdk/vhost_user.c \ vnet/devices/dpdk/cli.c nobase_include_HEADERS += \ diff --git a/vnet/vnet/devices/dpdk/cli.c b/vnet/vnet/devices/dpdk/cli.c index 2683030658a..fbd1637e654 100644 --- a/vnet/vnet/devices/dpdk/cli.c +++ b/vnet/vnet/devices/dpdk/cli.c @@ -169,13 +169,8 @@ show_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, rmp = vm->buffer_main->pktmbuf_pools[i]; if (rmp) { -#if RTE_VERSION >= RTE_VERSION_NUM(16, 7, 0, 0) unsigned count = rte_mempool_avail_count (rmp); unsigned free_count = rte_mempool_in_use_count (rmp); -#else - unsigned count = rte_mempool_count (rmp); - unsigned free_count = rte_mempool_free_count (rmp); -#endif vlib_cli_output (vm, "name=\"%s\" available = %7d allocated = %7d total = %7d\n", diff --git a/vnet/vnet/devices/dpdk/device.c b/vnet/vnet/devices/dpdk/device.c index 5f884a4a400..411380633e7 100644 --- a/vnet/vnet/devices/dpdk/device.c +++ b/vnet/vnet/devices/dpdk/device.c @@ -323,8 +323,7 @@ static_always_inline * This device only supports one TX queue, * and we're running multi-threaded... */ - if (PREDICT_FALSE ((xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) == 0 && - xd->lockp != 0)) + if (PREDICT_FALSE (xd->lockp != 0)) { queue_id = queue_id % xd->tx_q_used; while (__sync_lock_test_and_set (xd->lockp[queue_id], 1)) @@ -405,132 +404,13 @@ static_always_inline n_retry = (rv == xd->nb_tx_desc - tx_tail) ? 1 : 0; } } -#if DPDK_VHOST_USER - else if (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - u32 offset = 0; - if (xd->need_txlock) - { - queue_id = 0; - while (__sync_lock_test_and_set (xd->lockp[queue_id], 1)); - } - else - { - dpdk_device_and_queue_t *dq; - vec_foreach (dq, dm->devices_by_cpu[vm->cpu_index]) - { - if (xd->device_index == dq->device) - break; - } - assert (dq); - offset = dq->queue_id * VIRTIO_QNUM; - } - if (PREDICT_TRUE (tx_head > tx_tail)) - { - int i; - u32 bytes = 0; - struct rte_mbuf **pkts = &tx_vector[tx_tail]; - for (i = 0; i < (tx_head - tx_tail); i++) - { - struct rte_mbuf *buff = pkts[i]; - bytes += rte_pktmbuf_data_len (buff); - } - - /* no wrap, transmit in one burst */ - rv = - rte_vhost_enqueue_burst (&xd->vu_vhost_dev, - offset + VIRTIO_RXQ, - &tx_vector[tx_tail], - (uint16_t) (tx_head - tx_tail)); - if (PREDICT_TRUE (rv > 0)) - { - dpdk_vu_vring *vring = - &(xd->vu_intf->vrings[offset + VIRTIO_TXQ]); - vring->packets += rv; - vring->bytes += bytes; - - if (dpdk_vhost_user_want_interrupt - (xd, offset + VIRTIO_RXQ)) - { - vring = &(xd->vu_intf->vrings[offset + VIRTIO_RXQ]); - vring->n_since_last_int += rv; - - f64 now = vlib_time_now (vm); - if (vring->int_deadline < now || - vring->n_since_last_int > - dm->conf->vhost_coalesce_frames) - dpdk_vhost_user_send_interrupt (vm, xd, - offset + VIRTIO_RXQ); - } - - int c = rv; - while (c--) - rte_pktmbuf_free (tx_vector[tx_tail + c]); - } - } - else - { - /* - * If we transmitted everything we wanted, then allow 1 retry - * so we can try to transmit the rest. If we didn't transmit - * everything, stop now. - */ - int i; - u32 bytes = 0; - struct rte_mbuf **pkts = &tx_vector[tx_tail]; - for (i = 0; i < (xd->nb_tx_desc - tx_tail); i++) - { - struct rte_mbuf *buff = pkts[i]; - bytes += rte_pktmbuf_data_len (buff); - } - rv = - rte_vhost_enqueue_burst (&xd->vu_vhost_dev, - offset + VIRTIO_RXQ, - &tx_vector[tx_tail], - (uint16_t) (xd->nb_tx_desc - - tx_tail)); - - if (PREDICT_TRUE (rv > 0)) - { - dpdk_vu_vring *vring = - &(xd->vu_intf->vrings[offset + VIRTIO_TXQ]); - vring->packets += rv; - vring->bytes += bytes; - - if (dpdk_vhost_user_want_interrupt - (xd, offset + VIRTIO_RXQ)) - { - vring = &(xd->vu_intf->vrings[offset + VIRTIO_RXQ]); - vring->n_since_last_int += rv; - - f64 now = vlib_time_now (vm); - if (vring->int_deadline < now || - vring->n_since_last_int > - dm->conf->vhost_coalesce_frames) - dpdk_vhost_user_send_interrupt (vm, xd, - offset + VIRTIO_RXQ); - } - - int c = rv; - while (c--) - rte_pktmbuf_free (tx_vector[tx_tail + c]); - } - - n_retry = (rv == xd->nb_tx_desc - tx_tail) ? 1 : 0; - } - - if (xd->need_txlock) - *xd->lockp[queue_id] = 0; - } -#endif else { ASSERT (0); rv = 0; } - if (PREDICT_FALSE ((xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) == 0 && - xd->lockp != 0)) + if (PREDICT_FALSE (xd->lockp != 0)) *xd->lockp[queue_id] = 0; if (PREDICT_FALSE (rv < 0)) @@ -919,26 +799,6 @@ dpdk_interface_tx (vlib_main_t * vm, return tx_pkts; } -static int -dpdk_device_renumber (vnet_hw_interface_t * hi, u32 new_dev_instance) -{ -#if DPDK_VHOST_USER - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance); - - if (!xd || (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) == 0) - { - clib_warning - ("cannot renumber non-vhost-user interface (sw_if_index: %d)", - hi->sw_if_index); - return 0; - } - - xd->vu_if_id = new_dev_instance; -#endif - return 0; -} - static void dpdk_clear_hw_interface_counters (u32 instance) { @@ -956,17 +816,6 @@ dpdk_clear_hw_interface_counters (u32 instance) vec_len (xd->last_cleared_xstats) * sizeof (xd->last_cleared_xstats[0])); -#if DPDK_VHOST_USER - if (PREDICT_FALSE (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER)) - { - int i; - for (i = 0; i < xd->rx_q_used * VIRTIO_QNUM; i++) - { - xd->vu_intf->vrings[i].packets = 0; - xd->vu_intf->vrings[i].bytes = 0; - } - } -#endif } static clib_error_t * @@ -978,28 +827,6 @@ dpdk_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) dpdk_device_t *xd = vec_elt_at_index (dm->devices, hif->dev_instance); int rv = 0; -#if DPDK_VHOST_USER - if (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - if (is_up) - { - if (xd->vu_is_running) - vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, - VNET_HW_INTERFACE_FLAG_LINK_UP | - ETH_LINK_FULL_DUPLEX); - xd->flags |= DPDK_DEVICE_FLAG_ADMIN_UP; - } - else - { - vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, 0); - xd->flags &= ~DPDK_DEVICE_FLAG_ADMIN_UP; - } - - return 0; - } -#endif - - if (is_up) { f64 now = vlib_time_now (dm->vlib_main); @@ -1148,7 +975,6 @@ VNET_DEVICE_CLASS (dpdk_device_class) = { .subif_add_del_function = dpdk_subif_add_del_function, .rx_redirect_to_node = dpdk_set_interface_next_node, .no_flatten_output_chains = 1, - .name_renumber = dpdk_device_renumber, .mac_addr_change_function = dpdk_set_mac_address, }; diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h index f216a27019d..c2ea579a6fe 100644 --- a/vnet/vnet/devices/dpdk/dpdk.h +++ b/vnet/vnet/devices/dpdk/dpdk.h @@ -50,7 +50,6 @@ #include <rte_sched.h> #include <vnet/unix/pcap.h> -#include <vnet/devices/virtio/vhost-user.h> #if CLIB_DEBUG > 0 #define always_inline static inline @@ -58,12 +57,6 @@ #define always_inline static inline __attribute__ ((__always_inline__)) #endif -#if RTE_VERSION < RTE_VERSION_NUM(16, 7, 0, 0) -#define DPDK_VHOST_USER 1 -#else -#define DPDK_VHOST_USER 0 -#endif - #include <vlib/pci/pci.h> #define NB_MBUF (16<<10) @@ -131,40 +124,6 @@ typedef struct u32 total_packet_cnt; } dpdk_efd_agent_t; -#if DPDK_VHOST_USER -typedef struct -{ - int callfd; - int kickfd; - int errfd; - int enabled; - u32 callfd_idx; - u32 n_since_last_int; - f64 int_deadline; - u64 packets; - u64 bytes; -} dpdk_vu_vring; - -typedef struct -{ - u32 is_up; - u32 unix_fd; - u32 unix_file_index; - u32 client_fd; - char sock_filename[256]; - int sock_errno; - u8 sock_is_server; - u8 active; - - u64 feature_mask; - u32 num_vrings; - dpdk_vu_vring vrings[VHOST_MAX_QUEUE_PAIRS * 2]; - u64 region_addr[VHOST_MEMORY_MAX_NREGIONS]; - u32 region_fd[VHOST_MEMORY_MAX_NREGIONS]; - u64 region_offset[VHOST_MEMORY_MAX_NREGIONS]; -} dpdk_vu_intf_t; -#endif - typedef void (*dpdk_flowcontrol_callback_t) (vlib_main_t * vm, u32 hw_if_index, u32 n_packets); @@ -236,7 +195,6 @@ typedef struct #define DPDK_DEVICE_FLAG_PROMISC (1 << 1) #define DPDK_DEVICE_FLAG_PMD (1 << 2) -#define DPDK_DEVICE_FLAG_VHOST_USER (1 << 4) #define DPDK_DEVICE_FLAG_HAVE_SUBIF (1 << 5) #define DPDK_DEVICE_FLAG_HQOS (1 << 6) @@ -260,14 +218,6 @@ typedef struct dpdk_device_hqos_per_worker_thread_t *hqos_wt; dpdk_device_hqos_per_hqos_thread_t *hqos_ht; -#if DPDK_VHOST_USER - /* vhost-user related */ - u32 vu_if_id; - struct virtio_net vu_vhost_dev; - u32 vu_is_running; - dpdk_vu_intf_t *vu_intf; -#endif - /* af_packet */ u8 af_packet_port_id; @@ -277,18 +227,12 @@ typedef struct struct rte_eth_stats stats; struct rte_eth_stats last_stats; struct rte_eth_stats last_cleared_stats; -#if RTE_VERSION >= RTE_VERSION_NUM(16, 7, 0, 0) struct rte_eth_xstat *xstats; struct rte_eth_xstat *last_cleared_xstats; -#else - struct rte_eth_xstats *xstats; - struct rte_eth_xstats *last_cleared_xstats; -#endif f64 time_last_stats_update; dpdk_port_type_t port_type; dpdk_efd_agent_t efd_agent; - u8 need_txlock; /* Used by VNET_DPDK_DEV_VHOST_USER */ } dpdk_device_t; #define DPDK_STATS_POLL_INTERVAL (10.0) @@ -420,13 +364,6 @@ typedef struct */ u8 interface_name_format_decimal; - /* virtio vhost-user switch */ - u8 use_virtio_vhost; - - /* vhost-user coalescence frames config */ - u32 vhost_coalesce_frames; - f64 vhost_coalesce_time; - /* per-device config */ dpdk_device_config_t default_devconf; dpdk_device_config_t *dev_confs; @@ -478,8 +415,6 @@ typedef struct uword *vu_sw_if_index_by_sock_fd; u32 *vu_inactive_interfaces_device_index; - u32 next_vu_if_id; - /* efd (early-fast-discard) settings */ dpdk_efd_t efd; @@ -611,14 +546,6 @@ void dpdk_efd_update_counters (dpdk_device_t * xd, u32 n_buffers, u32 is_efd_discardable (vlib_thread_main_t * tm, vlib_buffer_t * b0, struct rte_mbuf *mb); -#if DPDK_VHOST_USER -/* dpdk vhost-user interrupt management */ -u8 dpdk_vhost_user_want_interrupt (dpdk_device_t * xd, int idx); -void dpdk_vhost_user_send_interrupt (vlib_main_t * vm, dpdk_device_t * xd, - int idx); -#endif - - static inline u64 vnet_get_aggregate_rx_packets (void) { @@ -646,34 +573,6 @@ void efd_config (u32 enabled, void post_sw_interface_set_flags (vlib_main_t * vm, u32 sw_if_index, u32 flags); -#if DPDK_VHOST_USER -typedef struct vhost_user_memory vhost_user_memory_t; - -void dpdk_vhost_user_process_init (void **ctx); -void dpdk_vhost_user_process_cleanup (void *ctx); -uword dpdk_vhost_user_process_if (vlib_main_t * vm, dpdk_device_t * xd, - void *ctx); - -// vhost-user calls -int dpdk_vhost_user_create_if (vnet_main_t * vnm, vlib_main_t * vm, - const char *sock_filename, - u8 is_server, - u32 * sw_if_index, - u64 feature_mask, - u8 renumber, u32 custom_dev_instance, - u8 * hwaddr); -int dpdk_vhost_user_modify_if (vnet_main_t * vnm, vlib_main_t * vm, - const char *sock_filename, - u8 is_server, - u32 sw_if_index, - u64 feature_mask, - u8 renumber, u32 custom_dev_instance); -int dpdk_vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm, - u32 sw_if_index); -int dpdk_vhost_user_dump_ifs (vnet_main_t * vnm, vlib_main_t * vm, - vhost_user_intf_details_t ** out_vuids); -#endif - u32 dpdk_get_admin_up_down_in_progress (void); u32 dpdk_num_mbufs (void); diff --git a/vnet/vnet/devices/dpdk/dpdk_priv.h b/vnet/vnet/devices/dpdk/dpdk_priv.h index fd4f2d7ed0b..eb13df2c643 100644 --- a/vnet/vnet/devices/dpdk/dpdk_priv.h +++ b/vnet/vnet/devices/dpdk/dpdk_priv.h @@ -23,22 +23,19 @@ #define DPDK_NB_TX_DESC_40GE 1024 #define DPDK_NB_RX_DESC_ENIC 1024 -#if RTE_VERSION >= RTE_VERSION_NUM(16, 7, 0, 0) #define I40E_DEV_ID_SFP_XL710 0x1572 #define I40E_DEV_ID_QSFP_A 0x1583 #define I40E_DEV_ID_QSFP_B 0x1584 #define I40E_DEV_ID_QSFP_C 0x1585 #define I40E_DEV_ID_10G_BASE_T 0x1586 #define I40E_DEV_ID_VF 0x154C -#endif /* These args appear by themselves */ #define foreach_eal_double_hyphen_predicate_arg \ _(no-shconf) \ _(no-hpet) \ _(no-huge) \ -_(vmware-tsc-map) \ -_(virtio-vhost) +_(vmware-tsc-map) #define foreach_eal_single_hyphen_mandatory_arg \ _(coremask, c) \ diff --git a/vnet/vnet/devices/dpdk/format.c b/vnet/vnet/devices/dpdk/format.c index 5865174990b..4a4f8080f9e 100644 --- a/vnet/vnet/devices/dpdk/format.c +++ b/vnet/vnet/devices/dpdk/format.c @@ -165,12 +165,6 @@ format_dpdk_device_name (u8 * s, va_list * args) else devname_format = "%s%x/%x/%x"; -#if DPDK_VHOST_USER - if (dm->devices[i].flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - return format (s, "VirtualEthernet0/0/%d", dm->devices[i].vu_if_id); - } -#endif switch (dm->devices[i].port_type) { case VNET_DPDK_PORT_TYPE_ETH_1G: @@ -219,11 +213,6 @@ format_dpdk_device_type (u8 * s, va_list * args) char *dev_type; u32 i = va_arg (*args, u32); - if (dm->devices[i].flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - return format (s, "vhost-user interface"); - } - switch (dm->devices[i].pmd) { case VNET_DPDK_PMD_E1000EM: @@ -444,13 +433,6 @@ format_dpdk_device (u8 * s, va_list * args) format_dpdk_rss_hf_name, di.flow_type_rss_offloads); } - if (verbose && xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - s = format (s, "%Uqueue size (max): rx %d (%d) tx %d (%d)\n", - format_white_space, indent + 2, - xd->rx_q_used, xd->rx_q_used, xd->tx_q_used, xd->tx_q_used); - } - s = format (s, "%Urx queues %d, rx desc %d, tx queues %d, tx desc %d\n", format_white_space, indent + 2, xd->rx_q_used, xd->nb_rx_desc, xd->tx_q_used, xd->nb_tx_desc); @@ -475,15 +457,11 @@ format_dpdk_device (u8 * s, va_list * args) u8 *xs = 0; u32 i = 0; -#if RTE_VERSION < RTE_VERSION_NUM(16, 7, 0, 0) - struct rte_eth_xstats *xstat, *last_xstat; -#else struct rte_eth_xstat *xstat, *last_xstat; struct rte_eth_xstat_name *xstat_names = 0; int len = rte_eth_xstats_get_names (xd->device_index, NULL, 0); vec_validate (xstat_names, len - 1); rte_eth_xstats_get_names (xd->device_index, xstat_names, len); -#endif ASSERT (vec_len (xd->xstats) == vec_len (xd->last_cleared_xstats)); @@ -498,11 +476,7 @@ format_dpdk_device (u8 * s, va_list * args) if (verbose == 2 || (verbose && delta)) { /* format_c_identifier doesn't like c strings inside vector */ -#if RTE_VERSION < RTE_VERSION_NUM(16, 7, 0, 0) - u8 * name = format(0,"%s", xstat->name); -#else u8 * name = format(0,"%s", xstat_names[i].name); -#endif xs = format(xs, "\n%U%-38U%16Ld", format_white_space, indent + 4, format_c_identifier, name, delta); @@ -511,50 +485,7 @@ format_dpdk_device (u8 * s, va_list * args) } /* *INDENT-ON* */ -#if RTE_VERSION >= RTE_VERSION_NUM(16, 7, 0, 0) vec_free (xstat_names); -#endif - -#if DPDK_VHOST_USER - if (verbose && xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - int i; - for (i = 0; i < xd->rx_q_used * VIRTIO_QNUM; i++) - { - u8 *name; - if (verbose == 2 || xd->vu_intf->vrings[i].packets) - { - if (i & 1) - { - name = format (NULL, "tx q%d packets", i >> 1); - } - else - { - name = format (NULL, "rx q%d packets", i >> 1); - } - xs = format (xs, "\n%U%-38U%16Ld", - format_white_space, indent + 4, - format_c_identifier, name, - xd->vu_intf->vrings[i].packets); - vec_free (name); - - if (i & 1) - { - name = format (NULL, "tx q%d bytes", i >> 1); - } - else - { - name = format (NULL, "rx q%d bytes", i >> 1); - } - xs = format (xs, "\n%U%-38U%16Ld", - format_white_space, indent + 4, - format_c_identifier, name, - xd->vu_intf->vrings[i].bytes); - vec_free (name); - } - } - } -#endif if (xs) { diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index 8077ef8071e..7045e454048 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -221,7 +221,6 @@ dpdk_device_lock_init (dpdk_device_t * xd) CLIB_CACHE_LINE_BYTES); memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES); } - xd->need_txlock = 1; } void @@ -233,7 +232,6 @@ dpdk_device_lock_free (dpdk_device_t * xd) clib_mem_free ((void *) xd->lockp[q]); vec_free (xd->lockp); xd->lockp = 0; - xd->need_txlock = 0; } static clib_error_t * @@ -795,9 +793,6 @@ dpdk_lib_init (dpdk_main_t * dm) clib_warning ("%d mbufs allocated but total rx/tx ring size is %d\n", dm->conf->num_mbufs, nb_desc); - /* init next vhost-user if index */ - dm->next_vu_if_id = 0; - return 0; } @@ -993,9 +988,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) conf->device_config_index_by_pci_addr = hash_create (0, sizeof (uword)); - // MATT-FIXME: inverted virtio-vhost logic to use virtio by default - conf->use_virtio_vhost = 1; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { /* Prime the pump */ @@ -1053,18 +1045,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) ; else if (unformat (input, "socket-mem %s", &socket_mem)) ; - else - if (unformat - (input, "vhost-user-coalesce-frames %d", - &conf->vhost_coalesce_frames)) - ; - else - if (unformat - (input, "vhost-user-coalesce-time %f", - &conf->vhost_coalesce_time)) - ; - else if (unformat (input, "enable-vhost-user")) - conf->use_virtio_vhost = 0; else if (unformat (input, "no-pci")) { no_pci = 1; @@ -1527,9 +1507,6 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) ethernet_main_t *em = ðernet_main; dpdk_device_t *xd; vlib_thread_main_t *tm = vlib_get_thread_main (); -#if DPDK_VHOST_USER - void *vu_state; -#endif int i; error = dpdk_lib_init (dm); @@ -1554,10 +1531,6 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) if (error) clib_error_report (error); -#if DPDK_VHOST_USER - dpdk_vhost_user_process_init (&vu_state); -#endif - tm->worker_thread_release = 1; f64 now = vlib_time_now (vm); @@ -1680,18 +1653,9 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) if ((now - xd->time_last_link_update) >= dm->link_state_poll_interval) dpdk_update_link_state (xd, now); -#if DPDK_VHOST_USER - if (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - if (dpdk_vhost_user_process_if (vm, xd, vu_state) != 0) - continue; -#endif } } -#if DPDK_VHOST_USER - dpdk_vhost_user_process_cleanup (vu_state); -#endif - return 0; } @@ -1768,10 +1732,6 @@ dpdk_init (vlib_main_t * vm) dm->efd.consec_full_frames_hi_thresh = DPDK_EFD_DEFAULT_CONSEC_FULL_FRAMES_HI_THRESH; - /* vhost-user coalescence frames defaults */ - dm->conf->vhost_coalesce_frames = 32; - dm->conf->vhost_coalesce_time = 1e-3; - /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */ dm->buffer_flags_template = (VLIB_BUFFER_TOTAL_LENGTH_VALID diff --git a/vnet/vnet/devices/dpdk/node.c b/vnet/vnet/devices/dpdk/node.c index d1db5e23165..a58c8d51917 100644 --- a/vnet/vnet/devices/dpdk/node.c +++ b/vnet/vnet/devices/dpdk/node.c @@ -303,70 +303,6 @@ dpdk_rx_burst (dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id) break; } } -#if DPDK_VHOST_USER - else if (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - vlib_main_t *vm = vlib_get_main (); - vlib_buffer_main_t *bm = vm->buffer_main; - unsigned socket_id = rte_socket_id (); - u32 offset = 0; - - offset = queue_id * VIRTIO_QNUM; - - struct vhost_virtqueue *vq = - xd->vu_vhost_dev.virtqueue[offset + VIRTIO_TXQ]; - - if (PREDICT_FALSE (!vq->enabled)) - return 0; - - struct rte_mbuf **pkts = xd->rx_vectors[queue_id]; - while (n_left) - { - n_this_chunk = rte_vhost_dequeue_burst (&xd->vu_vhost_dev, - offset + VIRTIO_TXQ, - bm->pktmbuf_pools - [socket_id], - pkts + n_buffers, n_left); - n_buffers += n_this_chunk; - n_left -= n_this_chunk; - if (n_this_chunk == 0) - break; - } - - int i; - u32 bytes = 0; - for (i = 0; i < n_buffers; i++) - { - struct rte_mbuf *buff = pkts[i]; - bytes += rte_pktmbuf_data_len (buff); - } - - f64 now = vlib_time_now (vm); - - dpdk_vu_vring *vring = NULL; - /* send pending interrupts if needed */ - if (dpdk_vhost_user_want_interrupt (xd, offset + VIRTIO_TXQ)) - { - vring = &(xd->vu_intf->vrings[offset + VIRTIO_TXQ]); - vring->n_since_last_int += n_buffers; - - if ((vring->n_since_last_int && (vring->int_deadline < now)) - || (vring->n_since_last_int > dm->conf->vhost_coalesce_frames)) - dpdk_vhost_user_send_interrupt (vm, xd, offset + VIRTIO_TXQ); - } - - vring = &(xd->vu_intf->vrings[offset + VIRTIO_RXQ]); - vring->packets += n_buffers; - vring->bytes += bytes; - - if (dpdk_vhost_user_want_interrupt (xd, offset + VIRTIO_RXQ)) - { - if (vring->n_since_last_int && (vring->int_deadline < now)) - dpdk_vhost_user_send_interrupt (vm, xd, offset + VIRTIO_RXQ); - } - - } -#endif else { ASSERT (0); diff --git a/vnet/vnet/devices/dpdk/vhost_user.c b/vnet/vnet/devices/dpdk/vhost_user.c deleted file mode 100644 index e37dfde1f73..00000000000 --- a/vnet/vnet/devices/dpdk/vhost_user.c +++ /dev/null @@ -1,2140 +0,0 @@ -/* - * Copyright (c) 2015 Cisco and/or its affiliates. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include <assert.h> -#include <sys/socket.h> -#include <sys/un.h> -#include <sys/stat.h> -#include <sys/vfs.h> - -#include <vlib/vlib.h> -#include <vlib/unix/unix.h> - -#include <vnet/vnet.h> -#include <vppinfra/vec.h> -#include <vppinfra/error.h> -#include <vppinfra/format.h> - -#include <vnet/ethernet/ethernet.h> -#include <vnet/devices/dpdk/dpdk.h> - -#include <vnet/devices/virtio/vhost-user.h> - -#define VHOST_USER_DEBUG_SOCKET 0 - -#if VHOST_USER_DEBUG_SOCKET == 1 -#define DBG_SOCK(args...) clib_warning(args); -#else -#define DBG_SOCK(args...) -#endif - -#if DPDK_VHOST_USER - -/* *INDENT-OFF* */ -static const char *vhost_message_str[] __attribute__ ((unused)) = -{ - [VHOST_USER_NONE] = "VHOST_USER_NONE", - [VHOST_USER_GET_FEATURES] = "VHOST_USER_GET_FEATURES", - [VHOST_USER_SET_FEATURES] = "VHOST_USER_SET_FEATURES", - [VHOST_USER_SET_OWNER] = "VHOST_USER_SET_OWNER", - [VHOST_USER_RESET_OWNER] = "VHOST_USER_RESET_OWNER", - [VHOST_USER_SET_MEM_TABLE] = "VHOST_USER_SET_MEM_TABLE", - [VHOST_USER_SET_LOG_BASE] = "VHOST_USER_SET_LOG_BASE", - [VHOST_USER_SET_LOG_FD] = "VHOST_USER_SET_LOG_FD", - [VHOST_USER_SET_VRING_NUM] = "VHOST_USER_SET_VRING_NUM", - [VHOST_USER_SET_VRING_ADDR] = "VHOST_USER_SET_VRING_ADDR", - [VHOST_USER_SET_VRING_BASE] = "VHOST_USER_SET_VRING_BASE", - [VHOST_USER_GET_VRING_BASE] = "VHOST_USER_GET_VRING_BASE", - [VHOST_USER_SET_VRING_KICK] = "VHOST_USER_SET_VRING_KICK", - [VHOST_USER_SET_VRING_CALL] = "VHOST_USER_SET_VRING_CALL", - [VHOST_USER_SET_VRING_ERR] = "VHOST_USER_SET_VRING_ERR", - [VHOST_USER_GET_PROTOCOL_FEATURES] = "VHOST_USER_GET_PROTOCOL_FEATURES", - [VHOST_USER_SET_PROTOCOL_FEATURES] = "VHOST_USER_SET_PROTOCOL_FEATURES", - [VHOST_USER_GET_QUEUE_NUM] = "VHOST_USER_GET_QUEUE_NUM", - [VHOST_USER_SET_VRING_ENABLE] = "VHOST_USER_SET_VRING_ENABLE", -}; -/* *INDENT-ON* */ - -static int dpdk_vhost_user_set_vring_enable (u32 hw_if_index, - u8 idx, int enable); - -/* - * DPDK vhost-user functions - */ - -/* portions taken from dpdk - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - -static uword -qva_to_vva (struct virtio_net *dev, uword qemu_va) -{ - struct virtio_memory_regions *region; - uword vhost_va = 0; - uint32_t regionidx = 0; - - /* Find the region where the address lives. */ - for (regionidx = 0; regionidx < dev->mem->nregions; regionidx++) - { - region = &dev->mem->regions[regionidx]; - if ((qemu_va >= region->userspace_address) && - (qemu_va <= region->userspace_address + region->memory_size)) - { - vhost_va = qemu_va + region->guest_phys_address + - region->address_offset - region->userspace_address; - break; - } - } - return vhost_va; -} - -static dpdk_device_t * -dpdk_vhost_user_device_from_hw_if_index (u32 hw_if_index) -{ - vnet_main_t *vnm = vnet_get_main (); - dpdk_main_t *dm = &dpdk_main; - vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index); - dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance); - - if ((xd->flags DPDK_DEVICE_FLAG_VHOST_USER) == 0) - return 0; - - return xd; -} - -static dpdk_device_t * -dpdk_vhost_user_device_from_sw_if_index (u32 sw_if_index) -{ - vnet_main_t *vnm = vnet_get_main (); - vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, sw_if_index); - ASSERT (sw->type == VNET_SW_INTERFACE_TYPE_HARDWARE); - - return dpdk_vhost_user_device_from_hw_if_index (sw->hw_if_index); -} - -static void -stop_processing_packets (u32 hw_if_index, u8 idx) -{ - dpdk_device_t *xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index); - assert (xd); - xd->vu_vhost_dev.virtqueue[idx]->enabled = 0; -} - -static void -disable_interface (dpdk_device_t * xd) -{ - u8 idx; - int numqs = xd->vu_vhost_dev.virt_qp_nb * VIRTIO_QNUM; - for (idx = 0; idx < numqs; idx++) - xd->vu_vhost_dev.virtqueue[idx]->enabled = 0; - - xd->vu_is_running = 0; -} - -static inline void * -map_guest_mem (dpdk_device_t * xd, uword addr) -{ - dpdk_vu_intf_t *vui = xd->vu_intf; - struct virtio_memory *mem = xd->vu_vhost_dev.mem; - int i; - for (i = 0; i < mem->nregions; i++) - { - if ((mem->regions[i].guest_phys_address <= addr) && - ((mem->regions[i].guest_phys_address + - mem->regions[i].memory_size) > addr)) - { - return (void *) ((uword) vui->region_addr[i] + addr - - (uword) mem->regions[i].guest_phys_address); - } - } - DBG_SOCK ("failed to map guest mem addr %lx", addr); - return 0; -} - -static clib_error_t * -dpdk_create_vhost_user_if_internal (u32 * hw_if_index, u32 if_id, u8 * hwaddr) -{ - dpdk_main_t *dm = &dpdk_main; - vlib_main_t *vm = vlib_get_main (); - vlib_thread_main_t *tm = vlib_get_thread_main (); - vnet_sw_interface_t *sw; - clib_error_t *error; - dpdk_device_and_queue_t *dq; - int num_qpairs = 1; - dpdk_vu_intf_t *vui = NULL; - - num_qpairs = dm->use_rss < 1 ? 1 : tm->n_vlib_mains; - - dpdk_device_t *xd = NULL; - u8 addr[6]; - int j; - - vlib_worker_thread_barrier_sync (vm); - - int inactive_cnt = vec_len (dm->vu_inactive_interfaces_device_index); - // if there are any inactive ifaces - if (inactive_cnt > 0) - { - // take last - u32 vui_idx = dm->vu_inactive_interfaces_device_index[inactive_cnt - 1]; - if (vec_len (dm->devices) > vui_idx) - { - xd = vec_elt_at_index (dm->devices, vui_idx); - if (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - DBG_SOCK - ("reusing inactive vhost-user interface sw_if_index %d", - xd->vlib_sw_if_index); - } - else - { - clib_warning - ("error: inactive vhost-user interface sw_if_index %d not VHOST_USER type!", - xd->vlib_sw_if_index); - // reset so new interface is created - xd = NULL; - } - } - // "remove" from inactive list - _vec_len (dm->vu_inactive_interfaces_device_index) -= 1; - } - - if (xd) - { - // existing interface used - do not overwrite if_id if not needed - if (if_id != (u32) ~ 0) - xd->vu_if_id = if_id; - - // reset virtqueues - vui = xd->vu_intf; - for (j = 0; j < num_qpairs * VIRTIO_QNUM; j++) - { - memset (xd->vu_vhost_dev.virtqueue[j], 0, - sizeof (struct vhost_virtqueue)); - xd->vu_vhost_dev.virtqueue[j]->kickfd = -1; - xd->vu_vhost_dev.virtqueue[j]->callfd = -1; - xd->vu_vhost_dev.virtqueue[j]->backend = -1; - vui->vrings[j].packets = 0; - vui->vrings[j].bytes = 0; - } - - // reset lockp - dpdk_device_lock_free (xd); - dpdk_device_lock_init (xd); - - // reset tx vectors - for (j = 0; j < tm->n_vlib_mains; j++) - { - vec_validate_ha (xd->tx_vectors[j], xd->nb_tx_desc, - sizeof (tx_ring_hdr_t), CLIB_CACHE_LINE_BYTES); - vec_reset_length (xd->tx_vectors[j]); - } - - // reset rx vector - for (j = 0; j < xd->rx_q_used; j++) - { - vec_validate_aligned (xd->rx_vectors[j], VLIB_FRAME_SIZE - 1, - CLIB_CACHE_LINE_BYTES); - vec_reset_length (xd->rx_vectors[j]); - } - } - else - { - // vui was not retrieved from inactive ifaces - create new - vec_add2_aligned (dm->devices, xd, 1, CLIB_CACHE_LINE_BYTES); - xd->flags |= DPDK_DEVICE_FLAG_VHOST_USER; - xd->rx_q_used = num_qpairs; - xd->tx_q_used = num_qpairs; - xd->vu_vhost_dev.virt_qp_nb = num_qpairs; - - vec_validate_aligned (xd->rx_vectors, xd->rx_q_used, - CLIB_CACHE_LINE_BYTES); - - if (if_id == (u32) ~ 0) - xd->vu_if_id = dm->next_vu_if_id++; - else - xd->vu_if_id = if_id; - - xd->device_index = xd - dm->devices; - xd->per_interface_next_index = ~0; - xd->vu_intf = clib_mem_alloc (sizeof (*(xd->vu_intf))); - - xd->vu_vhost_dev.mem = clib_mem_alloc (sizeof (struct virtio_memory) + - VHOST_MEMORY_MAX_NREGIONS * - sizeof (struct - virtio_memory_regions)); - - /* Will be set when guest sends VHOST_USER_SET_MEM_TABLE cmd */ - xd->vu_vhost_dev.mem->nregions = 0; - - /* - * New virtqueue structure is an array of VHOST_MAX_QUEUE_PAIRS * 2 - * We need to allocate numq pairs. - */ - vui = xd->vu_intf; - for (j = 0; j < num_qpairs * VIRTIO_QNUM; j++) - { - xd->vu_vhost_dev.virtqueue[j] = - clib_mem_alloc (sizeof (struct vhost_virtqueue)); - memset (xd->vu_vhost_dev.virtqueue[j], 0, - sizeof (struct vhost_virtqueue)); - xd->vu_vhost_dev.virtqueue[j]->kickfd = -1; - xd->vu_vhost_dev.virtqueue[j]->callfd = -1; - xd->vu_vhost_dev.virtqueue[j]->backend = -1; - vui->vrings[j].packets = 0; - vui->vrings[j].bytes = 0; - } - - dpdk_device_lock_init (xd); - - DBG_SOCK - ("tm->n_vlib_mains: %d. TX %d, RX: %d, num_qpairs: %d, Lock: %p", - tm->n_vlib_mains, xd->tx_q_used, xd->rx_q_used, num_qpairs, - xd->lockp); - - vec_validate_aligned (xd->tx_vectors, tm->n_vlib_mains, - CLIB_CACHE_LINE_BYTES); - - for (j = 0; j < tm->n_vlib_mains; j++) - { - vec_validate_ha (xd->tx_vectors[j], xd->nb_tx_desc, - sizeof (tx_ring_hdr_t), CLIB_CACHE_LINE_BYTES); - vec_reset_length (xd->tx_vectors[j]); - } - - // reset rx vector - for (j = 0; j < xd->rx_q_used; j++) - { - vec_validate_aligned (xd->rx_vectors[j], VLIB_FRAME_SIZE - 1, - CLIB_CACHE_LINE_BYTES); - vec_reset_length (xd->rx_vectors[j]); - } - - } - /* - * Generate random MAC address for the interface - */ - if (hwaddr) - { - clib_memcpy (addr, hwaddr, sizeof (addr)); - } - else - { - f64 now = vlib_time_now (vm); - u32 rnd; - rnd = (u32) (now * 1e6); - rnd = random_u32 (&rnd); - - clib_memcpy (addr + 2, &rnd, sizeof (rnd)); - addr[0] = 2; - addr[1] = 0xfe; - } - - error = ethernet_register_interface - (dm->vnet_main, dpdk_device_class.index, xd->device_index, - /* ethernet address */ addr, - &xd->vlib_hw_if_index, 0); - - if (error) - return error; - - sw = vnet_get_hw_sw_interface (dm->vnet_main, xd->vlib_hw_if_index); - xd->vlib_sw_if_index = sw->sw_if_index; - - *hw_if_index = xd->vlib_hw_if_index; - - DBG_SOCK ("xd->device_index: %d, dm->input_cpu_count: %d, " - "dm->input_cpu_first_index: %d\n", xd->device_index, - dm->input_cpu_count, dm->input_cpu_first_index); - - int q, next_cpu = 0; - for (q = 0; q < num_qpairs; q++) - { - int cpu = dm->input_cpu_first_index + (next_cpu % dm->input_cpu_count); - - unsigned lcore = vlib_worker_threads[cpu].lcore_id; - vec_validate (xd->cpu_socket_id_by_queue, q); - xd->cpu_socket_id_by_queue[q] = rte_lcore_to_socket_id (lcore); - - vec_add2 (dm->devices_by_cpu[cpu], dq, 1); - dq->device = xd->device_index; - dq->queue_id = q; - DBG_SOCK ("CPU for %d = %d. QID: %d", *hw_if_index, cpu, dq->queue_id); - - // start polling if it was not started yet (because of no phys ifaces) - if (tm->n_vlib_mains == 1 - && dpdk_input_node.state != VLIB_NODE_STATE_POLLING) - vlib_node_set_state (vm, dpdk_input_node.index, - VLIB_NODE_STATE_POLLING); - - if (tm->n_vlib_mains > 1) - vlib_node_set_state (vlib_mains[cpu], dpdk_input_node.index, - VLIB_NODE_STATE_POLLING); - next_cpu++; - } - - vlib_worker_thread_barrier_release (vm); - return 0; -} - -static long -get_huge_page_size (int fd) -{ - struct statfs s; - fstatfs (fd, &s); - return s.f_bsize; -} - -static clib_error_t * -dpdk_vhost_user_set_protocol_features (u32 hw_if_index, u64 prot_features) -{ - dpdk_device_t *xd; - xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index); - assert (xd); - xd->vu_vhost_dev.protocol_features = prot_features; - return 0; -} - -static clib_error_t * -dpdk_vhost_user_get_features (u32 hw_if_index, u64 * features) -{ - *features = rte_vhost_feature_get (); - -#define OFFLOAD_FEATURES ((1ULL << VIRTIO_NET_F_HOST_TSO4) | \ - (1ULL << VIRTIO_NET_F_HOST_TSO6) | \ - (1ULL << VIRTIO_NET_F_CSUM) | \ - (1ULL << VIRTIO_NET_F_GUEST_CSUM) | \ - (1ULL << VIRTIO_NET_F_GUEST_TSO4) | \ - (1ULL << VIRTIO_NET_F_GUEST_TSO6)) - - /* These are not suppoted as bridging/tunneling VHOST - * interfaces with hardware interfaces/drivers that does - * not support offloading breaks L4 traffic. - */ - *features &= (~OFFLOAD_FEATURES); - - DBG_SOCK ("supported features: 0x%lx", *features); - return 0; -} - -static clib_error_t * -dpdk_vhost_user_set_features (u32 hw_if_index, u64 features) -{ - dpdk_device_t *xd; - u16 hdr_len = sizeof (struct virtio_net_hdr); - - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - - xd->vu_vhost_dev.features = features; - - if (xd->vu_vhost_dev.features & (1 << VIRTIO_NET_F_MRG_RXBUF)) - hdr_len = sizeof (struct virtio_net_hdr_mrg_rxbuf); - - int numqs = VIRTIO_QNUM; - u8 idx; - int prot_feature = features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES); - numqs = xd->vu_vhost_dev.virt_qp_nb * VIRTIO_QNUM; - for (idx = 0; idx < numqs; idx++) - { - xd->vu_vhost_dev.virtqueue[idx]->vhost_hlen = hdr_len; - /* - * Spec says, if F_PROTOCOL_FEATURE is not set by the - * slave, then all the vrings should start off as - * enabled. If slave negotiates F_PROTOCOL_FEATURE, then - * slave is responsible to enable it. - */ - if (!prot_feature) - dpdk_vhost_user_set_vring_enable (hw_if_index, idx, 1); - } - - return 0; -} - -static clib_error_t * -dpdk_vhost_user_set_mem_table (u32 hw_if_index, vhost_user_memory_t * vum, - int fd[]) -{ - struct virtio_memory *mem; - int i; - dpdk_device_t *xd; - dpdk_vu_intf_t *vui; - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - - vui = xd->vu_intf; - mem = xd->vu_vhost_dev.mem; - - mem->nregions = vum->nregions; - - for (i = 0; i < mem->nregions; i++) - { - u64 mapped_size, mapped_address; - - mem->regions[i].guest_phys_address = vum->regions[i].guest_phys_addr; - mem->regions[i].guest_phys_address_end = - vum->regions[i].guest_phys_addr + vum->regions[i].memory_size; - mem->regions[i].memory_size = vum->regions[i].memory_size; - mem->regions[i].userspace_address = vum->regions[i].userspace_addr; - - mapped_size = mem->regions[i].memory_size + vum->regions[i].mmap_offset; - mapped_address = - pointer_to_uword (mmap - (NULL, mapped_size, PROT_READ | PROT_WRITE, - MAP_SHARED, fd[i], 0)); - - if (uword_to_pointer (mapped_address, void *) == MAP_FAILED) - { - clib_warning ("mmap error"); - return 0; - } - - mapped_address += vum->regions[i].mmap_offset; - vui->region_addr[i] = mapped_address; - vui->region_fd[i] = fd[i]; - vui->region_offset[i] = vum->regions[i].mmap_offset; - mem->regions[i].address_offset = - mapped_address - mem->regions[i].guest_phys_address; - - DBG_SOCK ("map memory region %d addr 0x%lx off 0x%lx len 0x%lx", - i, vui->region_addr[i], vui->region_offset[i], mapped_size); - - if (vum->regions[i].guest_phys_addr == 0) - { - mem->base_address = vum->regions[i].userspace_addr; - mem->mapped_address = mem->regions[i].address_offset; - } - } - - disable_interface (xd); - return 0; -} - -static clib_error_t * -dpdk_vhost_user_set_vring_num (u32 hw_if_index, u8 idx, u32 num) -{ - dpdk_device_t *xd; - struct vhost_virtqueue *vq; - - DBG_SOCK ("idx %u num %u", idx, num); - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - vq = xd->vu_vhost_dev.virtqueue[idx]; - vq->size = num; - - stop_processing_packets (hw_if_index, idx); - - return 0; -} - -static clib_error_t * -dpdk_vhost_user_set_vring_addr (u32 hw_if_index, u8 idx, uword desc, - uword used, uword avail, uword log) -{ - dpdk_device_t *xd; - struct vhost_virtqueue *vq; - - DBG_SOCK ("idx %u desc 0x%lx used 0x%lx avail 0x%lx log 0x%lx", - idx, desc, used, avail, log); - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - vq = xd->vu_vhost_dev.virtqueue[idx]; - - vq->desc = (struct vring_desc *) qva_to_vva (&xd->vu_vhost_dev, desc); - vq->used = (struct vring_used *) qva_to_vva (&xd->vu_vhost_dev, used); - vq->avail = (struct vring_avail *) qva_to_vva (&xd->vu_vhost_dev, avail); - vq->log_guest_addr = log; - - if (!(vq->desc && vq->used && vq->avail)) - { - clib_warning ("falied to set vring addr"); - } - - if (vq->last_used_idx != vq->used->idx) - { - clib_warning ("last_used_idx (%u) and vq->used->idx (%u) mismatches; " - "some packets maybe resent for Tx and dropped for Rx", - vq->last_used_idx, vq->used->idx); - vq->last_used_idx = vq->used->idx; - vq->last_used_idx_res = vq->used->idx; - } - - /* - * Inform the guest that there is no need to inform (kick) the - * host when it adds buffers. kick results in vmexit and will - * incur performance degradation. - * - * The below function sets a flag in used table. Therefore, - * should be initialized after initializing vq->used. - */ - rte_vhost_enable_guest_notification (&xd->vu_vhost_dev, idx, 0); - stop_processing_packets (hw_if_index, idx); - - return 0; -} - -static clib_error_t * -dpdk_vhost_user_get_vring_base (u32 hw_if_index, u8 idx, u32 * num) -{ - dpdk_device_t *xd; - struct vhost_virtqueue *vq; - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - - vq = xd->vu_vhost_dev.virtqueue[idx]; - *num = vq->last_used_idx; - -/* - * From spec: - * Client must start ring upon receiving a kick - * (that is, detecting that file descriptor is readable) - * on the descriptor specified by VHOST_USER_SET_VRING_KICK, - * and stop ring upon receiving VHOST_USER_GET_VRING_BASE. - */ - DBG_SOCK ("Stopping vring Q %u of device %d", idx, hw_if_index); - dpdk_vu_intf_t *vui = xd->vu_intf; - - /* if there is old fd, delete it */ - if (vui->vrings[idx].callfd > 0) - { - unix_file_t *uf = pool_elt_at_index (unix_main.file_pool, - vui->vrings[idx].callfd_idx); - unix_file_del (&unix_main, uf); - } - - vui->vrings[idx].enabled = 0; /* Reset local copy */ - vui->vrings[idx].callfd = -1; /* Reset FD */ - vq->enabled = 0; - vq->desc = NULL; - vq->used = NULL; - vq->avail = NULL; - vq->log_guest_addr = 0; - - /* Check if all Qs are disabled */ - int numqs = xd->vu_vhost_dev.virt_qp_nb * VIRTIO_QNUM; - for (idx = 0; idx < numqs; idx++) - { - if (xd->vu_vhost_dev.virtqueue[idx]->enabled) - break; - } - - /* If all vrings are disabed then disable device */ - if (idx == numqs) - { - DBG_SOCK ("Device %d disabled", hw_if_index); - xd->vu_is_running = 0; - } - - return 0; -} - -static clib_error_t * -dpdk_vhost_user_set_vring_base (u32 hw_if_index, u8 idx, u32 num) -{ - dpdk_device_t *xd; - struct vhost_virtqueue *vq; - - DBG_SOCK ("idx %u num %u", idx, num); - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - - vq = xd->vu_vhost_dev.virtqueue[idx]; - vq->last_used_idx = num; - vq->last_used_idx_res = num; - - stop_processing_packets (hw_if_index, idx); - - return 0; -} - -static clib_error_t * -dpdk_vhost_user_set_vring_kick (u32 hw_if_index, u8 idx, int fd) -{ - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd; - dpdk_vu_vring *vring; - struct vhost_virtqueue *vq0, *vq1, *vq; - int index, vu_is_running = 0; - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - - vq = xd->vu_vhost_dev.virtqueue[idx]; - vq->kickfd = fd; - - vring = &xd->vu_intf->vrings[idx]; - vq->enabled = (vq->desc && vq->avail && vq->used && vring->enabled) ? 1 : 0; - - /* - * Set xd->vu_is_running if at least one pair of - * RX/TX queues are enabled. - */ - int numqs = VIRTIO_QNUM; - numqs = xd->vu_vhost_dev.virt_qp_nb * VIRTIO_QNUM; - - for (index = 0; index < numqs; index += 2) - { - vq0 = xd->vu_vhost_dev.virtqueue[index]; /* RX */ - vq1 = xd->vu_vhost_dev.virtqueue[index + 1]; /* TX */ - if (vq0->enabled && vq1->enabled) - { - vu_is_running = 1; - break; - } - } - DBG_SOCK ("SET_VRING_KICK - idx %d, running %d, fd: %d", - idx, vu_is_running, fd); - - xd->vu_is_running = vu_is_running; - if (xd->vu_is_running && xd->admin_up) - { - vnet_hw_interface_set_flags (dm->vnet_main, - xd->vlib_hw_if_index, - VNET_HW_INTERFACE_FLAG_LINK_UP | - ETH_LINK_FULL_DUPLEX); - } - - return 0; -} - -static int -dpdk_vhost_user_set_vring_enable (u32 hw_if_index, u8 idx, int enable) -{ - dpdk_device_t *xd; - struct vhost_virtqueue *vq; - dpdk_vu_intf_t *vui; - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - - vui = xd->vu_intf; - /* - * Guest vhost driver wrongly enables queue before - * setting the vring address. Therefore, save a - * local copy. Reflect it in vq structure if addresses - * are set. If not, vq will be enabled when vring - * is kicked. - */ - vui->vrings[idx].enabled = enable; /* Save local copy */ - - int numqs = xd->vu_vhost_dev.virt_qp_nb * VIRTIO_QNUM; - while (numqs--) - { - if (!vui->vrings[numqs].enabled) - break; - } - - if (numqs == -1) /* All Qs are enabled */ - xd->need_txlock = 0; - else - xd->need_txlock = 1; - - vq = xd->vu_vhost_dev.virtqueue[idx]; - if (vq->desc && vq->avail && vq->used) - xd->vu_vhost_dev.virtqueue[idx]->enabled = enable; - - return 0; -} - -static clib_error_t * -dpdk_vhost_user_callfd_read_ready (unix_file_t * uf) -{ - __attribute__ ((unused)) int n; - u8 buff[8]; - n = read (uf->file_descriptor, ((char *) &buff), 8); - return 0; -} - -static clib_error_t * -dpdk_vhost_user_set_vring_call (u32 hw_if_index, u8 idx, int fd) -{ - dpdk_device_t *xd; - struct vhost_virtqueue *vq; - unix_file_t template = { 0 }; - - DBG_SOCK ("SET_VRING_CALL - idx %d, fd %d", idx, fd); - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_index))) - { - clib_warning ("not a vhost-user interface"); - return 0; - } - - dpdk_vu_intf_t *vui = xd->vu_intf; - - /* if there is old fd, delete it */ - if (vui->vrings[idx].callfd > -1) - { - unix_file_t *uf = pool_elt_at_index (unix_main.file_pool, - vui->vrings[idx].callfd_idx); - unix_file_del (&unix_main, uf); - } - vui->vrings[idx].callfd = fd; - template.read_function = dpdk_vhost_user_callfd_read_ready; - template.file_descriptor = fd; - vui->vrings[idx].callfd_idx = unix_file_add (&unix_main, &template); - - vq = xd->vu_vhost_dev.virtqueue[idx]; - vq->callfd = -1; /* We use locally saved vring->callfd; */ - - return 0; -} - -u8 -dpdk_vhost_user_want_interrupt (dpdk_device_t * xd, int idx) -{ - dpdk_vu_intf_t *vui = xd->vu_intf; - ASSERT (vui != NULL); - - if (PREDICT_FALSE (vui->num_vrings <= 0)) - return 0; - - dpdk_vu_vring *vring = &(vui->vrings[idx]); - struct vhost_virtqueue *vq = xd->vu_vhost_dev.virtqueue[idx]; - - /* return if vm is interested in interrupts */ - return (vring->callfd > -1) - && !(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT); -} - -void -dpdk_vhost_user_send_interrupt (vlib_main_t * vm, dpdk_device_t * xd, int idx) -{ - dpdk_main_t *dm = &dpdk_main; - dpdk_vu_intf_t *vui = xd->vu_intf; - ASSERT (vui != NULL); - - if (PREDICT_FALSE (vui->num_vrings <= 0)) - return; - - dpdk_vu_vring *vring = &(vui->vrings[idx]); - struct vhost_virtqueue *vq = xd->vu_vhost_dev.virtqueue[idx]; - - /* if vm is interested in interrupts */ - if ((vring->callfd > -1) - && !(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT)) - { - eventfd_write (vring->callfd, (eventfd_t) 1); - vring->n_since_last_int = 0; - vring->int_deadline = - vlib_time_now (vm) + dm->conf->vhost_coalesce_time; - } -} - -/* - * vhost-user interface management functions - */ - -// initialize vui with specified attributes -static void -dpdk_vhost_user_vui_init (vnet_main_t * vnm, - dpdk_device_t * xd, int sockfd, - const char *sock_filename, - u8 is_server, u64 feature_mask, u32 * sw_if_index) -{ - int q; - dpdk_vu_intf_t *vui = xd->vu_intf; - memset (vui, 0, sizeof (*vui)); - - vui->unix_fd = sockfd; - vui->num_vrings = xd->vu_vhost_dev.virt_qp_nb * VIRTIO_QNUM; - DBG_SOCK ("dpdk_vhost_user_vui_init VRINGS: %d", vui->num_vrings); - vui->sock_is_server = is_server; - strncpy (vui->sock_filename, sock_filename, - ARRAY_LEN (vui->sock_filename) - 1); - vui->sock_errno = 0; - vui->is_up = 0; - vui->feature_mask = feature_mask; - vui->active = 1; - vui->unix_file_index = ~0; - - for (q = 0; q < vui->num_vrings; q++) - { - vui->vrings[q].enabled = 0; - vui->vrings[q].callfd = -1; - vui->vrings[q].kickfd = -1; - } - - vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, 0); - - if (sw_if_index) - *sw_if_index = xd->vlib_sw_if_index; -} - -// register vui and start polling on it -static void -dpdk_vhost_user_vui_register (vlib_main_t * vm, dpdk_device_t * xd) -{ - dpdk_main_t *dm = &dpdk_main; - dpdk_vu_intf_t *vui = xd->vu_intf; - - hash_set (dm->vu_sw_if_index_by_listener_fd, vui->unix_fd, - xd->vlib_sw_if_index); -} - -static void -dpdk_unmap_all_mem_regions (dpdk_device_t * xd) -{ - int i, r; - dpdk_vu_intf_t *vui = xd->vu_intf; - struct virtio_memory *mem = xd->vu_vhost_dev.mem; - - for (i = 0; i < mem->nregions; i++) - { - if (vui->region_addr[i] != -1) - { - - long page_sz = get_huge_page_size (vui->region_fd[i]); - - ssize_t map_sz = RTE_ALIGN_CEIL (mem->regions[i].memory_size + - vui->region_offset[i], page_sz); - - r = - munmap ((void *) (vui->region_addr[i] - vui->region_offset[i]), - map_sz); - - DBG_SOCK - ("unmap memory region %d addr 0x%lx off 0x%lx len 0x%lx page_sz 0x%x", - i, vui->region_addr[i], vui->region_offset[i], map_sz, page_sz); - - vui->region_addr[i] = -1; - - if (r == -1) - { - clib_unix_warning ("failed to unmap memory region"); - } - close (vui->region_fd[i]); - } - } - mem->nregions = 0; -} - -static inline void -dpdk_vhost_user_if_disconnect (dpdk_device_t * xd) -{ - dpdk_vu_intf_t *vui = xd->vu_intf; - vnet_main_t *vnm = vnet_get_main (); - dpdk_main_t *dm = &dpdk_main; - struct vhost_virtqueue *vq; - int q; - - xd->admin_up = 0; - vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, 0); - - if (vui->unix_file_index != ~0) - { - unix_file_del (&unix_main, unix_main.file_pool + vui->unix_file_index); - vui->unix_file_index = ~0; - } - - hash_unset (dm->vu_sw_if_index_by_sock_fd, vui->unix_fd); - hash_unset (dm->vu_sw_if_index_by_listener_fd, vui->unix_fd); - close (vui->unix_fd); - vui->unix_fd = -1; - vui->is_up = 0; - - for (q = 0; q < vui->num_vrings; q++) - { - vq = xd->vu_vhost_dev.virtqueue[q]; - if (vui->vrings[q].callfd > -1) - { - unix_file_t *uf = pool_elt_at_index (unix_main.file_pool, - vui->vrings[q].callfd_idx); - unix_file_del (&unix_main, uf); - } - - if (vui->vrings[q].kickfd > -1) - { - close (vui->vrings[q].kickfd); - vui->vrings[q].kickfd = -1; - } - - vui->vrings[q].enabled = 0; /* Reset local copy */ - vui->vrings[q].callfd = -1; /* Reset FD */ - vq->enabled = 0; - vq->log_guest_addr = 0; - vq->desc = NULL; - vq->used = NULL; - vq->avail = NULL; - } - xd->vu_is_running = 0; - - dpdk_unmap_all_mem_regions (xd); - DBG_SOCK ("interface ifindex %d disconnected", xd->vlib_sw_if_index); -} - -static clib_error_t * -dpdk_vhost_user_socket_read (unix_file_t * uf) -{ - int n; - int fd, number_of_fds = 0; - int fds[VHOST_MEMORY_MAX_NREGIONS]; - vhost_user_msg_t msg; - struct msghdr mh; - struct iovec iov[1]; - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd; - dpdk_vu_intf_t *vui; - struct cmsghdr *cmsg; - uword *p; - u8 q; - vnet_main_t *vnm = vnet_get_main (); - - p = hash_get (dm->vu_sw_if_index_by_sock_fd, uf->file_descriptor); - if (p == 0) - { - DBG_SOCK ("FD %d doesn't belong to any interface", uf->file_descriptor); - return 0; - } - else - xd = dpdk_vhost_user_device_from_sw_if_index (p[0]); - - ASSERT (xd != NULL); - vui = xd->vu_intf; - - char control[CMSG_SPACE (VHOST_MEMORY_MAX_NREGIONS * sizeof (int))]; - - memset (&mh, 0, sizeof (mh)); - memset (control, 0, sizeof (control)); - - /* set the payload */ - iov[0].iov_base = (void *) &msg; - iov[0].iov_len = VHOST_USER_MSG_HDR_SZ; - - mh.msg_iov = iov; - mh.msg_iovlen = 1; - mh.msg_control = control; - mh.msg_controllen = sizeof (control); - - n = recvmsg (uf->file_descriptor, &mh, 0); - - if (n != VHOST_USER_MSG_HDR_SZ) - goto close_socket; - - if (mh.msg_flags & MSG_CTRUNC) - { - goto close_socket; - } - - cmsg = CMSG_FIRSTHDR (&mh); - - if (cmsg && (cmsg->cmsg_len > 0) && (cmsg->cmsg_level == SOL_SOCKET) && - (cmsg->cmsg_type == SCM_RIGHTS) && - (cmsg->cmsg_len - CMSG_LEN (0) <= - VHOST_MEMORY_MAX_NREGIONS * sizeof (int))) - { - number_of_fds = (cmsg->cmsg_len - CMSG_LEN (0)) / sizeof (int); - clib_memcpy (fds, CMSG_DATA (cmsg), number_of_fds * sizeof (int)); - } - - /* version 1, no reply bit set */ - if ((msg.flags & 7) != 1) - { - DBG_SOCK ("malformed message received. closing socket"); - goto close_socket; - } - - { - int rv __attribute__ ((unused)); - /* $$$$ pay attention to rv */ - rv = read (uf->file_descriptor, ((char *) &msg) + n, msg.size); - } - - DBG_SOCK ("VPP VHOST message %s", vhost_message_str[msg.request]); - switch (msg.request) - { - case VHOST_USER_GET_FEATURES: - DBG_SOCK ("if %d msg VHOST_USER_GET_FEATURES", xd->vlib_hw_if_index); - - msg.flags |= VHOST_USER_REPLY_MASK; - - dpdk_vhost_user_get_features (xd->vlib_hw_if_index, &msg.u64); - msg.u64 &= vui->feature_mask; - msg.size = sizeof (msg.u64); - break; - - case VHOST_USER_SET_FEATURES: - DBG_SOCK ("if %d msg VHOST_USER_SET_FEATURES features 0x%016lx", - xd->vlib_hw_if_index, msg.u64); - - dpdk_vhost_user_set_features (xd->vlib_hw_if_index, msg.u64); - break; - - case VHOST_USER_SET_MEM_TABLE: - DBG_SOCK ("if %d msg VHOST_USER_SET_MEM_TABLE nregions %d", - xd->vlib_hw_if_index, msg.memory.nregions); - - if ((msg.memory.nregions < 1) || - (msg.memory.nregions > VHOST_MEMORY_MAX_NREGIONS)) - { - - DBG_SOCK ("number of mem regions must be between 1 and %i", - VHOST_MEMORY_MAX_NREGIONS); - - goto close_socket; - } - - if (msg.memory.nregions != number_of_fds) - { - DBG_SOCK ("each memory region must have FD"); - goto close_socket; - } - - /* Unmap previously configured memory if necessary */ - dpdk_unmap_all_mem_regions (xd); - - dpdk_vhost_user_set_mem_table (xd->vlib_hw_if_index, &msg.memory, fds); - break; - - case VHOST_USER_SET_VRING_NUM: - DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_NUM idx %d num %d", - xd->vlib_hw_if_index, msg.state.index, msg.state.num); - - if ((msg.state.num > 32768) || /* maximum ring size is 32768 */ - (msg.state.num == 0) || /* it cannot be zero */ - (msg.state.num % 2)) /* must be power of 2 */ - goto close_socket; - - dpdk_vhost_user_set_vring_num (xd->vlib_hw_if_index, msg.state.index, - msg.state.num); - break; - - case VHOST_USER_SET_VRING_ADDR: - DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_ADDR idx %d", - xd->vlib_hw_if_index, msg.state.index); - - dpdk_vhost_user_set_vring_addr (xd->vlib_hw_if_index, msg.state.index, - msg.addr.desc_user_addr, - msg.addr.used_user_addr, - msg.addr.avail_user_addr, - msg.addr.log_guest_addr); - break; - - case VHOST_USER_SET_OWNER: - DBG_SOCK ("if %d msg VHOST_USER_SET_OWNER", xd->vlib_hw_if_index); - break; - - case VHOST_USER_RESET_OWNER: - DBG_SOCK ("if %d msg VHOST_USER_RESET_OWNER", xd->vlib_hw_if_index); - break; - - case VHOST_USER_SET_VRING_CALL: - q = (u8) (msg.u64 & 0xFF); - - DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_CALL u64 %lx, idx: %d", - xd->vlib_hw_if_index, msg.u64, q); - - if (!(msg.u64 & 0x100)) - { - if (number_of_fds != 1) - goto close_socket; - fd = fds[0]; - } - else - { - fd = -1; - } - dpdk_vhost_user_set_vring_call (xd->vlib_hw_if_index, q, fd); - - break; - - case VHOST_USER_SET_VRING_KICK: - - q = (u8) (msg.u64 & 0xFF); - - DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_KICK u64 %lx, idx: %d", - xd->vlib_hw_if_index, msg.u64, q); - - if (!(msg.u64 & 0x100)) - { - if (number_of_fds != 1) - goto close_socket; - - if (vui->vrings[q].kickfd > -1) - close (vui->vrings[q].kickfd); - - vui->vrings[q].kickfd = fds[0]; - } - else - vui->vrings[q].kickfd = -1; - - dpdk_vhost_user_set_vring_kick (xd->vlib_hw_if_index, q, - vui->vrings[q].kickfd); - break; - - case VHOST_USER_SET_VRING_ERR: - - q = (u8) (msg.u64 & 0xFF); - - DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_ERR u64 %lx, idx: %d", - xd->vlib_hw_if_index, msg.u64, q); - - if (!(msg.u64 & 0x100)) - { - if (number_of_fds != 1) - goto close_socket; - - fd = fds[0]; - } - else - fd = -1; - - vui->vrings[q].errfd = fd; - break; - - case VHOST_USER_SET_VRING_BASE: - DBG_SOCK ("if %d msg VHOST_USER_SET_VRING_BASE idx %d num %d", - xd->vlib_hw_if_index, msg.state.index, msg.state.num); - - dpdk_vhost_user_set_vring_base (xd->vlib_hw_if_index, msg.state.index, - msg.state.num); - break; - - case VHOST_USER_GET_VRING_BASE: - DBG_SOCK ("if %d msg VHOST_USER_GET_VRING_BASE idx %d num %d", - xd->vlib_hw_if_index, msg.state.index, msg.state.num); - - msg.flags |= VHOST_USER_REPLY_MASK; - msg.size = sizeof (msg.state); - - dpdk_vhost_user_get_vring_base (xd->vlib_hw_if_index, msg.state.index, - &msg.state.num); - break; - - case VHOST_USER_NONE: - DBG_SOCK ("if %d msg VHOST_USER_NONE", xd->vlib_hw_if_index); - break; - - case VHOST_USER_SET_LOG_BASE: - DBG_SOCK ("if %d msg VHOST_USER_SET_LOG_BASE", xd->vlib_hw_if_index); - - if (msg.size != sizeof (msg.log)) - { - DBG_SOCK - ("invalid msg size for VHOST_USER_SET_LOG_BASE: %u instead of %lu", - msg.size, sizeof (msg.log)); - goto close_socket; - } - - if (! - (xd->vu_vhost_dev.protocol_features & (1 << - VHOST_USER_PROTOCOL_F_LOG_SHMFD))) - { - DBG_SOCK - ("VHOST_USER_PROTOCOL_F_LOG_SHMFD not set but VHOST_USER_SET_LOG_BASE received"); - goto close_socket; - } - - fd = fds[0]; - /* align size to 2M page */ - long page_sz = get_huge_page_size (fd); - ssize_t map_sz = - RTE_ALIGN_CEIL (msg.log.size + msg.log.offset, page_sz); - - void *addr = mmap (0, map_sz, PROT_READ | PROT_WRITE, - MAP_SHARED, fd, 0); - - DBG_SOCK ("map log region addr 0 len 0x%lx off 0x%lx fd %d mapped %p", - map_sz, msg.log.offset, fd, addr); - - if (addr == MAP_FAILED) - { - clib_warning ("failed to map memory. errno is %d", errno); - goto close_socket; - } - - xd->vu_vhost_dev.log_base += pointer_to_uword (addr) + msg.log.offset; - xd->vu_vhost_dev.log_size = msg.log.size; - msg.flags |= VHOST_USER_REPLY_MASK; - msg.size = sizeof (msg.u64); - break; - - case VHOST_USER_SET_LOG_FD: - DBG_SOCK ("if %d msg VHOST_USER_SET_LOG_FD", xd->vlib_hw_if_index); - break; - - case VHOST_USER_GET_PROTOCOL_FEATURES: - DBG_SOCK ("if %d msg VHOST_USER_GET_PROTOCOL_FEATURES", - xd->vlib_hw_if_index); - - msg.flags |= VHOST_USER_REPLY_MASK; - msg.u64 = VHOST_USER_PROTOCOL_FEATURES; - DBG_SOCK ("VHOST_USER_PROTOCOL_FEATURES: %llx", - VHOST_USER_PROTOCOL_FEATURES); - msg.size = sizeof (msg.u64); - break; - - case VHOST_USER_SET_PROTOCOL_FEATURES: - DBG_SOCK ("if %d msg VHOST_USER_SET_PROTOCOL_FEATURES", - xd->vlib_hw_if_index); - - DBG_SOCK ("VHOST_USER_SET_PROTOCOL_FEATURES: 0x%lx", msg.u64); - dpdk_vhost_user_set_protocol_features (xd->vlib_hw_if_index, msg.u64); - break; - - case VHOST_USER_SET_VRING_ENABLE: - DBG_SOCK ("%d VPP VHOST_USER_SET_VRING_ENABLE IDX: %d, Enable: %d", - xd->vlib_hw_if_index, msg.state.index, msg.state.num); - dpdk_vhost_user_set_vring_enable - (xd->vlib_hw_if_index, msg.state.index, msg.state.num); - break; - - case VHOST_USER_GET_QUEUE_NUM: - DBG_SOCK ("if %d msg VHOST_USER_GET_QUEUE_NUM:", xd->vlib_hw_if_index); - - msg.flags |= VHOST_USER_REPLY_MASK; - msg.u64 = xd->vu_vhost_dev.virt_qp_nb; - msg.size = sizeof (msg.u64); - break; - - default: - DBG_SOCK ("unknown vhost-user message %d received. closing socket", - msg.request); - goto close_socket; - } - - /* if we have pointers to descriptor table, go up */ - if (!vui->is_up && - xd->vu_vhost_dev.virtqueue[VHOST_NET_VRING_IDX_TX]->desc && - xd->vu_vhost_dev.virtqueue[VHOST_NET_VRING_IDX_RX]->desc) - { - - DBG_SOCK ("interface %d connected", xd->vlib_sw_if_index); - - vnet_hw_interface_set_flags (vnm, xd->vlib_hw_if_index, - VNET_HW_INTERFACE_FLAG_LINK_UP); - vui->is_up = 1; - xd->admin_up = 1; - } - - /* if we need to reply */ - if (msg.flags & VHOST_USER_REPLY_MASK) - { - n = - send (uf->file_descriptor, &msg, VHOST_USER_MSG_HDR_SZ + msg.size, 0); - if (n != (msg.size + VHOST_USER_MSG_HDR_SZ)) - goto close_socket; - } - - return 0; - -close_socket: - DBG_SOCK ("error: close_socket"); - dpdk_vhost_user_if_disconnect (xd); - return 0; -} - -static clib_error_t * -dpdk_vhost_user_socket_error (unix_file_t * uf) -{ - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd; - uword *p; - - p = hash_get (dm->vu_sw_if_index_by_sock_fd, uf->file_descriptor); - if (p == 0) - { - DBG_SOCK ("FD %d doesn't belong to any interface", uf->file_descriptor); - return 0; - } - else - xd = dpdk_vhost_user_device_from_sw_if_index (p[0]); - - dpdk_vhost_user_if_disconnect (xd); - return 0; -} - -static clib_error_t * -dpdk_vhost_user_socksvr_accept_ready (unix_file_t * uf) -{ - int client_fd, client_len; - struct sockaddr_un client; - unix_file_t template = { 0 }; - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd = NULL; - dpdk_vu_intf_t *vui; - uword *p; - - p = hash_get (dm->vu_sw_if_index_by_listener_fd, uf->file_descriptor); - if (p == 0) - { - DBG_SOCK ("fd %d doesn't belong to any interface", uf->file_descriptor); - return 0; - } - - xd = dpdk_vhost_user_device_from_sw_if_index (p[0]); - ASSERT (xd != NULL); - vui = xd->vu_intf; - - client_len = sizeof (client); - client_fd = accept (uf->file_descriptor, - (struct sockaddr *) &client, - (socklen_t *) & client_len); - - if (client_fd < 0) - return clib_error_return_unix (0, "accept"); - - template.read_function = dpdk_vhost_user_socket_read; - template.error_function = dpdk_vhost_user_socket_error; - template.file_descriptor = client_fd; - vui->unix_file_index = unix_file_add (&unix_main, &template); - - vui->client_fd = client_fd; - hash_set (dm->vu_sw_if_index_by_sock_fd, vui->client_fd, - xd->vlib_sw_if_index); - - return 0; -} - -// init server socket on specified sock_filename -static int -dpdk_vhost_user_init_server_sock (const char *sock_filename, int *sockfd) -{ - int rv = 0; - struct sockaddr_un un = { }; - int fd; - /* create listening socket */ - fd = socket (AF_UNIX, SOCK_STREAM, 0); - - if (fd < 0) - { - return VNET_API_ERROR_SYSCALL_ERROR_1; - } - - un.sun_family = AF_UNIX; - strcpy ((char *) un.sun_path, (char *) sock_filename); - - /* remove if exists */ - unlink ((char *) sock_filename); - - if (bind (fd, (struct sockaddr *) &un, sizeof (un)) == -1) - { - rv = VNET_API_ERROR_SYSCALL_ERROR_2; - goto error; - } - - if (listen (fd, 1) == -1) - { - rv = VNET_API_ERROR_SYSCALL_ERROR_3; - goto error; - } - - unix_file_t template = { 0 }; - template.read_function = dpdk_vhost_user_socksvr_accept_ready; - template.file_descriptor = fd; - unix_file_add (&unix_main, &template); - *sockfd = fd; - return rv; - -error: - close (fd); - return rv; -} - -/* - * vhost-user interface control functions used from vpe api - */ - -int -dpdk_vhost_user_create_if (vnet_main_t * vnm, vlib_main_t * vm, - const char *sock_filename, - u8 is_server, - u32 * sw_if_index, - u64 feature_mask, - u8 renumber, u32 custom_dev_instance, u8 * hwaddr) -{ - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd; - u32 hw_if_idx = ~0; - int sockfd = -1; - int rv = 0; - - // using virtio vhost user? - if (dm->conf->use_virtio_vhost) - { - return vhost_user_create_if (vnm, vm, sock_filename, is_server, - sw_if_index, feature_mask, renumber, - custom_dev_instance, hwaddr); - } - - if (is_server) - { - if ((rv = - dpdk_vhost_user_init_server_sock (sock_filename, &sockfd)) != 0) - { - return rv; - } - } - - if (renumber) - { - // set next vhost-user if id if custom one is higher or equal - if (custom_dev_instance >= dm->next_vu_if_id) - dm->next_vu_if_id = custom_dev_instance + 1; - - dpdk_create_vhost_user_if_internal (&hw_if_idx, custom_dev_instance, - hwaddr); - } - else - dpdk_create_vhost_user_if_internal (&hw_if_idx, (u32) ~ 0, hwaddr); - DBG_SOCK ("dpdk vhost-user interface created hw_if_index %d", hw_if_idx); - - xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_idx); - ASSERT (xd != NULL); - - dpdk_vhost_user_vui_init (vnm, xd, sockfd, sock_filename, is_server, - feature_mask, sw_if_index); - - dpdk_vhost_user_vui_register (vm, xd); - return rv; -} - -int -dpdk_vhost_user_modify_if (vnet_main_t * vnm, vlib_main_t * vm, - const char *sock_filename, - u8 is_server, - u32 sw_if_index, - u64 feature_mask, - u8 renumber, u32 custom_dev_instance) -{ - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd; - dpdk_vu_intf_t *vui = NULL; - u32 sw_if_idx = ~0; - int sockfd = -1; - int rv = 0; - - // using virtio vhost user? - if (dm->conf->use_virtio_vhost) - { - return vhost_user_modify_if (vnm, vm, sock_filename, is_server, - sw_if_index, feature_mask, renumber, - custom_dev_instance); - } - - xd = dpdk_vhost_user_device_from_sw_if_index (sw_if_index); - - if (xd == NULL) - return VNET_API_ERROR_INVALID_SW_IF_INDEX; - - vui = xd->vu_intf; - - // interface is inactive - vui->active = 0; - // disconnect interface sockets - dpdk_vhost_user_if_disconnect (xd); - - if (is_server) - { - if ((rv = - dpdk_vhost_user_init_server_sock (sock_filename, &sockfd)) != 0) - { - return rv; - } - } - - dpdk_vhost_user_vui_init (vnm, xd, sockfd, sock_filename, is_server, - feature_mask, &sw_if_idx); - - if (renumber) - { - vnet_interface_name_renumber (sw_if_idx, custom_dev_instance); - } - - dpdk_vhost_user_vui_register (vm, xd); - - return rv; -} - -int -dpdk_vhost_user_delete_if (vnet_main_t * vnm, vlib_main_t * vm, - u32 sw_if_index) -{ - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd = NULL; - dpdk_vu_intf_t *vui; - int rv = 0; - - // using virtio vhost user? - if (dm->conf->use_virtio_vhost) - { - return vhost_user_delete_if (vnm, vm, sw_if_index); - } - - xd = dpdk_vhost_user_device_from_sw_if_index (sw_if_index); - - if (xd == NULL) - return VNET_API_ERROR_INVALID_SW_IF_INDEX; - - vui = xd->vu_intf; - - // interface is inactive - vui->active = 0; - // disconnect interface sockets - dpdk_vhost_user_if_disconnect (xd); - // add to inactive interface list - vec_add1 (dm->vu_inactive_interfaces_device_index, xd->device_index); - - ethernet_delete_interface (vnm, xd->vlib_hw_if_index); - DBG_SOCK ("deleted (deactivated) vhost-user interface sw_if_index %d", - sw_if_index); - - return rv; -} - -int -dpdk_vhost_user_dump_ifs (vnet_main_t * vnm, vlib_main_t * vm, - vhost_user_intf_details_t ** out_vuids) -{ - int rv = 0; - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd; - dpdk_vu_intf_t *vui; - struct virtio_net *vhost_dev; - vhost_user_intf_details_t *r_vuids = NULL; - vhost_user_intf_details_t *vuid = NULL; - u32 *hw_if_indices = 0; - vnet_hw_interface_t *hi; - u8 *s = NULL; - int i; - - if (!out_vuids) - return -1; - - // using virtio vhost user? - if (dm->conf->use_virtio_vhost) - { - return vhost_user_dump_ifs (vnm, vm, out_vuids); - } - - vec_foreach (xd, dm->devices) - { - if ((xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) && xd->vu_intf->active) - vec_add1 (hw_if_indices, xd->vlib_hw_if_index); - } - - for (i = 0; i < vec_len (hw_if_indices); i++) - { - hi = vnet_get_hw_interface (vnm, hw_if_indices[i]); - xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_indices[i]); - if (!xd) - { - clib_warning ("invalid vhost-user interface hw_if_index %d", - hw_if_indices[i]); - continue; - } - - vui = xd->vu_intf; - ASSERT (vui != NULL); - vhost_dev = &xd->vu_vhost_dev; - u32 virtio_net_hdr_sz = (vui->num_vrings > 0 ? - vhost_dev->virtqueue[0]->vhost_hlen : 0); - - vec_add2 (r_vuids, vuid, 1); - vuid->sw_if_index = xd->vlib_sw_if_index; - vuid->virtio_net_hdr_sz = virtio_net_hdr_sz; - vuid->features = vhost_dev->features; - vuid->is_server = vui->sock_is_server; - vuid->num_regions = - (vhost_dev->mem != NULL ? vhost_dev->mem->nregions : 0); - vuid->sock_errno = vui->sock_errno; - strncpy ((char *) vuid->sock_filename, (char *) vui->sock_filename, - ARRAY_LEN (vuid->sock_filename) - 1); - - s = format (s, "%v%c", hi->name, 0); - - strncpy ((char *) vuid->if_name, (char *) s, - ARRAY_LEN (vuid->if_name) - 1); - _vec_len (s) = 0; - } - - vec_free (s); - vec_free (hw_if_indices); - - *out_vuids = r_vuids; - - return rv; -} - -/* - * Processing functions called from dpdk process fn - */ - -typedef struct -{ - struct sockaddr_un sun; - int sockfd; - unix_file_t template; - uword *event_data; -} dpdk_vu_process_state; - -void -dpdk_vhost_user_process_init (void **ctx) -{ - dpdk_vu_process_state *state = - clib_mem_alloc (sizeof (dpdk_vu_process_state)); - memset (state, 0, sizeof (*state)); - state->sockfd = socket (AF_UNIX, SOCK_STREAM, 0); - state->sun.sun_family = AF_UNIX; - state->template.read_function = dpdk_vhost_user_socket_read; - state->template.error_function = dpdk_vhost_user_socket_error; - state->event_data = 0; - *ctx = state; -} - -void -dpdk_vhost_user_process_cleanup (void *ctx) -{ - clib_mem_free (ctx); -} - -uword -dpdk_vhost_user_process_if (vlib_main_t * vm, dpdk_device_t * xd, void *ctx) -{ - dpdk_main_t *dm = &dpdk_main; - dpdk_vu_process_state *state = (dpdk_vu_process_state *) ctx; - dpdk_vu_intf_t *vui = xd->vu_intf; - - if (vui->sock_is_server || !vui->active) - return 0; - - if (vui->unix_fd == -1) - { - /* try to connect */ - strncpy (state->sun.sun_path, (char *) vui->sock_filename, - sizeof (state->sun.sun_path) - 1); - - if (connect - (state->sockfd, (struct sockaddr *) &(state->sun), - sizeof (struct sockaddr_un)) == 0) - { - vui->sock_errno = 0; - vui->unix_fd = state->sockfd; - state->template.file_descriptor = state->sockfd; - vui->unix_file_index = - unix_file_add (&unix_main, &(state->template)); - hash_set (dm->vu_sw_if_index_by_sock_fd, state->sockfd, - xd->vlib_sw_if_index); - - state->sockfd = socket (AF_UNIX, SOCK_STREAM, 0); - if (state->sockfd < 0) - return -1; - } - else - { - vui->sock_errno = errno; - } - } - else - { - /* check if socket is alive */ - int error = 0; - socklen_t len = sizeof (error); - int retval = - getsockopt (vui->unix_fd, SOL_SOCKET, SO_ERROR, &error, &len); - - if (retval) - dpdk_vhost_user_if_disconnect (xd); - } - return 0; -} -#endif - -/* - * CLI functions - */ - -static clib_error_t * -dpdk_vhost_user_connect_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) -{ -#if DPDK_VHOST_USER - dpdk_main_t *dm = &dpdk_main; - unformat_input_t _line_input, *line_input = &_line_input; - u8 *sock_filename = NULL; - u32 sw_if_index; - u8 is_server = 0; - u64 feature_mask = (u64) ~ 0; - u8 renumber = 0; - u32 custom_dev_instance = ~0; - u8 hwaddr[6]; - u8 *hw = NULL; - - if (dm->conf->use_virtio_vhost) - { -#endif - return vhost_user_connect_command_fn (vm, input, cmd); -#if DPDK_VHOST_USER - } - - /* Get a line of input. */ - if (!unformat_user (input, unformat_line_input, line_input)) - return 0; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "socket %s", &sock_filename)) - ; - else if (unformat (line_input, "server")) - is_server = 1; - else if (unformat (line_input, "feature-mask 0x%llx", &feature_mask)) - ; - else - if (unformat - (line_input, "hwaddr %U", unformat_ethernet_address, hwaddr)) - hw = hwaddr; - else if (unformat (line_input, "renumber %d", &custom_dev_instance)) - { - renumber = 1; - } - else - return clib_error_return (0, "unknown input `%U'", - format_unformat_error, input); - } - unformat_free (line_input); - - vnet_main_t *vnm = vnet_get_main (); - if (sock_filename == NULL) - return clib_error_return (0, "missing socket file"); - - dpdk_vhost_user_create_if (vnm, vm, (char *) sock_filename, - is_server, &sw_if_index, feature_mask, - renumber, custom_dev_instance, hw); - - vec_free (sock_filename); - vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (), - sw_if_index); - return 0; -#endif -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (dpdk_vhost_user_connect_command, static) = { - .path = "create vhost-user", - .short_help = "create vhost-user socket <socket-filename> [server] [feature-mask <hex>] [renumber <dev_instance>]", - .function = dpdk_vhost_user_connect_command_fn, -}; -/* *INDENT-ON* */ - -static clib_error_t * -dpdk_vhost_user_delete_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) -{ - dpdk_main_t *dm = &dpdk_main; - clib_error_t *error = 0; - unformat_input_t _line_input, *line_input = &_line_input; - u32 sw_if_index = ~0; - - if (dm->conf->use_virtio_vhost) - { - return vhost_user_delete_command_fn (vm, input, cmd); - } - - /* Get a line of input. */ - if (!unformat_user (input, unformat_line_input, line_input)) - return 0; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "sw_if_index %d", &sw_if_index)) - ; - else - return clib_error_return (0, "unknown input `%U'", - format_unformat_error, input); - } - unformat_free (line_input); - - if (sw_if_index == ~0) - { - error = clib_error_return (0, "invalid sw_if_index", - format_unformat_error, input); - return error; - } - - vnet_main_t *vnm = vnet_get_main (); - -#if DPDK_VHOST_USER - dpdk_vhost_user_delete_if (vnm, vm, sw_if_index); -#else - vhost_user_delete_if (vnm, vm, sw_if_index); -#endif - - return 0; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (dpdk_vhost_user_delete_command, static) = { - .path = "delete vhost-user", - .short_help = "delete vhost-user sw_if_index <nn>", - .function = dpdk_vhost_user_delete_command_fn, -}; -/* *INDENT-ON* */ - -#define foreach_dpdk_vhost_feature \ - _ (VIRTIO_NET_F_MRG_RXBUF) \ - _ (VIRTIO_NET_F_CTRL_VQ) \ - _ (VIRTIO_NET_F_CTRL_RX) - -static clib_error_t * -show_dpdk_vhost_user_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) -{ -#if DPDK_VHOST_USER - clib_error_t *error = 0; - dpdk_main_t *dm = &dpdk_main; - vnet_main_t *vnm = vnet_get_main (); - dpdk_device_t *xd; - dpdk_vu_intf_t *vui; - struct virtio_net *vhost_dev; - u32 hw_if_index, *hw_if_indices = 0; - vnet_hw_interface_t *hi; - int i, j, q; - int show_descr = 0; - struct virtio_memory *mem; - struct feat_struct - { - u8 bit; - char *str; - }; - struct feat_struct *feat_entry; - - static struct feat_struct feat_array[] = { -#define _(f) { .str = #f, .bit = f, }, - foreach_dpdk_vhost_feature -#undef _ - {.str = NULL} - }; - - if (dm->conf->use_virtio_vhost) - { -#endif - return show_vhost_user_command_fn (vm, input, cmd); -#if DPDK_VHOST_USER - } - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat - (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index)) - { - vec_add1 (hw_if_indices, hw_if_index); - vlib_cli_output (vm, "add %d", hw_if_index); - } - else if (unformat (input, "descriptors") || unformat (input, "desc")) - show_descr = 1; - else - { - error = clib_error_return (0, "unknown input `%U'", - format_unformat_error, input); - goto done; - } - } - if (vec_len (hw_if_indices) == 0) - { - vec_foreach (xd, dm->devices) - { - if ((xd->flags DPDK_DEVICE_FLAG_VHOST_USER) && xd->vu_intf->active) - vec_add1 (hw_if_indices, xd->vlib_hw_if_index); - } - } - - vlib_cli_output (vm, "DPDK vhost-user interfaces"); - vlib_cli_output (vm, "Global:\n coalesce frames %d time %e\n\n", - dm->conf->vhost_coalesce_frames, - dm->conf->vhost_coalesce_time); - - for (i = 0; i < vec_len (hw_if_indices); i++) - { - hi = vnet_get_hw_interface (vnm, hw_if_indices[i]); - - if (!(xd = dpdk_vhost_user_device_from_hw_if_index (hw_if_indices[i]))) - { - error = clib_error_return (0, "not dpdk vhost-user interface: '%s'", - hi->name); - goto done; - } - vui = xd->vu_intf; - vhost_dev = &xd->vu_vhost_dev; - mem = vhost_dev->mem; - u32 virtio_net_hdr_sz = (vui->num_vrings > 0 ? - vhost_dev->virtqueue[0]->vhost_hlen : 0); - - vlib_cli_output (vm, "Interface: %v (ifindex %d)", - hi->name, hw_if_indices[i]); - - vlib_cli_output (vm, "virtio_net_hdr_sz %d\n features (0x%llx): \n", - virtio_net_hdr_sz, xd->vu_vhost_dev.features); - - feat_entry = (struct feat_struct *) &feat_array; - while (feat_entry->str) - { - if (xd->vu_vhost_dev.features & (1 << feat_entry->bit)) - vlib_cli_output (vm, " %s (%d)", feat_entry->str, - feat_entry->bit); - feat_entry++; - } - - vlib_cli_output (vm, "\n"); - - vlib_cli_output (vm, " socket filename %s type %s errno \"%s\"\n\n", - vui->sock_filename, - vui->sock_is_server ? "server" : "client", - strerror (vui->sock_errno)); - - vlib_cli_output (vm, " Memory regions (total %d)\n", mem->nregions); - - if (mem->nregions) - { - vlib_cli_output (vm, - " region fd guest_phys_addr memory_size userspace_addr mmap_offset mmap_addr\n"); - vlib_cli_output (vm, - " ====== ===== ================== ================== ================== ================== ==================\n"); - } - for (j = 0; j < mem->nregions; j++) - { - vlib_cli_output (vm, - " %d %-5d 0x%016lx 0x%016lx 0x%016lx 0x%016lx 0x%016lx\n", - j, vui->region_fd[j], - mem->regions[j].guest_phys_address, - mem->regions[j].memory_size, - mem->regions[j].userspace_address, - mem->regions[j].address_offset, - vui->region_addr[j]); - } - for (q = 0; q < vui->num_vrings; q++) - { - struct vhost_virtqueue *vq = vhost_dev->virtqueue[q]; - const char *qtype = (q & 1) ? "TX" : "RX"; - - vlib_cli_output (vm, "\n Virtqueue %d (%s)\n", q / 2, qtype); - - vlib_cli_output (vm, - " qsz %d last_used_idx %d last_used_idx_res %d\n", - vq->size, vq->last_used_idx, - vq->last_used_idx_res); - - if (vq->avail && vq->used) - vlib_cli_output (vm, - " avail.flags %x avail.idx %d used.flags %x used.idx %d\n", - vq->avail->flags, vq->avail->idx, - vq->used->flags, vq->used->idx); - - vlib_cli_output (vm, " kickfd %d callfd %d errfd %d enabled %d\n", - vq->kickfd, vq->callfd, vui->vrings[q].errfd, - vq->enabled); - - if (show_descr && vq->enabled) - { - vlib_cli_output (vm, "\n descriptor table:\n"); - vlib_cli_output (vm, - " id addr len flags next user_addr\n"); - vlib_cli_output (vm, - " ===== ================== ===== ====== ===== ==================\n"); - for (j = 0; j < vq->size; j++) - { - vlib_cli_output (vm, - " %-5d 0x%016lx %-5d 0x%04x %-5d 0x%016lx\n", - j, vq->desc[j].addr, vq->desc[j].len, - vq->desc[j].flags, vq->desc[j].next, - pointer_to_uword (map_guest_mem - (xd, vq->desc[j].addr))); - } - } - } - vlib_cli_output (vm, "\n"); - } -done: - vec_free (hw_if_indices); - return error; -#endif -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (show_vhost_user_command, static) = { - .path = "show vhost-user", - .short_help = "show vhost-user interface", - .function = show_dpdk_vhost_user_command_fn, -}; -/* *INDENT-ON* */ - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c index a3dacd13b42..fd3cd21f859 100644 --- a/vnet/vnet/devices/virtio/vhost-user.c +++ b/vnet/vnet/devices/virtio/vhost-user.c @@ -2416,7 +2416,6 @@ done: * CLI functions */ -#if DPDK == 0 /* *INDENT-OFF* */ VLIB_CLI_COMMAND (vhost_user_connect_command, static) = { .path = "create vhost-user", @@ -2436,7 +2435,6 @@ VLIB_CLI_COMMAND (show_vhost_user_command, static) = { .function = show_vhost_user_command_fn, }; /* *INDENT-ON* */ -#endif static clib_error_t * vhost_user_config (vlib_main_t * vm, unformat_input_t * input) diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c index 6ac51097df2..9af8dbc6a66 100644 --- a/vpp/vpp-api/api.c +++ b/vpp/vpp-api/api.c @@ -4200,15 +4200,10 @@ vl_api_create_vhost_user_if_t_handler (vl_api_create_vhost_user_if_t * mp) vnet_main_t *vnm = vnet_get_main (); vlib_main_t *vm = vlib_get_main (); -#if DPDK > 0 && DPDK_VHOST_USER - rv = dpdk_vhost_user_create_if ( -#else - rv = vhost_user_create_if ( -#endif - vnm, vm, (char *) mp->sock_filename, - mp->is_server, &sw_if_index, (u64) ~ 0, - mp->renumber, ntohl (mp->custom_dev_instance), - (mp->use_custom_mac) ? mp->mac_address : NULL); + rv = vhost_user_create_if (vnm, vm, (char *) mp->sock_filename, + mp->is_server, &sw_if_index, (u64) ~ 0, + mp->renumber, ntohl (mp->custom_dev_instance), + (mp->use_custom_mac) ? mp->mac_address : NULL); /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_CREATE_VHOST_USER_IF_REPLY, @@ -4228,14 +4223,9 @@ vl_api_modify_vhost_user_if_t_handler (vl_api_modify_vhost_user_if_t * mp) vnet_main_t *vnm = vnet_get_main (); vlib_main_t *vm = vlib_get_main (); -#if DPDK > 0 && DPDK_VHOST_USER - rv = dpdk_vhost_user_modify_if ( -#else - rv = vhost_user_modify_if ( -#endif - vnm, vm, (char *) mp->sock_filename, - mp->is_server, sw_if_index, (u64) ~ 0, - mp->renumber, ntohl (mp->custom_dev_instance)); + 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)); REPLY_MACRO (VL_API_MODIFY_VHOST_USER_IF_REPLY); } @@ -4250,11 +4240,7 @@ vl_api_delete_vhost_user_if_t_handler (vl_api_delete_vhost_user_if_t * mp) vnet_main_t *vnm = vnet_get_main (); vlib_main_t *vm = vlib_get_main (); -#if DPDK > 0 && DPDK_VHOST_USER - rv = dpdk_vhost_user_delete_if (vnm, vm, sw_if_index); -#else rv = vhost_user_delete_if (vnm, vm, sw_if_index); -#endif REPLY_MACRO (VL_API_DELETE_VHOST_USER_IF_REPLY); if (!rv) @@ -4318,11 +4304,7 @@ static void if (q == 0) return; -#if DPDK > 0 && DPDK_VHOST_USER - rv = dpdk_vhost_user_dump_ifs (vnm, vm, &ifaces); -#else rv = vhost_user_dump_ifs (vnm, vm, &ifaces); -#endif if (rv) return; |