From: Nikolay Aleksandrov <nikolay@nvidia.com>
To: "Linus Lüssing" <linus.luessing@c0d3.blue>, netdev@vger.kernel.org
Cc: Roopa Prabhu <roopa@nvidia.com>, Jakub Kicinski <kuba@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
bridge@lists.linux-foundation.org,
b.a.t.m.a.n@lists.open-mesh.org, linux-kernel@vger.kernel.org
Subject: Re: [net-next v2 11/11] net: bridge: mcast: export multicast router presence adjacent to a port
Date: Tue, 11 May 2021 12:23:24 +0300 [thread overview]
Message-ID: <7279c94e-a4ff-2fbb-290e-bdaf5844148c@nvidia.com> (raw)
In-Reply-To: <20210509194509.10849-12-linus.luessing@c0d3.blue>
On 09/05/2021 22:45, Linus Lüssing wrote:
> To properly support routable multicast addresses in batman-adv in a
> group-aware way, a batman-adv node needs to know if it serves multicast
> routers.
>
> This adds a function to the bridge to export this so that batman-adv
> can then make full use of the Multicast Router Discovery capability of
> the bridge.
>
> Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
> ---
> net/bridge/br_multicast.c | 58 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 58 insertions(+)
>
> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> index b625fd6..e963de5 100644
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -4061,6 +4061,64 @@ unlock:
> }
> EXPORT_SYMBOL_GPL(br_multicast_has_querier_adjacent);
>
> +/**
> + * br_multicast_has_router_adjacent - Checks for a router behind a bridge port
> + * @dev: The bridge port adjacent to which to check for a multicast router
> + * @proto: The protocol family to check for: IGMP -> ETH_P_IP, MLD -> ETH_P_IPV6
> + *
> + * Checks whether the given interface has a bridge on top and if so returns
> + * true if a multicast router is behind one of the other ports of this
> + * bridge. Otherwise returns false.
> + */
> +bool br_multicast_has_router_adjacent(struct net_device *dev, int proto)
> +{
> + struct net_bridge_port *port, *p;
> + bool ret = false;
> +
> + rcu_read_lock();
> + if (!netif_is_bridge_port(dev))
> + goto unlock;
> +
> + port = br_port_get_rcu(dev);
You can combine both of netif_is_bridge_port and br_port_get_rcu() checks and use
br_port_get_check_rcu(). Then you can also drop the port->br check.
> + if (!port || !port->br)
> + goto unlock;
> +
> + switch (proto) {
> + case ETH_P_IP:
> + hlist_for_each_entry_rcu(p, &port->br->ip4_mc_router_list,
> + ip4_rlist) {
> + if (p == port)
> + continue;
> +
> + ret = true;
> + goto unlock;
> + }
> + break;
> +#if IS_ENABLED(CONFIG_IPV6)
> + case ETH_P_IPV6:
> + hlist_for_each_entry_rcu(p, &port->br->ip6_mc_router_list,
> + ip6_rlist) {
> + if (p == port)
> + continue;
> +
> + ret = true;
> + goto unlock;
> + }
> + break;
> +#endif
> + default:
> + /* when compiled without IPv6 support, be conservative and
> + * always assume presence of an IPv6 multicast router
> + */
> + ret = true;
> + }
> +
> +unlock:
> + rcu_read_unlock();
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(br_multicast_has_router_adjacent);
> +
> static void br_mcast_stats_add(struct bridge_mcast_stats __percpu *stats,
> const struct sk_buff *skb, u8 type, u8 dir)
> {
>
prev parent reply other threads:[~2021-05-11 9:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-09 19:44 [PATCH net-next v2 00/11] net: bridge: split IPv4/v6 mc router state and export for batman-adv Linus Lüssing
2021-05-09 19:44 ` [net-next v2 01/11] net: bridge: mcast: rename multicast router lists and timers Linus Lüssing
2021-05-11 9:12 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 02/11] net: bridge: mcast: add wrappers for router node retrieval Linus Lüssing
2021-05-11 9:12 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 03/11] net: bridge: mcast: prepare mdb netlink for mcast router split Linus Lüssing
2021-05-11 9:13 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 04/11] net: bridge: mcast: prepare query reception " Linus Lüssing
2021-05-11 9:13 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 05/11] net: bridge: mcast: prepare is-router function " Linus Lüssing
2021-05-11 9:16 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 06/11] net: bridge: mcast: prepare expiry functions " Linus Lüssing
2021-05-11 9:16 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 07/11] net: bridge: mcast: prepare add-router function " Linus Lüssing
2021-05-09 19:45 ` [net-next v2 08/11] net: bridge: mcast: split router port del+notify " Linus Lüssing
2021-05-11 9:19 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 09/11] net: bridge: mcast: split multicast router state for IPv4 and IPv6 Linus Lüssing
2021-05-11 9:29 ` Nikolay Aleksandrov
2021-05-11 9:33 ` Nikolay Aleksandrov
2021-05-11 11:28 ` Linus Lüssing
2021-05-09 19:45 ` [net-next v2 10/11] net: bridge: mcast: add ip4+ip6 mcast router timers to mdb netlink Linus Lüssing
2021-05-11 9:30 ` Nikolay Aleksandrov
2021-05-09 19:45 ` [net-next v2 11/11] net: bridge: mcast: export multicast router presence adjacent to a port Linus Lüssing
2021-05-11 9:23 ` Nikolay Aleksandrov [this message]
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=7279c94e-a4ff-2fbb-290e-bdaf5844148c@nvidia.com \
--to=nikolay@nvidia.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linus.luessing@c0d3.blue \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--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).