X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fcommon.c;h=41b32a6e182b496c3688e32f042bb592fea78115;hb=34de6fea134051ff2f3488ccbddf5c055d3602f1;hp=25d5802899f2875adc208d40b9a2af861b3e978a;hpb=a5c308e68d5578e5d75327619e30d73a95abb1a5;p=vpp.git diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c index 25d5802899f..41b32a6e182 100644 --- a/src/plugins/dpdk/device/common.c +++ b/src/plugins/dpdk/device/common.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include @@ -40,6 +39,7 @@ void dpdk_device_setup (dpdk_device_t * xd) { dpdk_main_t *dm = &dpdk_main; + vlib_main_t *vm = vlib_get_main (); vnet_main_t *vnm = vnet_get_main (); vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index); vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, xd->hw_if_index); @@ -116,26 +116,23 @@ dpdk_device_setup (dpdk_device_t * xd) CLIB_CACHE_LINE_BYTES); for (j = 0; j < xd->rx_q_used; j++) { - dpdk_mempool_private_t *privp; uword tidx = vnet_get_device_input_thread_index (dm->vnet_main, xd->hw_if_index, j); unsigned lcore = vlib_worker_threads[tidx].cpu_id; u16 socket_id = rte_lcore_to_socket_id (lcore); + u8 bpidx = vlib_buffer_pool_get_default_for_numa (vm, socket_id); + vlib_buffer_pool_t *bp = vlib_get_buffer_pool (vm, bpidx); + struct rte_mempool *mp = dpdk_mempool_by_buffer_pool_index[bpidx]; - rv = - rte_eth_rx_queue_setup (xd->port_id, j, xd->nb_rx_desc, - xd->cpu_socket, 0, - dm->pktmbuf_pools[socket_id]); + rv = rte_eth_rx_queue_setup (xd->port_id, j, xd->nb_rx_desc, + xd->cpu_socket, 0, mp); /* retry with any other CPU socket */ if (rv < 0) - rv = - rte_eth_rx_queue_setup (xd->port_id, j, - xd->nb_rx_desc, SOCKET_ID_ANY, 0, - dm->pktmbuf_pools[socket_id]); + rv = rte_eth_rx_queue_setup (xd->port_id, j, xd->nb_rx_desc, + SOCKET_ID_ANY, 0, mp); - privp = rte_mempool_get_priv (dm->pktmbuf_pools[socket_id]); - xd->buffer_pool_for_queue[j] = privp->buffer_pool_index; + xd->buffer_pool_for_queue[j] = bp->index; if (rv < 0) dpdk_device_error (xd, "rte_eth_rx_queue_setup", rv); @@ -176,10 +173,8 @@ dpdk_device_start (dpdk_device_t * xd) } if (xd->default_mac_address) - rv = - rte_eth_dev_default_mac_addr_set (xd->port_id, - (struct ether_addr *) - xd->default_mac_address); + rv = rte_eth_dev_default_mac_addr_set (xd->port_id, + (void *) xd->default_mac_address); if (rv) dpdk_device_error (xd, "rte_eth_dev_default_mac_addr_set", rv); @@ -191,17 +186,6 @@ dpdk_device_start (dpdk_device_t * xd) rte_eth_allmulticast_enable (xd->port_id); - if (xd->pmd == VNET_DPDK_PMD_BOND) - { - dpdk_portid_t slink[16]; - int nlink = rte_eth_bond_slaves_get (xd->port_id, slink, 16); - while (nlink >= 1) - { - dpdk_portid_t dpdk_port = slink[--nlink]; - rte_eth_allmulticast_enable (dpdk_port); - } - } - dpdk_log_info ("Interface %U started", format_dpdk_device_name, xd->port_id); } @@ -216,82 +200,17 @@ dpdk_device_stop (dpdk_device_t * xd) rte_eth_dev_stop (xd->port_id); clib_memset (&xd->link, 0, sizeof (struct rte_eth_link)); - /* For bonded interface, stop slave links */ - if (xd->pmd == VNET_DPDK_PMD_BOND) - { - dpdk_portid_t slink[16]; - int nlink = rte_eth_bond_slaves_get (xd->port_id, slink, 16); - while (nlink >= 1) - { - dpdk_portid_t dpdk_port = slink[--nlink]; - rte_eth_dev_stop (dpdk_port); - } - } dpdk_log_info ("Interface %U stopped", format_dpdk_device_name, xd->port_id); } -/* Even type for send_garp_na_process */ -enum -{ - SEND_GARP_NA = 1, -} dpdk_send_garp_na_process_event_t; - -static vlib_node_registration_t send_garp_na_proc_node; - -static uword -send_garp_na_process (vlib_main_t * vm, - vlib_node_runtime_t * rt, vlib_frame_t * f) -{ - uword event_type, *event_data = 0; - - while (1) - { - u32 i; - uword dpdk_port; - vlib_process_wait_for_event (vm); - event_type = vlib_process_get_events (vm, &event_data); - ASSERT (event_type == SEND_GARP_NA); - for (i = 0; i < vec_len (event_data); i++) - { - dpdk_port = event_data[i]; - if (i < 5) /* wait 0.2 sec for link to settle, max total 1 sec */ - vlib_process_suspend (vm, 0.2); - dpdk_device_t *xd = &dpdk_main.devices[dpdk_port]; - dpdk_update_link_state (xd, vlib_time_now (vm)); - send_ip4_garp (vm, xd->sw_if_index); - send_ip6_na (vm, xd->sw_if_index); - } - vec_reset_length (event_data); - } - return 0; -} - -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (send_garp_na_proc_node, static) = { - .function = send_garp_na_process, - .type = VLIB_NODE_TYPE_PROCESS, - .name = "send-garp-na-process", -}; -/* *INDENT-ON* */ - void vl_api_force_rpc_call_main_thread (void *fp, u8 * data, u32 data_length); -static void -garp_na_proc_callback (uword * dpdk_port) -{ - vlib_main_t *vm = vlib_get_main (); - ASSERT (vlib_get_thread_index () == 0); - vlib_process_signal_event - (vm, send_garp_na_proc_node.index, SEND_GARP_NA, *dpdk_port); -} - always_inline int dpdk_port_state_callback_inline (dpdk_portid_t port_id, enum rte_eth_event_type type, void *param) { struct rte_eth_link link; - dpdk_device_t *xd = &dpdk_main.devices[port_id]; RTE_SET_USED (param); if (type != RTE_ETH_EVENT_INTR_LSC) @@ -302,36 +221,13 @@ dpdk_port_state_callback_inline (dpdk_portid_t port_id, rte_eth_link_get_nowait (port_id, &link); u8 link_up = link.link_status; - - if (xd->flags & DPDK_DEVICE_FLAG_BOND_SLAVE) - { - uword bd_port = xd->bond_port; - int bd_mode = rte_eth_bond_mode_get (bd_port); - dpdk_log_info ("Port %d state to %s, " - "slave of port %d BondEthernet%d in mode %d", - port_id, (link_up) ? "UP" : "DOWN", - bd_port, xd->bond_instance_num, bd_mode); - if (bd_mode == BONDING_MODE_ACTIVE_BACKUP) - { - vl_api_force_rpc_call_main_thread - (garp_na_proc_callback, (u8 *) & bd_port, sizeof (uword)); - } - - if (link_up) - xd->flags |= DPDK_DEVICE_FLAG_BOND_SLAVE_UP; - else - xd->flags &= ~DPDK_DEVICE_FLAG_BOND_SLAVE_UP; - } - else /* Should not happen as callback not setup for "normal" links */ - { - if (link_up) - dpdk_log_info ("Port %d Link Up - speed %u Mbps - %s", - port_id, (unsigned) link.link_speed, - (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - "full-duplex" : "half-duplex"); - else - dpdk_log_info ("Port %d Link Down\n\n", port_id); - } + if (link_up) + dpdk_log_info ("Port %d Link Up - speed %u Mbps - %s", + port_id, (unsigned) link.link_speed, + (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? + "full-duplex" : "half-duplex"); + else + dpdk_log_info ("Port %d Link Down\n\n", port_id); return 0; }