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

Commit 078b3573 authored by Guy Levi's avatar Guy Levi Committed by Doug Ledford
Browse files

IB/mlx4: Fix struct mlx4_ib_create_wq alignment 



The mlx4 ABI defines to have structures with alignment of 64B.

Fixes: 400b1ebc ("IB/mlx4: Add support for WQ related verbs")
Signed-off-by: default avatarGuy Levi <guyle@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent c3f1ee29

drivers/infiniband/hw/mlx4/qp.c

+4 −5
Original line number Diff line number Diff line
@@ -1046,9 +1046,8 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
		}



		if (src == MLX4_IB_RWQ_SRC) {

			if (ucmd.wq.comp_mask || ucmd.wq.reserved1 ||

			    ucmd.wq.reserved[0] || ucmd.wq.reserved[1] ||

			    ucmd.wq.reserved[2]) {

			if (ucmd.wq.comp_mask || ucmd.wq.reserved[0] ||

			    ucmd.wq.reserved[1] || ucmd.wq.reserved[2]) {

				pr_debug("user command isn't supported\n");

				err = -EOPNOTSUPP;

				goto err;
@@ -4146,8 +4145,8 @@ struct ib_wq *mlx4_ib_create_wq(struct ib_pd *pd, 
	if (!(udata && pd->uobject))

		return ERR_PTR(-EINVAL);



	required_cmd_sz = offsetof(typeof(ucmd), reserved) +

			  sizeof(ucmd.reserved);

	required_cmd_sz = offsetof(typeof(ucmd), comp_mask) +

			  sizeof(ucmd.comp_mask);

	if (udata->inlen < required_cmd_sz) {

		pr_debug("invalid inlen\n");

		return ERR_PTR(-EINVAL);

include/uapi/rdma/mlx4-abi.h

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ struct mlx4_ib_create_wq { 
	__u8	log_range_size;

	__u8	reserved[3];

	__u32   comp_mask;

	__u32   reserved1;

};



struct mlx4_ib_modify_wq {