lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 29 Sep 2017 12:50:55 +0300 From: Nikolay Aleksandrov <nikolay@...ulusnetworks.com> To: Jiri Pirko <jiri@...nulli.us>, netdev@...r.kernel.org Cc: davem@...emloft.net, yotamg@...lanox.com, idosch@...lanox.com, mlxsw@...lanox.com, andrew@...n.ch, dsa@...ulusnetworks.com, edumazet@...gle.com, willemb@...gle.com, johannes.berg@...el.com, dcaratti@...hat.com, pabeni@...hat.com, daniel@...earbox.net, f.fainelli@...il.com, fw@...len.de, gfree.wind@....163.com Subject: Re: [patch net-next 2/7] ipv4: ipmr: Add the parent ID field to VIF struct On 28/09/17 20:34, Jiri Pirko wrote: > From: Yotam Gigi <yotamg@...lanox.com> > > In order to allow the ipmr module to do partial multicast forwarding > according to the device parent ID, add the device parent ID field to the > VIF struct. This way, the forwarding path can use the parent ID field > without invoking switchdev calls, which requires the RTNL lock. > > When a new VIF is added, set the device parent ID field in it by invoking > the switchdev_port_attr_get call. > > Signed-off-by: Yotam Gigi <yotamg@...lanox.com> > Reviewed-by: Ido Schimmel <idosch@...lanox.com> > Signed-off-by: Jiri Pirko <jiri@...lanox.com> > --- > include/linux/mroute.h | 2 ++ > net/ipv4/ipmr.c | 9 +++++++++ > 2 files changed, 11 insertions(+) > > diff --git a/include/linux/mroute.h b/include/linux/mroute.h > index b072a84..a46577f 100644 > --- a/include/linux/mroute.h > +++ b/include/linux/mroute.h > @@ -57,6 +57,8 @@ static inline bool ipmr_rule_default(const struct fib_rule *rule) > > struct vif_device { > struct net_device *dev; /* Device we are using */ > + struct netdev_phys_item_id dev_parent_id; /* Device parent ID */ > + bool dev_parent_id_valid; > unsigned long bytes_in,bytes_out; > unsigned long pkt_in,pkt_out; /* Statistics */ > unsigned long rate_limit; /* Traffic shaping (NI) */ > diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c > index 292a8e8..4566c54 100644 > --- a/net/ipv4/ipmr.c > +++ b/net/ipv4/ipmr.c > @@ -67,6 +67,7 @@ > #include <net/fib_rules.h> > #include <linux/netconf.h> > #include <net/nexthop.h> > +#include <net/switchdev.h> > > struct ipmr_rule { > struct fib_rule common; > @@ -868,6 +869,9 @@ static int vif_add(struct net *net, struct mr_table *mrt, > struct vifctl *vifc, int mrtsock) > { > int vifi = vifc->vifc_vifi; > + struct switchdev_attr attr = { > + .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID, > + }; > struct vif_device *v = &mrt->vif_table[vifi]; > struct net_device *dev; > struct in_device *in_dev; > @@ -942,6 +946,11 @@ static int vif_add(struct net *net, struct mr_table *mrt, > > /* Fill in the VIF structures */ > > + attr.orig_dev = dev; > + if (!switchdev_port_attr_get(dev, &attr)) { > + v->dev_parent_id_valid = true; > + memcpy(v->dev_parent_id.id, attr.u.ppid.id, attr.u.ppid.id_len); > + } > v->rate_limit = vifc->vifc_rate_limit; > v->local = vifc->vifc_lcl_addr.s_addr; > v->remote = vifc->vifc_rmt_addr.s_addr; > One more thing - what happens on vif delete, then add with the same vif index of another device that doesn't have a parent id ? I think the vif will be stuck with its parent_id when it gets set.
Powered by blists - more mailing lists