[ovs-dev,branch-2.12] ovn-northd: Fix IP local multicast flooding.
diff mbox series

Message ID 1582794959-365-1-git-send-email-dceara@redhat.com
State Accepted
Headers show
Series
  • [ovs-dev,branch-2.12] ovn-northd: Fix IP local multicast flooding.
Related show

Commit Message

Dumitru Ceara Feb. 27, 2020, 9:15 a.m. UTC
Skip IGMP entries learned for local multicast groups when generating
logical flows. We still allow ovn-controller to learn them as
it might be useful information for administrators to see that hosts
register for the groups even though they are not expected to send JOIN
messages for this range.

Note: The upstream OVN master patch doesn't apply cleanly because OVN
2.12 doesn't support MLD. The conflict is however easy to solve and
involves removing the IPv6 specific code.

Fixes: ddc64665b678 ("OVN: Add ovn-northd IGMP support")
Reported-by: Lucas Alvares Gomes <lmartins@redhat.com>
Reported-at: https://bugzilla.redhat.com/1803008
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
Acked-by: Mark Michelson <mmichels@redhat.com>
(cherry picked from OVN commit 755ffada2a66416173d5f1e09672909d40f87fd1)

Conflicts:
	ovn/northd/ovn-northd.c
	tests/ovn.at
---
 ovn/northd/ovn-northd.c |  9 +++++++++
 tests/ovn.at            | 48 +++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 48 insertions(+), 9 deletions(-)

Comments

Ben Pfaff Feb. 28, 2020, 7:20 p.m. UTC | #1
On Thu, Feb 27, 2020 at 10:15:59AM +0100, Dumitru Ceara wrote:
> Skip IGMP entries learned for local multicast groups when generating
> logical flows. We still allow ovn-controller to learn them as
> it might be useful information for administrators to see that hosts
> register for the groups even though they are not expected to send JOIN
> messages for this range.
> 
> Note: The upstream OVN master patch doesn't apply cleanly because OVN
> 2.12 doesn't support MLD. The conflict is however easy to solve and
> involves removing the IPv6 specific code.
> 
> Fixes: ddc64665b678 ("OVN: Add ovn-northd IGMP support")
> Reported-by: Lucas Alvares Gomes <lmartins@redhat.com>
> Reported-at: https://bugzilla.redhat.com/1803008
> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
> Acked-by: Mark Michelson <mmichels@redhat.com>
> (cherry picked from OVN commit 755ffada2a66416173d5f1e09672909d40f87fd1)

Thanks, applied to branch-2.12.
Dumitru Ceara March 2, 2020, 10:04 a.m. UTC | #2
On 2/28/20 8:20 PM, Ben Pfaff wrote:
> On Thu, Feb 27, 2020 at 10:15:59AM +0100, Dumitru Ceara wrote:
>> Skip IGMP entries learned for local multicast groups when generating
>> logical flows. We still allow ovn-controller to learn them as
>> it might be useful information for administrators to see that hosts
>> register for the groups even though they are not expected to send JOIN
>> messages for this range.
>>
>> Note: The upstream OVN master patch doesn't apply cleanly because OVN
>> 2.12 doesn't support MLD. The conflict is however easy to solve and
>> involves removing the IPv6 specific code.
>>
>> Fixes: ddc64665b678 ("OVN: Add ovn-northd IGMP support")
>> Reported-by: Lucas Alvares Gomes <lmartins@redhat.com>
>> Reported-at: https://bugzilla.redhat.com/1803008
>> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
>> Acked-by: Mark Michelson <mmichels@redhat.com>
>> (cherry picked from OVN commit 755ffada2a66416173d5f1e09672909d40f87fd1)
> 
> Thanks, applied to branch-2.12.
> 

Thanks Ben!

Patch
diff mbox series

diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c
index 1c91649..a079ca3 100644
--- a/ovn/northd/ovn-northd.c
+++ b/ovn/northd/ovn-northd.c
@@ -5329,6 +5329,15 @@  build_lswitch_flows(struct hmap *datapaths, struct hmap *ports,
 
         struct mcast_info *mcast_info = &igmp_group->datapath->mcast_info;
 
+        /* RFC 4541, section 2.1.2, item 2: Skip groups in the 224.0.0.X
+         * range.
+         */
+        ovs_be32 group_address =
+            in6_addr_get_mapped_ipv4(&igmp_group->address);
+        if (ip_is_local_multicast(group_address)) {
+            continue;
+        }
+
         if (mcast_info->active_flows >= mcast_info->table_size) {
             continue;
         }
diff --git a/tests/ovn.at b/tests/ovn.at
index 4792e28..1307db0 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -14975,7 +14975,7 @@  ovn-nbctl set Logical_Switch sw1 other_config:mcast_querier="false"
 ovn-nbctl set Logical_Switch sw1 other_config:mcast_snoop="true"
 
 # No IGMP query should be generated by sw1 (mcast_querier="false").
-truncate -s 0 expected
+> expected
 OVN_CHECK_PACKETS([hv1/vif1-tx.pcap], [expected])
 OVN_CHECK_PACKETS([hv1/vif2-tx.pcap], [expected])
 OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected])
