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

Commit 16dfd1fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/qib: Fix panic in RC error flushing logic
  IB/iser: DMA unmap TX bufs used for iSCSI/iSER headers
  IB/iser: Use separate buffers for the login request/response
  IB/mthca: Fix buddy->num_free allocation size
parents b3196681 b8108d68

drivers/infiniband/hw/mthca/mthca_mr.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int mthca_buddy_init(struct mthca_buddy *buddy, int max_order) 


	buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *),

			      GFP_KERNEL);

	buddy->num_free = kzalloc((buddy->max_order + 1) * sizeof (int *),

	buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free,

				  GFP_KERNEL);

	if (!buddy->bits || !buddy->num_free)

		goto err_out;

drivers/infiniband/hw/qib/qib_rc.c

+3 −7
Original line number Diff line number Diff line
@@ -271,13 +271,9 @@ int qib_make_rc_req(struct qib_qp *qp) 
			goto bail;

		}

		wqe = get_swqe_ptr(qp, qp->s_last);

		while (qp->s_last != qp->s_acked) {

			qib_send_complete(qp, wqe, IB_WC_SUCCESS);

			if (++qp->s_last >= qp->s_size)

				qp->s_last = 0;

			wqe = get_swqe_ptr(qp, qp->s_last);

		}

		qib_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);

		qib_send_complete(qp, wqe, qp->s_last != qp->s_acked ?

			IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR);

		/* will get called again */

		goto done;

	}

drivers/infiniband/ulp/iser/iscsi_iser.c

+8 −3
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ int iser_initialize_task_headers(struct iscsi_task *task, 
	tx_desc->tx_sg[0].length = ISER_HEADERS_LEN;

	tx_desc->tx_sg[0].lkey   = device->mr->lkey;



	iser_task->headers_initialized	= 1;

	iser_task->iser_conn		= iser_conn;

	return 0;

}
@@ -166,7 +165,6 @@ iscsi_iser_task_init(struct iscsi_task *task) 
{

	struct iscsi_iser_task *iser_task = task->dd_data;



	if (!iser_task->headers_initialized)

	if (iser_initialize_task_headers(task, &iser_task->desc))

			return -ENOMEM;
@@ -278,6 +276,13 @@ iscsi_iser_task_xmit(struct iscsi_task *task) 
static void iscsi_iser_cleanup_task(struct iscsi_task *task)

{

	struct iscsi_iser_task *iser_task = task->dd_data;

	struct iser_tx_desc	*tx_desc = &iser_task->desc;



	struct iscsi_iser_conn *iser_conn = task->conn->dd_data;

	struct iser_device     *device    = iser_conn->ib_conn->device;



	ib_dma_unmap_single(device->ib_device,

		tx_desc->dma_addr, ISER_HEADERS_LEN, DMA_TO_DEVICE);



	/* mgmt tasks do not need special cleanup */

	if (!task->sc)

drivers/infiniband/ulp/iser/iscsi_iser.h

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ struct iser_conn { 
	struct list_head	     conn_list;       /* entry in ig conn list */



	char  			     *login_buf;

	u64 			     login_dma;

	char			     *login_req_buf, *login_resp_buf;

	u64			     login_req_dma, login_resp_dma;

	unsigned int 		     rx_desc_head;

	struct iser_rx_desc	     *rx_descs;

	struct ib_recv_wr	     rx_wr[ISER_MIN_POSTED_RX];
@@ -277,7 +278,6 @@ struct iscsi_iser_task { 
	struct iser_regd_buf         rdma_regd[ISER_DIRS_NUM];/* regd rdma buf */

	struct iser_data_buf         data[ISER_DIRS_NUM];     /* orig. data des*/

	struct iser_data_buf         data_copy[ISER_DIRS_NUM];/* contig. copy  */

	int                          headers_initialized;

};



struct iser_page_vec {

drivers/infiniband/ulp/iser/iser_initiator.c

+24 −7
Original line number Diff line number Diff line
@@ -221,7 +221,13 @@ void iser_free_rx_descriptors(struct iser_conn *ib_conn) 
	struct iser_device *device = ib_conn->device;



	if (ib_conn->login_buf) {

		ib_dma_unmap_single(device->ib_device, ib_conn->login_dma,

		if (ib_conn->login_req_dma)

			ib_dma_unmap_single(device->ib_device,

				ib_conn->login_req_dma,

				ISCSI_DEF_MAX_RECV_SEG_LEN, DMA_TO_DEVICE);

		if (ib_conn->login_resp_dma)

			ib_dma_unmap_single(device->ib_device,

				ib_conn->login_resp_dma,

				ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);

		kfree(ib_conn->login_buf);

	}
@@ -394,6 +400,7 @@ int iser_send_control(struct iscsi_conn *conn, 
	unsigned long data_seg_len;

	int err = 0;

	struct iser_device *device;

	struct iser_conn *ib_conn = iser_conn->ib_conn;



	/* build the tx desc regd header and add it to the tx desc dto */

	mdesc->type = ISCSI_TX_CONTROL;
@@ -409,9 +416,19 @@ int iser_send_control(struct iscsi_conn *conn, 
			iser_err("data present on non login task!!!\n");

			goto send_control_error;

		}

		memcpy(iser_conn->ib_conn->login_buf, task->data,



		ib_dma_sync_single_for_cpu(device->ib_device,

			ib_conn->login_req_dma, task->data_count,

			DMA_TO_DEVICE);



		memcpy(iser_conn->ib_conn->login_req_buf, task->data,

							task->data_count);

		tx_dsg->addr    = iser_conn->ib_conn->login_dma;



		ib_dma_sync_single_for_device(device->ib_device,

			ib_conn->login_req_dma, task->data_count,

			DMA_TO_DEVICE);



		tx_dsg->addr    = iser_conn->ib_conn->login_req_dma;

		tx_dsg->length  = task->data_count;

		tx_dsg->lkey    = device->mr->lkey;

		mdesc->num_sge = 2;
@@ -445,8 +462,8 @@ void iser_rcv_completion(struct iser_rx_desc *rx_desc, 
	int rx_buflen, outstanding, count, err;



	/* differentiate between login to all other PDUs */

	if ((char *)rx_desc == ib_conn->login_buf) {

		rx_dma = ib_conn->login_dma;

	if ((char *)rx_desc == ib_conn->login_resp_buf) {

		rx_dma = ib_conn->login_resp_dma;

		rx_buflen = ISER_RX_LOGIN_SIZE;

	} else {

		rx_dma = rx_desc->dma_addr;
@@ -473,7 +490,7 @@ void iser_rcv_completion(struct iser_rx_desc *rx_desc, 
	 * for the posted rx bufs refcount to become zero handles everything   */

	conn->ib_conn->post_recv_buf_count--;



	if (rx_dma == ib_conn->login_dma)

	if (rx_dma == ib_conn->login_resp_dma)

		return;



	outstanding = ib_conn->post_recv_buf_count;