From patchwork Thu Oct 1 10:30:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Bjoernlund X-Patchwork-Id: 1375012 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=p1gc8lm6; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C28bX13qXz9sVL for ; Thu, 1 Oct 2020 20:33:12 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732132AbgJAKdJ (ORCPT ); Thu, 1 Oct 2020 06:33:09 -0400 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:21334 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732081AbgJAKdA (ORCPT ); Thu, 1 Oct 2020 06:33:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1601548379; x=1633084379; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NKXV1txIRWBopGeNfGHrv1KvIEltoOYzNq5YVtkf2iw=; b=p1gc8lm6KX3NHJBPsX2xIBhFY9DGwj/r2MTEpIB9cENq6LrulFKYBVUw iQ6d1PY87g/yvrAjB1GKXvJTfJcy/iXWMhoDGAY8LNG6W8oP7qx+08XA5 o76zZTW+C1V9qLWCgXwzdUduv1XaapOpLUsbo9IL6ba1R9DMu4PY/3L6E HGYWOwME/nUmRgt6yU1DAK1TOKql65DWdmmkUs5O9Ho0iwbuWE1QjsuVm o/L/8YxcEnpbYqMGILeIas30lUMYMt+FMAMdULoNOiQaxlURkKIUE6kt+ ISZpvW+CXZbHLaKCVav5RWuzLqIi3idhog2xJO9er+mM7djQXvfjKmF7j Q==; IronPort-SDR: 5htpnA6LiPtEykOLCZnwB/QayYnHPt+mgdhcKhpJr4eeX37cN279j4M95ziMyH2IiFApYCOXN5 hBxY5ZnO4zi6FlURczmFdXG0ZuJCL1rDg2bQ/TKwXcYQYIuBC/YjGlyucHdM6/lsRtNWvW91G2 8dKxFFHGM3DhQfMhN3IRrWOdI70u5fdb9S+DTh1+1GphBqGAVzPGjHuJlulneG/VhVXefhrJQF ufTvqw01ieKcu9nz28tdn475ApyD8/d7qF/cGaZHkXJhq5MfveWzteimA5J9TRFKYRNiLitT8i 4Jc= X-IronPort-AV: E=Sophos;i="5.77,323,1596524400"; d="scan'208";a="88772460" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Oct 2020 03:32:59 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 1 Oct 2020 03:32:33 -0700 Received: from soft-test08.microsemi.net (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Thu, 1 Oct 2020 03:32:31 -0700 From: Henrik Bjoernlund To: , , , , , , , , , CC: Henrik Bjoernlund , Horatiu Vultur Subject: [net-next v2 09/11] bridge: cfm: Bridge port remove. Date: Thu, 1 Oct 2020 10:30:17 +0000 Message-ID: <20201001103019.1342470-10-henrik.bjoernlund@microchip.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001103019.1342470-1-henrik.bjoernlund@microchip.com> References: <20201001103019.1342470-1-henrik.bjoernlund@microchip.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Henrik Bjoernlund m --- 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 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;