@@ -14995,14 +14995,14 @@  send_igmp_v3_report hv2-vif1 hv2 000000000002 $(ip_to_hex 10 0 0 2) f9f9 \
 
 # Check that the IGMP Group is learned on both hv.
 OVS_WAIT_UNTIL([
-    total_entries=`ovn-sbctl find IGMP_Group | grep "239.0.1.68" | wc -l`
+    total_entries=`ovn-sbctl find IGMP_Group | grep "239.0.1.68" -c`
     test "${total_entries}" = "2"
 ])
 
 # Send traffic and make sure it gets forwarded only on the two ports that
 # joined.
-truncate -s 0 expected
-truncate -s 0 expected_empty
+> expected
+> expected_empty
 send_ip_multicast_pkt hv1-vif2 hv1 \
     000000000001 01005e000144 \
     $(ip_to_hex 10 0 0 42) $(ip_to_hex 239 0 1 68) 1e ca70 11 \
@@ -15024,7 +15024,7 @@  send_igmp_v3_report hv1-vif1 hv1 \
 
 # Check IGMP_Group table on both HV.
 OVS_WAIT_UNTIL([
-    total_entries=`ovn-sbctl find IGMP_Group | grep "239.0.1.68" | wc -l`
+    total_entries=`ovn-sbctl find IGMP_Group | grep "239.0.1.68" -c`
     test "${total_entries}" = "1"
 ])
 
@@ -15032,8 +15032,8 @@  OVS_WAIT_UNTIL([
 # joined.
 as hv1 reset_pcap_file hv1-vif1 hv1/vif1
 as hv2 reset_pcap_file hv2-vif1 hv2/vif1
-truncate -s 0 expected
-truncate -s 0 expected_empty
+> expected
+> expected_empty
 send_ip_multicast_pkt hv1-vif2 hv1 \
     000000000001 01005e000144 \
     $(ip_to_hex 10 0 0 42) $(ip_to_hex 239 0 1 68) 1e ca70 11 \
@@ -15051,10 +15051,40 @@  OVN_CHECK_PACKETS([hv2/vif3-tx.pcap], [expected_empty])
 ovn-sbctl ip-multicast-flush sw1
 ovn-nbctl --wait=hv -t 3 sync
 OVS_WAIT_UNTIL([
-    total_entries=`ovn-sbctl find IGMP_Group | grep "239.0.1.68" | wc -l`
+    total_entries=`ovn-sbctl find IGMP_Group | grep "239.0.1.68" -c`
     test "${total_entries}" = "0"
 ])
 
+# Check that traffic for 224.0.0.X is flooded even if some hosts register for
+# it.
+# Inject IGMP Join for 224.0.0.42 on sw1-p11.
+send_igmp_v3_report hv1-vif1 hv1 \
+    000000000001 $(ip_to_hex 10 0 0 1) f9f8 \
+    $(ip_to_hex 224 0 0 42) 04 f9d3 \
+    /dev/null
+
+# Check that the IGMP Group is learned.
+OVS_WAIT_UNTIL([
+    total_entries=`ovn-sbctl find IGMP_Group | grep "224.0.0.42" -c`
+    test "${total_entries}" = "1"
+])
+
+# Send traffic and make sure it gets flooded to all ports.
+as hv1 reset_pcap_file hv1-vif1 hv1/vif1
+as hv1 reset_pcap_file hv1-vif2 hv1/vif2
+as hv2 reset_pcap_file hv2-vif1 hv2/vif1
+as hv2 reset_pcap_file hv2-vif2 hv2/vif2
+> expected
+send_ip_multicast_pkt hv1-vif2 hv1 \
+    000000000001 01005e000144 \
+    $(ip_to_hex 10 0 0 42) $(ip_to_hex 224 0 0 42) 1e f989 11 \
+    e518e518000a4b540000 \
+    expected
+
+OVN_CHECK_PACKETS([hv1/vif1-tx.pcap], [expected])
+OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected])
+OVN_CHECK_PACKETS([hv2/vif2-tx.pcap], [expected])
+
 # Enable IGMP snooping and querier on sw2 and set query interval to minimum.
 ovn-nbctl set Logical_Switch sw2 \
     other_config:mcast_snoop="true" \
@@ -15064,7 +15094,7 @@  ovn-nbctl set Logical_Switch sw2 \
     other_config:mcast_ip4_src="20.0.0.254"
 
 # Wait for 1 query interval (1 sec) and check that two queries are generated.
-truncate -s 0 expected
+> expected
 store_igmp_v3_query 0000000002fe $(ip_to_hex 20 0 0 254) 84dd expected
 store_igmp_v3_query 0000000002fe $(ip_to_hex 20 0 0 254) 84dd expected