iscsi-target: add void (*iscsit_get_rx_pdu)()

Add void (*iscsit_get_rx_pdu)() to
struct iscsit_transport, iscsi-target
uses this callback to receive and
process Rx iSCSI PDUs.

cxgbit.ko needs this callback to
reuse iscsi-target Rx thread.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Acked-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 411e4464ca235bc984d5bc34c723a52e06071f31..9118d7c04a715e708f8bbedc2509301f25c19689 100644 (file)
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -3273,6 +3273,15 @@ static void isert_free_conn(struct iscsi_conn *conn)
        isert_put_conn(isert_conn);
 }
 
+static void isert_get_rx_pdu(struct iscsi_conn *conn)
+{
+       struct completion comp;
+
+       init_completion(&comp);
+
+       wait_for_completion_interruptible(&comp);
+}
+
 static struct iscsit_transport iser_target_transport = {
        .name                   = "IB/iSER",
        .transport_type         = ISCSI_INFINIBAND,
@@ -3291,6 +3300,7 @@ static struct iscsit_transport iser_target_transport = {
        .iscsit_queue_data_in   = isert_put_datain,
        .iscsit_queue_status    = isert_put_response,
        .iscsit_aborted_task    = isert_aborted_task,
+       .iscsit_get_rx_pdu      = isert_get_rx_pdu,
        .iscsit_get_sup_prot_ops = isert_get_sup_prot_ops,
 };
 

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 0724c8355e2932ae381f5eae52e05cb0759c6aeb..9fa9f0b3a0f4a18666b9ef4b2145493a51a3176a 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -3951,14 +3951,8 @@ int iscsi_target_rx_thread(void *arg)
        if (rc < 0 || iscsi_target_check_conn_state(conn))
                return 0;
 
-       if (conn->conn_transport->transport_type == ISCSI_INFINIBAND) {
-               struct completion comp;
-
-               init_completion(&comp);
-               rc = wait_for_completion_interruptible(&comp);
-               if (rc < 0)
-                       goto transport_err;
-
+       if (conn->conn_transport->iscsit_get_rx_pdu) {
+               conn->conn_transport->iscsit_get_rx_pdu(conn);
                goto transport_err;
        }
 

diff --git a/include/target/iscsi/iscsi_transport.h b/include/target/iscsi/iscsi_transport.h
index 3b0053efdfba6c2933ce579e9dd77ba8b307d8d0..ccc68a0334c231a242781a7050b51a736fbdacf2 100644 (file)
--- a/include/target/iscsi/iscsi_transport.h
+++ b/include/target/iscsi/iscsi_transport.h
@@ -25,6 +25,7 @@ struct iscsit_transport {
        int (*iscsit_xmit_pdu)(struct iscsi_conn *, struct iscsi_cmd *,
                               struct iscsi_datain_req *, const void *, u32);
        void (*iscsit_release_cmd)(struct iscsi_conn *, struct iscsi_cmd *);
+       void (*iscsit_get_rx_pdu)(struct iscsi_conn *);
        enum target_prot_op (*iscsit_get_sup_prot_ops)(struct iscsi_conn *);
 };