diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2016-07-21 16:03:30 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-08-02 12:02:41 -0400 |
| commit | 632bc3f65081dd1e2e5394a9161580a0f78e8839 (patch) | |
| tree | 45f033bacf41656957984f601d84636985212c7e /drivers/infiniband/core/rw.c | |
| parent | eaa74ec7329a48a4b724d8de440b3a2cbaabf7c8 (diff) | |
IB/core, RDMA RW API: Do not exceed QP SGE send limit
Compute the SGE limit for RDMA READ and WRITE requests in
ib_create_qp(). Use that limit in the RDMA RW API implementation.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Parav Pandit <pandit.parav@gmail.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: <stable@vger.kernel.org> #v4.7+
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/rw.c')
| -rw-r--r-- | drivers/infiniband/core/rw.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/infiniband/core/rw.c b/drivers/infiniband/core/rw.c index 1ad2baaa6c8c..dbfd854c32c9 100644 --- a/drivers/infiniband/core/rw.c +++ b/drivers/infiniband/core/rw.c | |||
| @@ -58,13 +58,6 @@ static inline bool rdma_rw_io_needs_mr(struct ib_device *dev, u8 port_num, | |||
| 58 | return false; | 58 | return false; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | static inline u32 rdma_rw_max_sge(struct ib_device *dev, | ||
| 62 | enum dma_data_direction dir) | ||
| 63 | { | ||
| 64 | return dir == DMA_TO_DEVICE ? | ||
| 65 | dev->attrs.max_sge : dev->attrs.max_sge_rd; | ||
| 66 | } | ||
| 67 | |||
| 68 | static inline u32 rdma_rw_fr_page_list_len(struct ib_device *dev) | 61 | static inline u32 rdma_rw_fr_page_list_len(struct ib_device *dev) |
| 69 | { | 62 | { |
| 70 | /* arbitrary limit to avoid allocating gigantic resources */ | 63 | /* arbitrary limit to avoid allocating gigantic resources */ |
| @@ -186,7 +179,8 @@ static int rdma_rw_init_map_wrs(struct rdma_rw_ctx *ctx, struct ib_qp *qp, | |||
| 186 | u64 remote_addr, u32 rkey, enum dma_data_direction dir) | 179 | u64 remote_addr, u32 rkey, enum dma_data_direction dir) |
| 187 | { | 180 | { |
| 188 | struct ib_device *dev = qp->pd->device; | 181 | struct ib_device *dev = qp->pd->device; |
| 189 | u32 max_sge = rdma_rw_max_sge(dev, dir); | 182 | u32 max_sge = dir == DMA_TO_DEVICE ? qp->max_write_sge : |
| 183 | qp->max_read_sge; | ||
| 190 | struct ib_sge *sge; | 184 | struct ib_sge *sge; |
| 191 | u32 total_len = 0, i, j; | 185 | u32 total_len = 0, i, j; |
| 192 | 186 | ||