From: Nikolay Aleksandrov <razor@blackwall.org>
To: netdev@vger.kernel.org
Cc: roopa@nvidia.com, davem@davemloft.net,
bridge@lists.linux-foundation.org,
Nikolay Aleksandrov <nikolay@nvidia.com>
Subject: [PATCH net-next v2 09/16] net: bridge: mcast: when igmpv3/mldv2 are enabled lookup (S,G) first, then (*,G)
Date: Tue, 22 Sep 2020 10:30:20 +0300 [thread overview]
Message-ID: <20200922073027.1196992-10-razor@blackwall.org> (raw)
In-Reply-To: <20200922073027.1196992-1-razor@blackwall.org>
From: Nikolay Aleksandrov <nikolay@nvidia.com>
If (S,G) entries are enabled (igmpv3/mldv2) then look them up first. If
there isn't a present (S,G) entry then try to find (*,G).
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
---
net/bridge/br_multicast.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index e1fb822b9ddb..4fd690bc848f 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -127,10 +127,28 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
switch (skb->protocol) {
case htons(ETH_P_IP):
ip.dst.ip4 = ip_hdr(skb)->daddr;
+ if (br->multicast_igmp_version == 3) {
+ struct net_bridge_mdb_entry *mdb;
+
+ ip.src.ip4 = ip_hdr(skb)->saddr;
+ mdb = br_mdb_ip_get_rcu(br, &ip);
+ if (mdb)
+ return mdb;
+ ip.src.ip4 = 0;
+ }
break;
#if IS_ENABLED(CONFIG_IPV6)
case htons(ETH_P_IPV6):
ip.dst.ip6 = ipv6_hdr(skb)->daddr;
+ if (br->multicast_mld_version == 2) {
+ struct net_bridge_mdb_entry *mdb;
+
+ ip.src.ip6 = ipv6_hdr(skb)->saddr;
+ mdb = br_mdb_ip_get_rcu(br, &ip);
+ if (mdb)
+ return mdb;
+ memset(&ip.src.ip6, 0, sizeof(ip.src.ip6));
+ }
break;
#endif
default:
--
2.25.4
next prev parent reply other threads:[~2020-09-22 7:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 7:30 [PATCH net-next v2 00/16] net: bridge: mcast: IGMPv3/MLDv2 fast-path (part 2) Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 01/16] net: bridge: mdb: use extack in br_mdb_parse() Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 02/16] net: bridge: mdb: move all port and bridge checks to br_mdb_add Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 03/16] net: bridge: mdb: use extack in br_mdb_add() and br_mdb_add_group() Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 04/16] net: bridge: add src field to br_ip Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 05/16] net: bridge: mcast: use br_ip's src for src groups and querier address Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 06/16] net: bridge: mcast: rename br_ip's u member to dst Nikolay Aleksandrov
2020-09-22 17:51 ` Linus Lüssing
2020-09-22 17:55 ` Linus Lüssing
2020-09-22 7:30 ` [PATCH net-next v2 07/16] net: bridge: mdb: add support to extend add/del commands Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 08/16] net: bridge: mdb: add support for add/del/dump of entries with source Nikolay Aleksandrov
2020-09-22 7:30 ` Nikolay Aleksandrov [this message]
2020-09-22 7:30 ` [PATCH net-next v2 10/16] net: bridge: mcast: add rt_protocol field to the port group struct Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 11/16] net: bridge: mcast: add sg_port rhashtable Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 12/16] net: bridge: mcast: install S,G entries automatically based on reports Nikolay Aleksandrov
[not found] ` <202009231635.WjfHleMK%lkp@intel.com>
2020-09-23 8:20 ` Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 13/16] net: bridge: mcast: handle port group filter modes Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 14/16] net: bridge: mcast: add support for blocked port groups Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 15/16] net: bridge: mcast: handle host state Nikolay Aleksandrov
2020-09-22 7:30 ` [PATCH net-next v2 16/16] net: bridge: mcast: when forwarding handle filter mode and blocked flag Nikolay Aleksandrov
2020-09-23 20:25 ` [PATCH net-next v2 00/16] net: bridge: mcast: IGMPv3/MLDv2 fast-path (part 2) David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200922073027.1196992-10-razor@blackwall.org \
--to=razor@blackwall.org \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=roopa@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).