Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6c95ef4 authored by Roi Dayan's avatar Roi Dayan Committed by Roland Dreier
Browse files

IB/iser: Use correct dma direction when unmapping SGs 



We always unmap SGs with the same direction instead of unmapping
with the direction the mapping was done, fix that.

Fixes: 9a8b08fa ("IB/iser: Generalize iser_unmap_task_data and [...]")
Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent bfa76d49

drivers/infiniband/ulp/iser/iscsi_iser.h

+3 −1
Original line number Diff line number Diff line
@@ -654,7 +654,9 @@ int iser_dma_map_task_data(struct iscsi_iser_task *iser_task, 
			   enum dma_data_direction dma_dir);



void iser_dma_unmap_task_data(struct iscsi_iser_task *iser_task,

			      struct iser_data_buf *data);

			      struct iser_data_buf *data,

			      enum dma_data_direction dir);



int  iser_initialize_task_headers(struct iscsi_task *task,

			struct iser_tx_desc *tx_desc);

int iser_alloc_rx_descriptors(struct iser_conn *iser_conn,

drivers/infiniband/ulp/iser/iser_initiator.c

+8 −4
Original line number Diff line number Diff line
@@ -714,19 +714,23 @@ void iser_task_rdma_finalize(struct iscsi_iser_task *iser_task) 
		device->iser_unreg_rdma_mem(iser_task, ISER_DIR_IN);

		if (is_rdma_data_aligned)

			iser_dma_unmap_task_data(iser_task,

						 &iser_task->data[ISER_DIR_IN]);

						 &iser_task->data[ISER_DIR_IN],

						 DMA_FROM_DEVICE);

		if (prot_count && is_rdma_prot_aligned)

			iser_dma_unmap_task_data(iser_task,

						 &iser_task->prot[ISER_DIR_IN]);

						 &iser_task->prot[ISER_DIR_IN],

						 DMA_FROM_DEVICE);

	}



	if (iser_task->dir[ISER_DIR_OUT]) {

		device->iser_unreg_rdma_mem(iser_task, ISER_DIR_OUT);

		if (is_rdma_data_aligned)

			iser_dma_unmap_task_data(iser_task,

						 &iser_task->data[ISER_DIR_OUT]);

						 &iser_task->data[ISER_DIR_OUT],

						 DMA_TO_DEVICE);

		if (prot_count && is_rdma_prot_aligned)

			iser_dma_unmap_task_data(iser_task,

						 &iser_task->prot[ISER_DIR_OUT]);

						 &iser_task->prot[ISER_DIR_OUT],

						 DMA_TO_DEVICE);

	}

}

drivers/infiniband/ulp/iser/iser_memory.c

+6 −3
Original line number Diff line number Diff line
@@ -332,12 +332,13 @@ int iser_dma_map_task_data(struct iscsi_iser_task *iser_task, 
}



void iser_dma_unmap_task_data(struct iscsi_iser_task *iser_task,

			      struct iser_data_buf *data)

			      struct iser_data_buf *data,

			      enum dma_data_direction dir)

{

	struct ib_device *dev;



	dev = iser_task->iser_conn->ib_conn.device->ib_device;

	ib_dma_unmap_sg(dev, data->buf, data->size, DMA_FROM_DEVICE);

	ib_dma_unmap_sg(dev, data->buf, data->size, dir);

}



static int fall_to_bounce_buf(struct iscsi_iser_task *iser_task,
@@ -357,7 +358,9 @@ static int fall_to_bounce_buf(struct iscsi_iser_task *iser_task, 
		iser_data_buf_dump(mem, ibdev);



	/* unmap the command data before accessing it */

	iser_dma_unmap_task_data(iser_task, mem);

	iser_dma_unmap_task_data(iser_task, mem,

				 (cmd_dir == ISER_DIR_OUT) ?

				 DMA_TO_DEVICE : DMA_FROM_DEVICE);



	/* allocate copy buf, if we are writing, copy the */

	/* unaligned scatterlist, dma map the copy        */