diff options
| author | Chris Mason <chris.mason@oracle.com> | 2010-05-12 00:14:16 +0200 |
|---|---|---|
| committer | Andy Grover <andy.grover@oracle.com> | 2010-09-09 03:15:10 +0200 |
| commit | c9e65383a20d9a656db70efbf67e57f8115ad776 (patch) | |
| tree | 3055f38ada5a60e858fe66e12353cad37e8ebdd5 /net/rds/ib_send.c | |
| parent | rds: don't let RDS shutdown a connection while senders are present (diff) | |
| download | linux-c9e65383a20d9a656db70efbf67e57f8115ad776.tar.xz linux-c9e65383a20d9a656db70efbf67e57f8115ad776.zip | |
rds: Fix RDMA message reference counting
The RDS send_xmit code was trying to get fancy with message
counting and was dropping the final reference on the RDMA messages
too early. This resulted in memory corruption and oopsen.
The fix here is to always add a ref as the parts of the message passes
through rds_send_xmit, and always drop a ref as the parts of the message
go through completion handling.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'net/rds/ib_send.c')
| -rw-r--r-- | net/rds/ib_send.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c index 657037d96cbf..82459e52c771 100644 --- a/net/rds/ib_send.c +++ b/net/rds/ib_send.c @@ -268,11 +268,12 @@ void rds_ib_send_cq_comp_handler(struct ib_cq *cq, void *context) if (send->s_queued + HZ/2 < jiffies) rds_ib_stats_inc(s_ib_tx_stalled); - if (&send->s_op == &rm->m_final_op) { - /* If anyone waited for this message to get flushed out, wake - * them up now */ - rds_message_unmapped(rm); - + if (send->s_op) { + if (send->s_op == rm->m_final_op) { + /* If anyone waited for this message to get flushed out, wake + * them up now */ + rds_message_unmapped(rm); + } rds_message_put(rm); send->s_op = NULL; } |