Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b332068c authored by Maor Gottlieb's avatar Maor Gottlieb Committed by David S. Miller
Browse files

net/mlx4_core: Fix mpt_entry initialization in mlx4_mr_rereg_mem_write() 



a) Previously, mlx4_mr_rereg_write filled the MPT's start
   and length with the old MPT's values.
   Fixing the initialization to take the new start and length.

b) In addition access flags in mpt_status were initialized instead of
   status due to bad boolean operation. Fixing the operation.

c) Initialization of pd_slave caused a protection error.
   Fix - removing this initialization.

d) In resource_tracker.c: Fixing vf encoding to be one-based.

Fixes: e630664c ('mlx4_core: Add helper functions to support MR re-registration')
Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce388fff

drivers/net/ethernet/mellanox/mlx4/mr.c

+5 −8
Original line number Diff line number Diff line
@@ -598,14 +598,11 @@ int mlx4_mr_rereg_mem_write(struct mlx4_dev *dev, struct mlx4_mr *mr, 
	if (err)

		return err;



	mpt_entry->start       = cpu_to_be64(mr->iova);

	mpt_entry->length      = cpu_to_be64(mr->size);

	mpt_entry->entity_size = cpu_to_be32(mr->mtt.page_shift);



	mpt_entry->pd_flags &= cpu_to_be32(MLX4_MPT_PD_MASK |

					   MLX4_MPT_PD_FLAG_EN_INV);

	mpt_entry->flags    &= cpu_to_be32(MLX4_MPT_FLAG_FREE |

					   MLX4_MPT_FLAG_SW_OWNS);

	mpt_entry->start       = cpu_to_be64(iova);

	mpt_entry->length      = cpu_to_be64(size);

	mpt_entry->entity_size = cpu_to_be32(page_shift);

	mpt_entry->flags    &= ~(cpu_to_be32(MLX4_MPT_FLAG_FREE |

					   MLX4_MPT_FLAG_SW_OWNS));

	if (mr->mtt.order < 0) {

		mpt_entry->flags |= cpu_to_be32(MLX4_MPT_FLAG_PHYSICAL);

		mpt_entry->mtt_addr = 0;

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

+1 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ int mlx4_SW2HW_MPT_wrapper(struct mlx4_dev *dev, int slave, 
	/* Make sure that the PD bits related to the slave id are zeros. */

	pd = mr_get_pd(inbox->buf);

	pd_slave = (pd >> 17) & 0x7f;

	if (pd_slave != 0 && pd_slave != slave) {

	if (pd_slave != 0 && --pd_slave != slave) {

		err = -EPERM;

		goto ex_abort;

	}