From c12311b86fb27114cdd3fa4ad9a5897a98448184 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 28 Apr 2017 17:19:16 +0200 Subject: dpdk: remove unused code Change-Id: I16dcc0de2553c6c1eb87dd1ec4c8d3c649e6f285 Signed-off-by: Damjan Marion --- src/plugins/dpdk/device/device.c | 22 +--------------------- src/plugins/dpdk/device/dpdk.h | 34 +--------------------------------- src/plugins/dpdk/device/init.c | 7 ------- src/plugins/dpdk/hqos/hqos.c | 2 -- src/plugins/dpdk/main.c | 2 +- 5 files changed, 3 insertions(+), 64 deletions(-) diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c index 48f3237b6a8..465a5874cf2 100644 --- a/src/plugins/dpdk/device/device.c +++ b/src/plugins/dpdk/device/device.c @@ -44,7 +44,7 @@ static char *dpdk_tx_func_error_strings[] = { #undef _ }; -clib_error_t * +static clib_error_t * dpdk_set_mac_address (vnet_hw_interface_t * hi, char *address) { int error; @@ -66,26 +66,6 @@ dpdk_set_mac_address (vnet_hw_interface_t * hi, char *address) } } -clib_error_t * -dpdk_set_mc_filter (vnet_hw_interface_t * hi, - struct ether_addr mc_addr_vec[], int naddr) -{ - int error; - dpdk_main_t *dm = &dpdk_main; - dpdk_device_t *xd = vec_elt_at_index (dm->devices, hi->dev_instance); - - error = rte_eth_dev_set_mc_addr_list (xd->device_index, mc_addr_vec, naddr); - - if (error) - { - return clib_error_return (0, "mc addr list failed: %d", error); - } - else - { - return NULL; - } -} - struct rte_mbuf * dpdk_replicate_packet_mb (vlib_buffer_t * b) { diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index 82e5938ace2..53f79ff2d30 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -22,29 +22,19 @@ #include #include -#include #include -#include -#include #include #include -#include -#include #include -#include #include #include -#include #include #include -#include -#include #include #include #include #include #include -#include #include #include #include @@ -64,7 +54,6 @@ extern vnet_device_class_t dpdk_device_class; extern vlib_node_registration_t dpdk_input_node; -extern vlib_node_registration_t handoff_dispatch_node; #if RTE_VERSION >= RTE_VERSION_NUM(17, 2, 0, 0) #define foreach_dpdk_pmd \ @@ -330,7 +319,6 @@ typedef struct u32 coremask; u32 nchannels; u32 num_mbufs; - u8 num_kni; /* while kni_init allows u32, port_id in callback fn is only u8 */ /* * format interface names ala xxxEthernet%d/%d/%d instead of @@ -376,12 +364,6 @@ typedef struct u32 pcap_sw_if_index; u32 pcap_pkts_to_capture; - /* hashes */ - uword *dpdk_device_by_kni_port_id; - uword *vu_sw_if_index_by_listener_fd; - uword *vu_sw_if_index_by_sock_fd; - u32 *vu_inactive_interfaces_device_index; - /* * flag indicating that a posted admin up/down * (via post_sw_interface_set_flags) is in progress @@ -413,7 +395,7 @@ typedef struct u16 msg_id_base; } dpdk_main_t; -dpdk_main_t dpdk_main; +extern dpdk_main_t dpdk_main; typedef struct { @@ -435,22 +417,8 @@ typedef struct u8 data[256]; /* First 256 data bytes, used for hexdump */ } dpdk_rx_dma_trace_t; -void vnet_buffer_needs_dpdk_mb (vlib_buffer_t * b); - -clib_error_t *dpdk_set_mac_address (vnet_hw_interface_t * hi, char *address); - -clib_error_t *dpdk_set_mc_filter (vnet_hw_interface_t * hi, - struct ether_addr mc_addr_vec[], int naddr); - -void dpdk_thread_input (dpdk_main_t * dm, dpdk_device_t * xd); - clib_error_t *dpdk_port_setup (dpdk_main_t * dm, dpdk_device_t * xd); -u32 dpdk_interface_tx_vector (vlib_main_t * vm, u32 dev_instance); - -struct rte_mbuf *dpdk_replicate_packet_mb (vlib_buffer_t * b); -struct rte_mbuf *dpdk_zerocopy_replicate_packet_mb (vlib_buffer_t * b); - #define foreach_dpdk_error \ _(NONE, "no error") \ _(RX_PACKET_ERROR, "Rx packet errors") \ diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index e20b25852cd..6f51ff64bc1 100755 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -1028,8 +1028,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) } else if (unformat (input, "num-mbufs %d", &conf->num_mbufs)) ; - else if (unformat (input, "kni %d", &conf->num_kni)) - ; else if (unformat (input, "uio-driver %s", &conf->uio_driver_name)) ; else if (unformat (input, "socket-mem %s", &socket_mem)) @@ -1679,11 +1677,6 @@ dpdk_init (vlib_main_t * vm) dm->conf->num_mbufs = dm->conf->num_mbufs ? dm->conf->num_mbufs : NB_MBUF; vec_add1 (dm->conf->eal_init_args, (u8 *) "vnet"); - dm->dpdk_device_by_kni_port_id = hash_create (0, sizeof (uword)); - dm->vu_sw_if_index_by_listener_fd = hash_create (0, sizeof (uword)); - dm->vu_sw_if_index_by_sock_fd = hash_create (0, sizeof (uword)); - - /* $$$ use n_thread_stacks since it's known-good at this point */ vec_validate (dm->recycle, tm->n_thread_stacks - 1); /* Default vlib_buffer_t flags, DISABLES tcp/udp checksumming... */ diff --git a/src/plugins/dpdk/hqos/hqos.c b/src/plugins/dpdk/hqos/hqos.c index 8b251beb174..ca1bdafaaa6 100644 --- a/src/plugins/dpdk/hqos/hqos.c +++ b/src/plugins/dpdk/hqos/hqos.c @@ -46,8 +46,6 @@ #include -dpdk_main_t dpdk_main; - /*** * * HQoS default configuration values diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c index 942b8b2d466..f2f1ba22ed5 100644 --- a/src/plugins/dpdk/main.c +++ b/src/plugins/dpdk/main.c @@ -24,7 +24,7 @@ * Return 1 if to skip the delay loop because we are suspending * the calling vlib process instead. */ -int +static int rte_delay_us_override (unsigned us) { vlib_main_t *vm; -- cgit 1.2.3-korg