From 2b9b097c35120b54dd5e5f0d4031823b8209a03b Mon Sep 17 00:00:00 2001 From: wanghonghao Date: Mon, 9 Dec 2019 22:43:06 +0800 Subject: [PATCH] iser: use `login_resp_buf` until login is finished This commit is to fix compatibility with CHAP. iSER transport only post `login_resp_buf` (which is larger than `rx_desc`) as work request (WR) once, but there may be multiple requests and responses during login phase (e.g. when CHAP is used) and login can't be finished in such cases. Signed-off-by: wanghonghao --- lib/iser.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/iser.c b/lib/iser.c index bf83c92..9dc5711 100644 --- a/lib/iser.c +++ b/lib/iser.c @@ -729,15 +729,6 @@ iser_send_control(struct iser_conn *iser_conn, struct iser_pdu *iser_pdu) { tx_desc->num_sge = 2; } - if (iser_pdu->iscsi_pdu.response_opcode == ISCSI_PDU_LOGIN_RESPONSE || - iscsi->session_type == ISCSI_SESSION_DISCOVERY) { - ret = iser_post_recvl(iser_conn); - if (ret) { - iscsi_set_error(iscsi, "Failed Post Recv login"); - return -1; - } - } - ret = iser_post_send(iser_conn, tx_desc, true); if (ret) { iscsi_set_error(iscsi, "Failed to post send"); @@ -1331,19 +1322,6 @@ iser_rcv_completion(struct iser_rx_desc *rx_desc, in = iscsi_malloc(iscsi, sizeof(*in)); - if ((unsigned char *)rx_desc == iser_conn->login_resp_buf) - if (iscsi->session_type == ISCSI_SESSION_NORMAL) { - if(iser_alloc_rx_descriptors(iser_conn,255)) { - iscsi_set_error(iscsi, "iser_alloc_rx_descriptors Failed\n"); - err = -1; - goto error; - } - err = iser_post_recvm(iser_conn, ISER_MIN_POSTED_RX); - if (err) { - err = -1; - goto error; - } - } in->hdr = (unsigned char*)rx_desc->iscsi_header; in->data_pos = iscsi_get_pdu_data_size(&in->hdr[0]); in->data = (unsigned char*)rx_desc->data; @@ -1401,6 +1379,23 @@ nop_target: goto error; } } + } else if (iscsi->is_loggedin) { + if(iser_alloc_rx_descriptors(iser_conn, 255)) { + iscsi_set_error(iscsi, "iser_alloc_rx_descriptors Failed\n"); + err = -1; + goto error; + } + err = iser_post_recvm(iser_conn, ISER_MIN_POSTED_RX); + if (err) { + err = -1; + goto error; + } + } else { + if (iser_post_recvl(iser_conn)) { + iscsi_set_error(iscsi, "Failed Post Recv login"); + err = -1; + goto error; + } } err = iscsi_process_pdu(iscsi, in); @@ -1559,6 +1554,11 @@ static int iser_connected_handler(struct rdma_cm_id *cma_id) { iser_conn->post_recv_buf_count = 0; iscsi->is_connected = 1; + if (iser_post_recvl(iser_conn)) { + iscsi_set_error(iscsi, "Failed Post Recv login"); + return -1; + } + return 0; }