Commit eef50d46 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'switchdev-callback' 



Vivien Didelot says:

====================
net: switchdev: use specific switchdev_obj_*

This patchset changes switchdev add, del, dump operations from this:

    int     (*switchdev_port_obj_add)(struct net_device *dev,
                                      struct switchdev_obj *obj,
                                      struct switchdev_trans *trans);
    int     (*switchdev_port_obj_del)(struct net_device *dev,
                                      struct switchdev_obj *obj);
    int     (*switchdev_port_obj_dump)(struct net_device *dev,
                                      struct switchdev_obj *obj);

to something similar to the notifier_call callback of a notifier_block:

    int     (*switchdev_port_obj_add)(struct net_device *dev,
                                      enum switchdev_obj_id id,
                                      const void *obj,
                                      struct switchdev_trans *trans);
    int     (*switchdev_port_obj_del)(struct net_device *dev,
                                      enum switchdev_obj_id id,
                                      const void *obj);
    int     (*switchdev_port_obj_dump)(struct net_device *dev,
                                       enum switchdev_obj_id id, void *obj,
                                       int (*cb)(void *obj));

This allows the caller to pass and expect back a specific switchdev_obj_*
structure (e.g. switchdev_obj_fdb) instead of the generic switchdev_obj one.

This will simplify pushing the callback function down to the drivers.

The first 3 patches get rid of the dev parameter of the dump callback, since it
is not always neeeded (e.g. vlan_dump) and some drivers (such as DSA drivers)
may not have easy access to it.

Patches 4 and 5 implement the change in the switchdev operations and its users.

Patch 6 extracts the inner switchdev_obj_* structures from switchdev_obj and
removes this last one.

v2: fix error spotted by kbuild (extra ';' inline switchdev_port_obj_dump).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 79b0eb2a 44bbcf5c

drivers/net/ethernet/rocker/rocker.c

+21 −21
Original line number Diff line number Diff line
@@ -4437,26 +4437,25 @@ static int rocker_port_fdb_add(struct rocker_port *rocker_port, 
}



static int rocker_port_obj_add(struct net_device *dev,

			       struct switchdev_obj *obj,

			       enum switchdev_obj_id id, const void *obj,

			       struct switchdev_trans *trans)

{

	struct rocker_port *rocker_port = netdev_priv(dev);

	const struct switchdev_obj_ipv4_fib *fib4;

	int err = 0;



	switch (obj->id) {

	switch (id) {

	case SWITCHDEV_OBJ_PORT_VLAN:

		err = rocker_port_vlans_add(rocker_port, trans,

					    &obj->u.vlan);

		err = rocker_port_vlans_add(rocker_port, trans, obj);

		break;

	case SWITCHDEV_OBJ_IPV4_FIB:

		fib4 = &obj->u.ipv4_fib;

		fib4 = obj;

		err = rocker_port_fib_ipv4(rocker_port, trans,

					   htonl(fib4->dst), fib4->dst_len,

					   fib4->fi, fib4->tb_id, 0);

		break;

	case SWITCHDEV_OBJ_PORT_FDB:

		err = rocker_port_fdb_add(rocker_port, trans, &obj->u.fdb);

		err = rocker_port_fdb_add(rocker_port, trans, obj);

		break;

	default:

		err = -EOPNOTSUPP;
@@ -4509,25 +4508,25 @@ static int rocker_port_fdb_del(struct rocker_port *rocker_port, 
}



static int rocker_port_obj_del(struct net_device *dev,

			       struct switchdev_obj *obj)

			       enum switchdev_obj_id id, const void *obj)

{

	struct rocker_port *rocker_port = netdev_priv(dev);

	const struct switchdev_obj_ipv4_fib *fib4;

	int err = 0;



	switch (obj->id) {

	switch (id) {

	case SWITCHDEV_OBJ_PORT_VLAN:

		err = rocker_port_vlans_del(rocker_port, &obj->u.vlan);

		err = rocker_port_vlans_del(rocker_port, obj);

		break;

	case SWITCHDEV_OBJ_IPV4_FIB:

		fib4 = &obj->u.ipv4_fib;

		fib4 = obj;

		err = rocker_port_fib_ipv4(rocker_port, NULL,

					   htonl(fib4->dst), fib4->dst_len,

					   fib4->fi, fib4->tb_id,

					   ROCKER_OP_FLAG_REMOVE);

		break;

	case SWITCHDEV_OBJ_PORT_FDB:

		err = rocker_port_fdb_del(rocker_port, NULL, &obj->u.fdb);

		err = rocker_port_fdb_del(rocker_port, NULL, obj);

		break;

	default:

		err = -EOPNOTSUPP;
@@ -4538,10 +4537,10 @@ static int rocker_port_obj_del(struct net_device *dev, 
}



static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,

				struct switchdev_obj *obj)

				struct switchdev_obj_fdb *fdb,

				int (*cb)(void *obj))

{

	struct rocker *rocker = rocker_port->rocker;

	struct switchdev_obj_fdb *fdb = &obj->u.fdb;

	struct rocker_fdb_tbl_entry *found;

	struct hlist_node *tmp;

	unsigned long lock_flags;
@@ -4556,7 +4555,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port, 
		fdb->ndm_state = NUD_REACHABLE;

		fdb->vid = rocker_port_vlan_to_vid(rocker_port,

						   found->key.vlan_id);

		err = obj->cb(rocker_port->dev, obj);

		err = cb(fdb);

		if (err)

			break;

	}
@@ -4566,9 +4565,9 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port, 
}



static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,

				 struct switchdev_obj *obj)

