diff options
| author | Noa Osherovich <noaos@mellanox.com> | 2016-06-04 15:15:35 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-06-07 10:03:50 -0400 |
| commit | 3c4c37746c919c983e439ac6a7328cd2d48c10ed (patch) | |
| tree | 8ded5be819a24bbaf8f22500dd8898bdf3118de2 | |
| parent | 9ea578528656e191c1097798a771ff08bab6f323 (diff) | |
| download | linux-3c4c37746c919c983e439ac6a7328cd2d48c10ed.tar.gz linux-3c4c37746c919c983e439ac6a7328cd2d48c10ed.tar.bz2 linux-3c4c37746c919c983e439ac6a7328cd2d48c10ed.zip | |
IB/mlx5: Fix entries check in mlx5_ib_resize_cq
Verify that number of entries is less than device capability.
Add an appropriate warning message for error flow.
Fixes: bde51583f49b ('IB/mlx5: Add support for resize CQ')
Signed-off-by: Majd Dibbiny <majd@mellanox.com>
Signed-off-by: Noa Osherovich <noaos@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | drivers/infiniband/hw/mlx5/cq.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c index 3984c68caae1..9c0e67bd2ba7 100644 --- a/drivers/infiniband/hw/mlx5/cq.c +++ b/drivers/infiniband/hw/mlx5/cq.c @@ -1169,11 +1169,16 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) return -ENOSYS; } - if (entries < 1) + if (entries < 1 || + entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz))) { + mlx5_ib_warn(dev, "wrong entries number %d, max %d\n", + entries, + 1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)); return -EINVAL; + } entries = roundup_pow_of_two(entries + 1); - if (entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)) + 1) + if (entries > (1 << MLX5_CAP_GEN(dev->mdev, log_max_cq_sz)) + 1) return -EINVAL; if (entries == ibcq->cqe + 1) |