Typically the datapath will support all available features, so check
that first before attempting to retrieve various values out of a
minimask as the latter doesn't need to be checked if all fields are
supported.
ct_state is an exception, because support for the bits in this field is
not binary; only some bits are defined so far, so they must still be
checked against the current known supported bits.
Suggested-by: Jarno Rajahalme <jrajaha...@nicira.com>
Signed-off-by: Joe Stringer <joestrin...@nicira.com>
---
ofproto/ofproto-dpif.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index ee2d267ab7b8..f0a2ca59e2e8 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -4022,6 +4022,11 @@ rule_check(struct rule *rule)
support = &ofproto_dpif_get_support(ofproto)->odp;
ct_state = MINIFLOW_GET_U16(&rule->cr.match.mask->masks, ct_state);
+ if (support->ct_state && support->ct_zone && support->ct_mark
+ && support->ct_label) {
+ return ct_state & CS_UNSUPPORTED_MASK ? OFPERR_OFPBMC_BAD_MASK : 0;
+ }
+
ct_zone = MINIFLOW_GET_U16(&rule->cr.match.mask->masks, ct_zone);
ct_mark = MINIFLOW_GET_U32(&rule->cr.match.mask->masks, ct_mark);
ct_label = MINIFLOW_GET_U128(&rule->cr.match.mask->masks, ct_label);
--
2.1.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
