Skip to content

Commit 2c153b9

Browse files
Hal RosenstockLinus Torvalds
authored andcommitted
[PATCH] IB: Eliminate MAD cache leak associated with local completions
Eliminate MAD cache leak associated with local completions. Also, when canceling MAD, empty local completion list as well. Signed-off-by: Hal Rosenstock <[email protected]> Cc: Roland Dreier <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent dbf9227 commit 2c153b9

File tree

1 file changed

+6
-1
lines changed
  • drivers/infiniband/core

1 file changed

+6
-1
lines changed

drivers/infiniband/core/mad.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1994,6 +1994,8 @@ static void cancel_mads(struct ib_mad_agent_private *mad_agent_priv)
19941994

19951995
/* Empty wait list to prevent receives from finding a request */
19961996
list_splice_init(&mad_agent_priv->wait_list, &cancel_list);
1997+
/* Empty local completion list as well */
1998+
list_splice_init(&mad_agent_priv->local_list, &cancel_list);
19971999
spin_unlock_irqrestore(&mad_agent_priv->lock, flags);
19982000

19992001
/* Report all cancelled requests */
@@ -2108,6 +2110,7 @@ static void local_completions(void *data)
21082110
struct ib_mad_local_private *local;
21092111
struct ib_mad_agent_private *recv_mad_agent;
21102112
unsigned long flags;
2113+
int recv = 0;
21112114
struct ib_wc wc;
21122115
struct ib_mad_send_wc mad_send_wc;
21132116

@@ -2123,10 +2126,10 @@ static void local_completions(void *data)
21232126
recv_mad_agent = local->recv_mad_agent;
21242127
if (!recv_mad_agent) {
21252128
printk(KERN_ERR PFX "No receive MAD agent for local completion\n");
2126-
kmem_cache_free(ib_mad_cache, local->mad_priv);
21272129
goto local_send_completion;
21282130
}
21292131

2132+
recv = 1;
21302133
/*
21312134
* Defined behavior is to complete response
21322135
* before request
@@ -2169,6 +2172,8 @@ static void local_completions(void *data)
21692172
spin_lock_irqsave(&mad_agent_priv->lock, flags);
21702173
list_del(&local->completion_list);
21712174
atomic_dec(&mad_agent_priv->refcount);
2175+
if (!recv)
2176+
kmem_cache_free(ib_mad_cache, local->mad_priv);
21722177
kfree(local);
21732178
}
21742179
spin_unlock_irqrestore(&mad_agent_priv->lock, flags);

0 commit comments

Comments
 (0)