Thread (16 messages) 16 messages, 7 authors, 2010-02-02

Re: [PATCH] igmp: fix ip_mc_sf_allow race

From: Eric Dumazet <hidden>
Date: 2010-01-04 19:53:12

Le 04/01/2010 19:51, Flavio Leitner a écrit :
On Mon, Jan 04, 2010 at 02:07:03PM +0100, Eric Dumazet wrote:
quoted
Le 04/01/2010 12:29, Flavio Leitner a écrit :
 
quoted
Then, I tried using call_rcu() to avoid the problem you are saying,
but when you stop the reproducer, sk_free() will warn printing 
"optmem leakage.." because the rcu callback didn't run yet.
This is probably because your call_rcu() callback was trying to call sock_kfree_s() ?
yes, correct.
quoted
 		rtnl_unlock();
		call_rcu(&iml->lock, callback_func)

callback_func()
{
	sock_kfree_s(sk, iml, sizeof(*iml));
}



Take a look at sock_kfree_s() definition :

void sock_kfree_s(struct sock *sk, void *mem, int size)
{
        kfree(mem);
        atomic_sub(size, &sk->sk_omem_alloc);
}


You can certainly try :

	rtnl_unlock();
	atomic_sub(sizeof(*iml), sk->sk_omem_alloc);
	call_rcu(&iml->rcu, kfree);

(immediate sk_omem_alloc handling, but deferred kfree())
Ok, below is the new version using call_rcu(). I'm still running my
tests here, so I'm planning to resubmit it later if this version is
okay with you.
It seems fine, but please make ip_mc_socklist_reclaim() static :
+
+void ip_mc_socklist_reclaim(struct rcu_head *rp)
+{
+	struct ip_mc_socklist *iml;
+
+	iml = container_of(rp, struct ip_mc_socklist, rcu);
+	/* sk_omem_alloc should have been decreased by the caller*/
+	kfree(iml);
+}
+
+
Thanks
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help