From: Vlad Yasevich <vyasevic@redhat.com> To: netdev@vger.kernel.org Cc: bridge@lists.linux-foundation.org, shemminger@vyatta.com, jhs@mojatatu.com, john.r.fastabend@intel.com, mst@redhat.com, Vlad Yasevich <vyasevic@redhat.com> Subject: [RFC PATCH v2 net-next 5/7] bridge: Add addresses from static fdbs to non-promisc ports Date: Tue, 29 Apr 2014 17:20:26 -0400 [thread overview] Message-ID: <1398806428-640-6-git-send-email-vyasevic@redhat.com> (raw) In-Reply-To: <1398806428-640-1-git-send-email-vyasevic@redhat.com> When a static fdb entry is created, add the mac address from this fdb entry to any ports that are currently running in non-promiscuous mode. These ports need this data so that they can receive traffic destined to these addresses. Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> --- net/bridge/br_fdb.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 9759b61..e0a4632 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -85,8 +85,58 @@ static void fdb_rcu_free(struct rcu_head *head) kmem_cache_free(br_fdb_cache, ent); } +/* When a static FDB entry is added, the mac address from the entry is + * added to the bridge private HW address list and all required ports + * are then updated with the new information. + * Called under RTNL. + */ +static void fdb_add_hw(struct net_bridge *br, const unsigned char *addr) +{ + int err; + struct net_bridge_port *p, *tmp = NULL; + + ASSERT_RTNL(); + + list_for_each_entry(p, &br->port_list, list) { + if (!br_is_promisc_port(p)) { + err = dev_uc_add(p->dev, addr); + if (err) + goto undo; + } + } + + return; +undo: + list_for_each_entry(tmp, &br->port_list, list) { + if (tmp == p) + break; + if (!br_is_promisc_port(tmp)) + dev_uc_del(tmp->dev, addr); + } +} + +/* When a static FDB entry is deleted, the HW address from that entry is + * also removed from the bridge private HW address list and updates all + * the ports with needed information. + * Called under RTNL. + */ +static void fdb_del_hw(struct net_bridge *br, const unsigned char *addr) +{ + struct net_bridge_port *p; + + ASSERT_RTNL(); + + list_for_each_entry(p, &br->port_list, list) { + if (!br_is_promisc_port(p)) + dev_uc_del(p->dev, addr); + } +} + static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f) { + if (f->is_static) + fdb_del_hw(br, f->addr.addr); + hlist_del_rcu(&f->hlist); fdb_notify(br, f, RTM_DELNEIGH); call_rcu(&f->rcu, fdb_rcu_free); @@ -466,6 +516,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source, return -ENOMEM; fdb->is_local = fdb->is_static = 1; + fdb_add_hw(br, addr); fdb_notify(br, fdb, RTM_NEWNEIGH); return 0; } @@ -678,16 +729,29 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr, } if (fdb_to_nud(fdb) != state) { - if (state & NUD_PERMANENT) - fdb->is_local = fdb->is_static = 1; - else if (state & NUD_NOARP) { + if (state & NUD_PERMANENT) { + fdb->is_local = 1; + if (!fdb->is_static) { + fdb->is_static = 1; + fdb_add_hw(br, addr); + } + } else if (state & NUD_NOARP) { + fdb->is_local = 0; + if (!fdb->is_static) { + fdb->is_static = 1; + fdb_add_hw(br, addr); + } + } else { fdb->is_local = 0; - fdb->is_static = 1; - } else - fdb->is_local = fdb->is_static = 0; + if (fdb->is_static) { + fdb->is_static = 0; + fdb_del_hw(br, addr); + } + } modified = true; } + fdb->added_by_user = 1; fdb->used = jiffies; -- 1.9.0
WARNING: multiple messages have this Message-ID (diff)
From: Vlad Yasevich <vyasevic@redhat.com> To: netdev@vger.kernel.org Cc: Vlad Yasevich <vyasevic@redhat.com>, mst@redhat.com, bridge@lists.linux-foundation.org, jhs@mojatatu.com, john.r.fastabend@intel.com, shemminger@vyatta.com Subject: [Bridge] [RFC PATCH v2 net-next 5/7] bridge: Add addresses from static fdbs to non-promisc ports Date: Tue, 29 Apr 2014 17:20:26 -0400 [thread overview] Message-ID: <1398806428-640-6-git-send-email-vyasevic@redhat.com> (raw) In-Reply-To: <1398806428-640-1-git-send-email-vyasevic@redhat.com> When a static fdb entry is created, add the mac address from this fdb entry to any ports that are currently running in non-promiscuous mode. These ports need this data so that they can receive traffic destined to these addresses. Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> --- net/bridge/br_fdb.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 9759b61..e0a4632 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -85,8 +85,58 @@ static void fdb_rcu_free(struct rcu_head *head) kmem_cache_free(br_fdb_cache, ent); } +/* When a static FDB entry is added, the mac address from the entry is + * added to the bridge private HW address list and all required ports + * are then updated with the new information. + * Called under RTNL. + */ +static void fdb_add_hw(struct net_bridge *br, const unsigned char *addr) +{ + int err; + struct net_bridge_port *p, *tmp = NULL; + + ASSERT_RTNL(); + + list_for_each_entry(p, &br->port_list, list) { + if (!br_is_promisc_port(p)) { + err = dev_uc_add(p->dev, addr); + if (err) + goto undo; + } + } + + return; +undo: + list_for_each_entry(tmp, &br->port_list, list) { + if (tmp == p) + break; + if (!br_is_promisc_port(tmp)) + dev_uc_del(tmp->dev, addr); + } +} + +/* When a static FDB entry is deleted, the HW address from that entry is + * also removed from the bridge private HW address list and updates all + * the ports with needed information. + * Called under RTNL. + */ +static void fdb_del_hw(struct net_bridge *br, const unsigned char *addr) +{ + struct net_bridge_port *p; + + ASSERT_RTNL(); + + list_for_each_entry(p, &br->port_list, list) { + if (!br_is_promisc_port(p)) + dev_uc_del(p->dev, addr); + } +} + static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f) { + if (f->is_static) + fdb_del_hw(br, f->addr.addr); + hlist_del_rcu(&f->hlist); fdb_notify(br, f, RTM_DELNEIGH); call_rcu(&f->rcu, fdb_rcu_free); @@ -466,6 +516,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source, return -ENOMEM; fdb->is_local = fdb->is_static = 1; + fdb_add_hw(br, addr); fdb_notify(br, fdb, RTM_NEWNEIGH); return 0; } @@ -678,16 +729,29 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr, } if (fdb_to_nud(fdb) != state) { - if (state & NUD_PERMANENT) - fdb->is_local = fdb->is_static = 1; - else if (state & NUD_NOARP) { + if (state & NUD_PERMANENT) { + fdb->is_local = 1; + if (!fdb->is_static) { + fdb->is_static = 1; + fdb_add_hw(br, addr); + } + } else if (state & NUD_NOARP) { + fdb->is_local = 0; + if (!fdb->is_static) { + fdb->is_static = 1; + fdb_add_hw(br, addr); + } + } else { fdb->is_local = 0; - fdb->is_static = 1; - } else - fdb->is_local = fdb->is_static = 0; + if (fdb->is_static) { + fdb->is_static = 0; + fdb_del_hw(br, addr); + } + } modified = true; } + fdb->added_by_user = 1; fdb->used = jiffies; -- 1.9.0
next prev parent reply other threads:[~2014-04-29 21:20 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-04-29 21:20 [RFC PATCH v2 net-next 0/7] Non-promisc bidge ports support Vlad Yasevich 2014-04-29 21:20 ` [Bridge] " Vlad Yasevich 2014-04-29 21:20 ` [RFC PATCH v2 net-next 1/7] bridge: Turn flag change macro into a function Vlad Yasevich 2014-04-29 21:20 ` [Bridge] " Vlad Yasevich 2014-04-29 21:20 ` [RFC PATCH v2 net-next 2/7] bridge: Keep track of ports capable of automatic discovery Vlad Yasevich 2014-04-29 21:20 ` [Bridge] " Vlad Yasevich 2014-04-30 10:18 ` Michael S. Tsirkin 2014-04-30 10:18 ` [Bridge] " Michael S. Tsirkin 2014-04-30 13:47 ` Vlad Yasevich 2014-04-30 13:47 ` [Bridge] " Vlad Yasevich 2014-04-29 21:20 ` [RFC PATCH v2 net-next 3/7] bridge: Add functionality to sync static fdb entries to hw Vlad Yasevich 2014-04-29 21:20 ` [Bridge] " Vlad Yasevich 2014-04-29 21:20 ` [RFC PATCH v2 net-next 4/7] bridge: Automatically manage port promiscuous mode Vlad Yasevich 2014-04-29 21:20 ` [Bridge] " Vlad Yasevich 2014-04-30 11:46 ` Michael S. Tsirkin 2014-04-30 11:46 ` [Bridge] " Michael S. Tsirkin 2014-04-30 14:17 ` Vlad Yasevich 2014-04-30 14:17 ` [Bridge] " Vlad Yasevich 2014-04-30 15:38 ` Michael S. Tsirkin 2014-04-30 15:38 ` [Bridge] " Michael S. Tsirkin 2014-04-29 21:20 ` Vlad Yasevich [this message] 2014-04-29 21:20 ` [Bridge] [RFC PATCH v2 net-next 5/7] bridge: Add addresses from static fdbs to non-promisc ports Vlad Yasevich 2014-04-29 21:20 ` [RFC PATCH v2 net-next 6/7] bridge: Correctly manage promiscuity when user requested it Vlad Yasevich 2014-04-29 21:20 ` [Bridge] " Vlad Yasevich 2014-04-29 21:20 ` [RFC PATCH v2 net-next 7/7] bridge: Automatically manage promisc mode when vlan filtering is on Vlad Yasevich 2014-04-29 21:20 ` [Bridge] " Vlad Yasevich 2014-04-30 17:22 ` [RFC PATCH v2 net-next 0/7] Non-promisc bidge ports support Stephen Hemminger 2014-04-30 17:22 ` [Bridge] " Stephen Hemminger 2014-04-30 17:37 ` Michael S. Tsirkin 2014-04-30 17:37 ` [Bridge] " Michael S. Tsirkin 2014-04-30 18:50 ` Vlad Yasevich 2014-04-30 18:50 ` [Bridge] " Vlad Yasevich
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1398806428-640-6-git-send-email-vyasevic@redhat.com \ --to=vyasevic@redhat.com \ --cc=bridge@lists.linux-foundation.org \ --cc=jhs@mojatatu.com \ --cc=john.r.fastabend@intel.com \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=shemminger@vyatta.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.