| Message ID | 20220927153255.2702604-1-amorenoz@redhat.com |
|---|---|
| State | Accepted |
| Commit | 77f739914d406665dc17733a6cdd4fff9a80f7a3 |
| Headers | show |
| Series | [ovs-dev] ofproto-dpif-xlate: allow sample when no in_port | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
On 27 Sep 2022, at 17:32, Adrian Moreno wrote: > OVN can (and indeed does) set in_port to OFPP_NONE during > the pipeline evaluation. If a sample action follows, it > will be incorrectly skipped. > > Per-flow sampling version of: > f0a9000ca ofproto: Fix ipfix not always sampling on egress. I did some poking around to make sure this will not mess up the cookie and pid values, but it all look good. Did basic testing, and passes here. Acked-by: Eelco Chaudron <echaudro@redhat.com> Cheers, Eelco
On 9/28/22 10:51, Eelco Chaudron wrote: > > > On 27 Sep 2022, at 17:32, Adrian Moreno wrote: > >> OVN can (and indeed does) set in_port to OFPP_NONE during >> the pipeline evaluation. If a sample action follows, it >> will be incorrectly skipped. >> >> Per-flow sampling version of: >> f0a9000ca ofproto: Fix ipfix not always sampling on egress. > > I did some poking around to make sure this will not mess up the cookie and pid values, but it all look good. > > Did basic testing, and passes here. > > Acked-by: Eelco Chaudron <echaudro@redhat.com> Applied. Thanks! Best regards, Ilya Maximets.
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index ab6f39bb2..4a4eed982 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -5691,7 +5691,7 @@ xlate_sample_action(struct xlate_ctx *ctx, struct dpif_ipfix *ipfix = ctx->xbridge->ipfix; bool emit_set_tunnel = false; - if (!ipfix || ctx->xin->flow.in_port.ofp_port == OFPP_NONE) { + if (!ipfix) { return; }
OVN can (and indeed does) set in_port to OFPP_NONE during the pipeline evaluation. If a sample action follows, it will be incorrectly skipped. Per-flow sampling version of: f0a9000ca ofproto: Fix ipfix not always sampling on egress. Signed-off-by: Adrian Moreno <amorenoz@redhat.com> --- ofproto/ofproto-dpif-xlate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)