From: Ido Schimmel <idosch@nvidia.com>
To: netdev@vger.kernel.org, bridge@lists.linux-foundation.org
Cc: mlxsw@nvidia.com, razor@blackwall.org,
Ido Schimmel <idosch@nvidia.com>,
edumazet@google.com, roopa@nvidia.com, kuba@kernel.org,
pabeni@redhat.com, davem@davemloft.net
Subject: [Bridge] [PATCH net-next v2 5/9] bridge: mcast: Use MDB group key from configuration structure
Date: Tue, 6 Dec 2022 12:58:05 +0200 [thread overview]
Message-ID: <20221206105809.363767-6-idosch@nvidia.com> (raw)
In-Reply-To: <20221206105809.363767-1-idosch@nvidia.com>
The MDB group key (i.e., {source, destination, protocol, VID}) is
currently determined under the multicast lock from the netlink
attributes. Instead, use the group key from the MDB configuration
structure that was prepared before acquiring the lock.
No functional changes intended.
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
---
Notes:
v2:
* Pass 'cfg' as 'const'.
net/bridge/br_mdb.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 6017bff8316a..b459886af675 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -855,20 +855,19 @@ __br_mdb_choose_context(struct net_bridge *br,
static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
struct br_mdb_entry *entry,
- struct nlattr **mdb_attrs,
+ const struct br_mdb_config *cfg,
struct netlink_ext_ack *extack)
{
struct net_bridge_mdb_entry *mp, *star_mp;
struct net_bridge_port_group __rcu **pp;
struct net_bridge_port_group *p;
struct net_bridge_mcast *brmctx;
- struct br_ip group, star_group;
+ struct br_ip group = cfg->group;
unsigned long now = jiffies;
unsigned char flags = 0;
+ struct br_ip star_group;
u8 filter_mode;
- __mdb_entry_to_br_ip(entry, &group, mdb_attrs);
-
brmctx = __br_mdb_choose_context(br, entry, extack);
if (!brmctx)
return -EINVAL;
@@ -966,7 +965,7 @@ static int __br_mdb_add(const struct br_mdb_config *cfg,
int ret;
spin_lock_bh(&cfg->br->multicast_lock);
- ret = br_mdb_add_group(cfg->br, cfg->p, cfg->entry, mdb_attrs, extack);
+ ret = br_mdb_add_group(cfg->br, cfg->p, cfg->entry, cfg, extack);
spin_unlock_bh(&cfg->br->multicast_lock);
return ret;
@@ -1118,6 +1117,7 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
if (br_vlan_enabled(cfg.br->dev) && vg && cfg.entry->vid == 0) {
list_for_each_entry(v, &vg->vlan_list, vlist) {
cfg.entry->vid = v->vid;
+ cfg.group.vid = v->vid;
err = __br_mdb_add(&cfg, mdb_attrs, extack);
if (err)
break;
@@ -1137,11 +1137,9 @@ static int __br_mdb_del(const struct br_mdb_config *cfg,
struct net_bridge_mdb_entry *mp;
struct net_bridge_port_group *p;
struct net_bridge_port_group __rcu **pp;
- struct br_ip ip;
+ struct br_ip ip = cfg->group;
int err = -EINVAL;
- __mdb_entry_to_br_ip(entry, &ip, mdb_attrs);
-
spin_lock_bh(&br->multicast_lock);
mp = br_mdb_ip_get(br, &ip);
if (!mp)
@@ -1204,6 +1202,7 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
if (br_vlan_enabled(cfg.br->dev) && vg && cfg.entry->vid == 0) {
list_for_each_entry(v, &vg->vlan_list, vlist) {
cfg.entry->vid = v->vid;
+ cfg.group.vid = v->vid;
err = __br_mdb_del(&cfg, mdb_attrs);
}
} else {
--
2.37.3
next prev parent reply other threads:[~2022-12-06 10:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 10:58 [Bridge] [PATCH net-next v2 0/9] bridge: mcast: Preparations for EVPN extensions Ido Schimmel
2022-12-06 10:58 ` [Bridge] [PATCH net-next v2 1/9] bridge: mcast: Centralize netlink attribute parsing Ido Schimmel
2022-12-06 12:32 ` Nikolay Aleksandrov
2022-12-06 10:58 ` [Bridge] [PATCH net-next v2 2/9] bridge: mcast: Remove redundant checks Ido Schimmel
2022-12-06 10:58 ` [Bridge] [PATCH net-next v2 3/9] bridge: mcast: Use MDB configuration structure where possible Ido Schimmel
2022-12-06 10:58 ` [Bridge] [PATCH net-next v2 4/9] bridge: mcast: Propagate MDB configuration structure further Ido Schimmel
2022-12-06 10:58 ` Ido Schimmel [this message]
2022-12-06 10:58 ` [Bridge] [PATCH net-next v2 6/9] bridge: mcast: Remove br_mdb_parse() Ido Schimmel
2022-12-06 10:58 ` [Bridge] [PATCH net-next v2 7/9] bridge: mcast: Move checks out of critical section Ido Schimmel
2022-12-06 10:58 ` [Bridge] [PATCH net-next v2 8/9] bridge: mcast: Remove redundant function arguments Ido Schimmel
2022-12-06 10:58 ` [Bridge] [PATCH net-next v2 9/9] bridge: mcast: Constify 'group' argument in br_multicast_new_port_group() Ido Schimmel
2022-12-06 12:32 ` Nikolay Aleksandrov
2022-12-08 4:10 ` [Bridge] [PATCH net-next v2 0/9] bridge: mcast: Preparations for EVPN extensions patchwork-bot+netdevbpf
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=20221206105809.363767-6-idosch@nvidia.com \
--to=idosch@nvidia.com \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=mlxsw@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=razor@blackwall.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