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

Commit cc47d369 authored by Sebastian Ott's avatar Sebastian Ott Committed by Doug Ledford
Browse files

infiniband/mlx4: check for mapping error 



Since ib_dma_map_single can fail use ib_dma_mapping_error to check
for errors.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Acked-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent d2928a8c

drivers/infiniband/hw/mlx4/mad.c

+9 −0
Original line number Diff line number Diff line
@@ -1430,6 +1430,10 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, 
							tun_qp->ring[i].addr,

							rx_buf_size,

							DMA_FROM_DEVICE);

		if (ib_dma_mapping_error(ctx->ib_dev, tun_qp->ring[i].map)) {

			kfree(tun_qp->ring[i].addr);

			goto err;

		}

	}



	for (i = 0; i < MLX4_NUM_TUNNEL_BUFS; i++) {
@@ -1442,6 +1446,11 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, 
					  tun_qp->tx_ring[i].buf.addr,

					  tx_buf_size,

					  DMA_TO_DEVICE);

		if (ib_dma_mapping_error(ctx->ib_dev,

					 tun_qp->tx_ring[i].buf.map)) {

			kfree(tun_qp->tx_ring[i].buf.addr);

			goto tx_err;

		}

		tun_qp->tx_ring[i].ah = NULL;

	}

	spin_lock_init(&tun_qp->tx_lock);

drivers/infiniband/hw/mlx4/qp.c

+4 −0
Original line number Diff line number Diff line
@@ -566,6 +566,10 @@ static int alloc_proxy_bufs(struct ib_device *dev, struct mlx4_ib_qp *qp) 
			ib_dma_map_single(dev, qp->sqp_proxy_rcv[i].addr,

					  sizeof (struct mlx4_ib_proxy_sqp_hdr),

					  DMA_FROM_DEVICE);

		if (ib_dma_mapping_error(dev, qp->sqp_proxy_rcv[i].map)) {

			kfree(qp->sqp_proxy_rcv[i].addr);

			goto err;

		}

	}

	return 0;