net,rcu: convert call_rcu(net_generic_release) to kfree_rcu() (04d4dfed) · Commits · 戴 / test

The rcu callback net_generic_release() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(net_generic_release). Signed-off-by:

net/core/net_namespace.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -27,14 +27,6 @@ EXPORT_SYMBOL(init_net);

		#define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */

		static void net_generic_release(struct rcu_head *rcu)
		{
		struct net_generic *ng;

		ng = container_of(rcu, struct net_generic, rcu);
		kfree(ng);
		}

		static int net_assign_generic(struct net net, int id, void data)
		{
		struct net_generic ng, old_ng;
		@@ -68,7 +60,7 @@ static int net_assign_generic(struct net net, int id, void data)
		memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));

		rcu_assign_pointer(net->gen, ng);
		call_rcu(&old_ng->rcu, net_generic_release);
		kfree_rcu(old_ng, rcu);
		assign:
		ng->ptr[id - 1] = data;
		return 0;