diff options
author | Andrew Yourtchenko <ayourtch@gmail.com> | 2017-08-08 20:10:12 +0200 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2017-08-10 13:56:31 +0000 |
commit | ef5dd4f2aec6df1b58aa8d07493acf486eccf802 (patch) | |
tree | efe67ac8e347936b78011de27616a64c486979e3 /src/plugins/acl/hash_lookup.h | |
parent | fa3eb7a993fe7538c51360960ef92dced0562342 (diff) |
acl-plugin: avoid crash in multithreaded setup adding/deleting ACLs with traffic (VPP-910/VPP-929)
The commit fixing the VPP-910 and separating the memory operations
into separate heaps has missed setting the MHEAP_FLAG_THREAD_SAFE,
which quite obviously caused the issues in the multithread setup.
Fix that.
Also, add the debug CLIs
"set acl-plugin heap {main|hash} {validate|trace} {1|0}"
to toggle the memory instrumentation, in case we ever need it
in the future.
Change-Id: I8bd4f7978613f5ea75a030cfb90674dac34ae7bf
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
(cherry picked from commit e6423bef32ca2ffcfcd7a092eb4673badd53ea4c)
Diffstat (limited to 'src/plugins/acl/hash_lookup.h')
-rw-r--r-- | src/plugins/acl/hash_lookup.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/acl/hash_lookup.h b/src/plugins/acl/hash_lookup.h index c5913624f81..2d7058e80ee 100644 --- a/src/plugins/acl/hash_lookup.h +++ b/src/plugins/acl/hash_lookup.h @@ -57,4 +57,8 @@ hash_multi_acl_match_5tuple (u32 sw_if_index, fa_5tuple_t * pkt_5tuple, int is_l */ void show_hash_acl_hash(vlib_main_t * vm, acl_main_t *am, u32 verbose); +/* Debug functions to turn validate/trace on and off */ +void acl_plugin_hash_acl_set_validate_heap(acl_main_t *am, int on); +void acl_plugin_hash_acl_set_trace_heap(acl_main_t *am, int on); + #endif |