net: devlink: move reload fail indication to devlink core and expose to user
Subsystems (6)
Jiri Pirko
maintainerv2 cover net: devlink: move reload fail indication to devlink core and expose to user
From: Jiri Pirko <[email protected]>
First two patches are dependencies of the last one. That moves devlink reload failure indication to the devlink code, so the drivers do not have to track it themselves. Currently it is only mlxsw, but I will send a follow-up patchset that introduces this in netdevsim too.
Jiri Pirko (3):
mlx4: Split restart_one into two functions
net: devlink: split reload op into two
net: devlink: move reload fail indication to devlink core and expose
to user
drivers/net/ethernet/mellanox/mlx4/catas.c | 2 +- drivers/net/ethernet/mellanox/mlx4/main.c | 44 ++++++++++++++++++---- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 30 +++++++++------ drivers/net/netdevsim/dev.c | 13 +++++-- include/net/devlink.h | 8 +++- include/uapi/linux/devlink.h | 2 + net/core/devlink.c | 35 +++++++++++++++-- 8 files changed, 106 insertions(+), 31 deletions(-)
Signature · 1 line
2.21.0
Jiri Pirko
maintainerPATCH v2 1/3 mlx4: Split restart_one into two functions
From: Jiri Pirko <[email protected]>
Split the function restart_one into two functions and separate teardown and buildup.
--- drivers/net/ethernet/mellanox/mlx4/catas.c | 2 +- drivers/net/ethernet/mellanox/mlx4/main.c | 25 ++++++++++++++++++---- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 +-- 3 files changed, 23 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx4/catas.c +1 -1
@@ -210,7 +210,7 @@ static void mlx4_handle_error_state(struct mlx4_dev_persistent *persist)mutex_lock (&persist->interface_state_mutex);if (persist->interface_state &MLX4_INTERFACE_STATE_UP && !(persist->interface_state &MLX4_INTERFACE_STATE_DELETION )) { - err =mlx4_restart_one (persist->pdev, false,NULL ); + err =mlx4_restart_one (persist->pdev);mlx4_info (persist->dev,"mlx4_restart_one was ended, ret=%d\n" , err); }
drivers/net/ethernet/mellanox/mlx4/main.c +21 -4
@@ -3931,6 +3931,10 @@ static void mlx4_devlink_param_load_driverinit_values(struct devlink *devlink) } } +static void mlx4_restart_one_down (struct pci_dev *pdev); +static int mlx4_restart_one_up (struct pci_dev *pdev,bool reload, +struct devlink *devlink); +static int mlx4_devlink_reload (struct devlink *devlink,struct netlink_ext_ack *extack) {
@@ -3941,9 +3945,11 @@ static int mlx4_devlink_reload(struct devlink *devlink,if (persist->num_vfs)mlx4_warn (persist->dev,"Reload performed on PF, will cause reset on operating Virtual Functions\n" ); - err =mlx4_restart_one (persist->pdev, true, devlink); +mlx4_restart_one_down (persist->pdev); + err =mlx4_restart_one_up (persist->pdev, true, devlink);if (err) -mlx4_err (persist->dev,"mlx4_restart_one failed, ret=%d\n" , err); +mlx4_err (persist->dev,"mlx4_restart_one_up failed, ret=%d\n" , + err);return err; }
@@ -4163,7 +4169,13 @@ static int restore_current_port_types(struct mlx4_dev *dev,return err; } -int mlx4_restart_one (struct pci_dev *pdev,bool reload,struct devlink *devlink) +static void mlx4_restart_one_down (struct pci_dev *pdev) +{ +mlx4_unload_one (pdev); +} + +static int mlx4_restart_one_up (struct pci_dev *pdev,bool reload, +struct devlink *devlink) {struct mlx4_dev_persistent *persist =pci_get_drvdata (pdev);struct mlx4_dev *dev = persist->dev;
@@ -4175,7 +4187,6 @@ int mlx4_restart_one(struct pci_dev *pdev, bool reload, struct devlink *devlink) total_vfs = dev->persist->num_vfs;memcpy (nvfs, dev->persist->nvfs,sizeof (dev->persist->nvfs)); -mlx4_unload_one (pdev);if (reload)mlx4_devlink_param_load_driverinit_values (devlink); err =mlx4_load_one (pdev, pci_dev_data, total_vfs, nvfs, priv,1 );
@@ -4194,6 +4205,12 @@ int mlx4_restart_one(struct pci_dev *pdev, bool reload, struct devlink *devlink)return err; } +int mlx4_restart_one (struct pci_dev *pdev) +{ +mlx4_restart_one_down (pdev); +return mlx4_restart_one_up (pdev, false,NULL ); +} +#define MLX_SP (id) { PCI_VDEVICE(MELLANOX, id), MLX4_PCI_DEV_FORCE_SENSE_PORT }#define MLX_VF (id) { PCI_VDEVICE(MELLANOX, id), MLX4_PCI_DEV_IS_VF }#define MLX_GN (id) { PCI_VDEVICE(MELLANOX, id), 0 }
drivers/net/ethernet/mellanox/mlx4/mlx4.h +1 -2
@@ -1043,8 +1043,7 @@ int mlx4_catas_init(struct mlx4_dev *dev);void mlx4_catas_end (struct mlx4_dev *dev);int mlx4_crdump_init (struct mlx4_dev *dev);void mlx4_crdump_end (struct mlx4_dev *dev); -int mlx4_restart_one (struct pci_dev *pdev,bool reload, -struct devlink *devlink); +int mlx4_restart_one (struct pci_dev *pdev);int mlx4_register_device (struct mlx4_dev *dev);void mlx4_unregister_device (struct mlx4_dev *dev); void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_dev_event type,
Signature · 1 line
2.21.0
Jiri Pirko
maintainerPATCH v2 2/3 net: devlink: split reload op into two
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
In order to properly implement failure indication during reload, split the reload op into two ops, one for down phase and one for up phase.
--- drivers/net/ethernet/mellanox/mlx4/main.c | 19 +++++++++++++++---- drivers/net/ethernet/mellanox/mlxsw/core.c | 19 +++++++++++++++---- drivers/net/netdevsim/dev.c | 13 ++++++++++--- include/net/devlink.h | 5 ++++- net/core/devlink.c | 16 ++++++++++++---- 5 files changed, 56 insertions(+), 16 deletions(-)
drivers/net/ethernet/mellanox/mlx4/main.c +15 -4
@@ -3935,17 +3935,27 @@ static void mlx4_restart_one_down(struct pci_dev *pdev);static int mlx4_restart_one_up (struct pci_dev *pdev,bool reload,struct devlink *devlink); -static int mlx4_devlink_reload (struct devlink *devlink, -struct netlink_ext_ack *extack) +static int mlx4_devlink_reload_down (struct devlink *devlink, +struct netlink_ext_ack *extack) {struct mlx4_priv *priv =devlink_priv (devlink);struct mlx4_dev *dev = &priv->dev;struct mlx4_dev_persistent *persist = dev->persist; -int err;if (persist->num_vfs)mlx4_warn (persist->dev,"Reload performed on PF, will cause reset on operating Virtual Functions\n" );mlx4_restart_one_down (persist->pdev); +return 0 ; +} + +static int mlx4_devlink_reload_up (struct devlink *devlink, +struct netlink_ext_ack *extack) +{ +struct mlx4_priv *priv =devlink_priv (devlink); +struct mlx4_dev *dev = &priv->dev; +struct mlx4_dev_persistent *persist = dev->persist; +int err; + err =mlx4_restart_one_up (persist->pdev, true, devlink);if (err) mlx4_err(persist->dev, "mlx4_restart_one_up failed, ret=%d\n",
@@ -3956,7 +3966,8 @@ static int mlx4_devlink_reload(struct devlink *devlink,static const struct devlink_ops mlx4_devlink_ops = { .port_type_set = mlx4_devlink_port_type_set, - .reload = mlx4_devlink_reload, + .reload_down = mlx4_devlink_reload_down, + .reload_up = mlx4_devlink_reload_up, };static int mlx4_init_one (struct pci_dev *pdev,const struct pci_device_id *id)
drivers/net/ethernet/mellanox/mlxsw/core.c +15 -4
@@ -984,16 +984,26 @@ mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,return 0 ; } -static int mlxsw_devlink_core_bus_device_reload (struct devlink *devlink, -struct netlink_ext_ack *extack) +static int +mlxsw_devlink_core_bus_device_reload_down (struct devlink *devlink, +struct netlink_ext_ack *extack) {struct mlxsw_core *mlxsw_core =devlink_priv (devlink); -int err;if (!(mlxsw_core->bus->features &MLXSW_BUS_F_RESET ))return -EOPNOTSUPP ;mlxsw_core_bus_device_unregister (mlxsw_core, true); +return 0 ; +} + +static int +mlxsw_devlink_core_bus_device_reload_up (struct devlink *devlink, +struct netlink_ext_ack *extack) +{ +struct mlxsw_core *mlxsw_core =devlink_priv (devlink); +int err; + err = mlxsw_core_bus_device_register(mlxsw_core->bus_info, mlxsw_core->bus, mlxsw_core->bus_priv, true,
@@ -1066,7 +1076,8 @@ mlxsw_devlink_trap_group_init(struct devlink *devlink, }static const struct devlink_ops mlxsw_devlink_ops = { - .reload = mlxsw_devlink_core_bus_device_reload, + .reload_down = mlxsw_devlink_core_bus_device_reload_down, + .reload_up = mlxsw_devlink_core_bus_device_reload_up, .port_type_set = mlxsw_devlink_port_type_set, .port_split = mlxsw_devlink_port_split, .port_unsplit = mlxsw_devlink_port_unsplit,
drivers/net/netdevsim/dev.c +10 -3
@@ -521,8 +521,14 @@ static void nsim_dev_traps_exit(struct devlink *devlink)kfree (nsim_dev->trap_data); } -static int nsim_dev_reload (struct devlink *devlink, -struct netlink_ext_ack *extack) +static int nsim_dev_reload_down (struct devlink *devlink, +struct netlink_ext_ack *extack) +{ +return 0 ; +} + +static int nsim_dev_reload_up (struct devlink *devlink, +struct netlink_ext_ack *extack) {enum nsim_resource_id res_ids[] = {NSIM_RESOURCE_IPV4_FIB ,NSIM_RESOURCE_IPV4_FIB_RULES ,
@@ -638,7 +644,8 @@ nsim_dev_devlink_trap_action_set(struct devlink *devlink, }static const struct devlink_ops nsim_dev_devlink_ops = { - .reload = nsim_dev_reload, + .reload_down = nsim_dev_reload_down, + .reload_up = nsim_dev_reload_up, .flash_update = nsim_dev_flash_update, .trap_init = nsim_dev_devlink_trap_init, .trap_action_set = nsim_dev_devlink_trap_action_set,
include/net/devlink.h +4 -1
@@ -637,7 +637,10 @@ enum devlink_trap_group_generic_id { }struct devlink_ops { -int (*reload)(struct devlink *devlink,struct netlink_ext_ack *extack); +int (*reload_down)(struct devlink *devlink, +struct netlink_ext_ack *extack); +int (*reload_up)(struct devlink *devlink, +struct netlink_ext_ack *extack);int (*port_type_set)(struct devlink_port *devlink_port,enum devlink_port_type port_type); int (*port_split)(struct devlink *devlink, unsigned int port_index,
net/core/devlink.c +12 -4
@@ -2672,12 +2672,17 @@ devlink_resources_validate(struct devlink *devlink,return err; } +static bool devlink_reload_supported (struct devlink *devlink) +{ +return devlink->ops->reload_down && devlink->ops->reload_up; +} +static int devlink_nl_cmd_reload (struct sk_buff *skb,struct genl_info *info) {struct devlink *devlink = info->user_ptr[0 ];int err; -if (!devlink->ops->reload) +if (!devlink_reload_supported (devlink))return -EOPNOTSUPP ; err =devlink_resources_validate (devlink,NULL , info);
@@ -2685,7 +2690,10 @@ static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)NL_SET_ERR_MSG_MOD (info->extack,"resources size validation failed" );return err; } -return devlink->ops->reload (devlink, info->extack); + err = devlink->ops->reload_down (devlink, info->extack); +if (err) +return err; +return devlink->ops->reload_up (devlink, info->extack); } static int devlink_nl_flash_update_fill(struct sk_buff *msg,
@@ -7145,7 +7153,7 @@ __devlink_param_driverinit_value_set(struct devlink *devlink,int devlink_param_driverinit_value_get (struct devlink *devlink,u32 param_id,union devlink_param_value *init_val) { -if (!devlink->ops->reload) +if (!devlink_reload_supported (devlink))return -EOPNOTSUPP ; return __devlink_param_driverinit_value_get(&devlink->param_list,
@@ -7192,7 +7200,7 @@ int devlink_port_param_driverinit_value_get(struct devlink_port *devlink_port, {struct devlink *devlink = devlink_port->devlink; -if (!devlink->ops->reload) +if (!devlink_reload_supported (devlink))return -EOPNOTSUPP ; return __devlink_param_driverinit_value_get(&devlink_port->param_list,
Signature · 1 line
2.21.0
Jiri Pirko
maintainerPATCH v2 3/3 net: devlink: move reload fail indication to devlink core and expose to user
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Currently the fact that devlink reload failed is stored in drivers. Move this flag into devlink core. Also, expose it to the user.
---v1->v2:
- s/devlink failed/devlink reload failed/ in description
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 15 +++++---------- include/net/devlink.h | 3 +++ include/uapi/linux/devlink.h | 2 ++ net/core/devlink.c | 21 ++++++++++++++++++++- 4 files changed, 30 insertions(+), 11 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +5 -10
@@ -80,7 +80,6 @@ struct mlxsw_core {struct mlxsw_thermal *thermal;struct mlxsw_core_port *ports;unsigned int max_ports; -bool reload_fail;bool fw_flash_in_progress;unsigned long driver_priv[0 ];/* driver_priv has to be always the last item */
@@ -1002,15 +1001,11 @@ mlxsw_devlink_core_bus_device_reload_up(struct devlink *devlink, struct netlink_ext_ack *extack) {struct mlxsw_core *mlxsw_core =devlink_priv (devlink); -int err; - - err =mlxsw_core_bus_device_register (mlxsw_core->bus_info, - mlxsw_core->bus, - mlxsw_core->bus_priv, true, - devlink); - mlxsw_core->reload_fail = !!err; -return err; +return mlxsw_core_bus_device_register (mlxsw_core->bus_info, + mlxsw_core->bus, + mlxsw_core->bus_priv, true, + devlink); } static int mlxsw_devlink_flash_update(struct devlink *devlink,
@@ -1254,7 +1249,7 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, {struct devlink *devlink =priv_to_devlink (mlxsw_core); -if (mlxsw_core->reload_fail) { +if (devlink_is_reload_failed (devlink)) {if (!reload)/* Only the parts that were not de-initialized in the * failed reload attempt need to be de-initialized.
include/net/devlink.h +3 -0
@@ -38,6 +38,7 @@ struct devlink {struct device *dev;possible_net_t _net;struct mutex lock; +bool reload_failed;char priv[0 ]__aligned(NETDEV_ALIGN) ; };
@@ -940,6 +941,8 @@ void devlink_health_reporter_state_update(struct devlink_health_reporter *reporter, enum devlink_health_reporter_state state); +bool devlink_is_reload_failed (struct devlink *devlink); +void devlink_flash_update_begin_notify (struct devlink *devlink);void devlink_flash_update_end_notify (struct devlink *devlink); void devlink_flash_update_status_notify(struct devlink *devlink,
include/uapi/linux/devlink.h +2 -0
@@ -410,6 +410,8 @@ enum devlink_attr {DEVLINK_ATTR_TRAP_METADATA ,/* nested */ DEVLINK_ATTR_TRAP_GROUP_NAME ,/* string */ +DEVLINK_ATTR_RELOAD_FAILED ,/* u8 0 or 1 */ +/* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX,
net/core/devlink.c +20 -1
@@ -471,6 +471,8 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,if (devlink_nl_put_handle (msg, devlink)) goto nla_put_failure; +if (nla_put_u8 (msg,DEVLINK_ATTR_RELOAD_FAILED , devlink->reload_failed)) + goto nla_put_failure;genlmsg_end (msg, hdr);return 0 ;
@@ -2677,6 +2679,21 @@ static bool devlink_reload_supported(struct devlink *devlink)return devlink->ops->reload_down && devlink->ops->reload_up; } +static void devlink_reload_failed_set (struct devlink *devlink, +bool reload_failed) +{ +if (devlink->reload_failed == reload_failed) +return ; + devlink->reload_failed = reload_failed; +devlink_notify (devlink,DEVLINK_CMD_NEW ); +} + +bool devlink_is_reload_failed (struct devlink *devlink) +{ +return devlink->reload_failed; +} +EXPORT_SYMBOL_GPL (devlink_is_reload_failed); +static int devlink_nl_cmd_reload (struct sk_buff *skb,struct genl_info *info) {struct devlink *devlink = info->user_ptr[0 ];
@@ -2693,7 +2710,9 @@ static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info) err = devlink->ops->reload_down (devlink, info->extack);if (err)return err; -return devlink->ops->reload_up (devlink, info->extack); + err = devlink->ops->reload_up (devlink, info->extack); +devlink_reload_failed_set (devlink, !!err); +return err; } static int devlink_nl_flash_update_fill(struct sk_buff *msg,
Signature · 1 line
2.21.0
Quoted 18 lines · Jiri Pirko
include/uapi/linux/devlink.h +2
-0@@ -410,6 +410,8 @@ enum devlink_attr {DEVLINK_ATTR_TRAP_METADATA ,/* nested */ DEVLINK_ATTR_TRAP_GROUP_NAME ,/* string */ +DEVLINK_ATTR_RELOAD_FAILED ,/* u8 0 or 1 */ +/* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX,net/core/devlink.c +0
-0
net/core/devlink.c static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink, · line 474
Quoted 4 lines
net/core/devlink.c +1
-0@@ -471,6 +471,8 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,if (devlink_nl_put_handle (msg, devlink)) goto nla_put_failure; +if (nla_put_u8 (msg,DEVLINK_ATTR_RELOAD_FAILED , devlink->reload_failed))
Why not use NLA_FLAG for this?
Quoted 7 lines
net/core/devlink.c +1
-0+ goto nla_put_failure;genlmsg_end (msg, hdr);return 0 ;@@ -2677,6 +2679,21 @@ static bool devlink_reload_supported(struct devlink *devlink)return devlink->ops->reload_down && devlink->ops->reload_up; }
Jiri Pirko
maintainerQuoted 20 lines · Sun, Sep 08, 2019 at 12:39:32PM CEST, [email protected] wrote:
Quoted 19 lines · Jiri Pirko
include/uapi/linux/devlink.h +2
-0@@ -410,6 +410,8 @@ enum devlink_attr {DEVLINK_ATTR_TRAP_METADATA ,/* nested */ DEVLINK_ATTR_TRAP_GROUP_NAME ,/* string */ +DEVLINK_ATTR_RELOAD_FAILED ,/* u8 0 or 1 */ +/* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX,net/core/devlink.c +0
-0@@ -471,6 +471,8 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
Quoted 5 lines
net/core/devlink.c static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink, · line 474
Quoted 3 lines
net/core/devlink.c +1
-0if (devlink_nl_put_handle (msg, devlink)) goto nla_put_failure; +if (nla_put_u8 (msg,DEVLINK_ATTR_RELOAD_FAILED , devlink->reload_failed))Why not use
NLA_FLAGfor this?
Bacause older kernel does not return this. So the user would not know if everything is fine or if the kernel does not support the attribute. Using u8 instead allows it.
Quoted 8 lines
Quoted 8 lines
net/core/devlink.c +1
-0+ goto nla_put_failure;genlmsg_end (msg, hdr);return 0 ;@@ -2677,6 +2679,21 @@ static bool devlink_reload_supported(struct devlink *devlink)return devlink->ops->reload_down && devlink->ops->reload_up; }
Quoted 1 line · Jiri Pirko
+bool
devlink_is_reload_failed(struct devlink *devlink)
Forgot to mention that this can be 'const'
Quoted 4 lines
net/core/devlink.c +4
-0+{ +return devlink->reload_failed; +} +EXPORT_SYMBOL_GPL (devlink_is_reload_failed);
Jiri Pirko
maintainerQuoted 4 lines · Sun, Sep 08, 2019 at 01:25:36PM CEST, [email protected] wrote:
Quoted 1 line · Jiri Pirko
+bool
devlink_is_reload_failed(struct devlink *devlink)Forgot to mention that this can be 'const'
ok.
Quoted 5 lines
Quoted 5 lines
net/core/devlink.c +4
-0+{ +return devlink->reload_failed; +} +EXPORT_SYMBOL_GPL (devlink_is_reload_failed);