From: Sebastian Ott <sebott@linux.vnet.ibm.com>
To: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Roland Dreier <roland@kernel.org>,
Sean Hefty <sean.hefty@intel.com>,
Hal Rosenstock <hal.rosenstock@gmail.com>,
Or Gerlitz <ogerlitz@mellanox.com>,
"David S. Miller" <davem@davemloft.net>,
Yishai Hadas <yishaih@mellanox.com>,
Ira Weiny <ira.weiny@intel.com>,
Jack Morgenstein <jackm@dev.mellanox.co.il>,
Matan Barak <matanb@mellanox.com>,
Moni Shoua <monis@mellanox.com>, Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH] infiniband/mlx4: check for mapping error
Date: Mon, 16 Mar 2015 18:49:59 +0100 (CET) [thread overview]
Message-ID: <alpine.LFD.2.11.1503161844400.1763@denkbrett> (raw)
Since ib_dma_map_single can fail use ib_dma_mapping_error to check
for errors.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
---
drivers/infiniband/hw/mlx4/mad.c | 9 +++++++++
drivers/infiniband/hw/mlx4/qp.c | 4 ++++
2 files changed, 13 insertions(+)
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -1418,6 +1418,10 @@ static int mlx4_ib_alloc_pv_bufs(struct
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++) {
@@ -1430,6 +1434,11 @@ static int mlx4_ib_alloc_pv_bufs(struct
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);
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -566,6 +566,10 @@ static int alloc_proxy_bufs(struct ib_de
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;
next reply other threads:[~2015-03-16 17:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 17:49 Sebastian Ott [this message]
2015-03-17 16:46 ` Jack Morgenstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.11.1503161844400.1763@denkbrett \
--to=sebott@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=hal.rosenstock@gmail.com \
--cc=ira.weiny@intel.com \
--cc=jackm@dev.mellanox.co.il \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=matanb@mellanox.com \
--cc=monis@mellanox.com \
--cc=ogerlitz@mellanox.com \
--cc=roland@kernel.org \
--cc=sean.hefty@intel.com \
--cc=yishaih@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®