summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2017-04-23 13:31:42 +0200
committerDoug Ledford <dledford@redhat.com>2017-05-01 20:56:07 +0200
commit0a49f2c31c3efbeb0de3e4b5598764887f629be2 (patch)
tree5a284c33c581cb3a984ab56a6ba13aa96f038a0e /drivers/infiniband
parentIB/rxe: Don't clamp residual length to mtu (diff)
downloadlinux-0a49f2c31c3efbeb0de3e4b5598764887f629be2.tar.xz
linux-0a49f2c31c3efbeb0de3e4b5598764887f629be2.zip
mlx5: Fix mlx5_ib_map_mr_sg mr length
In case we got an initial sg_offset, we need to account for it in the mr length. Cc: stable@vger.kernel.org Fixes: ff2ba9936591 ("IB/core: Add passing an offset into the SG to ib_map_mr_sg") Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Tested-by: Israel Rukshin <israelr@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/mlx5/mr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 93c0e82aa491..366433f71b58 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -1784,7 +1784,7 @@ mlx5_ib_sg_to_klms(struct mlx5_ib_mr *mr,
klms[i].va = cpu_to_be64(sg_dma_address(sg) + sg_offset);
klms[i].bcount = cpu_to_be32(sg_dma_len(sg) - sg_offset);
klms[i].key = cpu_to_be32(lkey);
- mr->ibmr.length += sg_dma_len(sg);
+ mr->ibmr.length += sg_dma_len(sg) - sg_offset;
sg_offset = 0;
}