From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ivan Vecera Subject: Re: [PATCH net-next 5/9] net: switchdev: Add extack to switchdev_handle_port_obj_add() callback Date: Wed, 12 Dec 2018 14:12:54 +0100 Message-ID: References: <28f21cbc60c1fa37a36f925f3bcf87c94abd11de.1544614445.git.petrm@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Cc: Jiri Pirko , Ido Schimmel , "davem@davemloft.net" To: Petr Machata , "netdev@vger.kernel.org" Return-path: Received: from mx1.redhat.com ([209.132.183.28]:39700 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726229AbeLLNM4 (ORCPT ); Wed, 12 Dec 2018 08:12:56 -0500 In-Reply-To: <28f21cbc60c1fa37a36f925f3bcf87c94abd11de.1544614445.git.petrm@mellanox.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 12. 12. 18 12:52, Petr Machata wrote: > 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 > Acked-by: Jiri Pirko > --- > drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 3 ++- > drivers/net/ethernet/mscc/ocelot.c | 3 ++- > include/net/switchdev.h | 6 ++++-- > net/switchdev/switchdev.c | 12 +++++++++--- > 4 files changed, 17 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c > index 5ad1fcebf788..4b9292289256 100644 > --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c > +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c > @@ -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, > 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); > const struct switchdev_obj_port_vlan *vlan; > diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c > index 7f8da8873a96..ea3eec263875 100644 > --- a/drivers/net/ethernet/mscc/ocelot.c > +++ b/drivers/net/ethernet/mscc/ocelot.c > @@ -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, > const struct switchdev_obj *obj, > - struct switchdev_trans *trans) > + struct switchdev_trans *trans, > + struct netlink_ext_ack *extack) > { > int ret = 0; > > diff --git a/include/net/switchdev.h b/include/net/switchdev.h > index 4facfa6775e8..a7fdab5ee6c3 100644 > --- a/include/net/switchdev.h > +++ b/include/net/switchdev.h > @@ -215,7 +215,8 @@ int switchdev_handle_port_obj_add(struct net_device *dev, > bool (*check_cb)(const struct net_device *dev), > int (*add_cb)(struct net_device *dev, > 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, > struct switchdev_notifier_port_obj_info *port_obj_info, > 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), > int (*add_cb)(struct net_device *dev, > const struct switchdev_obj *obj, > - struct switchdev_trans *trans)) > + struct switchdev_trans *trans, > + struct netlink_ext_ack *extack)) > { > return 0; > } > diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c > index aa84acfb6632..5df9d1138ac9 100644 > --- a/net/switchdev/switchdev.c > +++ b/net/switchdev/switchdev.c > @@ -616,16 +616,21 @@ static int __switchdev_handle_port_obj_add(struct net_device *dev, > bool (*check_cb)(const struct net_device *dev), > int (*add_cb)(struct net_device *dev, > 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 list_head *iter; > int err = -EOPNOTSUPP; > > + extack = switchdev_notifier_info_to_extack(&port_obj_info->info); > + > if (check_cb(dev)) { > /* This flag is only checked if the return value is success. */ > 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 > @@ -650,7 +655,8 @@ int switchdev_handle_port_obj_add(struct net_device *dev, > bool (*check_cb)(const struct net_device *dev), > int (*add_cb)(struct net_device *dev, > const struct switchdev_obj *obj, > - struct switchdev_trans *trans)) > + struct switchdev_trans *trans, > + struct netlink_ext_ack *extack)) > { > int err; > > Acked-by: Ivan Vecera