hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: switchdev: Add extack to switchdev_handle_port_obj_add() callback 

Drivers use switchdev_handle_port_obj_add() to handle recursive descent
through lower devices. Change this function prototype to take add_cb
that itself takes an extack argument. Decode extack from
switchdev_notifier_port_obj_info and pass it to add_cb.

Update mlxsw and ocelot drivers which use this helper.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Ivan Vecera <ivecera@redhat.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Petr Machata 2018-12-12 17:02:56 +00:00 committed by David S. Miller
parent 479c86dc55
commit 6921351359
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
View File

@ -1777,7 +1777,8 @@ static void mlxsw_sp_span_respin_schedule(struct mlxsw_sp *mlxsw_sp)
static int mlxsw_sp_port_obj_add(struct net_device *dev, static int mlxsw_sp_port_obj_add(struct net_device *dev,
const struct switchdev_obj *obj, const struct switchdev_obj *obj,
struct switchdev_trans *trans) struct switchdev_trans *trans,
struct netlink_ext_ack *extack)
{ {
struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev); struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
const struct switchdev_obj_port_vlan *vlan; const struct switchdev_obj_port_vlan *vlan;

3
drivers/net/ethernet/mscc/ocelot.c
View File

@ -1293,7 +1293,8 @@ static int ocelot_port_obj_del_mdb(struct net_device *dev,
static int ocelot_port_obj_add(struct net_device *dev, static int ocelot_port_obj_add(struct net_device *dev,
const struct switchdev_obj *obj, const struct switchdev_obj *obj,
struct switchdev_trans *trans) struct switchdev_trans *trans,
struct netlink_ext_ack *extack)
{ {
int ret = 0; int ret = 0;

6
include/net/switchdev.h
View File

@ -215,7 +215,8 @@ int switchdev_handle_port_obj_add(struct net_device *dev,
bool (*check_cb)(const struct net_device *dev), bool (*check_cb)(const struct net_device *dev),
int (*add_cb)(struct net_device *dev, int (*add_cb)(struct net_device *dev,
const struct switchdev_obj *obj, const struct switchdev_obj *obj,
struct switchdev_trans *trans)); struct switchdev_trans *trans,
struct netlink_ext_ack *extack));
int switchdev_handle_port_obj_del(struct net_device *dev, int switchdev_handle_port_obj_del(struct net_device *dev,
struct switchdev_notifier_port_obj_info *port_obj_info, struct switchdev_notifier_port_obj_info *port_obj_info,
bool (*check_cb)(const struct net_device *dev), bool (*check_cb)(const struct net_device *dev),
@ -304,7 +305,8 @@ switchdev_handle_port_obj_add(struct net_device *dev,
bool (*check_cb)(const struct net_device *dev), bool (*check_cb)(const struct net_device *dev),
int (*add_cb)(struct net_device *dev, int (*add_cb)(struct net_device *dev,
const struct switchdev_obj *obj, const struct switchdev_obj *obj,
struct switchdev_trans *trans)) struct switchdev_trans *trans,
struct netlink_ext_ack *extack))
{ {
return 0; return 0;
} }

12
net/switchdev/switchdev.c
View File

@ -616,16 +616,21 @@ static int __switchdev_handle_port_obj_add(struct net_device *dev,
bool (*check_cb)(const struct net_device *dev), bool (*check_cb)(const struct net_device *dev),
int (*add_cb)(struct net_device *dev, int (*add_cb)(struct net_device *dev,
const struct switchdev_obj *obj, const struct switchdev_obj *obj,
struct switchdev_trans *trans)) struct switchdev_trans *trans,
struct netlink_ext_ack *extack))
{ {
struct netlink_ext_ack *extack;
struct net_device *lower_dev; struct net_device *lower_dev;
struct list_head *iter; struct list_head *iter;
int err = -EOPNOTSUPP; int err = -EOPNOTSUPP;
extack = switchdev_notifier_info_to_extack(&port_obj_info->info);
if (check_cb(dev)) { if (check_cb(dev)) {
/* This flag is only checked if the return value is success. */ /* This flag is only checked if the return value is success. */
port_obj_info->handled = true; port_obj_info->handled = true;
return add_cb(dev, port_obj_info->obj, port_obj_info->trans); return add_cb(dev, port_obj_info->obj, port_obj_info->trans,
extack);
} }
/* Switch ports might be stacked under e.g. a LAG. Ignore the /* Switch ports might be stacked under e.g. a LAG. Ignore the
@ -650,7 +655,8 @@ int switchdev_handle_port_obj_add(struct net_device *dev,
bool (*check_cb)(const struct net_device *dev), bool (*check_cb)(const struct net_device *dev),
int (*add_cb)(struct net_device *dev, int (*add_cb)(struct net_device *dev,
const struct switchdev_obj *obj, const struct switchdev_obj *obj,
struct switchdev_trans *trans)) struct switchdev_trans *trans,
struct netlink_ext_ack *extack))
{ {
int err; int err;