Skip to content

Commit

Permalink
platform/mellanox: fix potential race in mlxbf-tmfifo driver
Browse files Browse the repository at this point in the history
[ Upstream commit 3d43f9f ]

This commit adds memory barrier for the 'vq' update in function
mlxbf_tmfifo_virtio_find_vqs() to avoid potential race due to
out-of-order memory write. It also adds barrier for the 'is_ready'
flag to make sure the initializations are visible before this flag
is checked.

Signed-off-by: Liming Sun <limings@nvidia.com>
Reviewed-by: Vadim Pasternak <vadimp@nvidia.com>
Link: https://lore.kernel.org/r/b98c0ab61d644ba38fa9b3fd1607b138b0dd820b.1682518748.git.limings@nvidia.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Liming Sun authored and gregkh committed Jun 9, 2023
1 parent 809efd7 commit 61c3962
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/platform/mellanox/mlxbf-tmfifo.c
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ static void mlxbf_tmfifo_rxtx(struct mlxbf_tmfifo_vring *vring, bool is_rx)
fifo = vring->fifo;

/* Return if vdev is not ready. */
if (!fifo->vdev[devid])
if (!fifo || !fifo->vdev[devid])
return;

/* Return if another vring is running. */
Expand Down Expand Up @@ -961,9 +961,13 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,

vq->num_max = vring->num;

vq->priv = vring;

/* Make vq update visible before using it. */
virtio_mb(false);

vqs[i] = vq;
vring->vq = vq;
vq->priv = vring;
}

return 0;
Expand Down Expand Up @@ -1260,6 +1264,9 @@ static int mlxbf_tmfifo_probe(struct platform_device *pdev)

mod_timer(&fifo->timer, jiffies + MLXBF_TMFIFO_TIMER_INTERVAL);

/* Make all updates visible before setting the 'is_ready' flag. */
virtio_mb(false);

fifo->is_ready = true;
return 0;

Expand Down

0 comments on commit 61c3962

Please sign in to comment.