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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A18F1C433FF for ; Wed, 14 Aug 2019 14:40:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EEC02084F for ; Wed, 14 Aug 2019 14:40:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="FDirRc2X" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728049AbfHNOkl (ORCPT ); Wed, 14 Aug 2019 10:40:41 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39584 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726166AbfHNOkj (ORCPT ); Wed, 14 Aug 2019 10:40:39 -0400 Received: by mail-wm1-f67.google.com with SMTP id i63so4687494wmg.4 for ; Wed, 14 Aug 2019 07:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WcjxfoHTef+rzVi2MznJlfR9cVOKNUDGmg2Wkh7C8H8=; b=FDirRc2XnSa0S/1kGuimrluLWRBl+cDepl6ix4Cgi96B+akIPlCSnj6QQyt+OsuL5L gA3so4X77//RvTemkbRiYDtL1csmuN7fwYCe0zWgieSAzzpzioEa2uC0H69d4sSNmNwf qzBURWc19LfsbwapUFOgm/vbodtsldqgQIeB4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WcjxfoHTef+rzVi2MznJlfR9cVOKNUDGmg2Wkh7C8H8=; b=oq2+90ABFpkT5jhqyHrkK9oq36UlHPhUxkiMaZ+mrDngOILA3lBiVFi7WTLBoBC+Sm oDiVDCdJZjy1BBOnQMxcE1qE1G3qoK9Rnfh+8vp3zf3blX87nJmDxGtzIiB7VtjiibZ7 rVMDUlRsEKGRjA5p7KY/pbm+p2rhAyUQ+Gf19Ys/fzYP9z1JK5TFTzNvPmUEkr7xqcoO QAiVxNsxmqVH7vvyGbyBU1DZ2RVLCypyIeLc4TbymZW/T73HPiHzHwhuNcurSAqjCNHz EHlr8JrhTv45Dezd55k7SbhfNzquqlhfMMIPoQ2X1kmZDMOH4HUxXXgS2NE6od5EHH31 hSiA== X-Gm-Message-State: APjAAAUZa9+Zs1RR2DwEnl7NkSAiRsXqHDmhmqgcrwx7DHOKNBX74OeV 7XA62/XU8VEgzwb/GkGqx3uqoHdgftg= X-Google-Smtp-Source: APXvYqxUHKLeRt9TqdIqrdTbwAR2FFm+fcFvmQEL9EWa6UxzIMA9NDs0r98WrLmLa4h4zPiZjvoi+g== X-Received: by 2002:a7b:c118:: with SMTP id w24mr9135454wmi.100.1565793637570; Wed, 14 Aug 2019 07:40:37 -0700 (PDT) Received: from wrk.www.tendawifi.com ([79.134.174.40]) by smtp.gmail.com with ESMTPSA id o8sm3383874wma.1.2019.08.14.07.40.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 14 Aug 2019 07:40:37 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: davem@davemloft.net, roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org, Nikolay Aleksandrov Subject: [PATCH net-next 3/4] net: bridge: mdb: dump host-joined entries as well Date: Wed, 14 Aug 2019 17:40:23 +0300 Message-Id: <20190814144024.9710-4-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190814144024.9710-1-nikolay@cumulusnetworks.com> References: <20190814144024.9710-1-nikolay@cumulusnetworks.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently we dump only the port mdb entries but we can have host-joined entries on the bridge itself and they should be treated as normal temp mdbs, they're already notified: $ bridge monitor all [MDB]dev br0 port br0 grp ff02::8 temp The group will not be shown in the bridge mdb output, but it takes 1 slot and it's timing out. If it's only host-joined then the mdb show output can even be empty. After this patch we show the host-joined groups: $ bridge mdb show dev br0 port br0 grp ff02::8 temp Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_mdb.c | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 77730983097e..985273425117 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -78,22 +78,35 @@ static void __mdb_entry_to_br_ip(struct br_mdb_entry *entry, struct br_ip *ip) } static int __mdb_fill_info(struct sk_buff *skb, + struct net_bridge_mdb_entry *mp, struct net_bridge_port_group *p) { + struct timer_list *mtimer; struct nlattr *nest_ent; struct br_mdb_entry e; + u8 flags = 0; + int ifindex; memset(&e, 0, sizeof(e)); - __mdb_entry_fill_flags(&e, p->flags); - e.ifindex = p->port->dev->ifindex; - e.vid = p->addr.vid; - if (p->addr.proto == htons(ETH_P_IP)) - e.addr.u.ip4 = p->addr.u.ip4; + if (p) { + ifindex = p->port->dev->ifindex; + mtimer = &p->timer; + flags = p->flags; + } else { + ifindex = mp->br->dev->ifindex; + mtimer = &mp->timer; + } + + __mdb_entry_fill_flags(&e, flags); + e.ifindex = ifindex; + e.vid = mp->addr.vid; + if (mp->addr.proto == htons(ETH_P_IP)) + e.addr.u.ip4 = mp->addr.u.ip4; #if IS_ENABLED(CONFIG_IPV6) - if (p->addr.proto == htons(ETH_P_IPV6)) - e.addr.u.ip6 = p->addr.u.ip6; + if (mp->addr.proto == htons(ETH_P_IPV6)) + e.addr.u.ip6 = mp->addr.u.ip6; #endif - e.addr.proto = p->addr.proto; + e.addr.proto = mp->addr.proto; nest_ent = nla_nest_start_noflag(skb, MDBA_MDB_ENTRY_INFO); if (!nest_ent) @@ -102,7 +115,7 @@ static int __mdb_fill_info(struct sk_buff *skb, if (nla_put_nohdr(skb, sizeof(e), &e) || nla_put_u32(skb, MDBA_MDB_EATTR_TIMER, - br_timer_value(&p->timer))) { + br_timer_value(mtimer))) { nla_nest_cancel(skb, nest_ent); return -EMSGSIZE; } @@ -139,12 +152,20 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb, break; } + if (mp->host_joined) { + err = __mdb_fill_info(skb, mp, NULL); + if (err) { + nla_nest_cancel(skb, nest2); + break; + } + } + for (pp = &mp->ports; (p = rcu_dereference(*pp)) != NULL; pp = &p->next) { if (!p->port) continue; - err = __mdb_fill_info(skb, p); + err = __mdb_fill_info(skb, mp, p); if (err) { nla_nest_cancel(skb, nest2); goto out; -- 2.21.0