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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 5986BC433E2 for ; Thu, 21 May 2020 21:21:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2175120756 for ; Thu, 21 May 2020 21:21:38 +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="w0TxGZgU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730619AbgEUVVf (ORCPT ); Thu, 21 May 2020 17:21:35 -0400 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:64611 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726814AbgEUVVe (ORCPT ); Thu, 21 May 2020 17:21:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1590096093; x=1621632093; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SkOPy4sOOrRfqtyXNELyPdU3uc8AlMHu0+NJ6A1acWA=; b=w0TxGZgUAer80vNU2WJ7wu/qGHAcQR1p4GQJPxTMlbc4f2VaE76DicuG 4DhMb9drLFUZ7G4nwvaMhtF0FNyqVs01p0HHbZ1lufqd7/NfHkWcqwcBz mVeEieu6Eg8b3FZgEva0eyItsXFHOGkUq65LNDDnYhX60MUZ8DtTyjLiD s4egg7RAlYEs3yigyUDz1CS2dZIFI8mku6UuCnoAPdTm16lR0TUvzRoJo immluWFVLmQ0xCM85s4nFiwpemdrDODhiNAzOmRCdHsJcguG7e2gCqMSA 8POjaeGL9ERpo07fL2x8CIYzc1lKRt0DubZACi6z6T5MHj+uCpqUnNwjC w==; IronPort-SDR: +KSsA92efQNbOei2SKt5XgayClAxCTccHNNj7bkFIEP0ni42CJB6b9ZRtXo9+7L9Ev12nnGx4m W8FYo+MeNgKTsbdC0Z0YQXY3uyXs8cCAmBYNHHOUmcqBGA9EIMDhmSglbSoKTSoz7K9CYJtcdI Yb45lp66XtzSMnfVFmLe9NI8Op68Hf6bNr1kwd7rhOpEDObFbOTDEwqF6vT800M7036HdiCLb3 AdrjrvcRmxdSjSu+KIHh4hPBuARaohkDvpvWf8j09nIja0m24m+bXjnp7qRp5riaa+v1Q0yLpZ 7Sc= X-IronPort-AV: E=Sophos;i="5.73,419,1583218800"; d="scan'208";a="77506684" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 21 May 2020 14:21:33 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.87.72) by chn-vm-ex02.mchp-main.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 21 May 2020 14:21:33 -0700 Received: from soft-dev3.localdomain (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Thu, 21 May 2020 14:21:31 -0700 From: Horatiu Vultur To: , , , , , , , , , , CC: Horatiu Vultur Subject: [PATCH v2 1/3] bridge: mrp: Add br_mrp_unique_ifindex function Date: Thu, 21 May 2020 23:19:05 +0000 Message-ID: <20200521231907.3564679-2-horatiu.vultur@microchip.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200521231907.3564679-1-horatiu.vultur@microchip.com> References: <20200521231907.3564679-1-horatiu.vultur@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is not allow to have the same net bridge port part of multiple MRP rings. Therefore add a check if the port is used already in a different MRP. In that case return failure. Fixes: 9a9f26e8f7ea ("bridge: mrp: Connect MRP API with the switchdev API") Signed-off-by: Horatiu Vultur --- net/bridge/br_mrp.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c index d7bc09de4c139..854e31bf0151e 100644 --- a/net/bridge/br_mrp.c +++ b/net/bridge/br_mrp.c @@ -37,6 +37,26 @@ static struct br_mrp *br_mrp_find_id(struct net_bridge *br, u32 ring_id) return res; } +static bool br_mrp_unique_ifindex(struct net_bridge *br, u32 ifindex) +{ + struct br_mrp *mrp; + + list_for_each_entry_rcu(mrp, &br->mrp_list, list, + lockdep_rtnl_is_held()) { + struct net_bridge_port *p; + + p = rtnl_dereference(mrp->p_port); + if (p && p->dev->ifindex == ifindex) + return false; + + p = rtnl_dereference(mrp->s_port); + if (p && p->dev->ifindex == ifindex) + return false; + } + + return true; +} + static struct br_mrp *br_mrp_find_port(struct net_bridge *br, struct net_bridge_port *p) { @@ -255,6 +275,11 @@ int br_mrp_add(struct net_bridge *br, struct br_mrp_instance *instance) !br_mrp_get_port(br, instance->s_ifindex)) return -EINVAL; + /* It is not possible to have the same port part of multiple rings */ + if (!br_mrp_unique_ifindex(br, instance->p_ifindex) || + !br_mrp_unique_ifindex(br, instance->s_ifindex)) + return -EINVAL; + mrp = kzalloc(sizeof(*mrp), GFP_KERNEL); if (!mrp) return -ENOMEM; -- 2.26.2