| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20191122215111.21723-7-saeedm@mellanox.com>
Date: Fri, 22 Nov 2019 21:51:58 +0000
From: Saeed Mahameed <saeedm@...lanox.com>
To: "David S. Miller" <davem@...emloft.net>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
Jiri Pirko <jiri@...lanox.com>,
Saeed Mahameed <saeedm@...lanox.com>
Subject: [PATCH net-next 6/6] net/mlxfw: Macro for error reporting
Add a macro to simplify error message reporting, instead of always
calling both mlxfw_err and NL_SET_ERR_MSG_MOD with the same message,
use a macro instead.
This is doable now since NL_SET_ERR_MSG_MOD can accept formattable
messages.
Signed-off-by: Saeed Mahameed <saeedm@...lanox.com>
Acked-by: Jiri Pirko <jiri@...lanox.com>
---
.../net/ethernet/mellanox/mlxfw/mlxfw_fsm.c | 72 ++++++++++---------
1 file changed, 39 insertions(+), 33 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c
index c29c385d1dd0..5715192d2195 100644
--- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c
+++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c
@@ -95,6 +95,12 @@ static void mlxfw_status_notify(struct mlxfw_dev *mlxfw_dev,
done_bytes, total_bytes);
}
+#define MLXFW_ERR_MSG(mlxfw_dev, extack, fmt, ...) \
+({ \
+ mlxfw_err(mlxfw_dev, fmt "\n", ## __VA_ARGS__); \
+ NL_SET_ERR_MSG_MOD(extack, fmt, ## __VA_ARGS__);\
+})
+
static int mlxfw_fsm_state_wait(struct mlxfw_dev *mlxfw_dev, u32 fwhandle,
enum mlxfw_fsm_state fsm_state,
struct netlink_ext_ack *extack)
@@ -109,8 +115,8 @@ static int mlxfw_fsm_state_wait(struct mlxfw_dev *mlxfw_dev, u32 fwhandle,
err = mlxfw_dev->ops->fsm_query_state(mlxfw_dev, fwhandle,
&curr_fsm_state, &fsm_state_err);
if (err) {
- NL_SET_ERR_MSG_MOD(extack, "FSM state query failed, err (%d)",
- err);
+ MLXFW_ERR_MSG(mlxfw_dev, extack, "FSM state query failed, err (%d)",
+ err);
return err;
}
@@ -119,8 +125,8 @@ static int mlxfw_fsm_state_wait(struct mlxfw_dev *mlxfw_dev, u32 fwhandle,
if (curr_fsm_state != fsm_state) {
if (--times == 0) {
- mlxfw_err(mlxfw_dev, "Timeout reached on FSM state change\n");
- NL_SET_ERR_MSG_MOD(extack, "Timeout reached on FSM state change");
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "Timeout reached on FSM state change");
return -ETIMEDOUT;
}
msleep(MLXFW_FSM_STATE_WAIT_CYCLE_MS);
@@ -153,17 +159,17 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev,
&comp_max_size, &comp_align_bits,
&comp_max_write_size);
if (err) {
- NL_SET_ERR_MSG_MOD(extack,
- "FSM component query failed, comp_name(%s) err (%d)",
- comp_name, err);
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "FSM component query failed, comp_name(%s) err (%d)",
+ comp_name, err);
return err;
}
comp_max_size = min_t(u32, comp_max_size, MLXFW_FSM_MAX_COMPONENT_SIZE);
if (comp->data_size > comp_max_size) {
- mlxfw_err(mlxfw_dev, "Component %d is of size %d which is bigger than limit %d\n",
- comp->index, comp->data_size, comp_max_size);
- NL_SET_ERR_MSG_MOD(extack, "Component is bigger than limit");
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "Component size is bigger than limit, Component %d size %d limit %d",
+ comp->index, comp->data_size, comp_max_size);
return -EINVAL;
}
@@ -176,9 +182,9 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev,
comp->index,
comp->data_size);
if (err) {
- NL_SET_ERR_MSG_MOD(extack,
- "FSM component update failed, comp_name(%s) err (%d)",
- comp_name, err);
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "FSM component update failed, comp_name(%s) err (%d)",
+ comp_name, err);
return err;
}
@@ -200,9 +206,9 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev,
block_ptr, block_size,
offset);
if (err) {
- NL_SET_ERR_MSG_MOD(extack,
- "Component download failed, comp_name(%s) err (%d)",
- comp_name, err);
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "Component download failed, comp_name(%s) err (%d)",
+ comp_name, err);
goto err_out;
}
mlxfw_status_notify(mlxfw_dev, "Downloading component",
@@ -215,9 +221,9 @@ static int mlxfw_flash_component(struct mlxfw_dev *mlxfw_dev,
err = mlxfw_dev->ops->fsm_component_verify(mlxfw_dev, fwhandle,
comp->index);
if (err) {
- NL_SET_ERR_MSG_MOD(extack,
- "FSM component verify failed, comp_name(%s) err (%d)",
- comp_name, err);
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "FSM component verify failed, comp_name(%s) err (%d)",
+ comp_name, err);
goto err_out;
}
@@ -244,8 +250,9 @@ static int mlxfw_flash_components(struct mlxfw_dev *mlxfw_dev, u32 fwhandle,
mlxfw_dev->psid_size,
&component_count);
if (err) {
- mlxfw_err(mlxfw_dev, "Could not find device PSID in MFA2 file\n");
- NL_SET_ERR_MSG_MOD(extack, "Could not find device PSID in MFA2 file");
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "Could not find device PSID in MFA2 file, err (%d)",
+ err);
return err;
}
@@ -256,9 +263,9 @@ static int mlxfw_flash_components(struct mlxfw_dev *mlxfw_dev, u32 fwhandle,
mlxfw_dev->psid_size, i);
if (IS_ERR(comp)) {
err = PTR_ERR(comp);
- NL_SET_ERR_MSG_MOD(extack,
- "Failed to get MFA2 component, component (%d) err (%d)",
- i, err);
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "Failed to get MFA2 component, component (%d) err (%d)",
+ i, err);
return err;
}
@@ -281,17 +288,16 @@ int mlxfw_firmware_flash(struct mlxfw_dev *mlxfw_dev,
int err;
if (!mlxfw_mfa2_check(firmware)) {
- mlxfw_err(mlxfw_dev, "Firmware file is not MFA2\n");
- NL_SET_ERR_MSG_MOD(extack, "Firmware file is not MFA2");
+ MLXFW_ERR_MSG(mlxfw_dev, extack, "Firmware file is not MFA2");
return -EINVAL;
}
mfa2_file = mlxfw_mfa2_file_init(firmware);
if (IS_ERR(mfa2_file)) {
err = PTR_ERR(mfa2_file);
- NL_SET_ERR_MSG_MOD(extack,
- "Failed to initialize MFA2 firmware file, err (%d)",
- err);
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "Failed to initialize MFA2 firmware file, err (%d)",
+ err);
return err;
}
@@ -301,8 +307,8 @@ int mlxfw_firmware_flash(struct mlxfw_dev *mlxfw_dev,
NULL, 0, 0);
err = mlxfw_dev->ops->fsm_lock(mlxfw_dev, &fwhandle);
if (err) {
- mlxfw_err(mlxfw_dev, "Could not lock the firmware FSM\n");
- NL_SET_ERR_MSG_MOD(extack, "Could not lock the firmware FSM");
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "Could not lock the firmware FSM, err (%d)", err);
goto err_fsm_lock;
}
@@ -319,8 +325,8 @@ int mlxfw_firmware_flash(struct mlxfw_dev *mlxfw_dev,
mlxfw_status_notify(mlxfw_dev, "Activating image", NULL, 0, 0);
err = mlxfw_dev->ops->fsm_activate(mlxfw_dev, fwhandle);
if (err) {
- mlxfw_err(mlxfw_dev, "Could not activate the downloaded image\n");
- NL_SET_ERR_MSG_MOD(extack, "Could not activate the downloaded image");
+ MLXFW_ERR_MSG(mlxfw_dev, extack,
+ "Could not activate the downloaded image, err (%d)", err);
goto err_fsm_activate;
}
--
2.21.0
Powered by blists - more mailing lists