Commit 53ca376e authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller

mlxsw: core: Fix race condition in __mlxsw_emad_transmit

Under certain conditions EMAD responses can be returned from the device
even before setting trans_active. This will cause the EMAD Rx listener
to drop the EMAD response - as there are no active transactions - and
timeouts will be generated.

Fix this by setting trans_active before transmitting the EMAD skb.

Fixes: 4ec14b76 ("mlxsw: Add interface to access registers and process events")
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dde4b5ae
...@@ -374,26 +374,31 @@ static int __mlxsw_emad_transmit(struct mlxsw_core *mlxsw_core, ...@@ -374,26 +374,31 @@ static int __mlxsw_emad_transmit(struct mlxsw_core *mlxsw_core,
int err; int err;
int ret; int ret;
mlxsw_core->emad.trans_active = true;
err = mlxsw_core_skb_transmit(mlxsw_core->driver_priv, skb, tx_info); err = mlxsw_core_skb_transmit(mlxsw_core->driver_priv, skb, tx_info);
if (err) { if (err) {
dev_err(mlxsw_core->bus_info->dev, "Failed to transmit EMAD (tid=%llx)\n", dev_err(mlxsw_core->bus_info->dev, "Failed to transmit EMAD (tid=%llx)\n",
mlxsw_core->emad.tid); mlxsw_core->emad.tid);
dev_kfree_skb(skb); dev_kfree_skb(skb);
return err; goto trans_inactive_out;
} }
mlxsw_core->emad.trans_active = true;
ret = wait_event_timeout(mlxsw_core->emad.wait, ret = wait_event_timeout(mlxsw_core->emad.wait,
!(mlxsw_core->emad.trans_active), !(mlxsw_core->emad.trans_active),
msecs_to_jiffies(MLXSW_EMAD_TIMEOUT_MS)); msecs_to_jiffies(MLXSW_EMAD_TIMEOUT_MS));
if (!ret) { if (!ret) {
dev_warn(mlxsw_core->bus_info->dev, "EMAD timed-out (tid=%llx)\n", dev_warn(mlxsw_core->bus_info->dev, "EMAD timed-out (tid=%llx)\n",
mlxsw_core->emad.tid); mlxsw_core->emad.tid);
mlxsw_core->emad.trans_active = false; err = -EIO;
return -EIO; goto trans_inactive_out;
} }
return 0; return 0;
trans_inactive_out:
mlxsw_core->emad.trans_active = false;
return err;
} }
static int mlxsw_emad_process_status(struct mlxsw_core *mlxsw_core, static int mlxsw_emad_process_status(struct mlxsw_core *mlxsw_core,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment