From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eran Ben Elisha Subject: [PATCH RFC net-next 12/19] net/mlx5: Refactor print health info Date: Mon, 31 Dec 2018 16:32:06 +0200 Message-ID: <1546266733-9512-13-git-send-email-eranbe@mellanox.com> References: <1546266733-9512-1-git-send-email-eranbe@mellanox.com> Cc: Moshe Shemesh , Aya Levin , Eran Ben Elisha , Tal Alon , Ariel Almog To: netdev@vger.kernel.org, "David S. Miller" , Jiri Pirko Return-path: Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:52245 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726127AbeLaOc1 (ORCPT ); Mon, 31 Dec 2018 09:32:27 -0500 In-Reply-To: <1546266733-9512-1-git-send-email-eranbe@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Moshe Shemesh Refactor print health info code, split to two functions: 1. mlx5_get_health_info() - writes the health info into a buffer. 2. mlx5_print_health_info() - prints the health info to kernel log. This refactoring is done to enable using the health info data by devlink health reporter diagnose() in the downstream patch. Signed-off-by: Moshe Shemesh --- .../net/ethernet/mellanox/mlx5/core/health.c | 44 +++++++++++++------ .../ethernet/mellanox/mlx5/core/mlx5_core.h | 7 +++ include/linux/mlx5/device.h | 1 + include/linux/mlx5/mlx5_ifc.h | 4 +- 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c index 196c07383082..2fa78edde1fe 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c @@ -215,7 +215,8 @@ static const char *hsynd_str(u8 synd) } } -static void print_health_info(struct mlx5_core_dev *dev) +void mlx5_get_health_info(struct mlx5_core_dev *dev, u8 *synd, + char (*lines_buf)[HEALTH_INFO_MAX_LINE]) { struct mlx5_core_health *health = &dev->priv.health; struct health_buffer __iomem *h = health->health; @@ -223,23 +224,40 @@ static void print_health_info(struct mlx5_core_dev *dev) u32 fw; int i; + *synd = ioread8(&h->synd); /* If the syndrome is 0, the device is OK and no need to print buffer */ - if (!ioread8(&h->synd)) + if (!synd) return; for (i = 0; i < ARRAY_SIZE(h->assert_var); i++) - dev_err(&dev->pdev->dev, "assert_var[%d] 0x%08x\n", i, ioread32be(h->assert_var + i)); + sprintf(lines_buf[i], "assert_var[%d] 0x%08x\n", i, ioread32be(h->assert_var + i)); - dev_err(&dev->pdev->dev, "assert_exit_ptr 0x%08x\n", ioread32be(&h->assert_exit_ptr)); - dev_err(&dev->pdev->dev, "assert_callra 0x%08x\n", ioread32be(&h->assert_callra)); + sprintf(lines_buf[i++], "assert_exit_ptr 0x%08x\n", ioread32be(&h->assert_exit_ptr)); + sprintf(lines_buf[i++], "assert_callra 0x%08x\n", ioread32be(&h->assert_callra)); sprintf(fw_str, "%d.%d.%d", fw_rev_maj(dev), fw_rev_min(dev), fw_rev_sub(dev)); - dev_err(&dev->pdev->dev, "fw_ver %s\n", fw_str); - dev_err(&dev->pdev->dev, "hw_id 0x%08x\n", ioread32be(&h->hw_id)); - dev_err(&dev->pdev->dev, "irisc_index %d\n", ioread8(&h->irisc_index)); - dev_err(&dev->pdev->dev, "synd 0x%x: %s\n", ioread8(&h->synd), hsynd_str(ioread8(&h->synd))); - dev_err(&dev->pdev->dev, "ext_synd 0x%04x\n", ioread16be(&h->ext_synd)); + sprintf(lines_buf[i++], "fw_ver %s\n", fw_str); + sprintf(lines_buf[i++], "hw_id 0x%08x\n", ioread32be(&h->hw_id)); + sprintf(lines_buf[i++], "irisc_index %d\n", ioread8(&h->irisc_index)); + sprintf(lines_buf[i++], "synd 0x%x: %s\n", ioread8(&h->synd), hsynd_str(ioread8(&h->synd))); + sprintf(lines_buf[i++], "ext_synd 0x%04x\n", ioread16be(&h->ext_synd)); fw = ioread32be(&h->fw_ver); - dev_err(&dev->pdev->dev, "raw fw_ver 0x%08x\n", fw); + sprintf(lines_buf[i], "raw fw_ver 0x%08x\n", fw); +} + +static void mlx5_print_health_info(struct mlx5_core_dev *dev) +{ + char lines_buf[HEALTH_INFO_LINES][HEALTH_INFO_MAX_LINE] = {}; + u8 synd; + int i; + + mlx5_get_health_info(dev, &synd, lines_buf); + + if (!synd) + return; + + for (i = 0; i < HEALTH_INFO_LINES; i++) + dev_err(&dev->pdev->dev, lines_buf[i]); + } static unsigned long get_next_poll_jiffies(void) @@ -285,12 +303,12 @@ static void poll_health(struct timer_list *t) health->prev = count; if (health->miss_counter == MAX_MISSES) { dev_err(&dev->pdev->dev, "device's health compromised - reached miss count\n"); - print_health_info(dev); + mlx5_print_health_info(dev); } if (in_fatal(dev) && !health->sick) { health->sick = true; - print_health_info(dev); + mlx5_print_health_info(dev); mlx5_trigger_health_work(dev); } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h index c68dcea5985b..ea53195c89a6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h @@ -199,4 +199,11 @@ enum { u8 mlx5_get_nic_state(struct mlx5_core_dev *dev); void mlx5_set_nic_state(struct mlx5_core_dev *dev, u8 state); + +#define HEALTH_INFO_MAX_LINE 80 +#define HEALTH_INFO_LINES (MLX5_FLD_SZ_DW(health_buffer, assert_var) + 8) +#define HEALTH_INFO_MAX_BUFF (HEALTH_INFO_MAX_LINE * HEALTH_INFO_LINES) +void mlx5_get_health_info(struct mlx5_core_dev *dev, u8 *synd, + char (*lines_buf)[HEALTH_INFO_MAX_LINE]); + #endif /* __MLX5_CORE_H__ */ diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 8c4a820bd4c1..bb68ab6dffe0 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -61,6 +61,7 @@ #define __mlx5_st_sz_bits(typ) sizeof(struct mlx5_ifc_##typ##_bits) #define MLX5_FLD_SZ_BYTES(typ, fld) (__mlx5_bit_sz(typ, fld) / 8) +#define MLX5_FLD_SZ_DW(typ, fld) (__mlx5_bit_sz(typ, fld) / 32) #define MLX5_ST_SZ_BYTES(typ) (sizeof(struct mlx5_ifc_##typ##_bits) / 8) #define MLX5_ST_SZ_DW(typ) (sizeof(struct mlx5_ifc_##typ##_bits) / 32) #define MLX5_ST_SZ_QW(typ) (sizeof(struct mlx5_ifc_##typ##_bits) / 64) diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h index 821b751485fb..505a5f6cecdf 100644 --- a/include/linux/mlx5/mlx5_ifc.h +++ b/include/linux/mlx5/mlx5_ifc.h @@ -3360,7 +3360,9 @@ union mlx5_ifc_event_auto_bits { }; struct mlx5_ifc_health_buffer_bits { - u8 reserved_at_0[0x100]; + u8 assert_var[0xa0]; + + u8 reserved_at_a0[0x60]; u8 assert_existptr[0x20]; -- 2.17.1