iser-target: Kill the ->isert_cmd back pointer in struct iser_tx_desc

We only use the pointer when processing regular iSER commands, and it then
always points to the struct iser_cmd that contains the TX descriptor.

Remove it and rely on container_of to save a little space and avoid a
pointer that is updated multiple times per processed command.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
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 b432a29e46a8c63e5f0ac49141e5ddefe8ec1ccb..60b30d338a813447782449a54b6f7161874d4b22 100644 (file)
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1041,7 +1041,6 @@ isert_create_send_desc(struct isert_conn *isert_conn,
        tx_desc->iser_header.flags = ISCSI_CTRL;
 
        tx_desc->num_sge = 1;
-       tx_desc->isert_cmd = isert_cmd;
 
        if (tx_desc->tx_sg[0].lkey != device->pd->local_dma_lkey) {
                tx_desc->tx_sg[0].lkey = device->pd->local_dma_lkey;
@@ -1882,7 +1881,7 @@ isert_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc)
        struct isert_conn *isert_conn = wc->qp->qp_context;
        struct isert_device *device = isert_conn->device;
        struct iser_tx_desc *desc = cqe_to_tx_desc(wc->wr_cqe);
-       struct isert_cmd *isert_cmd = desc->isert_cmd;
+       struct isert_cmd *isert_cmd = tx_desc_to_cmd(desc);
        struct se_cmd *cmd = &isert_cmd->iscsi_cmd->se_cmd;
        int ret = 0;
 
@@ -1916,7 +1915,7 @@ isert_rdma_read_done(struct ib_cq *cq, struct ib_wc *wc)
        struct isert_conn *isert_conn = wc->qp->qp_context;
        struct isert_device *device = isert_conn->device;
        struct iser_tx_desc *desc = cqe_to_tx_desc(wc->wr_cqe);
-       struct isert_cmd *isert_cmd = desc->isert_cmd;
+       struct isert_cmd *isert_cmd = tx_desc_to_cmd(desc);
        struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;
        struct se_cmd *se_cmd = &cmd->se_cmd;
        int ret = 0;
@@ -2009,7 +2008,7 @@ isert_send_done(struct ib_cq *cq, struct ib_wc *wc)
        struct isert_conn *isert_conn = wc->qp->qp_context;
        struct ib_device *ib_dev = isert_conn->cm_id->device;
        struct iser_tx_desc *tx_desc = cqe_to_tx_desc(wc->wr_cqe);
-       struct isert_cmd *isert_cmd = tx_desc->isert_cmd;
+       struct isert_cmd *isert_cmd = tx_desc_to_cmd(tx_desc);
 
        if (unlikely(wc->status != IB_WC_SUCCESS)) {
                isert_print_wc(wc, "send");
@@ -2339,8 +2338,6 @@ isert_map_rdma(struct isert_cmd *isert_cmd, struct iscsi_conn *conn)
        u32 offset, data_len, data_left, rdma_write_max, va_offset = 0;
        int ret = 0, i, ib_sge_cnt;
 
-       isert_cmd->tx_desc.isert_cmd = isert_cmd;
-
        offset = isert_cmd->iser_ib_op == ISER_IB_RDMA_READ ?
                        cmd->write_data_done : 0;
        ret = isert_map_data_buf(isert_conn, isert_cmd, se_cmd->t_data_sg,
@@ -2702,8 +2699,6 @@ isert_reg_rdma(struct isert_cmd *isert_cmd, struct iscsi_conn *conn)
        int ret = 0;
        unsigned long flags;
 
-       isert_cmd->tx_desc.isert_cmd = isert_cmd;
-
        offset = isert_cmd->iser_ib_op == ISER_IB_RDMA_READ ?
                        cmd->write_data_done : 0;
        ret = isert_map_data_buf(isert_conn, isert_cmd, se_cmd->t_data_sg,

diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h
index f552797dc8639020e5a94e899336497c71db4981..192788a4820cde54795c313a068e662017f222a0 100644 (file)
--- a/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/drivers/infiniband/ulp/isert/ib_isert.h
@@ -110,7 +110,6 @@ struct iser_tx_desc {
        struct ib_sge   tx_sg[2];
        struct ib_cqe   tx_cqe;
        int             num_sge;
-       struct isert_cmd *isert_cmd;
        struct ib_send_wr send_wr;
 } __packed;
 
@@ -181,6 +180,11 @@ struct isert_cmd {
        struct scatterlist      sg;
 };
 
+static inline struct isert_cmd *tx_desc_to_cmd(struct iser_tx_desc *desc)
+{
+       return container_of(desc, struct isert_cmd, tx_desc);
+}
+
 struct isert_device;
 
 struct isert_conn {