From: Christoph Hellwig <hch@lst.de>
To: linux-rdma@vger.kernel.org
Cc: swise@opengridcomputing.com, sagig@mellanox.com,
target-devel@vger.kernel.org
Subject: [PATCH 11/13] IB/isert: the kill ->isert_cmd back pointer in the struct iser_tx_desc
Date: Sat, 27 Feb 2016 19:10:29 +0100 [thread overview]
Message-ID: <1456596631-19418-12-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1456596631-19418-1-git-send-email-hch@lst.de>
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>
---
drivers/infiniband/ulp/isert/ib_isert.c | 14 ++++++--------
drivers/infiniband/ulp/isert/ib_isert.h | 1 -
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index c93be93..e1a553f 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1043,7 +1043,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;
@@ -1896,7 +1895,8 @@ isert_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc)
struct isert_device *device = isert_conn->device;
struct iser_tx_desc *desc =
container_of(wc->wr_cqe, struct iser_tx_desc, tx_cqe);
- struct isert_cmd *isert_cmd = desc->isert_cmd;
+ struct isert_cmd *isert_cmd =
+ container_of(desc, struct isert_cmd, tx_desc);
struct se_cmd *cmd = &isert_cmd->iscsi_cmd->se_cmd;
int ret = 0;
@@ -1929,7 +1929,8 @@ isert_rdma_read_done(struct ib_cq *cq, struct ib_wc *wc)
struct isert_device *device = isert_conn->device;
struct iser_tx_desc *desc =
container_of(wc->wr_cqe, struct iser_tx_desc, tx_cqe);
- struct isert_cmd *isert_cmd = desc->isert_cmd;
+ struct isert_cmd *isert_cmd =
+ container_of(desc, struct isert_cmd, tx_desc);
struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;
struct se_cmd *se_cmd = &cmd->se_cmd;
int ret = 0;
@@ -2019,7 +2020,8 @@ isert_send_done(struct ib_cq *cq, struct ib_wc *wc)
struct ib_device *ib_dev = isert_conn->cm_id->device;
struct iser_tx_desc *tx_desc =
container_of(wc->wr_cqe, struct iser_tx_desc, tx_cqe);
- struct isert_cmd *isert_cmd = tx_desc->isert_cmd;
+ struct isert_cmd *isert_cmd =
+ container_of(tx_desc, struct isert_cmd, tx_desc);
if (unlikely(wc->status != IB_WC_SUCCESS)) {
isert_print_wc(wc);
@@ -2347,8 +2349,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,
@@ -2710,8 +2710,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 b751b6a..2614403 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/drivers/infiniband/ulp/isert/ib_isert.h
@@ -106,7 +106,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;
--
2.1.4
next prev parent reply other threads:[~2016-02-27 18:10 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-27 18:10 RFC: a first draft of a generic RDMA READ/WRITE API Christoph Hellwig
[not found] ` <1456596631-19418-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2016-02-27 18:10 ` [PATCH 01/13] IB/cma: pass the port number to ib_create_qp Christoph Hellwig
2016-02-27 18:10 ` [PATCH 02/13] IB/core: allow passing mapping an offset into the SG in ib_map_mr_sg Christoph Hellwig
[not found] ` <1456596631-19418-3-git-send-email-hch-jcswGhMUV9g@public.gmane.org>
2016-02-28 14:57 ` Sagi Grimberg
2016-02-28 16:20 ` Christoph Hellwig
2016-02-28 17:50 ` Sagi Grimberg
[not found] ` <56D33356.1020707-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2016-02-29 22:22 ` Steve Wise
2016-02-29 11:15 ` Christoph Hellwig
[not found] ` <20160229111557.GA11499-jcswGhMUV9g@public.gmane.org>
2016-02-29 11:35 ` Sagi Grimberg
2016-02-29 11:56 ` Christoph Hellwig
2016-02-29 12:08 ` Sagi Grimberg
2016-02-27 18:10 ` [PATCH 03/13] IB/core: add a helper to check for READ WITH INVALIDATE support Christoph Hellwig
2016-02-27 18:10 ` [PATCH 05/13] IB/core: add a simple MR pool Christoph Hellwig
2016-03-02 2:48 ` Parav Pandit
2016-03-02 9:15 ` Christoph Hellwig
2016-03-02 15:22 ` Bart Van Assche
[not found] ` <56D70543.1000506-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2016-03-03 8:30 ` Christoph Hellwig
2016-02-27 18:10 ` [PATCH 07/13] IB/core: generic RDMA READ/WRITE API Christoph Hellwig
2016-02-28 15:05 ` Sagi Grimberg
2016-02-27 18:10 ` [PATCH 08/13] IB/isert: properly type the login buffer Christoph Hellwig
2016-02-27 18:10 ` [PATCH 09/13] IB/isert: convert to new CQ API Christoph Hellwig
2016-02-27 18:10 ` [PATCH 10/13] IB/isert: kill struct isert_rdma_wr Christoph Hellwig
2016-02-27 18:10 ` [PATCH 12/13] IB/core: add a MR pool for signature MRs Christoph Hellwig
2016-02-27 18:10 ` [PATCH 04/13] IB/core: refactor ib_create_qp Christoph Hellwig
2016-02-27 18:10 ` [PATCH 06/13] IB/core: add a need_inval flag to struct ib_mr Christoph Hellwig
2016-02-28 15:10 ` Sagi Grimberg
2016-02-28 16:05 ` Christoph Hellwig
2016-02-27 18:10 ` Christoph Hellwig [this message]
2016-02-27 18:10 ` [PATCH 13/13] IB/isert: RW API WIP Christoph Hellwig
2016-02-28 13:57 ` Sagi Grimberg
2016-02-28 16:04 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456596631-19418-12-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=linux-rdma@vger.kernel.org \
--cc=sagig@mellanox.com \
--cc=swise@opengridcomputing.com \
--cc=target-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox