openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ib_srpt: Use correct ib_sg_dma primitives 

The code was incorrectly using sg_dma_address() and
sg_dma_len() instead of ib_sg_dma_address() and
ib_sg_dma_len().

This prevents srpt from functioning with the
Intel HCA and indeed will corrupt memory
badly.

Cc: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Tested-by: Vinod Kumar <vinod.kumar@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Cc: stable@vger.kernel.org # 3.3+
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Mike Marciniszyn 2014-04-07 13:58:35 -04:00 committed by Nicholas Bellinger
parent e3d4440cdc
commit b076808051
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/infiniband/ulp/srpt/ib_srpt.c
View File

@ -1078,6 +1078,7 @@ static void srpt_unmap_sg_to_ib_sge(struct srpt_rdma_ch *ch,
static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch, static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
struct srpt_send_ioctx *ioctx) struct srpt_send_ioctx *ioctx)
{ {
struct ib_device *dev = ch->sport->sdev->device;
struct se_cmd *cmd; struct se_cmd *cmd;
struct scatterlist *sg, *sg_orig; struct scatterlist *sg, *sg_orig;
int sg_cnt; int sg_cnt;
@ -1124,7 +1125,7 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
db = ioctx->rbufs; db = ioctx->rbufs;
tsize = cmd->data_length; tsize = cmd->data_length;
dma_len = sg_dma_len(&sg[0]); dma_len = ib_sg_dma_len(dev, &sg[0]);
riu = ioctx->rdma_ius; riu = ioctx->rdma_ius;
/* /*
@ -1155,7 +1156,8 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
++j; ++j;
if (j < count) { if (j < count) {
sg = sg_next(sg); sg = sg_next(sg);
dma_len = sg_dma_len(sg); dma_len = ib_sg_dma_len(
dev, sg);
} }
} }
} else { } else {
@ -1192,8 +1194,8 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
tsize = cmd->data_length; tsize = cmd->data_length;
riu = ioctx->rdma_ius; riu = ioctx->rdma_ius;
sg = sg_orig; sg = sg_orig;
dma_len = sg_dma_len(&sg[0]); dma_len = ib_sg_dma_len(dev, &sg[0]);
dma_addr = sg_dma_address(&sg[0]); dma_addr = ib_sg_dma_address(dev, &sg[0]);
/* this second loop is really mapped sg_addres to rdma_iu->ib_sge */ /* this second loop is really mapped sg_addres to rdma_iu->ib_sge */
for (i = 0, j = 0; for (i = 0, j = 0;
@ -1216,8 +1218,10 @@ static int srpt_map_sg_to_ib_sge(struct srpt_rdma_ch *ch,
++j; ++j;
if (j < count) { if (j < count) {
sg = sg_next(sg); sg = sg_next(sg);
dma_len = sg_dma_len(sg); dma_len = ib_sg_dma_len(
dma_addr = sg_dma_address(sg); dev, sg);
dma_addr = ib_sg_dma_address(
dev, sg);
} }
} }
} else { } else {