From: Ido Schimmel <idosch@nvidia.com>
To: netdev@vger.kernel.org, bridge@lists.linux-foundation.org
Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
edumazet@google.com, roopa@nvidia.com, razor@blackwall.org,
mlxsw@nvidia.com, Ido Schimmel <idosch@nvidia.com>
Subject: [PATCH net-next v2 4/9] bridge: mcast: Propagate MDB configuration structure further
Date: Tue, 6 Dec 2022 12:58:04 +0200 [thread overview]
Message-ID: <20221206105809.363767-5-idosch@nvidia.com> (raw)
In-Reply-To: <20221206105809.363767-1-idosch@nvidia.com>
As an intermediate step towards only using the new MDB configuration
structure, pass it further in the control path instead of passing
individual attributes.
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 | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 080516a3ee9c..6017bff8316a 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -959,17 +959,15 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
return 0;
}
-static int __br_mdb_add(struct net *net, struct net_bridge *br,
- struct net_bridge_port *p,
- struct br_mdb_entry *entry,
+static int __br_mdb_add(const struct br_mdb_config *cfg,
struct nlattr **mdb_attrs,
struct netlink_ext_ack *extack)
{
int ret;
- spin_lock_bh(&br->multicast_lock);
- ret = br_mdb_add_group(br, p, entry, mdb_attrs, extack);
- spin_unlock_bh(&br->multicast_lock);
+ spin_lock_bh(&cfg->br->multicast_lock);
+ ret = br_mdb_add_group(cfg->br, cfg->p, cfg->entry, mdb_attrs, extack);
+ spin_unlock_bh(&cfg->br->multicast_lock);
return ret;
}
@@ -1120,22 +1118,22 @@ 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;
- err = __br_mdb_add(net, cfg.br, cfg.p, cfg.entry,
- mdb_attrs, extack);
+ err = __br_mdb_add(&cfg, mdb_attrs, extack);
if (err)
break;
}
} else {
- err = __br_mdb_add(net, cfg.br, cfg.p, cfg.entry, mdb_attrs,
- extack);
+ err = __br_mdb_add(&cfg, mdb_attrs, extack);
}
return err;
}
-static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry,
+static int __br_mdb_del(const struct br_mdb_config *cfg,
struct nlattr **mdb_attrs)
{
+ struct br_mdb_entry *entry = cfg->entry;
+ struct net_bridge *br = cfg->br;
struct net_bridge_mdb_entry *mp;
struct net_bridge_port_group *p;
struct net_bridge_port_group __rcu **pp;
@@ -1206,10 +1204,10 @@ 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;
- err = __br_mdb_del(cfg.br, cfg.entry, mdb_attrs);
+ err = __br_mdb_del(&cfg, mdb_attrs);
}
} else {
- err = __br_mdb_del(cfg.br, cfg.entry, mdb_attrs);
+ err = __br_mdb_del(&cfg, mdb_attrs);
}
return err;
--
2.37.3
next prev parent reply other threads:[~2022-12-06 10:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 10:58 [PATCH net-next v2 0/9] bridge: mcast: Preparations for EVPN extensions Ido Schimmel
2022-12-06 10:58 ` [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 ` [PATCH net-next v2 2/9] bridge: mcast: Remove redundant checks Ido Schimmel
2022-12-06 10:58 ` [PATCH net-next v2 3/9] bridge: mcast: Use MDB configuration structure where possible Ido Schimmel
2022-12-06 10:58 ` Ido Schimmel [this message]
2022-12-06 10:58 ` [PATCH net-next v2 5/9] bridge: mcast: Use MDB group key from configuration structure Ido Schimmel
2022-12-06 10:58 ` [PATCH net-next v2 6/9] bridge: mcast: Remove br_mdb_parse() Ido Schimmel
2022-12-06 10:58 ` [PATCH net-next v2 7/9] bridge: mcast: Move checks out of critical section Ido Schimmel
2022-12-06 10:58 ` [PATCH net-next v2 8/9] bridge: mcast: Remove redundant function arguments Ido Schimmel
2022-12-06 10:58 ` [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 ` [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-5-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;
as well as URLs for NNTP newsgroup(s).