				 struct switchdev_obj_vlan *vlan,

				int (*cb)(void *obj))

{

	struct switchdev_obj_vlan *vlan = &obj->u.vlan;

	u16 vid;

	int err = 0;
@@ -4579,7 +4578,7 @@ static int rocker_port_vlan_dump(const struct rocker_port *rocker_port, 
		if (rocker_vlan_id_is_internal(htons(vid)))

			vlan->flags |= BRIDGE_VLAN_INFO_PVID;

		vlan->vid_begin = vlan->vid_end = vid;

		err = obj->cb(rocker_port->dev, obj);

		err = cb(vlan);

		if (err)

			break;

	}
@@ -4588,17 +4587,18 @@ static int rocker_port_vlan_dump(const struct rocker_port *rocker_port, 
}



static int rocker_port_obj_dump(struct net_device *dev,

				struct switchdev_obj *obj)

				enum switchdev_obj_id id, void *obj,

				int (*cb)(void *obj))

{

	const struct rocker_port *rocker_port = netdev_priv(dev);

	int err = 0;



	switch (obj->id) {

	switch (id) {

	case SWITCHDEV_OBJ_PORT_FDB:

		err = rocker_port_fdb_dump(rocker_port, obj);

		err = rocker_port_fdb_dump(rocker_port, obj, cb);

		break;

	case SWITCHDEV_OBJ_PORT_VLAN:

		err = rocker_port_vlan_dump(rocker_port, obj);

		err = rocker_port_vlan_dump(rocker_port, obj, cb);

		break;

	default:

		err = -EOPNOTSUPP;

include/net/switchdev.h

+44 −36
Original line number Diff line number Diff line
@@ -64,16 +64,15 @@ enum switchdev_obj_id { 
	SWITCHDEV_OBJ_PORT_FDB,

};



struct switchdev_obj {

	enum switchdev_obj_id id;

	int (*cb)(struct net_device *dev, struct switchdev_obj *obj);

	union {

		struct switchdev_obj_vlan {		/* PORT_VLAN */

/* SWITCHDEV_OBJ_PORT_VLAN */

struct switchdev_obj_vlan {

	u16 flags;

	u16 vid_begin;

	u16 vid_end;

		} vlan;

		struct switchdev_obj_ipv4_fib {		/* IPV4_FIB */

};



/* SWITCHDEV_OBJ_IPV4_FIB */

struct switchdev_obj_ipv4_fib {

	u32 dst;

	int dst_len;

	struct fib_info *fi;
@@ -81,13 +80,13 @@ struct switchdev_obj { 
	u8 type;

	u32 nlflags;

	u32 tb_id;

		} ipv4_fib;

		struct switchdev_obj_fdb {		/* PORT_FDB */

};



/* SWITCHDEV_OBJ_PORT_FDB */

struct switchdev_obj_fdb {

	const unsigned char *addr;

	u16 vid;

	u16 ndm_state;

		} fdb;

	} u;

};



void switchdev_trans_item_enqueue(struct switchdev_trans *trans,
@@ -102,11 +101,11 @@ void *switchdev_trans_item_dequeue(struct switchdev_trans *trans); 
 *

 * @switchdev_port_attr_set: Set a port attribute (see switchdev_attr).

 *

 * @switchdev_port_obj_add: Add an object to port (see switchdev_obj).

 * @switchdev_port_obj_add: Add an object to port (see switchdev_obj_*).

 *

 * @switchdev_port_obj_del: Delete an object from port (see switchdev_obj).

 * @switchdev_port_obj_del: Delete an object from port (see switchdev_obj_*).

 *

 * @switchdev_port_obj_dump: Dump port objects (see switchdev_obj).

 * @switchdev_port_obj_dump: Dump port objects (see switchdev_obj_*).

 */

struct switchdev_ops {

	int	(*switchdev_port_attr_get)(struct net_device *dev,
@@ -115,12 +114,15 @@ struct switchdev_ops { 
					   struct switchdev_attr *attr,

					   struct switchdev_trans *trans);

	int	(*switchdev_port_obj_add)(struct net_device *dev,

					  struct switchdev_obj *obj,

					  enum switchdev_obj_id id,

					  const void *obj,

					  struct switchdev_trans *trans);

	int	(*switchdev_port_obj_del)(struct net_device *dev,

					  struct switchdev_obj *obj);

					  enum switchdev_obj_id id,

					  const void *obj);

	int	(*switchdev_port_obj_dump)(struct net_device *dev,

					  struct switchdev_obj *obj);

					   enum switchdev_obj_id id, void *obj,

					   int (*cb)(void *obj));

};



enum switchdev_notifier_type {
@@ -150,9 +152,12 @@ int switchdev_port_attr_get(struct net_device *dev, 
			    struct switchdev_attr *attr);

int switchdev_port_attr_set(struct net_device *dev,

			    struct switchdev_attr *attr);

int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj);

int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj);

int switchdev_port_obj_dump(struct net_device *dev, struct switchdev_obj *obj);

int switchdev_port_obj_add(struct net_device *dev, enum switchdev_obj_id id,

			   const void *obj);

int switchdev_port_obj_del(struct net_device *dev, enum switchdev_obj_id id,

			   const void *obj);

int switchdev_port_obj_dump(struct net_device *dev, enum switchdev_obj_id id,

			    void *obj, int (*cb)(void *obj));

int register_switchdev_notifier(struct notifier_block *nb);

int unregister_switchdev_notifier(struct notifier_block *nb);

int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
@@ -197,19 +202,22 @@ static inline int switchdev_port_attr_set(struct net_device *dev, 
}



static inline int switchdev_port_obj_add(struct net_device *dev,

					 struct switchdev_obj *obj)

					 enum switchdev_obj_id id,

					 const void *obj)

{

	return -EOPNOTSUPP;

}



static inline int switchdev_port_obj_del(struct net_device *dev,

					 struct switchdev_obj *obj)

					 enum switchdev_obj_id id,

					 const void *obj)

{

	return -EOPNOTSUPP;

}



static inline int switchdev_port_obj_dump(struct net_device *dev,

					  struct switchdev_obj *obj)

					  enum switchdev_obj_id id, void *obj,

					  int (*cb)(void *obj))

{

	return -EOPNOTSUPP;

}

net/bridge/br_fdb.c

+4 −7
Original line number Diff line number Diff line
@@ -133,15 +133,12 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr) 


