Commit 524900a2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netdevsim-add-devlink-health-reporters-support' 



Jiri Pirko says:

====================
netdevsim: add devlink health reporters support

This patchset adds support for devlink health reporter interface
testing. First 2 patches are small dependencies of the last 2.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1635520a 9b88fc54

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

+6 −3
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
#include "bnxt_devlink.h"



static int bnxt_fw_reporter_diagnose(struct devlink_health_reporter *reporter,

				     struct devlink_fmsg *fmsg)

				     struct devlink_fmsg *fmsg,

				     struct netlink_ext_ack *extack)

{

	struct bnxt *bp = devlink_health_reporter_priv(reporter);

	struct bnxt_fw_health *health = bp->fw_health;
@@ -66,7 +67,8 @@ static const struct devlink_health_reporter_ops bnxt_dl_fw_reporter_ops = { 
};



static int bnxt_fw_reset_recover(struct devlink_health_reporter *reporter,

				 void *priv_ctx)

				 void *priv_ctx,

				 struct netlink_ext_ack *extack)

{

	struct bnxt *bp = devlink_health_reporter_priv(reporter);
@@ -84,7 +86,8 @@ struct devlink_health_reporter_ops bnxt_dl_fw_reset_reporter_ops = { 
};



static int bnxt_fw_fatal_recover(struct devlink_health_reporter *reporter,

				 void *priv_ctx)

				 void *priv_ctx,

				 struct netlink_ext_ack *extack)

{

	struct bnxt *bp = devlink_health_reporter_priv(reporter);

	struct bnxt_fw_reporter_ctx *fw_reporter_ctx = priv_ctx;

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

+4 −2
Original line number Diff line number Diff line
@@ -222,7 +222,8 @@ static int mlx5e_rx_reporter_recover_from_ctx(struct mlx5e_err_ctx *err_ctx) 
}



static int mlx5e_rx_reporter_recover(struct devlink_health_reporter *reporter,

				     void *context)

				     void *context,

				     struct netlink_ext_ack *extack)

{

	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);

	struct mlx5e_err_ctx *err_ctx = context;
@@ -301,7 +302,8 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq, 
}



static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,

				      struct devlink_fmsg *fmsg)

				      struct devlink_fmsg *fmsg,

				      struct netlink_ext_ack *extack)

{

	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);

	struct mlx5e_params *params = &priv->channels.params;

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

+4 −2
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ static int mlx5e_tx_reporter_recover_from_ctx(struct mlx5e_err_ctx *err_ctx) 
}



static int mlx5e_tx_reporter_recover(struct devlink_health_reporter *reporter,

				     void *context)

				     void *context,

				     struct netlink_ext_ack *extack)

{

	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);

	struct mlx5e_err_ctx *err_ctx = context;
@@ -205,7 +206,8 @@ mlx5e_tx_reporter_build_diagnose_output(struct devlink_fmsg *fmsg, 
}



static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter,

				      struct devlink_fmsg *fmsg)

				      struct devlink_fmsg *fmsg,

				      struct netlink_ext_ack *extack)

{

	struct mlx5e_priv *priv = devlink_health_reporter_priv(reporter);

	struct mlx5e_txqsq *generic_sq = priv->txq2sq[0];

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

+8 −4
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ static void print_health_info(struct mlx5_core_dev *dev) 


static int

mlx5_fw_reporter_diagnose(struct devlink_health_reporter *reporter,

			  struct devlink_fmsg *fmsg)

			  struct devlink_fmsg *fmsg,

			  struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);

	struct mlx5_core_health *health = &dev->priv.health;
@@ -491,7 +492,8 @@ mlx5_fw_reporter_heath_buffer_data_put(struct mlx5_core_dev *dev, 


static int

mlx5_fw_reporter_dump(struct devlink_health_reporter *reporter,

		      struct devlink_fmsg *fmsg, void *priv_ctx)

		      struct devlink_fmsg *fmsg, void *priv_ctx,

		      struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);

	int err;
@@ -545,7 +547,8 @@ static const struct devlink_health_reporter_ops mlx5_fw_reporter_ops = { 


static int

mlx5_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter,

			       void *priv_ctx)

			       void *priv_ctx,

			       struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);
@@ -555,7 +558,8 @@ mlx5_fw_fatal_reporter_recover(struct devlink_health_reporter *reporter, 
#define MLX5_CR_DUMP_CHUNK_SIZE 256

static int

mlx5_fw_fatal_reporter_dump(struct devlink_health_reporter *reporter,

			    struct devlink_fmsg *fmsg, void *priv_ctx)

			    struct devlink_fmsg *fmsg, void *priv_ctx,

			    struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_health_reporter_priv(reporter);

	u32 crdump_size = dev->priv.health.crdump_size;

drivers/net/netdevsim/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
obj-$(CONFIG_NETDEVSIM) += netdevsim.o



netdevsim-objs := \

	netdev.o dev.o fib.o bus.o

	netdev.o dev.o fib.o bus.o health.o



ifeq ($(CONFIG_BPF_SYSCALL),y)

netdevsim-objs += \

CRA Git | Maintained and supported by SUSTech CRA and CCSE