| Message ID | 20201001103019.1342470-10-henrik.bjoernlund@microchip.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | net: bridge: cfm: Add support for Connectivity Fault Management(CFM) | expand |
On Thu, 2020-10-01 at 10:30 +0000, Henrik Bjoernlund wrote: > This is addition of CFM functionality to delete MEP instances > on a port that is removed from the bridge. > A MEP can only exist on a port that is related to a bridge. > > Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com> > Signed-off-by: Henrik Bjoernlund <henrik.bjoernlund@microchip.com>m > --- > net/bridge/br_cfm.c | 13 +++++++++++++ > net/bridge/br_if.c | 1 + > net/bridge/br_private.h | 6 ++++++ > 3 files changed, 20 insertions(+) > This patch should be a part of the one which adds the ability to attach MEPs to ports so they will get cleaned up properly on port del in the same patch. Is there a reason for it to be a separate patch? One more comment below. Thanks, Nik > diff --git a/net/bridge/br_cfm.c b/net/bridge/br_cfm.c > index 6fbfef44c235..fc8268cb76c1 100644 > --- a/net/bridge/br_cfm.c > +++ b/net/bridge/br_cfm.c > @@ -867,3 +867,16 @@ bool br_cfm_created(struct net_bridge *br) > { > return !hlist_empty(&br->mep_list); > } > + > +/* Deletes the CFM instances on a specific bridge port > + */ > +void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *port) > +{ > + struct br_cfm_mep *mep; > + > + ASSERT_RTNL(); > + > + hlist_for_each_entry(mep, &br->mep_list, head) hlist_for_each_entry_safe() > + if (mep->create.ifindex == port->dev->ifindex) > + mep_delete_implementation(br, mep); > +} > diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c > index a0e9a7937412..f7d2f472ae24 100644 > --- a/net/bridge/br_if.c > +++ b/net/bridge/br_if.c > @@ -334,6 +334,7 @@ static void del_nbp(struct net_bridge_port *p) > spin_unlock_bh(&br->lock); > > br_mrp_port_del(br, p); > + br_cfm_port_del(br, p); > > br_ifinfo_notify(RTM_DELLINK, NULL, p); > > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h > index 5954ee45af80..735dd0028b40 100644 > --- a/net/bridge/br_private.h > +++ b/net/bridge/br_private.h > @@ -1465,6 +1465,7 @@ static inline int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br) > int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p, > struct nlattr *attr, int cmd, struct netlink_ext_ack *extack); > bool br_cfm_created(struct net_bridge *br); > +void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *p); > int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br); > int br_cfm_status_fill_info(struct sk_buff *skb, > struct net_bridge *br, > @@ -1484,6 +1485,11 @@ static inline bool br_cfm_created(struct net_bridge *br) > return false; > } > > +static inline void br_cfm_port_del(struct net_bridge *br, > + struct net_bridge_port *p) > +{ > +} > + > static inline int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br) > { > return -EOPNOTSUPP;
diff --git a/net/bridge/br_cfm.c b/net/bridge/br_cfm.c index 6fbfef44c235..fc8268cb76c1 100644 --- a/net/bridge/br_cfm.c +++ b/net/bridge/br_cfm.c @@ -867,3 +867,16 @@ bool br_cfm_created(struct net_bridge *br) { return !hlist_empty(&br->mep_list); } + +/* Deletes the CFM instances on a specific bridge port + */ +void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *port) +{ + struct br_cfm_mep *mep; + + ASSERT_RTNL(); + + hlist_for_each_entry(mep, &br->mep_list, head) + if (mep->create.ifindex == port->dev->ifindex) + mep_delete_implementation(br, mep); +} diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index a0e9a7937412..f7d2f472ae24 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -334,6 +334,7 @@ static void del_nbp(struct net_bridge_port *p) spin_unlock_bh(&br->lock); br_mrp_port_del(br, p); + br_cfm_port_del(br, p); br_ifinfo_notify(RTM_DELLINK, NULL, p); diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 5954ee45af80..735dd0028b40 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -1465,6 +1465,7 @@ static inline int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br) int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p, struct nlattr *attr, int cmd, struct netlink_ext_ack *extack); bool br_cfm_created(struct net_bridge *br); +void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *p); int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br); int br_cfm_status_fill_info(struct sk_buff *skb, struct net_bridge *br, @@ -1484,6 +1485,11 @@ static inline bool br_cfm_created(struct net_bridge *br) return false; } +static inline void br_cfm_port_del(struct net_bridge *br, + struct net_bridge_port *p) +{ +} + static inline int br_cfm_config_fill_info(struct sk_buff *skb, struct net_bridge *br) { return -EOPNOTSUPP;