Commit 307b4e0b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Devlink-health-auto-attributes-refactor' 



Eran Ben Elisha says:

====================
Devlink health auto attributes refactor

This patchset refactors the auto-recover health reporter flag to be
explicitly set by the devlink core.
In addition, add another flag to control auto-dump attribute, also
to be explicitly set by the devlink core.

For that, patch 0001 changes the auto-recover default value of
netdevsim dummy reporter.

After reporter registration, both flags can be altered be administrator
only.

Changes since v1:
- Change default behaviour of netdevsim dummy reporter
- Move initialization of DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 62582a7e 48bb52c8

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ void bnxt_dl_fw_reporters_create(struct bnxt *bp) 
	health->fw_reset_reporter =

		devlink_health_reporter_create(bp->dl,

					       &bnxt_dl_fw_reset_reporter_ops,

					       0, true, bp);

					       0, bp);

	if (IS_ERR(health->fw_reset_reporter)) {

		netdev_warn(bp->dev, "Failed to create FW fatal health reporter, rc = %ld\n",

			    PTR_ERR(health->fw_reset_reporter));
@@ -166,7 +166,7 @@ err_recovery: 
		health->fw_reporter =

			devlink_health_reporter_create(bp->dl,

						       &bnxt_dl_fw_reporter_ops,

						       0, false, bp);

						       0, bp);

		if (IS_ERR(health->fw_reporter)) {

			netdev_warn(bp->dev, "Failed to create FW health reporter, rc = %ld\n",

				    PTR_ERR(health->fw_reporter));
@@ -182,7 +182,7 @@ err_recovery: 
	health->fw_fatal_reporter =

		devlink_health_reporter_create(bp->dl,

					       &bnxt_dl_fw_fatal_reporter_ops,

					       0, true, bp);

					       0, bp);

	if (IS_ERR(health->fw_fatal_reporter)) {

		netdev_warn(bp->dev, "Failed to create FW fatal health reporter, rc = %ld\n",

			    PTR_ERR(health->fw_fatal_reporter));

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ int mlx5e_reporter_rx_create(struct mlx5e_priv *priv) 
	reporter = devlink_health_reporter_create(devlink,

						  &mlx5_rx_reporter_ops,

						  MLX5E_REPORTER_RX_GRACEFUL_PERIOD,

						  true, priv);

						  priv);

	if (IS_ERR(reporter)) {

		netdev_warn(priv->netdev, "Failed to create rx reporter, err = %ld\n",

			    PTR_ERR(reporter));

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ int mlx5e_reporter_tx_create(struct mlx5e_priv *priv) 
	reporter =

		devlink_health_reporter_create(devlink, &mlx5_tx_reporter_ops,

					       MLX5_REPORTER_TX_GRACEFUL_PERIOD,

					       true, priv);

					       priv);

	if (IS_ERR(reporter)) {

		netdev_warn(priv->netdev,

			    "Failed to create tx reporter, err = %ld\n",

drivers/net/ethernet/mellanox/mlx5/core/health.c

+2 −2
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static void mlx5_fw_reporters_create(struct mlx5_core_dev *dev) 


	health->fw_reporter =

		devlink_health_reporter_create(devlink, &mlx5_fw_reporter_ops,

					       0, false, dev);

					       0, dev);

	if (IS_ERR(health->fw_reporter))

		mlx5_core_warn(dev, "Failed to create fw reporter, err = %ld\n",

			       PTR_ERR(health->fw_reporter));
@@ -636,7 +636,7 @@ static void mlx5_fw_reporters_create(struct mlx5_core_dev *dev) 
		devlink_health_reporter_create(devlink,

					       &mlx5_fw_fatal_reporter_ops,

					       MLX5_REPORTER_FW_GRACEFUL_PERIOD,

					       true, dev);

					       dev);

	if (IS_ERR(health->fw_fatal_reporter))

		mlx5_core_warn(dev, "Failed to create fw fatal reporter, err = %ld\n",

			       PTR_ERR(health->fw_fatal_reporter));

drivers/net/netdevsim/health.c

+2 −2
Original line number Diff line number Diff line
@@ -271,14 +271,14 @@ int nsim_dev_health_init(struct nsim_dev *nsim_dev, struct devlink *devlink) 
	health->empty_reporter =

		devlink_health_reporter_create(devlink,

					       &nsim_dev_empty_reporter_ops,

					       0, false, health);

					       0, health);

	if (IS_ERR(health->empty_reporter))

		return PTR_ERR(health->empty_reporter);



	health->dummy_reporter =

		devlink_health_reporter_create(devlink,

					       &nsim_dev_dummy_reporter_ops,

					       0, false, health);

					       0, health);

	if (IS_ERR(health->dummy_reporter)) {

		err = PTR_ERR(health->dummy_reporter);

		goto err_empty_reporter_destroy;

CRA Git | Maintained and supported by SUSTech CRA and CCSE