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

Commit 648b4a99 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

switchdev: bring back switchdev_obj and use it as a generic object param 



Replace "void *obj" with a generic structure. Introduce couple of
helpers along that.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarScott Feldman <sfeldma@gmail.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52ba57cf

drivers/net/ethernet/rocker/rocker.c

+25 −16
Original line number Diff line number Diff line
@@ -4437,7 +4437,8 @@ static int rocker_port_fdb_add(struct rocker_port *rocker_port, 
}



static int rocker_port_obj_add(struct net_device *dev,

			       enum switchdev_obj_id id, const void *obj,

			       enum switchdev_obj_id id,

			       const struct switchdev_obj *obj,

			       struct switchdev_trans *trans)

{

	struct rocker_port *rocker_port = netdev_priv(dev);
@@ -4446,16 +4447,18 @@ static int rocker_port_obj_add(struct net_device *dev, 


	switch (id) {

	case SWITCHDEV_OBJ_ID_PORT_VLAN:

		err = rocker_port_vlans_add(rocker_port, trans, obj);

		err = rocker_port_vlans_add(rocker_port, trans,

					    SWITCHDEV_OBJ_PORT_VLAN(obj));

		break;

	case SWITCHDEV_OBJ_ID_IPV4_FIB:

		fib4 = obj;

		fib4 = SWITCHDEV_OBJ_IPV4_FIB(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_ID_PORT_FDB:

		err = rocker_port_fdb_add(rocker_port, trans, obj);

		err = rocker_port_fdb_add(rocker_port, trans,

					  SWITCHDEV_OBJ_PORT_FDB(obj));

		break;

	default:

		err = -EOPNOTSUPP;
@@ -4508,7 +4511,8 @@ static int rocker_port_fdb_del(struct rocker_port *rocker_port, 
}



static int rocker_port_obj_del(struct net_device *dev,

			       enum switchdev_obj_id id, const void *obj)

			       enum switchdev_obj_id id,

			       const struct switchdev_obj *obj)

{

	struct rocker_port *rocker_port = netdev_priv(dev);

	const struct switchdev_obj_ipv4_fib *fib4;
@@ -4516,17 +4520,19 @@ static int rocker_port_obj_del(struct net_device *dev, 


	switch (id) {

	case SWITCHDEV_OBJ_ID_PORT_VLAN:

		err = rocker_port_vlans_del(rocker_port, obj);

		err = rocker_port_vlans_del(rocker_port,

					    SWITCHDEV_OBJ_PORT_VLAN(obj));

		break;

	case SWITCHDEV_OBJ_ID_IPV4_FIB:

		fib4 = obj;

		fib4 = SWITCHDEV_OBJ_IPV4_FIB(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_ID_PORT_FDB:

		err = rocker_port_fdb_del(rocker_port, NULL, obj);

		err = rocker_port_fdb_del(rocker_port, NULL,

					  SWITCHDEV_OBJ_PORT_FDB(obj));

		break;

	default:

		err = -EOPNOTSUPP;
@@ -4538,7 +4544,7 @@ 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_port_fdb *fdb,

				int (*cb)(void *obj))

				switchdev_obj_dump_cb_t *cb)

{

	struct rocker *rocker = rocker_port->rocker;

	struct rocker_fdb_tbl_entry *found;
@@ -4555,7 +4561,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 = cb(fdb);

		err = cb(&fdb->obj);

		if (err)

			break;

	}
@@ -4566,7 +4572,7 @@ 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_port_vlan *vlan,

				int (*cb)(void *obj))

				 switchdev_obj_dump_cb_t *cb)

{

	u16 vid;

	int err = 0;
@@ -4578,7 +4584,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 = cb(vlan);

		err = cb(&vlan->obj);

		if (err)

			break;

	}
@@ -4587,18 +4593,21 @@ static int rocker_port_vlan_dump(const struct rocker_port *rocker_port, 
}



static int rocker_port_obj_dump(struct net_device *dev,

				enum switchdev_obj_id id, void *obj,

				int (*cb)(void *obj))

				enum switchdev_obj_id id,

				struct switchdev_obj *obj,

				switchdev_obj_dump_cb_t *cb)

{

	const struct rocker_port *rocker_port = netdev_priv(dev);

	int err = 0;



	switch (id) {

	case SWITCHDEV_OBJ_ID_PORT_FDB:

		err = rocker_port_fdb_dump(rocker_port, obj, cb);

		err = rocker_port_fdb_dump(rocker_port,

					   SWITCHDEV_OBJ_PORT_FDB(obj), cb);

		break;

	case SWITCHDEV_OBJ_ID_PORT_VLAN:

		err = rocker_port_vlan_dump(rocker_port, obj, cb);

		err = rocker_port_vlan_dump(rocker_port,

					    SWITCHDEV_OBJ_PORT_VLAN(obj), cb);

		break;

	default:

		err = -EOPNOTSUPP;

include/net/switchdev.h

+31 −11
Original line number Diff line number Diff line
@@ -64,15 +64,23 @@ enum switchdev_obj_id { 
	SWITCHDEV_OBJ_ID_PORT_FDB,

};



struct switchdev_obj {

};



/* SWITCHDEV_OBJ_ID_PORT_VLAN */

struct switchdev_obj_port_vlan {

	struct switchdev_obj obj;

	u16 flags;

	u16 vid_begin;

	u16 vid_end;

};



#define SWITCHDEV_OBJ_PORT_VLAN(obj) \

	container_of(obj, struct switchdev_obj_port_vlan, obj)



/* SWITCHDEV_OBJ_ID_IPV4_FIB */

struct switchdev_obj_ipv4_fib {

	struct switchdev_obj obj;

	u32 dst;

	int dst_len;

	struct fib_info *fi;
@@ -82,18 +90,27 @@ struct switchdev_obj_ipv4_fib { 
	u32 tb_id;

};



#define SWITCHDEV_OBJ_IPV4_FIB(obj) \

	container_of(obj, struct switchdev_obj_ipv4_fib, obj)



/* SWITCHDEV_OBJ_ID_PORT_FDB */

struct switchdev_obj_port_fdb {

	struct switchdev_obj obj;

	const unsigned char *addr;

	u16 vid;

	u16 ndm_state;

};



#define SWITCHDEV_OBJ_PORT_FDB(obj) \

	container_of(obj, struct switchdev_obj_port_fdb, obj)



void switchdev_trans_item_enqueue(struct switchdev_trans *trans,

				  void *data, void (*destructor)(void const *),

				  struct switchdev_trans_item *tritem);

void *switchdev_trans_item_dequeue(struct switchdev_trans *trans);



typedef int switchdev_obj_dump_cb_t(struct switchdev_obj *obj);



/**

 * struct switchdev_ops - switchdev operations

 *
@@ -115,14 +132,15 @@ struct switchdev_ops { 
					   struct switchdev_trans *trans);

	int	(*switchdev_port_obj_add)(struct net_device *dev,

					  enum switchdev_obj_id id,

					  const void *obj,

					  const struct switchdev_obj *obj,

					  struct switchdev_trans *trans);

	int	(*switchdev_port_obj_del)(struct net_device *dev,

					  enum switchdev_obj_id id,

					  const void *obj);

					  const struct switchdev_obj *obj);

	int	(*switchdev_port_obj_dump)(struct net_device *dev,

					   enum switchdev_obj_id id, void *obj,

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

					   enum switchdev_obj_id id,

					   struct switchdev_obj *obj,

					   switchdev_obj_dump_cb_t *cb);

};



enum switchdev_notifier_type {
@@ -153,11 +171,12 @@ int switchdev_port_attr_get(struct net_device *dev, 
int switchdev_port_attr_set(struct net_device *dev,

			    struct switchdev_attr *attr);

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

			   const void *obj);

			   const struct switchdev_obj *obj);

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

			   const void *obj);

			   const struct switchdev_obj *obj);

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

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

			    struct switchdev_obj *obj,

			    switchdev_obj_dump_cb_t *cb);

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,
@@ -203,21 +222,22 @@ static inline int switchdev_port_attr_set(struct net_device *dev, 


static inline int switchdev_port_obj_add(struct net_device *dev,

					 enum switchdev_obj_id id,

					 const void *obj)

					 const struct switchdev_obj *obj)

{

	return -EOPNOTSUPP;

}



static inline int switchdev_port_obj_del(struct net_device *dev,

					 enum switchdev_obj_id id,

					 const void *obj)

					 const struct switchdev_obj *obj)

{

	return -EOPNOTSUPP;

}



static inline int switchdev_port_obj_dump(struct net_device *dev,

					  enum switchdev_obj_id id, void *obj,

					  int (*cb)(void *obj))

					  enum switchdev_obj_id id,

					  const struct switchdev_obj *obj,

					  switchdev_obj_dump_cb_t *cb)

{

	return -EOPNOTSUPP;

}

net/bridge/br_fdb.c

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ static void fdb_del_external_learn(struct net_bridge_fdb_entry *f) 
		.vid = f->vlan_id,

	};



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

	switchdev_port_obj_del(f->dst->dev, SWITCHDEV_OBJ_ID_PORT_FDB,

			       &fdb.obj);

}



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

net/bridge/br_vlan.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, 
		};



		err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_ID_PORT_VLAN,

					     &v);

					     &v.obj);

		if (err == -EOPNOTSUPP)

			err = 0;

	}
@@ -138,7 +138,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, 
		};



		err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_ID_PORT_VLAN,

					     &v);

					     &v.obj);

		if (err == -EOPNOTSUPP)

			err = 0;

	}

net/dsa/slave.c

+27 −14
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ 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_port_vlan *vlan,

				    int (*cb)(void *obj))

				    switchdev_obj_dump_cb_t *cb)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;
@@ -332,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 = cb(vlan);

		err = cb(&vlan->obj);

		if (err)

			break;

	}
@@ -371,7 +371,7 @@ 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_port_fdb *fdb,

				   int (*cb)(void *obj))

				   switchdev_obj_dump_cb_t *cb)

{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;
@@ -394,7 +394,7 @@ static int dsa_slave_port_fdb_dump(struct net_device *dev, 
		fdb->vid = vid;

		fdb->ndm_state = is_static ? NUD_NOARP : NUD_REACHABLE;



		ret = cb(fdb);

		ret = cb(&fdb->obj);

		if (ret < 0)

			break;

	}
@@ -474,7 +474,8 @@ static int dsa_slave_port_attr_set(struct net_device *dev, 
}



static int dsa_slave_port_obj_add(struct net_device *dev,

				  enum switchdev_obj_id id, const void *obj,

				  enum switchdev_obj_id id,

				  const struct switchdev_obj *obj,

				  struct switchdev_trans *trans)

{

	int err;
@@ -486,10 +487,14 @@ static int dsa_slave_port_obj_add(struct net_device *dev, 


	switch (id) {

	case SWITCHDEV_OBJ_ID_PORT_FDB:

		err = dsa_slave_port_fdb_add(dev, obj, trans);

		err = dsa_slave_port_fdb_add(dev,

					     SWITCHDEV_OBJ_PORT_FDB(obj),

					     trans);

		break;

	case SWITCHDEV_OBJ_ID_PORT_VLAN:

		err = dsa_slave_port_vlan_add(dev, obj, trans);

		err = dsa_slave_port_vlan_add(dev,

					      SWITCHDEV_OBJ_PORT_VLAN(obj),

					      trans);

		break;

	default:

		err = -EOPNOTSUPP;
@@ -500,16 +505,19 @@ static int dsa_slave_port_obj_add(struct net_device *dev, 
}



static int dsa_slave_port_obj_del(struct net_device *dev,

				  enum switchdev_obj_id id, const void *obj)

				  enum switchdev_obj_id id,

				  const struct switchdev_obj *obj)

{

	int err;



	switch (id) {

	case SWITCHDEV_OBJ_ID_PORT_FDB:

		err = dsa_slave_port_fdb_del(dev, obj);

		err = dsa_slave_port_fdb_del(dev,

					     SWITCHDEV_OBJ_PORT_FDB(obj));

		break;

	case SWITCHDEV_OBJ_ID_PORT_VLAN:

		err = dsa_slave_port_vlan_del(dev, obj);

		err = dsa_slave_port_vlan_del(dev,

					      SWITCHDEV_OBJ_PORT_VLAN(obj));

		break;

	default:

		err = -EOPNOTSUPP;
@@ -520,17 +528,22 @@ static int dsa_slave_port_obj_del(struct net_device *dev, 
}



static int dsa_slave_port_obj_dump(struct net_device *dev,

				   enum switchdev_obj_id id, void *obj,

				   int (*cb)(void *obj))

				   enum switchdev_obj_id id,

				   struct switchdev_obj *obj,

				   switchdev_obj_dump_cb_t *cb)

{

	int err;



	switch (id) {

	case SWITCHDEV_OBJ_ID_PORT_FDB:

		err = dsa_slave_port_fdb_dump(dev, obj, cb);

		err = dsa_slave_port_fdb_dump(dev,

					      SWITCHDEV_OBJ_PORT_FDB(obj),

					      cb);

		break;

	case SWITCHDEV_OBJ_ID_PORT_VLAN:

		err = dsa_slave_port_vlan_dump(dev, obj, cb);

		err = dsa_slave_port_vlan_dump(dev,

					       SWITCHDEV_OBJ_PORT_VLAN(obj),

					       cb);

		break;

	default:

		err = -EOPNOTSUPP;