On Fri, Dec 09, 2022 at 10:08:48AM +0200, Nikolay Aleksandrov wrote:
> On 08/12/2022 17:28, Ido Schimmel wrote:
> > +static int br_mdb_replace_group_sg(const struct br_mdb_config *cfg,
> > + struct net_bridge_mdb_entry *mp,
> > + struct net_bridge_port_group *pg,
> > + struct net_bridge_mcast *brmctx,
> > + unsigned char flags,
> > + struct netlink_ext_ack *extack)
>
> extack seems unused here
Oops, will remove. Audited the code and didn't find more places where
extack is passed unnecessarily.
>
> > +{
> > + unsigned long now = jiffies;
> > +
> > + pg->flags = flags;
> > + pg->rt_protocol = cfg->rt_protocol;
> > + if (!(flags & MDB_PG_FLAGS_PERMANENT) && !cfg->src_entry)
> > + mod_timer(&pg->timer,
> > + now + brmctx->multicast_membership_interval);
> > + else
> > + del_timer(&pg->timer);
> > +
> > + br_mdb_notify(cfg->br->dev, mp, pg, RTM_NEWMDB);
> > +
> > + return 0;
> > +}
> > +
> > static int br_mdb_add_group_sg(const struct br_mdb_config *cfg,
> > struct net_bridge_mdb_entry *mp,
> > struct net_bridge_mcast *brmctx,
> [snip]
> > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
> > index cdc9e040f1f6..2473add41e16 100644
> > --- a/net/bridge/br_private.h
> > +++ b/net/bridge/br_private.h
> > @@ -107,6 +107,7 @@ struct br_mdb_config {
> > struct br_mdb_src_entry *src_entries;
> > int num_src_entries;
> > u8 rt_protocol;
> > + u32 nlflags;
>
> nlmsg_flags is u16 (__u16), also I'd add it before rt_protocol
Not sure why I used u32... Changed to u16 and moved it after
'filter_mode' to fill in the 2 bytes hole:
struct br_mdb_config {
struct net_bridge * br; /* 0 8 */
struct net_bridge_port * p; /* 8 8 */
struct br_mdb_entry * entry; /* 16 8 */
struct br_ip group; /* 24 36 */
bool src_entry; /* 60 1 */
u8 filter_mode; /* 61 1 */
u16 nlflags; /* 62 2 */
/* --- cacheline 1 boundary (64 bytes) --- */
struct br_mdb_src_entry * src_entries; /* 64 8 */
int num_src_entries; /* 72 4 */
u8 rt_protocol; /* 76 1 */
/* size: 80, cachelines: 2, members: 10 */
/* padding: 3 */
/* last cacheline: 16 bytes */
};
Thanks!