static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)

{

	struct switchdev_obj obj = {

		.id = SWITCHDEV_OBJ_PORT_FDB,

		.u.fdb = {

	struct switchdev_obj_fdb fdb = {

		.addr = f->addr.addr,

		.vid = f->vlan_id,

		},

	};



	switchdev_port_obj_del(f->dst->dev, &obj);

	switchdev_port_obj_del(f->dst->dev, SWITCHDEV_OBJ_PORT_FDB, &fdb);

}



static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)

net/bridge/br_vlan.c

+9 −15
Original line number Diff line number Diff line
@@ -80,16 +80,13 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, 
	if (ops->ndo_vlan_rx_add_vid) {

		err = vlan_vid_add(dev, br->vlan_proto, vid);

	} else {

		struct switchdev_obj vlan_obj = {

			.id = SWITCHDEV_OBJ_PORT_VLAN,

			.u.vlan = {

		struct switchdev_obj_vlan v = {

			.flags = flags,

			.vid_begin = vid,

			.vid_end = vid,

			},

		};



		err = switchdev_port_obj_add(dev, &vlan_obj);

		err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);

		if (err == -EOPNOTSUPP)

			err = 0;

	}
@@ -132,15 +129,12 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, 
	if (ops->ndo_vlan_rx_kill_vid) {

		vlan_vid_del(dev, br->vlan_proto, vid);

	} else {

		struct switchdev_obj vlan_obj = {

			.id = SWITCHDEV_OBJ_PORT_VLAN,

			.u.vlan = {

		struct switchdev_obj_vlan v = {

			.vid_begin = vid,

			.vid_end = vid,

			},

		};



		err = switchdev_port_obj_del(dev, &vlan_obj);

		err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);

		if (err == -EOPNOTSUPP)

			err = 0;

	}

net/dsa/slave.c

+22 −24
Original line number Diff line number Diff line
@@ -242,10 +242,9 @@ static int dsa_bridge_check_vlan_range(struct dsa_switch *ds, 
}



static int dsa_slave_port_vlan_add(struct net_device *dev,

				   struct switchdev_obj *obj,

				   const struct switchdev_obj_vlan *vlan,

				   struct switchdev_trans *trans)

{

	struct switchdev_obj_vlan *vlan = &obj->u.vlan;

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;

	u16 vid;
@@ -279,9 +278,8 @@ static int dsa_slave_port_vlan_add(struct net_device *dev, 
}



static int dsa_slave_port_vlan_del(struct net_device *dev,

				   struct switchdev_obj *obj)

