From 88caf28354133160d2446e939f1e54adb71cc144 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Wed, 16 Sep 2020 12:10:27 +0000 Subject: acl: remove custom ACL-plugin heap Custom ACL-plugin heap was useful in early stages, but it interferes with other infra optimizations. Remove it and use global heap. Change-Id: I2300548f1d1798dec27bc5a2a41cf37f9fcda95d Type: improvement Signed-off-by: Andrew Yourtchenko --- src/plugins/acl/acl.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/plugins/acl/acl.h') diff --git a/src/plugins/acl/acl.h b/src/plugins/acl/acl.h index 9b276aada5f..c540bf8fbca 100644 --- a/src/plugins/acl/acl.h +++ b/src/plugins/acl/acl.h @@ -43,7 +43,6 @@ #define SESSION_PURGATORY_TIMEOUT_USEC 10 -#define ACL_PLUGIN_HASH_LOOKUP_HEAP_SIZE (2 << 25) #define ACL_PLUGIN_HASH_LOOKUP_HASH_BUCKETS 65536 #define ACL_PLUGIN_HASH_LOOKUP_HASH_MEMORY (2 << 25) @@ -115,10 +114,6 @@ typedef struct } ace_mask_type_entry_t; typedef struct { - /* mheap to hold all the ACL module related allocations, other than hash */ - void *acl_mheap; - uword acl_mheap_size; - /* API message ID base */ u16 msg_id_base; @@ -133,9 +128,6 @@ typedef struct { u32 hash_lookup_hash_buckets; uword hash_lookup_hash_memory; - /* mheap to hold all the miscellaneous allocations related to hash-based lookups */ - void *hash_lookup_mheap; - uword hash_lookup_mheap_size; int acl_lookup_hash_initialized; /* applied_hash_ace_entry_t **input_hash_entry_vec_by_sw_if_index; @@ -379,8 +371,6 @@ AH has a special treatment of its length, it is in 32-bit words, not 64-bit word extern acl_main_t acl_main; -void *acl_plugin_set_heap(); - typedef enum { ACL_FA_REQ_SESS_RESCHEDULE = 0, ACL_FA_N_REQ, -- cgit 1.2.3-korg