From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2129C433E2 for ; Tue, 15 Sep 2020 10:03:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C56A206E6 for ; Tue, 15 Sep 2020 10:03:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="cKICjDU+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726281AbgIOKC6 (ORCPT ); Tue, 15 Sep 2020 06:02:58 -0400 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:29987 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726095AbgIOKCx (ORCPT ); Tue, 15 Sep 2020 06:02:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1600164172; x=1631700172; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=VDuFAZKE9N46+36zzKBBpzaXvyDd1MrM8aOiIAUSOH8=; b=cKICjDU+JzmnWaU1KH4rD34ssV7LdGpRZ63hyZy6w9R6hCt9bEoOYTeT ppfBDImDvRSWVSvjK5VlqZAUZXjYvqLbM0ywoRqpAFpbZ/RkGPjDqJcQx BBk+8em8gnSTWUQcV/mnFSwgMJQq1p+92Fl4W0xob71OhfDx1YcXeLNOS u7wDm84lO4u5955EK7RlOsQc1ohwq2WP5/8meLCPQQUVucvecIDrWhyfI 8FwYPiiPcRNxRCwiczVbKDt930X3JBZXxyCiZaYa79VQln8TTRBWzxMXP /5XvHWFMNcDkuV8jg/8WneH3rxjqnFbVBn+FyQ6L4oW1j6IdPr1sKR9sN A==; IronPort-SDR: 60d1DH5BYDUTQVvtML3UYotGwxATmlj7AZjfXzE7e5K7TW52BW/opeeRGeurkNBpxQeI/4ZD+g Yh+orLXzKlUPHPb2d+sS4+6UBCEPwh8Cj5TovDlgBfVQ0lqfXrnm6u4BFEGpXWkERvuVQIt9/k fHeTH6mJ0IF7N1alc8H+aGbXpXNupPsEqZEi1MZIOfnxzwFuIWXVl+9+HaqEX/+LmKT53z0mJ4 MZ2rZtYU7GTAxLtLp3rWe6oeqGW+wXwDCKxknrpK851s7qWk4aIttXeNiExXzKpc9kUEqw5XFu QkM= X-IronPort-AV: E=Sophos;i="5.76,429,1592895600"; d="scan'208";a="91846117" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 15 Sep 2020 03:02:52 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Tue, 15 Sep 2020 03:02:42 -0700 Received: from localhost (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Tue, 15 Sep 2020 03:02:50 -0700 Date: Tue, 15 Sep 2020 10:00:16 +0000 From: "henrik.bjoernlund@microchip.com" To: Nikolay Aleksandrov CC: "bridge@lists.linux-foundation.org" , "davem@davemloft.net" , "linux-kernel@vger.kernel.org" , "jiri@mellanox.com" , "netdev@vger.kernel.org" , Roopa Prabhu , "idosch@mellanox.com" , "kuba@kernel.org" , "UNGLinuxDriver@microchip.com" , "horatiu.vultur@microchip.com" Subject: Re: [PATCH RFC 7/7] bridge: cfm: Bridge port remove. Message-ID: <20200915100016.tqxsgef6dts2rbno@soft-test08> References: <20200904091527.669109-1-henrik.bjoernlund@microchip.com> <20200904091527.669109-8-henrik.bjoernlund@microchip.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks for the review. I will update the next version as suggested. The 09/08/2020 13:58, Nikolay Aleksandrov wrote: > > On Fri, 2020-09-04 at 09:15 +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. > > > > Signed-off-by: Henrik Bjoernlund > > --- > > net/bridge/br_cfm.c | 13 +++++++++++++ > > net/bridge/br_if.c | 1 + > > net/bridge/br_private.h | 6 ++++++ > > 3 files changed, 20 insertions(+) > > > > diff --git a/net/bridge/br_cfm.c b/net/bridge/br_cfm.c > > index b7fed2c1d8ec..c724ce020ce3 100644 > > --- a/net/bridge/br_cfm.c > > +++ b/net/bridge/br_cfm.c > > @@ -921,3 +921,16 @@ bool br_cfm_created(struct net_bridge *br) > > { > > return !list_empty(&br->mep_list); > > } > > + > > +/* Deletes the CFM instances on a specific bridge port > > + * note: called under rtnl_lock > > + */ > > +void br_cfm_port_del(struct net_bridge *br, struct net_bridge_port *port) > > +{ > > + struct br_cfm_mep *mep; > > + > > + list_for_each_entry_rcu(mep, &br->mep_list, head, > > + lockdep_rtnl_is_held()) > > Use standard/non-rcu list traversing, rtnl is already held. > > > + 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 53bcbdd21f34..5617255f0c0c 100644 > > --- a/net/bridge/br_private.h > > +++ b/net/bridge/br_private.h > > @@ -1369,6 +1369,7 @@ int br_cfm_parse(struct net_bridge *br, struct net_bridge_port *p, > > struct nlattr *attr, int cmd, struct netlink_ext_ack *extack); > > int br_cfm_rx_frame_process(struct net_bridge_port *p, struct sk_buff *skb); > > 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, > > @@ -1393,6 +1394,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; > -- /Henrik