From 5c1e48c01b50ddbd7623228e3dbc94d835d23813 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Thu, 15 Oct 2020 14:41:36 -0400 Subject: classify: add pcap/trace classfier mgmt API calls Add lookup/get/set API calls to manage both PCAP and Trace filtering Classifier tables. The "lookup" call may be used to identify a Classifier table within a chain of tables taht matches a particular mask vector. For efficiency, this call should be used to determine to which table a match vector should be added. The "get" calls return the first table within a chain (either a PCAP or the Trace) set of tables. The "set" call may be used to add a new table to one such chain. If the "sort_masks" flag is set, the tables within the chain are ordered such that the most-specific mask is first, and the least-specific mask is last. A call that "sets" a chain to ~0 will delete and free all the tables with a chain. The PCAP filters are per-interface, with "local0", (that is, sw_if_index == 0) holding the system-wide PCAP filter. The Classifier used a reference-counted "set" for each PCAP or trace filter that it stored. The ref counts were not used, and the vector of tables was only used temporarily to establish a sorted order for tables based on masks. None of that complexity was actually warranted, and where it was used, the same could be achieved more simply. Type: refactor Signed-off-by: Jon Loeliger Change-Id: Icc56116cca91b91c631ca0628e814fb53f3677d2 --- src/vnet/classify/vnet_classify.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/vnet/classify/vnet_classify.h') diff --git a/src/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h index f0c81241584..1ce29df5f13 100644 --- a/src/vnet/classify/vnet_classify.h +++ b/src/vnet/classify/vnet_classify.h @@ -180,12 +180,6 @@ typedef struct } vnet_classify_table_t; -typedef struct -{ - int refcnt; - u32 *table_indices; -} vnet_classify_filter_set_t; - struct _vnet_classify_main { /* Table pool */ @@ -198,11 +192,8 @@ struct _vnet_classify_main unformat_function_t **unformat_policer_next_index_fns; unformat_function_t **unformat_opaque_index_fns; - /* Pool of filter sets */ - vnet_classify_filter_set_t *filter_sets; - - /* Per-interface filter set map. [0] is used for pcap */ - u32 *filter_set_by_sw_if_index; + /* Per-interface filter table. [0] is used for pcap */ + u32 *classify_table_index_by_sw_if_index; /* convenience variables */ vlib_main_t *vlib_main; @@ -554,6 +545,17 @@ void vnet_classify_register_unformat_policer_next_index_fn void vnet_classify_register_unformat_opaque_index_fn (unformat_function_t * fn); +u32 classify_get_pcap_chain (vnet_classify_main_t * cm, u32 sw_if_index); +void classify_set_pcap_chain (vnet_classify_main_t * cm, + u32 sw_if_index, u32 table_index); + +u32 classify_get_trace_chain (void); +void classify_set_trace_chain (vnet_classify_main_t * cm, u32 table_index); + +u32 classify_sort_table_chain (vnet_classify_main_t * cm, u32 table_index); +u32 classify_lookup_chain (u32 table_index, + u8 * mask, u32 n_skip, u32 n_match); + #endif /* __included_vnet_classify_h__ */ /* -- cgit 1.2.3-korg