> -----Original Message----- > From: Iremonger, Bernard > Sent: Wednesday, December 6, 2017 12:34 PM > To: Iremonger, Bernard <bernard.iremon...@intel.com>; Singh, Jasvinder > <jasvinder.si...@intel.com>; dev@dpdk.org > Subject: RE: [PATCH 1/3] lib/librte_flow_classify: remove table id parameter > from apis > > Hi Jasvinder, > > > > > -----Original Message----- > > > > From: Singh, Jasvinder > > > > Sent: Thursday, November 23, 2017 11:32 AM > > > > To: dev@dpdk.org > > > > Cc: Iremonger, Bernard <bernard.iremon...@intel.com> > > > > Subject: [PATCH 1/3] lib/librte_flow_classify: remove table id > > > > parameter from apis > > > > > > > > This patch removes table id parameter from all the flow classify > > > > apis to reduce the complexity and and does some cleanup of the code. > > > > > > > > The validate api has been exposed as public api to allows user to > > > > validate the flow before adding it to the classifier. > > > > > > > > The sample app and unit tests have been updated to accomodate the > > > > apis changes. > > > > > > > > Signed-off-by: Jasvinder Singh <jasvinder.si...@intel.com> > > > > --- > > > > examples/flow_classify/flow_classify.c | 27 +- > > > > lib/librte_flow_classify/rte_flow_classify.c | 320 > > > > +++++++++++-------- > -- > > > > lib/librte_flow_classify/rte_flow_classify.h | 74 +++-- > > > > lib/librte_flow_classify/rte_flow_classify_parse.c | 118 ++++---- > > > > lib/librte_flow_classify/rte_flow_classify_parse.h | 16 +- > > > > .../rte_flow_classify_version.map | 1 + > > > > test/test/test_flow_classify.c | 86 +++--- > > > > test/test/test_flow_classify.h | 10 +- > > > > 8 files changed, 365 insertions(+), 287 deletions(-) > > > > > > It would be better to break this patch into three patches, a > librte_flow_classify patch, a flow_classify sample app patch, and a > test_flow_classify patch.
Ok, Will break this into multiple patches. > flow_classify test > > > > diff --git a/examples/flow_classify/flow_classify.c > > > > b/examples/flow_classify/flow_classify.c > > > > index 766f1dd..37e6904 100644 > > > > --- a/examples/flow_classify/flow_classify.c > > > > +++ b/examples/flow_classify/flow_classify.c <snip> > > > > + if (!actions) { > > > > + rte_flow_error_set(error, EINVAL, > > > > + RTE_FLOW_ERROR_TYPE_ACTION_NUM, > > > > + NULL, "NULL action."); > > > > + return -EINVAL; > > > > + } > > > > + > > > > + if (!error) { > > > > + rte_flow_error_set(error, EINVAL, > > > > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > > > > + NULL, "NULL error."); > > > > + return -EINVAL; > > > > + } > > The check on error, should be the first check and should not use > rte_flow_error_set(). Will correct this. > > > > + > > > > + memset(&cls->ntuple_filter, 0, sizeof(cls->ntuple_filter)); > > > > > > > > /* Get the non-void item number of pattern */ > > > > while ((pattern + i)->type != RTE_FLOW_ITEM_TYPE_END) { @@ - > > > > 150,7 +195,7 @@ flow_classify_parse_flow( > > > > return -EINVAL; > > > > } > > > > <snip> > > > > struct rte_flow_classify_rule *rule; > > > > struct rte_flow_classify_table_entry *table_entry; > > > > + struct classify_action *action; > > > > + uint32_t i; > > > > int ret; > > > > > > > > - if (!error) > > > > - return NULL; > > > > - > > > > - if (!cls) { > > > > - rte_flow_error_set(error, EINVAL, > > > > - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > > > > - NULL, "NULL classifier."); > > > > - return NULL; > > > > - } > > > > - > > > > - if (table_id >= cls->num_tables) { > > > > - rte_flow_error_set(error, EINVAL, > > > > - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > > > > - NULL, "invalid table_id."); > > > > - return NULL; > > > > - } > > > > - > > > > if (key_found == NULL) { > > > > rte_flow_error_set(error, EINVAL, > > > > RTE_FLOW_ERROR_TYPE_UNSPECIFIED, @@ > - > > 520,91 +536,95 @@ > > > > rte_flow_classify_table_entry_add(struct > > > > rte_flow_classifier *cls, > > > > return NULL; > > > > } > > > > > > The check on error should be restored as the first check. Ok. > > > > - if (!pattern) { > > > > - rte_flow_error_set(error, EINVAL, > > > > - RTE_FLOW_ERROR_TYPE_ITEM_NUM, > > > > - NULL, "NULL pattern."); > > > > - return NULL; > > > > - } > > > > - > > > > - if (!actions) { > > > > - rte_flow_error_set(error, EINVAL, > > > > - RTE_FLOW_ERROR_TYPE_ACTION_NUM, > > > > - NULL, "NULL action."); > > > > - return NULL; > > > > - } <snip> > > > > static struct rte_flow_action count_action_bad = { -1, 0}; > > > > > > > > static struct rte_flow_action end_action = { > > > > RTE_FLOW_ACTION_TYPE_END, 0}; > > > > -- > > > > 2.9.3 > > > > > > This patch fails to apply to the 18.02 master branch, a rebase may be > needed. > > > > > > Regards, > > > > > > Bernard. > > > > False alarm, the patch applies ok on a fresh checkout. > > > > Regards, > > > > Bernard. Thank you for the review, Bernard. Jasvinder