Skip to content

Commit

Permalink
Merge branch 'bridge-mdb-entry-offload-flag'
Browse files Browse the repository at this point in the history 
Jiri Pirko says:

====================
bridge: mdb: flag offloaded mdb entries

This patchset extends uapi to let the user know if an mdb entry is offloaded.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Feb 9, 2016
2 parents d66bd90 + 9e8430f commit a1b486a
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 38 deletions.
2 changes: 2 additions & 0 deletions include/uapi/linux/if_bridge.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ struct br_mdb_entry {
#define MDB_TEMPORARY 0
#define MDB_PERMANENT 1
__u8 state;
#define MDB_FLAGS_OFFLOAD (1 << 0)
__u8 flags;
__u16 vid;
struct {
union {
Expand Down
63 changes: 39 additions & 24 deletions net/bridge/br_mdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
return -EMSGSIZE;
}

static void __mdb_entry_fill_flags(struct br_mdb_entry *e, unsigned char flags)
{
e->state = flags & MDB_PG_FLAGS_PERMANENT;
e->flags = 0;
if (flags & MDB_PG_FLAGS_OFFLOAD)
e->flags |= MDB_FLAGS_OFFLOAD;
}

static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
struct net_device *dev)
{
Expand Down Expand Up @@ -85,8 +93,8 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
struct br_mdb_entry e;
memset(&e, 0, sizeof(e));
e.ifindex = port->dev->ifindex;
e.state = p->state;
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)
Expand Down Expand Up @@ -209,7 +217,7 @@ static inline size_t rtnl_mdb_nlmsg_size(void)
}

static void __br_mdb_notify(struct net_device *dev, struct br_mdb_entry *entry,
int type)
int type, struct net_bridge_port_group *pg)
{
struct switchdev_obj_port_mdb mdb = {
.obj = {
Expand All @@ -232,10 +240,13 @@ static void __br_mdb_notify(struct net_device *dev, struct br_mdb_entry *entry,
#endif

mdb.obj.orig_dev = port_dev;
if (port_dev && type == RTM_NEWMDB)
switchdev_port_obj_add(port_dev, &mdb.obj);
else if (port_dev && type == RTM_DELMDB)
if (port_dev && type == RTM_NEWMDB) {
err = switchdev_port_obj_add(port_dev, &mdb.obj);
if (!err && pg)
pg->flags |= MDB_PG_FLAGS_OFFLOAD;
} else if (port_dev && type == RTM_DELMDB) {
switchdev_port_obj_del(port_dev, &mdb.obj);
}

skb = nlmsg_new(rtnl_mdb_nlmsg_size(), GFP_ATOMIC);
if (!skb)
Expand All @@ -253,21 +264,21 @@ static void __br_mdb_notify(struct net_device *dev, struct br_mdb_entry *entry,
rtnl_set_sk_err(net, RTNLGRP_MDB, err);
}

void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
struct br_ip *group, int type, u8 state)
void br_mdb_notify(struct net_device *dev, struct net_bridge_port_group *pg,
int type)
{
struct br_mdb_entry entry;

memset(&entry, 0, sizeof(entry));
entry.ifindex = port->dev->ifindex;
entry.addr.proto = group->proto;
entry.addr.u.ip4 = group->u.ip4;
entry.ifindex = pg->port->dev->ifindex;
entry.addr.proto = pg->addr.proto;
entry.addr.u.ip4 = pg->addr.u.ip4;
#if IS_ENABLED(CONFIG_IPV6)
entry.addr.u.ip6 = group->u.ip6;
entry.addr.u.ip6 = pg->addr.u.ip6;
#endif
entry.state = state;
entry.vid = group->vid;
__br_mdb_notify(dev, &entry, type);
entry.vid = pg->addr.vid;
__mdb_entry_fill_flags(&entry, pg->flags);
__br_mdb_notify(dev, &entry, type, pg);
}

static int nlmsg_populate_rtr_fill(struct sk_buff *skb,
Expand Down Expand Up @@ -412,7 +423,8 @@ static int br_mdb_parse(struct sk_buff *skb, struct nlmsghdr *nlh,
}

static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
struct br_ip *group, unsigned char state)
struct br_ip *group, unsigned char state,
struct net_bridge_port_group **pg)
{
struct net_bridge_mdb_entry *mp;
struct net_bridge_port_group *p;
Expand Down Expand Up @@ -443,14 +455,16 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
if (unlikely(!p))
return -ENOMEM;
rcu_assign_pointer(*pp, p);
*pg = p;
if (state == MDB_TEMPORARY)
mod_timer(&p->timer, now + br->multicast_membership_interval);

return 0;
}

static int __br_mdb_add(struct net *net, struct net_bridge *br,
struct br_mdb_entry *entry)
struct br_mdb_entry *entry,
struct net_bridge_port_group **pg)
{
struct br_ip ip;
struct net_device *dev;
Expand Down Expand Up @@ -479,14 +493,15 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br,
#endif

spin_lock_bh(&br->multicast_lock);
ret = br_mdb_add_group(br, p, &ip, entry->state);
ret = br_mdb_add_group(br, p, &ip, entry->state, pg);
spin_unlock_bh(&br->multicast_lock);
return ret;
}

static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
{
struct net *net = sock_net(skb->sk);
struct net_bridge_port_group *pg;
struct net_bridge_vlan_group *vg;
struct net_device *dev, *pdev;
struct br_mdb_entry *entry;
Expand Down Expand Up @@ -516,15 +531,15 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
if (br_vlan_enabled(br) && vg && entry->vid == 0) {
list_for_each_entry(v, &vg->vlan_list, vlist) {
entry->vid = v->vid;
err = __br_mdb_add(net, br, entry);
err = __br_mdb_add(net, br, entry, &pg);
if (err)
break;
__br_mdb_notify(dev, entry, RTM_NEWMDB);
__br_mdb_notify(dev, entry, RTM_NEWMDB, pg);
}
} else {
err = __br_mdb_add(net, br, entry);
err = __br_mdb_add(net, br, entry, &pg);
if (!err)
__br_mdb_notify(dev, entry, RTM_NEWMDB);
__br_mdb_notify(dev, entry, RTM_NEWMDB, pg);
}

return err;
Expand Down Expand Up @@ -568,7 +583,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)
if (p->port->state == BR_STATE_DISABLED)
goto unlock;

entry->state = p->state;
__mdb_entry_fill_flags(entry, p->flags);
rcu_assign_pointer(*pp, p->next);
hlist_del_init(&p->mglist);
del_timer(&p->timer);
Expand Down Expand Up @@ -620,12 +635,12 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh)
entry->vid = v->vid;
err = __br_mdb_del(br, entry);
if (!err)
__br_mdb_notify(dev, entry, RTM_DELMDB);
__br_mdb_notify(dev, entry, RTM_DELMDB, NULL);
}
} else {
err = __br_mdb_del(br, entry);
if (!err)
__br_mdb_notify(dev, entry, RTM_DELMDB);
__br_mdb_notify(dev, entry, RTM_DELMDB, NULL);
}

