|
 |
d01aaa |
From b8cc526501b02438713e6cf88c709c4a12d11507 Mon Sep 17 00:00:00 2001
|
|
|
d01aaa |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d01aaa |
Date: Tue, 9 Oct 2018 15:14:14 +0100
|
|
|
d01aaa |
Subject: [PATCH 1/6] iser_rcv_completion: unify error handling
|
|
|
d01aaa |
|
|
|
d01aaa |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d01aaa |
Message-id: <20181009151419.20418-2-pbonzini@redhat.com>
|
|
|
d01aaa |
Patchwork-id: 82505
|
|
|
d01aaa |
O-Subject: [RHEL8 libiscsi PATCH 1/6] iser_rcv_completion: unify error handling
|
|
|
d01aaa |
Bugzilla: 1634541
|
|
|
d01aaa |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
d01aaa |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
d01aaa |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d01aaa |
|
|
|
d01aaa |
Move the iscsi_set_error to iser_post_recv, and avoid leaking the
|
|
|
d01aaa |
input buffer "in".
|
|
|
d01aaa |
|
|
|
d01aaa |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d01aaa |
(cherry picked from commit 346fb947cb46ee8afcf5b2205e40af4ce8d29a79)
|
|
|
d01aaa |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
d01aaa |
---
|
|
|
d01aaa |
lib/iser.c | 18 +++++++++---------
|
|
|
d01aaa |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
d01aaa |
|
|
|
d01aaa |
diff --git a/lib/iser.c b/lib/iser.c
|
|
|
d01aaa |
index aa7244c..4b314be 100644
|
|
|
d01aaa |
--- a/lib/iser.c
|
|
|
d01aaa |
+++ b/lib/iser.c
|
|
|
d01aaa |
@@ -957,7 +957,7 @@ iser_post_recvm(struct iser_conn *iser_conn, int count)
|
|
|
d01aaa |
iser_conn->post_recv_buf_count += count;
|
|
|
d01aaa |
ret = ibv_post_recv(iser_conn->qp, iser_conn->rx_wr, &rx_wr_failed);
|
|
|
d01aaa |
if (ret) {
|
|
|
d01aaa |
- iscsi_set_error(iscsi, "ib_post_recv failed ret=%d", ret);
|
|
|
d01aaa |
+ iscsi_set_error(iscsi, "posting %d rx bufs, ib_post_recv failed ret=%d", count, ret);
|
|
|
d01aaa |
iser_conn->post_recv_buf_count -= count;
|
|
|
d01aaa |
} else
|
|
|
d01aaa |
iser_conn->rx_desc_head = my_rx_head;
|
|
|
d01aaa |
@@ -1030,12 +1030,13 @@ iser_rcv_completion(struct iser_rx_desc *rx_desc,
|
|
|
d01aaa |
if (iscsi->session_type == ISCSI_SESSION_NORMAL) {
|
|
|
d01aaa |
if(iser_alloc_rx_descriptors(iser_conn,255)) {
|
|
|
d01aaa |
iscsi_set_error(iscsi, "iser_alloc_rx_descriptors Failed\n");
|
|
|
d01aaa |
- return -1;
|
|
|
d01aaa |
+ err = -1;
|
|
|
d01aaa |
+ goto error;
|
|
|
d01aaa |
}
|
|
|
d01aaa |
err = iser_post_recvm(iser_conn, ISER_MIN_POSTED_RX);
|
|
|
d01aaa |
if (err) {
|
|
|
d01aaa |
- iscsi_set_error(iscsi, "posting %d rx bufs err %d", count, err);
|
|
|
d01aaa |
- return -1;
|
|
|
d01aaa |
+ err = -1;
|
|
|
d01aaa |
+ goto error;
|
|
|
d01aaa |
}
|
|
|
d01aaa |
}
|
|
|
d01aaa |
in->hdr = (unsigned char*)rx_desc->iscsi_header;
|
|
|
d01aaa |
@@ -1082,7 +1083,6 @@ iser_rcv_completion(struct iser_rx_desc *rx_desc,
|
|
|
d01aaa |
ISCSI_LIST_ADD_END(&iser_conn->tx_desc, iser_pdu->desc);
|
|
|
d01aaa |
|
|
|
d01aaa |
nop_target:
|
|
|
d01aaa |
-
|
|
|
d01aaa |
/* decrementing conn->post_recv_buf_count only --after-- freeing the *
|
|
|
d01aaa |
* task eliminates the need to worry on tasks which are completed in *
|
|
|
d01aaa |
* parallel to the execution of iser_conn_term. So the code that waits *
|
|
|
d01aaa |
@@ -1100,16 +1100,16 @@ nop_target:
|
|
|
d01aaa |
count = iser_conn->qp_max_recv_dtos - outstanding;
|
|
|
d01aaa |
err = iser_post_recvm(iser_conn, count);
|
|
|
d01aaa |
if (err) {
|
|
|
d01aaa |
- iscsi_set_error(iscsi, "posting %d rx bufs err %d", count, err);
|
|
|
d01aaa |
- return -1;
|
|
|
d01aaa |
+ err = -1;
|
|
|
d01aaa |
+ goto error;
|
|
|
d01aaa |
}
|
|
|
d01aaa |
}
|
|
|
d01aaa |
|
|
|
d01aaa |
receive:
|
|
|
d01aaa |
-
|
|
|
d01aaa |
err = iscsi_process_pdu(iscsi, in);
|
|
|
d01aaa |
- iscsi_free(iscsi, in);
|
|
|
d01aaa |
|
|
|
d01aaa |
+error:
|
|
|
d01aaa |
+ iscsi_free(iscsi, in);
|
|
|
d01aaa |
return err;
|
|
|
d01aaa |
}
|
|
|
d01aaa |
|
|
|
d01aaa |
--
|
|
|
d01aaa |
1.8.3.1
|
|
|
d01aaa |
|