From 4ee3a65b93282aec6d2016f174529d7ac5e364e1 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 15 Nov 2016 19:47:58 +0100 Subject: dpdk: remove efd Change-Id: I761af883403b6740bd24ce196ae0bfe6bc77b408 Signed-off-by: Damjan Marion --- vlib/vlib/threads.c | 4 ---- vlib/vlib/threads.h | 22 ---------------------- 2 files changed, 26 deletions(-) (limited to 'vlib') diff --git a/vlib/vlib/threads.c b/vlib/vlib/threads.c index 70d4019a1fd..fb84c676cb3 100644 --- a/vlib/vlib/threads.c +++ b/vlib/vlib/threads.c @@ -287,10 +287,6 @@ vlib_thread_init (vlib_main_t * vm) vec_validate_aligned (vlib_worker_threads, first_index - 1, CLIB_CACHE_LINE_BYTES); - - tm->efd.enabled = VLIB_EFD_DISABLED; - tm->efd.queue_hi_thresh = ((VLIB_EFD_DEF_WORKER_HI_THRESH_PCT * - FRAME_QUEUE_NELTS) / 100); return 0; } diff --git a/vlib/vlib/threads.h b/vlib/vlib/threads.h index c2db86442aa..fd09c31181c 100644 --- a/vlib/vlib/threads.h +++ b/vlib/vlib/threads.h @@ -119,7 +119,6 @@ typedef struct u64 enqueue_ticks; u64 enqueue_vectors; u32 enqueue_full_events; - u32 enqueue_efd_discards; /* dequeue side */ CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); @@ -249,25 +248,6 @@ do { \ vec_free (__vlib_mains); \ } while (0); - -/* Early-Fast-Discard (EFD) */ -#define VLIB_EFD_DISABLED 0 -#define VLIB_EFD_DISCARD_ENABLED (1 << 0) -#define VLIB_EFD_MONITOR_ENABLED (1 << 1) - -#define VLIB_EFD_DEF_WORKER_HI_THRESH_PCT 90 - -/* EFD worker thread settings */ -typedef struct vlib_efd_t -{ - u16 enabled; - u16 queue_hi_thresh; - u8 ip_prec_bitmap; - u8 mpls_exp_bitmap; - u8 vlan_cos_bitmap; - u8 pad; -} vlib_efd_t; - #define foreach_sched_policy \ _(SCHED_OTHER, OTHER, "other") \ _(SCHED_BATCH, BATCH, "batch") \ @@ -328,8 +308,6 @@ typedef struct /* Bitmap of available CPU sockets (NUMA nodes) */ uword *cpu_socket_bitmap; - vlib_efd_t efd; - /* Worker handoff queues */ vlib_frame_queue_main_t *frame_queue_mains; -- cgit 1.2.3-korg