From dfb19cabe20ccf1cbd1aa714f493ccd322839b91 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 3 Jun 2020 20:13:59 +0200 Subject: dpdk: cleanup, add rx queue struct Type: improvement Change-Id: I3defde103ab245404de42d2be7abcb2c43d49a60 Signed-off-by: Damjan Marion --- src/plugins/dpdk/device/init.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'src/plugins/dpdk/device/init.c') diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 7911ccc61a8..b69e2b1b7c7 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -143,19 +143,6 @@ dpdk_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi, u32 flags) return old; } -static void -dpdk_device_lock_init (dpdk_device_t * xd) -{ - int q; - vec_validate (xd->lockp, xd->tx_q_used - 1); - for (q = 0; q < xd->tx_q_used; q++) - { - xd->lockp[q] = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, - CLIB_CACHE_LINE_BYTES); - clib_memset ((void *) xd->lockp[q], 0, CLIB_CACHE_LINE_BYTES); - } -} - static int dpdk_port_crc_strip_enabled (dpdk_device_t * xd) { @@ -623,7 +610,11 @@ dpdk_lib_init (dpdk_main_t * dm) rte_eth_macaddr_get (i, (void *) addr); if (xd->tx_q_used < tm->n_vlib_mains) - dpdk_device_lock_init (xd); + for (int q = 0; q < xd->tx_q_used; q++) + { + dpdk_rx_queue_t *rxq = vec_elt_at_index (xd->rx_queues, q); + clib_spinlock_init (&rxq->lock); + } xd->port_id = i; xd->device_index = xd - dm->devices; -- cgit 1.2.3-korg