return err;
Expand Down
18 changes: 8 additions & 10 deletions net/bridge/br_multicast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,7 @@ static void br_multicast_del_pg(struct net_bridge *br,
rcu_assign_pointer(*pp, p->next);
hlist_del_init(&p->mglist);
del_timer(&p->timer);
br_mdb_notify(br->dev, p->port, &pg->addr, RTM_DELMDB,
p->state);
br_mdb_notify(br->dev, p, RTM_DELMDB);
call_rcu_bh(&p->rcu, br_multicast_free_pg);

if (!mp->ports && !mp->mglist &&
Expand All @@ -304,7 +303,7 @@ static void br_multicast_port_group_expired(unsigned long data)

spin_lock(&br->multicast_lock);
if (!netif_running(br->dev) || timer_pending(&pg->timer) ||
hlist_unhashed(&pg->mglist) || pg->state & MDB_PERMANENT)
hlist_unhashed(&pg->mglist) || pg->flags & MDB_PG_FLAGS_PERMANENT)
goto out;

br_multicast_del_pg(br, pg);
Expand Down Expand Up @@ -649,7 +648,7 @@ struct net_bridge_port_group *br_multicast_new_port_group(
struct net_bridge_port *port,
struct br_ip *group,
struct net_bridge_port_group __rcu *next,
unsigned char state)
unsigned char flags)
{
struct net_bridge_port_group *p;

Expand All @@ -659,7 +658,7 @@ struct net_bridge_port_group *br_multicast_new_port_group(

p->addr = *group;
p->port = port;
p->state = state;
p->flags = flags;
rcu_assign_pointer(p->next, next);
hlist_add_head(&p->mglist, &port->mglist);
setup_timer(&p->timer, br_multicast_port_group_expired,
Expand Down Expand Up @@ -702,11 +701,11 @@ static int br_multicast_add_group(struct net_bridge *br,
break;
}

p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY);
p = br_multicast_new_port_group(port, group, *pp, 0);
if (unlikely(!p))
goto err;
rcu_assign_pointer(*pp, p);
br_mdb_notify(br->dev, port, group, RTM_NEWMDB, MDB_TEMPORARY);
br_mdb_notify(br->dev, p, RTM_NEWMDB);

found:
mod_timer(&p->timer, now + br->multicast_membership_interval);
Expand Down Expand Up @@ -975,7 +974,7 @@ void br_multicast_disable_port(struct net_bridge_port *port)

spin_lock(&br->multicast_lock);
hlist_for_each_entry_safe(pg, n, &port->mglist, mglist)
if (pg->state == MDB_TEMPORARY)
if (!(pg->flags & MDB_PG_FLAGS_PERMANENT))
br_multicast_del_pg(br, pg);

if (!hlist_unhashed(&port->rlist)) {
Expand Down Expand Up @@ -1453,8 +1452,7 @@ br_multicast_leave_group(struct net_bridge *br,
hlist_del_init(&p->mglist);
del_timer(&p->timer);
call_rcu_bh(&p->rcu, br_multicast_free_pg);
br_mdb_notify(br->dev, port, group, RTM_DELMDB,
p->state);
br_mdb_notify(br->dev, p, RTM_DELMDB);

if (!mp->ports && !mp->mglist &&
netif_running(br->dev))
Expand Down
11 changes: 7 additions & 4 deletions net/bridge/br_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,17 @@ struct net_bridge_fdb_entry
struct rcu_head rcu;
};

#define MDB_PG_FLAGS_PERMANENT BIT(0)
#define MDB_PG_FLAGS_OFFLOAD BIT(1)

struct net_bridge_port_group {
struct net_bridge_port *port;
struct net_bridge_port_group __rcu *next;
struct hlist_node mglist;
struct rcu_head rcu;
struct timer_list timer;
struct br_ip addr;
unsigned char state;
unsigned char flags;
};

struct net_bridge_mdb_entry
Expand Down Expand Up @@ -554,11 +557,11 @@ void br_multicast_free_pg(struct rcu_head *head);
struct net_bridge_port_group *
br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
struct net_bridge_port_group __rcu *next,
unsigned char state);
unsigned char flags);
void br_mdb_init(void);
void br_mdb_uninit(void);
void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
struct br_ip *group, int type, u8 state);
void br_mdb_notify(struct net_device *dev, struct net_bridge_port_group *pg,
int type);
void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port,
int type);

Expand Down

0 comments on commit a1b486a

Please sign in to comment.