Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11d6c461 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Jesse Gross
Browse files

net: ovs: use kfree_rcu instead of rcu_free_{sw_flow_mask_cb,acts_callback} 



As we're only doing a kfree() anyway in the RCU callback, we can
simply use kfree_rcu, which does the same job, and remove the
function rcu_free_sw_flow_mask_cb() and rcu_free_acts_callback().

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent e298e505

net/openvswitch/flow_netlink.c

+1 −9
Original line number Diff line number Diff line
@@ -1176,19 +1176,11 @@ struct sw_flow_actions *ovs_nla_alloc_flow_actions(int size) 
	return sfa;

}



/* RCU callback used by ovs_nla_free_flow_actions. */

static void rcu_free_acts_callback(struct rcu_head *rcu)

{

	struct sw_flow_actions *sf_acts = container_of(rcu,

			struct sw_flow_actions, rcu);

	kfree(sf_acts);

}



/* Schedules 'sf_acts' to be freed after the next RCU grace period.

 * The caller must hold rcu_read_lock for this to be sensible. */

void ovs_nla_free_flow_actions(struct sw_flow_actions *sf_acts)

{

	call_rcu(&sf_acts->rcu, rcu_free_acts_callback);

	kfree_rcu(sf_acts, rcu);

}



static struct nlattr *reserve_sfa_size(struct sw_flow_actions **sfa,

net/openvswitch/flow_table.c

+1 −8
Original line number Diff line number Diff line
@@ -155,13 +155,6 @@ static void rcu_free_flow_callback(struct rcu_head *rcu) 
	flow_free(flow);

}



static void rcu_free_sw_flow_mask_cb(struct rcu_head *rcu)

{

	struct sw_flow_mask *mask = container_of(rcu, struct sw_flow_mask, rcu);



	kfree(mask);

}



static void flow_mask_del_ref(struct sw_flow_mask *mask, bool deferred)

{

	if (!mask)
@@ -173,7 +166,7 @@ static void flow_mask_del_ref(struct sw_flow_mask *mask, bool deferred) 
	if (!mask->ref_count) {

		list_del_rcu(&mask->list);

		if (deferred)

			call_rcu(&mask->rcu, rcu_free_sw_flow_mask_cb);

			kfree_rcu(mask, rcu);

		else

			kfree(mask);

	}