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: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 1d22ce9f352e2e7610095c4b1774164aa6af4516..6612946167feb1d85f2a74a493b73ad94ab0ac20 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -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;
 };

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index a642bb829d09cfd473d5ad17a64b2ba6b76d912e..82e3e97050173542b5d6094ebc4db81324198b18 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -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,
                },

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 5f3f6455317924e0e74281d23075d2af68d72d73..b3cca126b103d24ddaee0b13d7eb73f4e8617f3a 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -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,

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 5396ff08af3215d1a532b853c8859fb64dfc6a1f..775e00fbeb1ef52a4367f118c2a3dbb6410c025a 100644 (file)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -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,

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 1394da63614a1d8a325ef44d5fa17849b5d82294..66c4549efbbb3505831587baaeaf7c0d55be1607 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -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,

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index f88a62ab019d25097efc67ee8e5239c9b39e8ca3..bca8c350e7f30e44ea4743adcd606234aa44627c 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -471,6 +471,7 @@ static ssize_t phys_switch_id_show(struct device *dev,
 
        if (dev_isalive(netdev)) {
                struct switchdev_attr attr = {
+                       .orig_dev = netdev,
                        .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
                        .flags = SWITCHDEV_F_NO_RECURSE,
                };

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 34ba7a08876de74409ea5d2ad3af6f78124ff0a7..d8b0113d3eec83f1e8b46b34db2efea9e93c8fb8 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1027,6 +1027,7 @@ static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)
 {
        int err;
        struct switchdev_attr attr = {
+               .orig_dev = dev,
                .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
                .flags = SWITCHDEV_F_NO_RECURSE,
        };

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index f34e535e93bdf780d7093c84e32a6288029d5442..df790d3385a22f4d89af1ba3d01212102dec765a 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -723,6 +723,7 @@ static int switchdev_port_vlan_fill(struct sk_buff *skb, struct net_device *dev,
                                    u32 filter_mask)
 {
        struct switchdev_vlan_dump dump = {
+               .vlan.obj.orig_dev = dev,
                .vlan.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
                .skb = skb,
                .filter_mask = filter_mask,
@@ -757,6 +758,7 @@ int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
                                  int nlflags)
 {
        struct switchdev_attr attr = {
+               .orig_dev = dev,
                .id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS,
        };
        u16 mode = BRIDGE_MODE_UNDEF;
@@ -778,6 +780,7 @@ static int switchdev_port_br_setflag(struct net_device *dev,
                                     unsigned long brport_flag)
 {
        struct switchdev_attr attr = {
+               .orig_dev = dev,
                .id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS,
        };
        u8 flag = nla_get_u8(nlattr);
@@ -853,6 +856,7 @@ static int switchdev_port_br_afspec(struct net_device *dev,
        struct nlattr *attr;
        struct bridge_vlan_info *vinfo;
        struct switchdev_obj_port_vlan vlan = {
+               .obj.orig_dev = dev,
                .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,
        };
        int rem;
@@ -975,6 +979,7 @@ int switchdev_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                           u16 vid, u16 nlm_flags)
 {
        struct switchdev_obj_port_fdb fdb = {
+               .obj.orig_dev = dev,
                .obj.id = SWITCHDEV_OBJ_ID_PORT_FDB,
                .vid = vid,
        };
@@ -1000,6 +1005,7 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
                           u16 vid)
 {
        struct switchdev_obj_port_fdb fdb = {
+               .obj.orig_dev = dev,
                .obj.id = SWITCHDEV_OBJ_ID_PORT_FDB,
                .vid = vid,
        };
@@ -1077,6 +1083,7 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                            struct net_device *filter_dev, int idx)
 {
        struct switchdev_fdb_dump dump = {
+               .fdb.obj.orig_dev = dev,
                .fdb.obj.id = SWITCHDEV_OBJ_ID_PORT_FDB,
                .dev = dev,
                .skb = skb,
@@ -1135,6 +1142,7 @@ static struct net_device *switchdev_get_dev_by_nhs(struct fib_info *fi)
                if (!dev)
                        return NULL;
 
+               attr.orig_dev = dev;
                if (switchdev_port_attr_get(dev, &attr))
                        return NULL;
 
@@ -1194,6 +1202,7 @@ int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
        if (!dev)
                return 0;
 
+       ipv4_fib.obj.orig_dev = dev;
        err = switchdev_port_obj_add(dev, &ipv4_fib.obj);
        if (!err)
                fi->fib_flags |= RTNH_F_OFFLOAD;
@@ -1238,6 +1247,7 @@ int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
        if (!dev)
                return 0;
 
+       ipv4_fib.obj.orig_dev = dev;
        err = switchdev_port_obj_del(dev, &ipv4_fib.obj);
        if (!err)
                fi->fib_flags &= ~RTNH_F_OFFLOAD;
@@ -1270,10 +1280,12 @@ static bool switchdev_port_same_parent_id(struct net_device *a,
                                          struct net_device *b)
 {
        struct switchdev_attr a_attr = {
+               .orig_dev = a,
                .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
                .flags = SWITCHDEV_F_NO_RECURSE,
        };
        struct switchdev_attr b_attr = {
+               .orig_dev = b,
                .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
                .flags = SWITCHDEV_F_NO_RECURSE,
        };