From a20111174e368aba0e6d6869b8bbcd432cb38159 Mon Sep 17 00:00:00 2001
From: Ben Pfaff
Date: Fri, 16 Oct 2015 13:01:04 -0700
Subject: [PATCH] ovn: Add new predicates for matching broadcast and multicast
packets.
In my opinion, "eth.mcast" is a bit more readable than "eth.dst[40]", and
so on.
Signed-off-by: Ben Pfaff
Acked-by: Justin Pettit
---
ovn/controller/lflow.c | 4 ++++
ovn/northd/ovn-northd.c | 4 ++--
ovn/ovn-sb.xml | 3 +++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c
index 37dc48d00..38c72c179 100644
--- a/ovn/controller/lflow.c
+++ b/ovn/controller/lflow.c
@@ -71,6 +71,9 @@ symtab_init(void)
expr_symtab_add_field(&symtab, "eth.src", MFF_ETH_SRC, NULL, false);
expr_symtab_add_field(&symtab, "eth.dst", MFF_ETH_DST, NULL, false);
expr_symtab_add_field(&symtab, "eth.type", MFF_ETH_TYPE, NULL, true);
+ expr_symtab_add_predicate(&symtab, "eth.bcast",
+ "eth.dst == ff:ff:ff:ff:ff:ff");
+ expr_symtab_add_subfield(&symtab, "eth.mcast", NULL, "eth.dst[40]");
expr_symtab_add_field(&symtab, "vlan.tci", MFF_VLAN_TCI, NULL, false);
expr_symtab_add_predicate(&symtab, "vlan.present", "vlan.tci[12]");
@@ -89,6 +92,7 @@ symtab_init(void)
expr_symtab_add_field(&symtab, "ip4.src", MFF_IPV4_SRC, "ip4", false);
expr_symtab_add_field(&symtab, "ip4.dst", MFF_IPV4_DST, "ip4", false);
+ expr_symtab_add_predicate(&symtab, "ip4.mcast", "ip4.dst[28..31] == 0xe");
expr_symtab_add_predicate(&symtab, "icmp4", "ip4 && ip.proto == 1");
expr_symtab_add_field(&symtab, "icmp4.type", MFF_ICMPV4_TYPE, "icmp4",
diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c
index ca2eca694..6ef134f83 100644
--- a/ovn/northd/ovn-northd.c
+++ b/ovn/northd/ovn-northd.c
@@ -913,7 +913,7 @@ build_lflows(struct northd_context *ctx, struct hmap *datapaths,
}
}
HMAP_FOR_EACH (od, key_node, datapaths) {
- ovn_lflow_add(&lflows, od, P_IN, S_IN_L2_LKUP, 100, "eth.dst[40]",
+ ovn_lflow_add(&lflows, od, P_IN, S_IN_L2_LKUP, 100, "eth.mcast",
"outport = \""MC_FLOOD"\"; output;");
}
@@ -961,7 +961,7 @@ build_lflows(struct northd_context *ctx, struct hmap *datapaths,
/* Egress table 2: Egress port security multicast/broadcast (priority
* 100). */
HMAP_FOR_EACH (od, key_node, datapaths) {
- ovn_lflow_add(&lflows, od, P_OUT, S_OUT_PORT_SEC, 100, "eth.dst[40]",
+ ovn_lflow_add(&lflows, od, P_OUT, S_OUT_PORT_SEC, 100, "eth.mcast",
"output;");
}
diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
index 87b944b90..55da9eefb 100644
--- a/ovn/ovn-sb.xml
+++ b/ovn/ovn-sb.xml
@@ -722,8 +722,11 @@
+ eth.bcast
expands to eth.dst == ff:ff:ff:ff:ff:ff
+ eth.mcast
expands to eth.dst[40]
vlan.present
expands to vlan.tci[12]
ip4
expands to eth.type == 0x800
+ ip4.mcast
expands to ip4.dst[28..31] == 0xe
ip6
expands to eth.type == 0x86dd
ip
expands to ip4 || ip6
icmp4
expands to ip4 && ip.proto == 1
--
2.20.1