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

Commit d474186f authored by Doug Ledford's avatar Doug Ledford Committed by Roland Dreier
Browse files

IB/iser: Free IB connection resources in the proper place 



We allocate the login dma buffers in iser_verbs.c as part of
alloc_ib_conn_resources(), however we are freeing them in
iser_initiator.c as part of iser_free_rx_descriptors().  This is
needlessly confusing.  We have an alloc_rx_descriptors() and it
doesn't alloc something that the free_rx_descriptors() frees, and we
have an alloc_ib_conn_resources() that allocs something not freed by
free_ib_conn_resources().  Clean that up.

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>

[ Fix build error in iser_free_ib_conn_res().  - Or ]

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 6b21d18e

drivers/infiniband/ulp/iser/iser_initiator.c

+0 −12
Original line number Diff line number Diff line
@@ -220,18 +220,6 @@ void iser_free_rx_descriptors(struct iser_conn *ib_conn) 
	struct iser_rx_desc *rx_desc;

	struct iser_device *device = ib_conn->device;



	if (ib_conn->login_buf) {

		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);

	}



	if (!ib_conn->rx_descs)

		return;

drivers/infiniband/ulp/iser/iser_verbs.c

+12 −0
Original line number Diff line number Diff line
@@ -274,6 +274,18 @@ static int iser_free_ib_conn_res(struct iser_conn *ib_conn, int can_destroy_id) 
	ib_conn->cma_id   = NULL;

	kfree(ib_conn->page_vec);



	if (ib_conn->login_buf) {

		if (ib_conn->login_req_dma)

			ib_dma_unmap_single(ib_conn->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(ib_conn->device->ib_device,

				ib_conn->login_resp_dma,

				ISER_RX_LOGIN_SIZE, DMA_FROM_DEVICE);

		kfree(ib_conn->login_buf);

	}



	return 0;

}