Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ff64f6f authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

switchdev: Pass original device to port netdev driver 



switchdev drivers need to know the netdev on which the switchdev op was
invoked. For example, the STP state of a VLAN interface configured on top
of a port can change while being member in a bridge. In this case, the
underlying driver should only change the STP state of that particular
VLAN and not of all the VLANs configured on the port.

However, current switchdev infrastructure only passes the port netdev down
to the driver. Solve that by passing the original device down to the
driver as part of the required switchdev object / attribute.

This doesn't entail any change in current switchdev drivers. It simply
enables those supporting stacked devices to know the originating device
and act accordingly.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d547833

include/net/switchdev.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ enum switchdev_attr_id { 
};



struct switchdev_attr {

	struct net_device *orig_dev;

	enum switchdev_attr_id id;

	u32 flags;

	union {
@@ -68,6 +69,7 @@ enum switchdev_obj_id { 
};



struct switchdev_obj {

	struct net_device *orig_dev;

	enum switchdev_obj_id id;

	u32 flags;

};

net/bridge/br_fdb.c

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ static void fdb_del_external_learn(struct net_bridge_fdb_entry *f) 
{

	struct switchdev_obj_port_fdb fdb = {

		.obj = {

			.orig_dev = f->dst->dev,

			.id = SWITCHDEV_OBJ_ID_PORT_FDB,

			.flags = SWITCHDEV_F_DEFER,

		},

net/bridge/br_stp.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ void br_log_state(const struct net_bridge_port *p) 
void br_set_state(struct net_bridge_port *p, unsigned int state)

{

	struct switchdev_attr attr = {

		.orig_dev = p->dev,

		.id = SWITCHDEV_ATTR_ID_PORT_STP_STATE,

		.flags = SWITCHDEV_F_DEFER,

		.u.stp_state = state,
@@ -570,6 +571,7 @@ int br_set_max_age(struct net_bridge *br, unsigned long val) 
int br_set_ageing_time(struct net_bridge *br, u32 ageing_time)

{

	struct switchdev_attr attr = {

		.orig_dev = br->dev,

		.id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,

		.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,

		.u.ageing_time = ageing_time,

net/bridge/br_stp_if.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static inline port_id br_make_port_id(__u8 priority, __u16 port_no) 
void br_init_port(struct net_bridge_port *p)

{

	struct switchdev_attr attr = {

		.orig_dev = p->dev,

		.id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,

		.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP | SWITCHDEV_F_DEFER,

		.u.ageing_time = p->br->ageing_time,

net/bridge/br_vlan.c

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, 
			  u16 vid, u16 flags)

{

	struct switchdev_obj_port_vlan v = {

		.obj.orig_dev = dev,

		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,

		.flags = flags,

		.vid_begin = vid,
@@ -120,6 +121,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, 
			  u16 vid)

{

	struct switchdev_obj_port_vlan v = {

		.obj.orig_dev = dev,

		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,

		.vid_begin = vid,

		.vid_end = vid,