From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jamal Hadi Salim Subject: Re: [net-next PATCH 2/2] bridge: netlink dump interface at par with brctl Date: Sat, 07 Jun 2014 10:34:22 -0400 Message-ID: <539322EE.70107@mojatatu.com> References: <1402151244-3324-1-git-send-email-jhs@emojatatu.com> <1402151244-3324-2-git-send-email-jhs@emojatatu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, vyasevic@redhat.com, sfeldma@cumulusnetworks.com, john.r.fastabend@intel.com, roopa@cumulusnetworks.com To: davem@davemloft.net, stephen@networkplumber.org Return-path: Received: from mail-ig0-f182.google.com ([209.85.213.182]:51410 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752707AbaFGOe0 (ORCPT ); Sat, 7 Jun 2014 10:34:26 -0400 Received: by mail-ig0-f182.google.com with SMTP id a13so1883168igq.3 for ; Sat, 07 Jun 2014 07:34:25 -0700 (PDT) In-Reply-To: <1402151244-3324-2-git-send-email-jhs@emojatatu.com> Sender: netdev-owner@vger.kernel.org List-ID: And now for the tests that Dave doesnt want me to add to the commit ;-> Vlad, the last part should satisfy your earlier comment. --------- // show all.. root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show 33:33:00:00:00:01 dev bond0 self permanent 33:33:00:00:00:01 dev dummy0 self permanent 33:33:00:00:00:01 dev ifb0 self permanent 33:33:00:00:00:01 dev ifb1 self permanent 33:33:00:00:00:01 dev eth0 self permanent 01:00:5e:00:00:01 dev eth0 self permanent 33:33:ff:22:01:01 dev eth0 self permanent 02:00:00:12:01:02 dev eth1 vlan 0 master br0 permanent 00:17:42:8a:b4:05 dev eth1 vlan 0 master br0 permanent 00:17:42:8a:b4:07 dev eth1 self permanent 33:33:00:00:00:01 dev eth1 self permanent 33:33:00:00:00:01 dev gretap0 self permanent da:ac:46:27:d9:53 dev sw1-p1 vlan 0 master br0 permanent 33:33:00:00:00:01 dev sw1-p1 self permanent //filter by bridge root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show br br0 02:00:00:12:01:02 dev eth1 vlan 0 master br0 permanent 00:17:42:8a:b4:05 dev eth1 vlan 0 master br0 permanent 00:17:42:8a:b4:07 dev eth1 self permanent 33:33:00:00:00:01 dev eth1 self permanent da:ac:46:27:d9:53 dev sw1-p1 vlan 0 master br0 permanent 33:33:00:00:00:01 dev sw1-p1 self permanent // bridge sw1 has no ports attached root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show br sw1 //filter by port root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show brport eth1 02:00:00:12:01:02 vlan 0 master br0 permanent 00:17:42:8a:b4:05 vlan 0 master br0 permanent 00:17:42:8a:b4:07 self permanent 33:33:00:00:00:01 self permanent // filter by port + bridge root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show br br0 brport sw1-p1 da:ac:46:27:d9:53 vlan 0 master br0 permanent 33:33:00:00:00:01 self permanent // for shits and giggles, lets change the mac that br0 uses // Note: a magical fdb entry with no brport is added ... root@moja-1:/configs/may30-iprt/bridge# ip link set dev br0 address 02:00:00:12:01:04 // lets see if we can see it .. root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show 33:33:00:00:00:01 dev bond0 self permanent 33:33:00:00:00:01 dev dummy0 self permanent 33:33:00:00:00:01 dev ifb0 self permanent 33:33:00:00:00:01 dev ifb1 self permanent 33:33:00:00:00:01 dev eth0 self permanent 01:00:5e:00:00:01 dev eth0 self permanent 33:33:ff:22:01:01 dev eth0 self permanent 02:00:00:12:01:02 dev eth1 vlan 0 master br0 permanent 00:17:42:8a:b4:05 dev eth1 vlan 0 master br0 permanent 00:17:42:8a:b4:07 dev eth1 self permanent 33:33:00:00:00:01 dev eth1 self permanent 33:33:00:00:00:01 dev gretap0 self permanent 02:00:00:12:01:04 dev br0 vlan 0 master br0 permanent da:ac:46:27:d9:53 dev sw1-p1 vlan 0 master br0 permanent 33:33:00:00:00:01 dev sw1-p1 self permanent //yep, it is there. //can we see it if we filter by bridge? root@moja-1:/configs/may30-iprt/bridge# ./bridge fdb show br br0 02:00:00:12:01:02 dev eth1 vlan 0 master br0 permanent 00:17:42:8a:b4:05 dev eth1 vlan 0 master br0 permanent 00:17:42:8a:b4:07 dev eth1 self permanent 33:33:00:00:00:01 dev eth1 self permanent 02:00:00:12:01:04 dev br0 vlan 0 master br0 permanent da:ac:46:27:d9:53 dev sw1-p1 vlan 0 master br0 permanent 33:33:00:00:00:01 dev sw1-p1 self permanent --------- cheers, jamal On 06/07/14 10:27, Jamal Hadi Salim wrote: > From: Jamal Hadi Salim > > Actually better than brctl showmacs because we can filter by bridge > port in the kernel. > The current bridge netlink interface doesnt scale when you have many > bridges each with large fdbs or even bridges with many bridge ports > > For example usage look at accompanying iproute2 patch. > > Signed-off-by: Jamal Hadi Salim > --- > net/bridge/br_fdb.c | 17 +++++++++--- > net/core/rtnetlink.c | 71 +++++++++++++++++++++++++++++++++++++++++--------- > 2 files changed, 72 insertions(+), 16 deletions(-) > > diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c > index 48449fc..7114382 100644 > --- a/net/bridge/br_fdb.c > +++ b/net/bridge/br_fdb.c > @@ -694,9 +694,20 @@ int br_fdb_dump(struct sk_buff *skb, > if (idx < cb->args[0]) > goto skip; > > - if (filter_dev && (!f->dst || !f->dst->dev || > - f->dst->dev != filter_dev)) > - goto skip; > + if (filter_dev && (!f->dst || f->dst->dev != filter_dev)) { > + if (filter_dev != dev) > + goto skip; > + else { > + /* > + * !f->dst is a speacial case for bridge > + * It means the MAC belongs to the bridge > + * Therefore need a little more filtering > + * we only want to dump the !f->dst case > + */ > + if (f->dst) > + goto skip; > + } > + } > > if (fdb_fill_info(skb, br, f, > NETLINK_CB(cb->skb).portid, > diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c > index 8721f1b..2a3c225 100644 > --- a/net/core/rtnetlink.c > +++ b/net/core/rtnetlink.c > @@ -2512,26 +2512,71 @@ EXPORT_SYMBOL(ndo_dflt_fdb_dump); > > static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb) > { > - int idx = 0; > - struct net *net = sock_net(skb->sk); > struct net_device *dev; > + struct nlattr *tb[IFLA_MAX+1]; > + struct net_device *bdev = NULL; /*pacify stoopid gcc*/ > + struct net_device *br_dev = NULL; /*pacify stoopid gcc*/ > + const struct net_device_ops *ops = NULL; /*pacify stoopid gcc*/ > + struct ifinfomsg *ifm = nlmsg_data(cb->nlh); > + struct net *net = sock_net(skb->sk); > + int brport_idx = 0; > + int br_idx = 0; > + int idx = 0; > + > + if (nlmsg_parse(cb->nlh, sizeof(struct ifinfomsg), tb, IFLA_MAX, > + ifla_policy) == 0) { > + if (tb[IFLA_MASTER]) > + br_idx = nla_get_u32(tb[IFLA_MASTER]); > + } > + > + brport_idx = ifm->ifi_index; > > rcu_read_lock(); > + if (br_idx) { > + br_dev = __dev_get_by_index(net, br_idx); > + if (!br_dev) { > + rcu_read_unlock(); > + return -ENODEV; > + } > + ops = br_dev->netdev_ops; > + bdev = br_dev; > + } > + > for_each_netdev_rcu(net, dev) { > - if (dev->priv_flags & IFF_BRIDGE_PORT) { > - struct net_device *br_dev; > - const struct net_device_ops *ops; > - > - br_dev = netdev_master_upper_dev_get(dev); > - ops = br_dev->netdev_ops; > - if (ops->ndo_fdb_dump) > - idx = ops->ndo_fdb_dump(skb, cb, dev, NULL, idx); > + > + if (brport_idx && (dev->ifindex != brport_idx)) > + continue; > + > + if (!br_idx) { /* user did not specify a specific bridge */ > + if (dev->priv_flags & IFF_BRIDGE_PORT) { > + br_dev = netdev_master_upper_dev_get(dev); > + ops = br_dev->netdev_ops; > + if (ops->ndo_fdb_dump) > + idx = ops->ndo_fdb_dump(skb, cb, br_dev, > + dev, idx); > + } > + > + bdev = dev; > + } else { > + if (dev != br_dev && > + !(dev->priv_flags & IFF_BRIDGE_PORT)) > + continue; > + > + if (br_dev != netdev_master_upper_dev_get(dev) && > + !(dev->priv_flags & IFF_EBRIDGE)) > + continue; > + > + if (dev->priv_flags & IFF_BRIDGE_PORT) > + idx = ops->ndo_fdb_dump(skb, cb, br_dev, > + dev, idx); > } > > - if (dev->netdev_ops->ndo_fdb_dump) > - idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, NULL, idx); > - else > + if (dev->netdev_ops->ndo_fdb_dump) { > + idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, bdev, dev, > + idx); > + } else { > idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx); > + } > } > rcu_read_unlock(); > >