Commit 5d8b3e69 authored by Yotam Gigi's avatar Yotam Gigi Committed by David S. Miller
Browse files

ipv4: ipmr: Add the parent ID field to VIF struct 



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: default avatarYotam Gigi <yotamg@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent abf4bb6b

include/linux/mroute.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 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    */

	unsigned long	bytes_in,bytes_out;

	unsigned long	pkt_in,pkt_out;		/* Statistics 			*/

	unsigned long	rate_limit;		/* Traffic shaping (NI) 	*/

net/ipv4/ipmr.c

+11 −0
Original line number Diff line number Diff line
@@ -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,13 @@ 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)) {

		memcpy(v->dev_parent_id.id, attr.u.ppid.id, attr.u.ppid.id_len);

		v->dev_parent_id.id_len = attr.u.ppid.id_len;

	} else {

		v->dev_parent_id.id_len = 0;

	}

	v->rate_limit = vifc->vifc_rate_limit;

	v->local = vifc->vifc_lcl_addr.s_addr;

	v->remote = vifc->vifc_rmt_addr.s_addr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE