From patchwork Sat Aug 17 11:22:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1148705 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="TXmcamN8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 469d8B4t2Dz9s3Z for ; Sat, 17 Aug 2019 21:22:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726012AbfHQLW3 (ORCPT ); Sat, 17 Aug 2019 07:22:29 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37679 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725889AbfHQLW3 (ORCPT ); Sat, 17 Aug 2019 07:22:29 -0400 Received: by mail-wm1-f67.google.com with SMTP id z23so6090369wmf.2 for ; Sat, 17 Aug 2019 04:22:28 -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=zLOU89kM0wwKVTB1UPD2cV0f8y3hOpOztYSgdhvell4=; b=TXmcamN8IcT8ZBgKXUN3NLesuIAUUL7x46HjkvMIMfGewwwHulzc77+29EH8KrHU7Y B3yzwPOG3qloRH3y3cK992aC/jSfzZRPVcpEktcAEDdHJcaNYhiuk3aYFunnL0r9zuvm 8W8wfnSj1z8jwudBnjPFvLL+TUlqWcHjS3toY= 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=zLOU89kM0wwKVTB1UPD2cV0f8y3hOpOztYSgdhvell4=; b=UizNATLWX4XFNov8bSZ9I2TqyQZOhH0mQXlfRlu8yrlIIfvaddF307zT/96/Jb1jvW kQFIqlFClJw2XqOBoNrcZmOk5/TvbVBJfVjZTsEOQWPt1z+YO30B6jb2Kn2JVZeysUhs vL3btq3m6mPPhLqwGk9NnfklXr58O2n1B5Ov/Q2BPEbPYSRgfjntMo0DgUwRIUgQhnUg wAgeMzQxDd7FaPgxxqqo6iB58mHUpXUAxKUNieFrtZTjHfNbtHOhEM+TVI/FJT0QvfQZ 0R6ZOytYSE48pqn6cXRj08OrkzPCASualFstRY2P/BT9ggwbjZV2Z30t+QcmvfSxYZyU LGbQ== X-Gm-Message-State: APjAAAUuSIOCDTmNtp/637ntIchp5X2RAX28bXrfARIJlPainFrh5gWm pPCxo0+oiUOrrN0JQQ1BPjL+JB63IyJ8qQ== X-Google-Smtp-Source: APXvYqx2rwrmVbC7StInA7D0K8/GZ1e2Eu45rlRA9xvkQeV0/cu2Y5ANuDqJSopU+aqwv1mGjvsIQA== X-Received: by 2002:a1c:a701:: with SMTP id q1mr10891536wme.72.1566040947122; Sat, 17 Aug 2019 04:22:27 -0700 (PDT) Received: from debil.localdomain (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id o14sm13900244wrg.64.2019.08.17.04.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2019 04:22:26 -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 v3 1/4] net: bridge: mdb: move vlan comments Date: Sat, 17 Aug 2019 14:22:10 +0300 Message-Id: <20190817112213.27097-2-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190817112213.27097-1-nikolay@cumulusnetworks.com> References: <20190816.130417.1610388599335442981.davem@davemloft.net> <20190817112213.27097-1-nikolay@cumulusnetworks.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Trivial patch to move the vlan comments in their proper places above the vid 0 checks. Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_mdb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 428af1abf8cc..ee6208c6d946 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -653,9 +653,6 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, br = netdev_priv(dev); - /* If vlan filtering is enabled and VLAN is not specified - * install mdb entry on all vlans configured on the port. - */ pdev = __dev_get_by_index(net, entry->ifindex); if (!pdev) return -ENODEV; @@ -665,6 +662,9 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, return -EINVAL; vg = nbp_vlan_group(p); + /* If vlan filtering is enabled and VLAN is not specified + * install mdb entry on all vlans configured on the port. + */ if (br_vlan_enabled(br->dev) && vg && entry->vid == 0) { list_for_each_entry(v, &vg->vlan_list, vlist) { entry->vid = v->vid; @@ -745,9 +745,6 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, br = netdev_priv(dev); - /* If vlan filtering is enabled and VLAN is not specified - * delete mdb entry on all vlans configured on the port. - */ pdev = __dev_get_by_index(net, entry->ifindex); if (!pdev) return -ENODEV; @@ -757,6 +754,9 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, return -EINVAL; vg = nbp_vlan_group(p); + /* If vlan filtering is enabled and VLAN is not specified + * delete mdb entry on all vlans configured on the port. + */ if (br_vlan_enabled(br->dev) && vg && entry->vid == 0) { list_for_each_entry(v, &vg->vlan_list, vlist) { entry->vid = v->vid; From patchwork Sat Aug 17 11:22:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1148707 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="S/xvscTk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 469d8C1D7rz9sDB for ; Sat, 17 Aug 2019 21:22:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726075AbfHQLWb (ORCPT ); Sat, 17 Aug 2019 07:22:31 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37831 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725832AbfHQLWa (ORCPT ); Sat, 17 Aug 2019 07:22:30 -0400 Received: by mail-wr1-f67.google.com with SMTP id z11so3985931wrt.4 for ; Sat, 17 Aug 2019 04:22:29 -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=EW+6AvSLzUYJxeji2mVd2Q1VYO3NHO/LYR1JxyZ6kvU=; b=S/xvscTkR2xIOirXThIGvGDBdnu2fBqMGTaoVdqnO3YoDG8zz38QeHOopjQLiDFe8Z XNulE2hhqAAAUbwfMrhVxxqTFiPT+TDbU719EeMbIrGbxFLmG1qIyv/i1UoK/xbK9tfn vtQ4HAoBwHBIDZIK1q47yv0KHbA731GYjQNQY= 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=EW+6AvSLzUYJxeji2mVd2Q1VYO3NHO/LYR1JxyZ6kvU=; b=MkdaHskW2vnxbJnwbS6i+F8Lf/Sbv2QT3Luz/ydXA6Qq1v7CNvAPaMk/jfiz0tFglf VAYd4Fr8htcDXZhRCPArQRkEbIhiPE5RgNNsTm/5byjaBi3Z89hf5InMBgY566GEI8pI GCDqjQEpd5eg09tdY/XQ1AINjXdkfEf58zdFiohpshTdWxjLHz40UXY0a2PPWfCRkj6F 1IvMU8Odm6eNtCerIz89HuKggksiQ9bcD0ciZb1k4Kp9Sm3hmHK0+u97gTsPwCbTcOnE GD9ramH2AwHK+pk84WNSkhbM/XCQJXi5LvIkIqY3ecix7iUkxEBKxMtwwuM1J2GJ+Btf 1Dhg== X-Gm-Message-State: APjAAAWorHY6HuhBfjIV28k7GFe2+6UKy67uiVFqlKfqQekp/DaqF4z6 PqqGtNIcXX6iF14mJGxBFv+9OzYv+W1YtQ== X-Google-Smtp-Source: APXvYqzVLtyPHVyhZRxnjN0aSl+FrD0ky1mzYbmx1jkUmpk22BBmlDF8l9D6SJmf5OTDCVW8pIKKOg== X-Received: by 2002:a05:6000:1189:: with SMTP id g9mr17098474wrx.51.1566040948243; Sat, 17 Aug 2019 04:22:28 -0700 (PDT) Received: from debil.localdomain (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id o14sm13900244wrg.64.2019.08.17.04.22.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2019 04:22:27 -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 v3 2/4] net: bridge: mdb: factor out mdb filling Date: Sat, 17 Aug 2019 14:22:11 +0300 Message-Id: <20190817112213.27097-3-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190817112213.27097-1-nikolay@cumulusnetworks.com> References: <20190816.130417.1610388599335442981.davem@davemloft.net> <20190817112213.27097-1-nikolay@cumulusnetworks.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We have to factor out the mdb fill portion in order to re-use it later for the bridge mdb entries. No functional changes intended. Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_mdb.c | 68 ++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index ee6208c6d946..77730983097e 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -77,6 +77,40 @@ static void __mdb_entry_to_br_ip(struct br_mdb_entry *entry, struct br_ip *ip) #endif } +static int __mdb_fill_info(struct sk_buff *skb, + struct net_bridge_port_group *p) +{ + struct nlattr *nest_ent; + struct br_mdb_entry e; + + 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 IS_ENABLED(CONFIG_IPV6) + if (p->addr.proto == htons(ETH_P_IPV6)) + e.addr.u.ip6 = p->addr.u.ip6; +#endif + e.addr.proto = p->addr.proto; + nest_ent = nla_nest_start_noflag(skb, + MDBA_MDB_ENTRY_INFO); + if (!nest_ent) + return -EMSGSIZE; + + if (nla_put_nohdr(skb, sizeof(e), &e) || + nla_put_u32(skb, + MDBA_MDB_EATTR_TIMER, + br_timer_value(&p->timer))) { + nla_nest_cancel(skb, nest_ent); + return -EMSGSIZE; + } + nla_nest_end(skb, nest_ent); + + return 0; +} + static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb, struct net_device *dev) { @@ -95,7 +129,6 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb, hlist_for_each_entry_rcu(mp, &br->mdb_list, mdb_node) { struct net_bridge_port_group *p; struct net_bridge_port_group __rcu **pp; - struct net_bridge_port *port; if (idx < s_idx) goto skip; @@ -108,41 +141,14 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb, for (pp = &mp->ports; (p = rcu_dereference(*pp)) != NULL; pp = &p->next) { - struct nlattr *nest_ent; - struct br_mdb_entry e; - - port = p->port; - if (!port) + if (!p->port) continue; - memset(&e, 0, sizeof(e)); - e.ifindex = port->dev->ifindex; - e.vid = p->addr.vid; - __mdb_entry_fill_flags(&e, p->flags); - if (p->addr.proto == htons(ETH_P_IP)) - e.addr.u.ip4 = p->addr.u.ip4; -#if IS_ENABLED(CONFIG_IPV6) - if (p->addr.proto == htons(ETH_P_IPV6)) - e.addr.u.ip6 = p->addr.u.ip6; -#endif - e.addr.proto = p->addr.proto; - nest_ent = nla_nest_start_noflag(skb, - MDBA_MDB_ENTRY_INFO); - if (!nest_ent) { - nla_nest_cancel(skb, nest2); - err = -EMSGSIZE; - goto out; - } - if (nla_put_nohdr(skb, sizeof(e), &e) || - nla_put_u32(skb, - MDBA_MDB_EATTR_TIMER, - br_timer_value(&p->timer))) { - nla_nest_cancel(skb, nest_ent); + err = __mdb_fill_info(skb, p); + if (err) { nla_nest_cancel(skb, nest2); - err = -EMSGSIZE; goto out; } - nla_nest_end(skb, nest_ent); } nla_nest_end(skb, nest2); skip: From patchwork Sat Aug 17 11:22:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1148709 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Utwkaw62"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 469d8G40XCz9sBF for ; Sat, 17 Aug 2019 21:22:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726107AbfHQLWf (ORCPT ); Sat, 17 Aug 2019 07:22:35 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:35438 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725889AbfHQLWb (ORCPT ); Sat, 17 Aug 2019 07:22:31 -0400 Received: by mail-wm1-f68.google.com with SMTP id l2so6086584wmg.0 for ; Sat, 17 Aug 2019 04:22:30 -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=Utwkaw62Lg4PmWbws7n7Rj3e/UAUCuuEoj9JB5cS0tTC9lf4cvZboDuS7sG0Zfe5B9 sb9tcSrRgQruzawSZs+IS4dfksrdfWbF64gCTUxcZzVtRNCXgXD4E1m59edporzJD5+j Vityu2nIT2VMuHAFqjPPLHFu8DwNWu7f+NrC4= 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=c4nc2W5yj4eedBU4C80ufGbU66+ifXNNvs9+cJZ9EXT5kd1lIUZfypfUGgaSMbg5jr CqaqkAiR4U/cOvDmVY0tRm1SSH+gf+HHrTj7GCoSgBMgnYbhm/Hte/zimCYWp7ja8MZF u80XZiMcFw9E4xFm7H7wzQ0d3VYVHOkKUsJxH4PEy8GvaHUmlVlTGC+mR3CR5DEeKefl 8tmjdBTQgouHij4lhpDdL2z8m06urhA/FOuseptwioNbe3IWXYcm0uak3YZy14WDVLAe ig3ex0sSDeOXcJ8SPE1uwBpuqR6wnK+AXe12R7x93p69MFs5wP6IO2QHlSJZo1kWb1fr ZQtQ== X-Gm-Message-State: APjAAAUitOpiy7SOdI/UexXoqVTOOe2DKSWW4GmLvrb83veXKHIOOfbz V4NcKXUtmtEGrouguw0y59LvwkSdUWhTRQ== X-Google-Smtp-Source: APXvYqw40XT6FkmxVeQnDo6SYvwFDiFiZRDl9jfNfjPBQab35v/F9Dh96RflCBgSTz7wbNEOTyvxQQ== X-Received: by 2002:a1c:9950:: with SMTP id b77mr11599279wme.46.1566040949288; Sat, 17 Aug 2019 04:22:29 -0700 (PDT) Received: from debil.localdomain (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id o14sm13900244wrg.64.2019.08.17.04.22.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2019 04:22:28 -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 v3 3/4] net: bridge: mdb: dump host-joined entries as well Date: Sat, 17 Aug 2019 14:22:12 +0300 Message-Id: <20190817112213.27097-4-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190817112213.27097-1-nikolay@cumulusnetworks.com> References: <20190816.130417.1610388599335442981.davem@davemloft.net> <20190817112213.27097-1-nikolay@cumulusnetworks.com> MIME-Version: 1.0 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; From patchwork Sat Aug 17 11:22:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1148708 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Cj4p2pYc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 469d8F5JyJz9s3Z for ; Sat, 17 Aug 2019 21:22:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726088AbfHQLWe (ORCPT ); Sat, 17 Aug 2019 07:22:34 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:38323 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726046AbfHQLWd (ORCPT ); Sat, 17 Aug 2019 07:22:33 -0400 Received: by mail-wr1-f65.google.com with SMTP id g17so3983257wrr.5 for ; Sat, 17 Aug 2019 04:22:31 -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=BIhN0NCeXX6XtngY93qhTFsAXFd/Y27EwjCsb1YM6v8=; b=Cj4p2pYcCXun/17OMFy2SHlNQ5JR35gNan+u0T7L2QTJet82PMiI2yX/LRr6EtjU5d 8kCZfmSH6TE1Sv5RUIOOrb4Z4+Z/qxXugxMLF/SKVHYO7RYxeVTqO+KwxbTQMqcAGqoB U/mN0G6Z6zYJsCL70ZLyC6MkGEphV2QHGc/ag= 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=BIhN0NCeXX6XtngY93qhTFsAXFd/Y27EwjCsb1YM6v8=; b=TTLYIwlktJalkVZfHgHDfLcBjThgiyrAWshK6MfhI+ze38kSCgWBBYVtmk9nVxkLmB BAGRJ84bCQh5NMB0upzudLmR7+JDFvtyuCVqTS8CSZ0Yesle6tHGgA2EvzCNnkMqsU6S NZhOOSiINv5nZ8Bqr4crvmHl584ZgbCLAq/MfLGiOtCRsG9Fr16tvvETDBDwMeHNTSmz zb7B2l6sLjOHCICHjW1TdhK7P2b+5oW42L6ntNOCoPDVS69OzB/uVo+ctUnNta8EuFkj pY5LE95IpWZ2McUXvdaruPMCHzSeyz99cMSzCnlO5uNRSV1que4RxP9bsNFd5BOuLq3S CE5A== X-Gm-Message-State: APjAAAWZPeFQkdE7kPx9/Wl8qTtVhgDTX4T8kN02EiVsDolaS7/hTMqT tQG0eP7vnH/d021toU4eLDzEEL+UCmFEgA== X-Google-Smtp-Source: APXvYqwHw3JGbvphNgPBpEXOSUwN8P2M3G29hmc1MJl5xcfBWLc0p6AFvumPopevQAwnja1xo+q+yA== X-Received: by 2002:adf:f204:: with SMTP id p4mr16615317wro.317.1566040950277; Sat, 17 Aug 2019 04:22:30 -0700 (PDT) Received: from debil.localdomain (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id o14sm13900244wrg.64.2019.08.17.04.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2019 04:22:29 -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 v3 4/4] net: bridge: mdb: allow add/delete for host-joined groups Date: Sat, 17 Aug 2019 14:22:13 +0300 Message-Id: <20190817112213.27097-5-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190817112213.27097-1-nikolay@cumulusnetworks.com> References: <20190816.130417.1610388599335442981.davem@davemloft.net> <20190817112213.27097-1-nikolay@cumulusnetworks.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently this is needed only for user-space compatibility, so similar object adds/deletes as the dumped ones would succeed. Later it can be used for L2 mcast MAC add/delete. v3: fix compiler warning (DaveM) v2: don't send a notification when used from user-space, arm the group timer if no ports are left after host entry del Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_mdb.c | 78 +++++++++++++++++++++++++++------------ net/bridge/br_multicast.c | 30 +++++++++++---- net/bridge/br_private.h | 2 + 3 files changed, 80 insertions(+), 30 deletions(-) diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index 985273425117..44594635a972 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -616,6 +616,19 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port, return err; } + /* host join */ + if (!port) { + /* don't allow any flags for host-joined groups */ + if (state) + return -EINVAL; + if (mp->host_joined) + return -EEXIST; + + br_multicast_host_join(mp, false); + + return 0; + } + for (pp = &mp->ports; (p = mlock_dereference(*pp, br)) != NULL; pp = &p->next) { @@ -640,19 +653,21 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br, { struct br_ip ip; struct net_device *dev; - struct net_bridge_port *p; + struct net_bridge_port *p = NULL; int ret; if (!netif_running(br->dev) || !br_opt_get(br, BROPT_MULTICAST_ENABLED)) return -EINVAL; - dev = __dev_get_by_index(net, entry->ifindex); - if (!dev) - return -ENODEV; + if (entry->ifindex != br->dev->ifindex) { + dev = __dev_get_by_index(net, entry->ifindex); + if (!dev) + return -ENODEV; - p = br_port_get_rtnl(dev); - if (!p || p->br != br || p->state == BR_STATE_DISABLED) - return -EINVAL; + p = br_port_get_rtnl(dev); + if (!p || p->br != br || p->state == BR_STATE_DISABLED) + return -EINVAL; + } __mdb_entry_to_br_ip(entry, &ip); @@ -667,9 +682,9 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, { struct net *net = sock_net(skb->sk); struct net_bridge_vlan_group *vg; + struct net_bridge_port *p = NULL; struct net_device *dev, *pdev; struct br_mdb_entry *entry; - struct net_bridge_port *p; struct net_bridge_vlan *v; struct net_bridge *br; int err; @@ -680,15 +695,19 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh, br = netdev_priv(dev); - pdev = __dev_get_by_index(net, entry->ifindex); - if (!pdev) - return -ENODEV; + if (entry->ifindex != br->dev->ifindex) { + pdev = __dev_get_by_index(net, entry->ifindex); + if (!pdev) + return -ENODEV; - p = br_port_get_rtnl(pdev); - if (!p || p->br != br || p->state == BR_STATE_DISABLED) - return -EINVAL; + p = br_port_get_rtnl(pdev); + if (!p || p->br != br || p->state == BR_STATE_DISABLED) + return -EINVAL; + vg = nbp_vlan_group(p); + } else { + vg = br_vlan_group(br); + } - vg = nbp_vlan_group(p); /* If vlan filtering is enabled and VLAN is not specified * install mdb entry on all vlans configured on the port. */ @@ -727,6 +746,15 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) if (!mp) goto unlock; + /* host leave */ + if (entry->ifindex == mp->br->dev->ifindex && mp->host_joined) { + br_multicast_host_leave(mp, false); + err = 0; + if (!mp->ports && netif_running(br->dev)) + mod_timer(&mp->timer, jiffies); + goto unlock; + } + for (pp = &mp->ports; (p = mlock_dereference(*pp, br)) != NULL; pp = &p->next) { @@ -759,9 +787,9 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, { struct net *net = sock_net(skb->sk); struct net_bridge_vlan_group *vg; + struct net_bridge_port *p = NULL; struct net_device *dev, *pdev; struct br_mdb_entry *entry; - struct net_bridge_port *p; struct net_bridge_vlan *v; struct net_bridge *br; int err; @@ -772,15 +800,19 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh, br = netdev_priv(dev); - pdev = __dev_get_by_index(net, entry->ifindex); - if (!pdev) - return -ENODEV; + if (entry->ifindex != br->dev->ifindex) { + pdev = __dev_get_by_index(net, entry->ifindex); + if (!pdev) + return -ENODEV; - p = br_port_get_rtnl(pdev); - if (!p || p->br != br || p->state == BR_STATE_DISABLED) - return -EINVAL; + p = br_port_get_rtnl(pdev); + if (!p || p->br != br || p->state == BR_STATE_DISABLED) + return -EINVAL; + vg = nbp_vlan_group(p); + } else { + vg = br_vlan_group(br); + } - vg = nbp_vlan_group(p); /* If vlan filtering is enabled and VLAN is not specified * delete mdb entry on all vlans configured on the port. */ diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 9b379e110129..ad12fe3fca8c 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -148,8 +148,7 @@ static void br_multicast_group_expired(struct timer_list *t) if (!netif_running(br->dev) || timer_pending(&mp->timer)) goto out; - mp->host_joined = false; - br_mdb_notify(br->dev, NULL, &mp->addr, RTM_DELMDB, 0); + br_multicast_host_leave(mp, true); if (mp->ports) goto out; @@ -512,6 +511,27 @@ static bool br_port_group_equal(struct net_bridge_port_group *p, return ether_addr_equal(src, p->eth_addr); } +void br_multicast_host_join(struct net_bridge_mdb_entry *mp, bool notify) +{ + if (!mp->host_joined) { + mp->host_joined = true; + if (notify) + br_mdb_notify(mp->br->dev, NULL, &mp->addr, + RTM_NEWMDB, 0); + } + mod_timer(&mp->timer, jiffies + mp->br->multicast_membership_interval); +} + +void br_multicast_host_leave(struct net_bridge_mdb_entry *mp, bool notify) +{ + if (!mp->host_joined) + return; + + mp->host_joined = false; + if (notify) + br_mdb_notify(mp->br->dev, NULL, &mp->addr, RTM_DELMDB, 0); +} + static int br_multicast_add_group(struct net_bridge *br, struct net_bridge_port *port, struct br_ip *group, @@ -534,11 +554,7 @@ static int br_multicast_add_group(struct net_bridge *br, goto err; if (!port) { - if (!mp->host_joined) { - mp->host_joined = true; - br_mdb_notify(br->dev, NULL, &mp->addr, RTM_NEWMDB, 0); - } - mod_timer(&mp->timer, now + br->multicast_membership_interval); + br_multicast_host_join(mp, true); goto out; } diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index b7a4942ff1b3..ce2ab14ee605 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -702,6 +702,8 @@ void br_multicast_get_stats(const struct net_bridge *br, struct br_mcast_stats *dest); void br_mdb_init(void); void br_mdb_uninit(void); +void br_multicast_host_join(struct net_bridge_mdb_entry *mp, bool notify); +void br_multicast_host_leave(struct net_bridge_mdb_entry *mp, bool notify); #define mlock_dereference(X, br) \ rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))