| Message ID | 20200527192431.1442778-1-blp@ovn.org |
|---|---|
| State | Accepted |
| Commit | edd04838c61c61f0156400c36bcdf06c746481b0 |
| Headers | show |
| Series | [ovs-dev] meta-flow: Document that constituents of conjunctive flows may overlap. | expand |
On Wed, May 27, 2020 at 12:24:31PM -0700, Ben Pfaff wrote: > Suggested-by: Antonin Bas <abas@vmware.com> > Signed-off-by: Ben Pfaff <blp@ovn.org> > --- > lib/meta-flow.xml | 2 ++ > manpages.mk | 3 --- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml > index d4495552b3c2..1546758744b4 100644 > --- a/lib/meta-flow.xml > +++ b/lib/meta-flow.xml > @@ -1240,6 +1240,8 @@ tcp,tp_src=0x07c0/0xfff0 > priority, that is, any given packet must be able to match at most one > conjunctive flow at a given priority. Overlapping conjunctive flows > yield unpredictable results. > + (The flows that constitute a conjunctive flow may overlap with those > + that constitute the same or another conjunctive flow.) > </li> > <li> > Following a conjunctive flow match, the search for the flow with LGTM above. Acked-by: William Tu <u9012063@gmail.com> But the blow is unrelated. > diff --git a/manpages.mk b/manpages.mk > index dc201484c637..54a3a82ad963 100644 > --- a/manpages.mk > +++ b/manpages.mk > @@ -104,7 +104,6 @@ utilities/bugtool/ovs-bugtool.8: \ > utilities/bugtool/ovs-bugtool.8.in: > lib/ovs.tmac: > > - > utilities/ovs-dpctl-top.8: \ > utilities/ovs-dpctl-top.8.in \ > lib/ovs.tmac > @@ -155,8 +154,6 @@ lib/common-syn.man: > lib/common.man: > lib/ovs.tmac: > > -lib/ovs.tmac: > - > utilities/ovs-testcontroller.8: \ > utilities/ovs-testcontroller.8.in \ > lib/common.man \ > -- > 2.25.3 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
On Thu, May 28, 2020 at 05:11:53PM -0700, William Tu wrote: > On Wed, May 27, 2020 at 12:24:31PM -0700, Ben Pfaff wrote: > > Suggested-by: Antonin Bas <abas@vmware.com> > > Signed-off-by: Ben Pfaff <blp@ovn.org> > > --- > > lib/meta-flow.xml | 2 ++ > > manpages.mk | 3 --- > > 2 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml > > index d4495552b3c2..1546758744b4 100644 > > --- a/lib/meta-flow.xml > > +++ b/lib/meta-flow.xml > > @@ -1240,6 +1240,8 @@ tcp,tp_src=0x07c0/0xfff0 > > priority, that is, any given packet must be able to match at most one > > conjunctive flow at a given priority. Overlapping conjunctive flows > > yield unpredictable results. > > + (The flows that constitute a conjunctive flow may overlap with those > > + that constitute the same or another conjunctive flow.) > > </li> > > <li> > > Following a conjunctive flow match, the search for the flow with > LGTM above. > Acked-by: William Tu <u9012063@gmail.com> Thanks, I applied this to master. > But the blow is unrelated. You are right. I dropped it.
diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml index d4495552b3c2..1546758744b4 100644 --- a/lib/meta-flow.xml +++ b/lib/meta-flow.xml @@ -1240,6 +1240,8 @@ tcp,tp_src=0x07c0/0xfff0 priority, that is, any given packet must be able to match at most one conjunctive flow at a given priority. Overlapping conjunctive flows yield unpredictable results. + (The flows that constitute a conjunctive flow may overlap with those + that constitute the same or another conjunctive flow.) </li> <li> Following a conjunctive flow match, the search for the flow with diff --git a/manpages.mk b/manpages.mk index dc201484c637..54a3a82ad963 100644 --- a/manpages.mk +++ b/manpages.mk @@ -104,7 +104,6 @@ utilities/bugtool/ovs-bugtool.8: \ utilities/bugtool/ovs-bugtool.8.in: lib/ovs.tmac: - utilities/ovs-dpctl-top.8: \ utilities/ovs-dpctl-top.8.in \ lib/ovs.tmac @@ -155,8 +154,6 @@ lib/common-syn.man: lib/common.man: lib/ovs.tmac: -lib/ovs.tmac: - utilities/ovs-testcontroller.8: \ utilities/ovs-testcontroller.8.in \ lib/common.man \
Suggested-by: Antonin Bas <abas@vmware.com> Signed-off-by: Ben Pfaff <blp@ovn.org> --- lib/meta-flow.xml | 2 ++ manpages.mk | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)