				   const struct switchdev_obj_vlan *vlan)

{

	struct switchdev_obj_vlan *vlan = &obj->u.vlan;

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;

	u16 vid;
@@ -300,9 +298,9 @@ static int dsa_slave_port_vlan_del(struct net_device *dev, 
}



static int dsa_slave_port_vlan_dump(struct net_device *dev,

				    struct switchdev_obj *obj)

				    struct switchdev_obj_vlan *vlan,

				    int (*cb)(void *obj))

{

	struct switchdev_obj_vlan *vlan = &obj->u.vlan;

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;

	DECLARE_BITMAP(members, DSA_MAX_PORTS);
@@ -334,7 +332,7 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev, 
		if (test_bit(p->port, untagged))

			vlan->flags |= BRIDGE_VLAN_INFO_UNTAGGED;



		err = obj->cb(dev, obj);

		err = cb(vlan);

		if (err)

			break;

	}
@@ -343,10 +341,9 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev, 
}



static int dsa_slave_port_fdb_add(struct net_device *dev,

				  struct switchdev_obj *obj,

				  const struct switchdev_obj_fdb *fdb,

				  struct switchdev_trans *trans)

{

	struct switchdev_obj_fdb *fdb = &obj->u.fdb;

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;

	int ret = -EOPNOTSUPP;
@@ -360,9 +357,8 @@ static int dsa_slave_port_fdb_add(struct net_device *dev, 
}



static int dsa_slave_port_fdb_del(struct net_device *dev,

				  struct switchdev_obj *obj)

				  const struct switchdev_obj_fdb *fdb)

{

	struct switchdev_obj_fdb *fdb = &obj->u.fdb;

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;

	int ret = -EOPNOTSUPP;
@@ -374,7 +370,8 @@ static int dsa_slave_port_fdb_del(struct net_device *dev, 
}



static int dsa_slave_port_fdb_dump(struct net_device *dev,

				   struct switchdev_obj *obj)

				   struct switchdev_obj_fdb *fdb,

				   int (*cb)(void *obj))

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;
@@ -393,11 +390,11 @@ static int dsa_slave_port_fdb_dump(struct net_device *dev, 
		if (ret < 0)

			break;



		obj->u.fdb.addr = addr;

		obj->u.fdb.vid = vid;

		obj->u.fdb.ndm_state = is_static ? NUD_NOARP : NUD_REACHABLE;

		fdb->addr = addr;

		fdb->vid = vid;

		fdb->ndm_state = is_static ? NUD_NOARP : NUD_REACHABLE;



		ret = obj->cb(dev, obj);

		ret = cb(fdb);

		if (ret < 0)

			break;

	}
@@ -472,7 +469,7 @@ static int dsa_slave_port_attr_set(struct net_device *dev, 
}



static int dsa_slave_port_obj_add(struct net_device *dev,

				  struct switchdev_obj *obj,

				  enum switchdev_obj_id id, const void *obj,

				  struct switchdev_trans *trans)

{

	int err;
@@ -482,7 +479,7 @@ static int dsa_slave_port_obj_add(struct net_device *dev, 
	 * supported, return -EOPNOTSUPP.

	 */



	switch (obj->id) {

	switch (id) {

	case SWITCHDEV_OBJ_PORT_FDB:

		err = dsa_slave_port_fdb_add(dev, obj, trans);

		break;
@@ -498,11 +495,11 @@ static int dsa_slave_port_obj_add(struct net_device *dev, 
}



static int dsa_slave_port_obj_del(struct net_device *dev,

				  struct switchdev_obj *obj)

				  enum switchdev_obj_id id, const void *obj)

{

	int err;



	switch (obj->id) {

	switch (id) {

	case SWITCHDEV_OBJ_PORT_FDB:

		err = dsa_slave_port_fdb_del(dev, obj);

		break;
@@ -518,16 +515,17 @@ static int dsa_slave_port_obj_del(struct net_device *dev, 
}



static int dsa_slave_port_obj_dump(struct net_device *dev,

				   struct switchdev_obj *obj)

				   enum switchdev_obj_id id, void *obj,

				   int (*cb)(void *obj))

{

	int err;



	switch (obj->id) {

	switch (id) {

	case SWITCHDEV_OBJ_PORT_FDB:

		err = dsa_slave_port_fdb_dump(dev, obj);

		err = dsa_slave_port_fdb_dump(dev, obj, cb);

		break;

	case SWITCHDEV_OBJ_PORT_VLAN:

		err = dsa_slave_port_vlan_dump(dev, obj);

		err = dsa_slave_port_vlan_dump(dev, obj, cb);

		break;

	default:

		err = -EOPNOTSUPP;

CRA Git | Maintained and supported by SUSTech CRA and CCSE