Browse Source

IB/iser: fix a check of SG alignment for RDMA

dma mapping may include a "compaction" of the sg associated with scsi command.
Hence, the size of the maximal prefix of the SG which is aligned for rdma must be
compared against the length of the dma mapped sg (mem->dma_nents) and not against
the size of it before it was mapped (mem->size).

Signed-off-by: Erez Zilber <erezz@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Erez Zilber 18 năm trước cách đây
mục cha
commit
777a71dd4d

+ 1 - 1
drivers/infiniband/ulp/iser/iser_memory.c

@@ -378,7 +378,7 @@ int iser_reg_rdma_mem(struct iscsi_iser_cmd_task *iser_ctask,
 	regd_buf = &iser_ctask->rdma_regd[cmd_dir];
 	regd_buf = &iser_ctask->rdma_regd[cmd_dir];
 
 
 	aligned_len = iser_data_buf_aligned_len(mem);
 	aligned_len = iser_data_buf_aligned_len(mem);
-	if (aligned_len != mem->size) {
+	if (aligned_len != mem->dma_nents) {
 		iser_err("rdma alignment violation %d/%d aligned\n",
 		iser_err("rdma alignment violation %d/%d aligned\n",
 			 aligned_len, mem->size);
 			 aligned_len, mem->size);
 		iser_data_buf_dump(mem);
 		iser_data_buf_dump(mem);