Commit 445d3749 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

net/sched: Replace rcu_swap_protected() with rcu_replace_pointer() 

This commit replaces the use of rcu_swap_protected() with the more
intuitively appealing rcu_replace_pointer() as a step towards removing
rcu_swap_protected().

Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/


Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
[ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ]
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>
parent b685b534

net/sched/act_api.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct tcf_chain *tcf_action_set_ctrlact(struct tc_action *a, int action, 
					 struct tcf_chain *goto_chain)

{

	a->tcfa_action = action;

	rcu_swap_protected(a->goto_chain, goto_chain, 1);

	goto_chain = rcu_replace_pointer(a->goto_chain, goto_chain, 1);

	return goto_chain;

}

EXPORT_SYMBOL(tcf_action_set_ctrlact);

net/sched/act_csum.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int tcf_csum_init(struct net *net, struct nlattr *nla, 


	spin_lock_bh(&p->tcf_lock);

	goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);

	rcu_swap_protected(p->params, params_new,

	params_new = rcu_replace_pointer(p->params, params_new,

					 lockdep_is_held(&p->tcf_lock));

	spin_unlock_bh(&p->tcf_lock);

net/sched/act_ct.c

+2 −1
Original line number Diff line number Diff line
@@ -722,7 +722,8 @@ static int tcf_ct_init(struct net *net, struct nlattr *nla, 


	spin_lock_bh(&c->tcf_lock);

	goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);

	rcu_swap_protected(c->params, params, lockdep_is_held(&c->tcf_lock));

	params = rcu_replace_pointer(c->params, params,

				     lockdep_is_held(&c->tcf_lock));

	spin_unlock_bh(&c->tcf_lock);



	if (goto_ch)

net/sched/act_ctinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int tcf_ctinfo_init(struct net *net, struct nlattr *nla, 


	spin_lock_bh(&ci->tcf_lock);

	goto_ch = tcf_action_set_ctrlact(*a, actparm->action, goto_ch);

	rcu_swap_protected(ci->params, cp_new,

	cp_new = rcu_replace_pointer(ci->params, cp_new,

				     lockdep_is_held(&ci->tcf_lock));

	spin_unlock_bh(&ci->tcf_lock);

net/sched/act_ife.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla, 
		spin_lock_bh(&ife->tcf_lock);

	/* protected by tcf_lock when modifying existing action */

	goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);

	rcu_swap_protected(ife->params, p, 1);

	p = rcu_replace_pointer(ife->params, p, 1);



	if (exists)

		spin_unlock_bh(&ife->tcf_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE