stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Patch "mlx5: Fix mlx5_ib_map_mr_sg mr length" has been added to the 4.9-stable tree
@ 2017-05-22 16:08 gregkh
  0 siblings, 0 replies; only message in thread
From: gregkh @ 2017-05-22 16:08 UTC (permalink / raw)
  To: sagi, dledford, gregkh, israelr; +Cc: stable, stable-commits


This is a note to let you know that I've just added the patch titled

    mlx5: Fix mlx5_ib_map_mr_sg mr length

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mlx5-fix-mlx5_ib_map_mr_sg-mr-length.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 0a49f2c31c3efbeb0de3e4b5598764887f629be2 Mon Sep 17 00:00:00 2001
From: Sagi Grimberg <sagi@grimberg.me>
Date: Sun, 23 Apr 2017 14:31:42 +0300
Subject: mlx5: Fix mlx5_ib_map_mr_sg mr length

From: Sagi Grimberg <sagi@grimberg.me>

commit 0a49f2c31c3efbeb0de3e4b5598764887f629be2 upstream.

In case we got an initial sg_offset, we need to
account for it in the mr length.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/infiniband/hw/mlx5/mr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -1828,7 +1828,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;
 	}


Patches currently in stable-queue which might be from sagi@grimberg.me are

queue-4.9/mlx5-fix-mlx5_ib_map_mr_sg-mr-length.patch

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-05-22 16:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-22 16:08 Patch "mlx5: Fix mlx5_ib_map_mr_sg mr length" has been added to the 4.9-stable tree gregkh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).