Commit 58a3de05 authored by Eugenia Emantayev's avatar Eugenia Emantayev Committed by David S. Miller

mlx4_core: fix race on comm channel

Prevent race condition between commands on comm channel.
Happened while unloading the driver when switching from
event to polling mode. VF got completion on the last command
before switching to polling mode, but toggle was not changed.
After the fix - VF will not write the next command before
toggle is updated.
Signed-off-by: default avatarEugenia Emantayev <eugenia@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c3ac428
...@@ -239,6 +239,7 @@ static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op, ...@@ -239,6 +239,7 @@ static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op,
{ {
struct mlx4_cmd *cmd = &mlx4_priv(dev)->cmd; struct mlx4_cmd *cmd = &mlx4_priv(dev)->cmd;
struct mlx4_cmd_context *context; struct mlx4_cmd_context *context;
unsigned long end;
int err = 0; int err = 0;
down(&cmd->event_sem); down(&cmd->event_sem);
...@@ -268,6 +269,14 @@ static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op, ...@@ -268,6 +269,14 @@ static int mlx4_comm_cmd_wait(struct mlx4_dev *dev, u8 op,
} }
out: out:
/* wait for comm channel ready
* this is necessary for prevention the race
* when switching between event to polling mode
*/
end = msecs_to_jiffies(timeout) + jiffies;
while (comm_pending(dev) && time_before(jiffies, end))
cond_resched();
spin_lock(&cmd->context_lock); spin_lock(&cmd->context_lock);
context->next = cmd->free_head; context->next = cmd->free_head;
cmd->free_head = context - cmd->context; cmd->free_head = context - cmd->context;
......
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