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 2/8] bridge: mcast: Remove redundant checks
Date: Mon, 5 Dec 2022 09:42:45 +0200 [thread overview]
Message-ID: <20221205074251.4049275-3-idosch@nvidia.com> (raw)
In-Reply-To: <20221205074251.4049275-1-idosch@nvidia.com>
These checks are now redundant as they are performed by
br_mdb_config_init() while parsing the RTM_{NEW,DEL}MDB messages.
Remove them.
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
net/bridge/br_mdb.c | 63 +++++++--------------------------------------
1 file changed, 9 insertions(+), 54 deletions(-)
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index c53050e47a0f..68fd34161a40 100644
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -1090,11 +1090,10 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
struct nlattr *mdb_attrs[MDBE_ATTR_MAX + 1];
struct net *net = sock_net(skb->sk);
struct net_bridge_vlan_group *vg;
- struct net_bridge_port *p = NULL;
- struct net_device *dev, *pdev;
struct br_mdb_entry *entry;
struct net_bridge_vlan *v;
struct br_mdb_config cfg;
+ struct net_device *dev;
struct net_bridge *br;
int err;
@@ -1108,38 +1107,12 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
br = netdev_priv(dev);
- if (!netif_running(br->dev)) {
- NL_SET_ERR_MSG_MOD(extack, "Bridge device is not running");
- return -EINVAL;
- }
-
- if (!br_opt_get(br, BROPT_MULTICAST_ENABLED)) {
- NL_SET_ERR_MSG_MOD(extack, "Bridge's multicast processing is disabled");
- return -EINVAL;
- }
-
if (entry->ifindex != br->dev->ifindex) {
- pdev = __dev_get_by_index(net, entry->ifindex);
- if (!pdev) {
- NL_SET_ERR_MSG_MOD(extack, "Port net device doesn't exist");
- return -ENODEV;
- }
-
- p = br_port_get_rtnl(pdev);
- if (!p) {
- NL_SET_ERR_MSG_MOD(extack, "Net device is not a bridge port");
- return -EINVAL;
- }
-
- if (p->br != br) {
- NL_SET_ERR_MSG_MOD(extack, "Port belongs to a different bridge device");
- return -EINVAL;
- }
- if (p->state == BR_STATE_DISABLED && entry->state != MDB_PERMANENT) {
+ if (cfg.p->state == BR_STATE_DISABLED && entry->state != MDB_PERMANENT) {
NL_SET_ERR_MSG_MOD(extack, "Port is in disabled state and entry is not permanent");
return -EINVAL;
}
- vg = nbp_vlan_group(p);
+ vg = nbp_vlan_group(cfg.p);
} else {
vg = br_vlan_group(br);
}
@@ -1150,12 +1123,12 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
if (br_vlan_enabled(br->dev) && vg && entry->vid == 0) {
list_for_each_entry(v, &vg->vlan_list, vlist) {
entry->vid = v->vid;
- err = __br_mdb_add(net, br, p, entry, mdb_attrs, extack);
+ err = __br_mdb_add(net, br, cfg.p, entry, mdb_attrs, extack);
if (err)
break;
}
} else {
- err = __br_mdb_add(net, br, p, entry, mdb_attrs, extack);
+ err = __br_mdb_add(net, br, cfg.p, entry, mdb_attrs, extack);
}
return err;
@@ -1170,9 +1143,6 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry,
struct br_ip ip;
int err = -EINVAL;
- if (!netif_running(br->dev) || !br_opt_get(br, BROPT_MULTICAST_ENABLED))
- return -EINVAL;
-
__mdb_entry_to_br_ip(entry, &ip, mdb_attrs);
spin_lock_bh(&br->multicast_lock);
@@ -1212,11 +1182,10 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
struct nlattr *mdb_attrs[MDBE_ATTR_MAX + 1];
struct net *net = sock_net(skb->sk);
struct net_bridge_vlan_group *vg;
- struct net_bridge_port *p = NULL;
- struct net_device *dev, *pdev;
struct br_mdb_entry *entry;
struct net_bridge_vlan *v;
struct br_mdb_config cfg;
+ struct net_device *dev;
struct net_bridge *br;
int err;
@@ -1230,24 +1199,10 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
br = netdev_priv(dev);
- if (entry->ifindex != br->dev->ifindex) {
- pdev = __dev_get_by_index(net, entry->ifindex);
- if (!pdev)
- return -ENODEV;
-
- p = br_port_get_rtnl(pdev);
- if (!p) {
- NL_SET_ERR_MSG_MOD(extack, "Net device is not a bridge port");
- return -EINVAL;
- }
- if (p->br != br) {
- NL_SET_ERR_MSG_MOD(extack, "Port belongs to a different bridge device");
- return -EINVAL;
- }
- vg = nbp_vlan_group(p);
- } else {
+ if (entry->ifindex != br->dev->ifindex)
+ vg = nbp_vlan_group(cfg.p);
+ else
vg = br_vlan_group(br);
- }
/* If vlan filtering is enabled and VLAN is not specified
* delete mdb entry on all vlans configured on the port.
--
2.37.3
next prev parent reply other threads:[~2022-12-05 7:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-05 7:42 [Bridge] [PATCH net-next 0/8] bridge: mcast: Preparations for EVPN extensions Ido Schimmel
2022-12-05 7:42 ` [Bridge] [PATCH net-next 1/8] bridge: mcast: Centralize netlink attribute parsing Ido Schimmel
2022-12-05 11:34 ` Nikolay Aleksandrov
2022-12-06 9:53 ` Ido Schimmel
2022-12-05 7:42 ` Ido Schimmel [this message]
2022-12-05 11:34 ` [Bridge] [PATCH net-next 2/8] bridge: mcast: Remove redundant checks Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 3/8] bridge: mcast: Use MDB configuration structure where possible Ido Schimmel
2022-12-05 11:35 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 4/8] bridge: mcast: Propagate MDB configuration structure further Ido Schimmel
2022-12-05 11:40 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 5/8] bridge: mcast: Use MDB group key from configuration structure Ido Schimmel
2022-12-05 11:41 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 6/8] bridge: mcast: Remove br_mdb_parse() Ido Schimmel
2022-12-05 11:42 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 7/8] bridge: mcast: Move checks out of critical section Ido Schimmel
2022-12-05 11:43 ` Nikolay Aleksandrov
2022-12-05 7:42 ` [Bridge] [PATCH net-next 8/8] bridge: mcast: Remove redundant function arguments Ido Schimmel
2022-12-05 11:43 ` Nikolay Aleksandrov
2022-12-05 11:55 ` [Bridge] [PATCH net-next 0/8] bridge: mcast: Preparations for EVPN extensions Nikolay Aleksandrov
2022-12-06 9:58 ` Ido Schimmel
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=20221205074251.4049275-3-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