On 11/15/23 10:47, Nobuhiro MIKI wrote: > A conjunctive flow consists of two or more multiple flows with > conjunction actions. When input to the ofproto/trace command > matches a conjunctive flow, it outputs flows of all dimensions. > > Acked-by: Simon Horman <ho...@ovn.org> > Signed-off-by: Nobuhiro MIKI <nm...@yahoo-corp.jp> > --- > v6: > * Support multiple tables with resubmit action > v5: > * Support tunnel metadata > v4: > * Fix conj_id matching > * Fix priority matching > * Add a new test > v3: > * Remove struct flow changes. > * Use struct 'cls_rule' instead of struct 'flow'. > * Add priority and id conditionals for 'soft' arrays. > * Use 'minimask' in struct 'cls_rule' as mask. > * Use hmapx instead of ovs_list to store conj flows. > * Passe 'conj_flows' as an argument only when tracing. > v2: > * Reimplemented v1 with a safer and cleaner approach, > since v1 was a messy implementation that rewrote const variables. > --- > lib/classifier.c | 51 ++++++++++++++++--- > lib/classifier.h | 4 +- > lib/ovs-router.c | 5 +- > lib/tnl-ports.c | 6 +-- > ofproto/ofproto-dpif-xlate.c | 67 +++++++++++++++++++++--- > ofproto/ofproto-dpif.c | 25 ++++++--- > ofproto/ofproto-dpif.h | 3 +- > tests/classifier.at | 99 ++++++++++++++++++++++++++++++++++++ > tests/test-classifier.c | 8 +-- > 9 files changed, 238 insertions(+), 30 deletions(-)
Thanks for the update and the added tests! This version looks good to me and works fine in all the tested cases. Applied. Best regards, Ilya Maximets. _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
