diff options
| author | Andy Grover <andy.grover@oracle.com> | 2010-03-01 14:03:09 -0800 |
|---|---|---|
| committer | Andy Grover <andy.grover@oracle.com> | 2010-09-08 18:12:08 -0700 |
| commit | ff3d7d36134ef7138803734fdbf91cc986ea7976 (patch) | |
| tree | 77ef55e071f84f1b97550dbc6d6755cb3089339b /net/rds/ib_cm.c | |
| parent | aa0a4ef4ac3a3c5ffa35e32520bfbc0922ef3630 (diff) | |
| download | kernel-common-ff3d7d36134ef7138803734fdbf91cc986ea7976.tar.gz kernel-common-ff3d7d36134ef7138803734fdbf91cc986ea7976.tar.bz2 kernel-common-ff3d7d36134ef7138803734fdbf91cc986ea7976.zip | |
RDS: Perform unmapping ops in stages
Previously, RDS would wait until the final send WR had completed
and then handle cleanup. With silent ops, we do not know
if an atomic, rdma, or data op will be last. This patch
handles any of these cases by keeping a pointer to the last
op in the message in m_last_op.
When the TX completion event fires, rds dispatches to per-op-type
cleanup functions, and then does whole-message cleanup, if the
last op equalled m_last_op.
This patch also moves towards having op-specific functions take
the op struct, instead of the overall rm struct.
rds_ib_connection has a pointer to keep track of a a partially-
completed data send operation. This patch changes it from an
rds_message pointer to the narrower rm_data_op pointer, and
modifies places that use this pointer as needed.
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Diffstat (limited to 'net/rds/ib_cm.c')
| -rw-r--r-- | net/rds/ib_cm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index 8b0c743c0900..b5b5ebbc0bb6 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -673,9 +673,12 @@ void rds_ib_conn_shutdown(struct rds_connection *conn) BUG_ON(ic->rds_ibdev); /* Clear pending transmit */ - if (ic->i_rm) { - rds_message_put(ic->i_rm); - ic->i_rm = NULL; + if (ic->i_data_op) { + struct rds_message *rm; + + rm = container_of(ic->i_data_op, struct rds_message, data); + rds_message_put(rm); + ic->i_data_op = NULL; } /* Clear the ACK state */ |