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

Commit 2670ac26 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: devlink: move reload fail indication to devlink core and expose to user 



Currently the fact that devlink reload failed is stored in drivers.
Move this flag into devlink core. Also, expose it to the user.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97691069

drivers/net/ethernet/mellanox/mlxsw/core.c

+5 −10
Original line number Diff line number Diff line
@@ -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,

	return 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;

}



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
Original line number Diff line number Diff line
@@ -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);

};
@@ -945,6 +946,8 @@ void 
devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,

				     enum devlink_health_reporter_state state);



bool devlink_is_reload_failed(const 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
Original line number Diff line number Diff line
@@ -419,6 +419,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
Original line number Diff line number Diff line
@@ -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(const 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,