admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

net_sched: act_vlan: use RCU in tcf_vlan_dump()

Browse Source 
Also storing tcf_action into struct tcf_vlan_params
makes sure there is no discrepancy in tcf_vlan_act().

No longer block BH in tcf_vlan_init() when acquiring tcf_lock.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250827125349.3505302-3-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Eric Dumazet
2025-08-27 12:53:47 +00:00
committed by Jakub Kicinski
parent 3133d5c15c
commit 48b5e5dbdb
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/tc_act/tc_vlan.h
View File

@@ -10,6 +10,7 @@
#include <linux/tc_act/tc_vlan.h> #include <linux/tc_act/tc_vlan.h>
struct tcf_vlan_params { struct tcf_vlan_params {
int action;
int tcfv_action; int tcfv_action;
unsigned char tcfv_push_dst[ETH_ALEN]; unsigned char tcfv_push_dst[ETH_ALEN];
unsigned char tcfv_push_src[ETH_ALEN]; unsigned char tcfv_push_src[ETH_ALEN];

20
net/sched/act_vlan.c
View File

@@ -25,7 +25,6 @@ TC_INDIRECT_SCOPE int tcf_vlan_act(struct sk_buff *skb,
{ {
struct tcf_vlan *v = to_vlan(a); struct tcf_vlan *v = to_vlan(a);
struct tcf_vlan_params *p; struct tcf_vlan_params *p;
int action;
int err; int err;
u16 tci; u16 tci;
@@ -38,8 +37,6 @@ TC_INDIRECT_SCOPE int tcf_vlan_act(struct sk_buff *skb,
if (skb_at_tc_ingress(skb)) if (skb_at_tc_ingress(skb))
skb_push_rcsum(skb, skb->mac_len); skb_push_rcsum(skb, skb->mac_len);
action = READ_ONCE(v->tcf_action);
p = rcu_dereference_bh(v->vlan_p); p = rcu_dereference_bh(v->vlan_p);
switch (p->tcfv_action) { switch (p->tcfv_action) {
@@ -97,7 +94,7 @@ out:
skb_pull_rcsum(skb, skb->mac_len); skb_pull_rcsum(skb, skb->mac_len);
skb_reset_mac_len(skb); skb_reset_mac_len(skb);
return action; return p->action;
drop: drop:
tcf_action_inc_drop_qstats(&v->common); tcf_action_inc_drop_qstats(&v->common);
@@ -255,10 +252,11 @@ static int tcf_vlan_init(struct net *net, struct nlattr *nla,
ETH_ALEN); ETH_ALEN);
} }
spin_lock_bh(&v->tcf_lock); p->action = parm->action;
spin_lock(&v->tcf_lock);
goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch); goto_ch = tcf_action_set_ctrlact(*a, parm->action, goto_ch);
p = rcu_replace_pointer(v->vlan_p, p, lockdep_is_held(&v->tcf_lock)); p = rcu_replace_pointer(v->vlan_p, p, lockdep_is_held(&v->tcf_lock));
spin_unlock_bh(&v->tcf_lock); spin_unlock(&v->tcf_lock);
if (goto_ch) if (goto_ch)
tcf_chain_put_by_act(goto_ch); tcf_chain_put_by_act(goto_ch);
@@ -297,9 +295,9 @@ static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a,
}; };
struct tcf_t t; struct tcf_t t;
spin_lock_bh(&v->tcf_lock); rcu_read_lock();
opt.action = v->tcf_action; p = rcu_dereference(v->vlan_p);
p = rcu_dereference_protected(v->vlan_p, lockdep_is_held(&v->tcf_lock)); opt.action = p->action;
opt.v_action = p->tcfv_action; opt.v_action = p->tcfv_action;
if (nla_put(skb, TCA_VLAN_PARMS, sizeof(opt), &opt)) if (nla_put(skb, TCA_VLAN_PARMS, sizeof(opt), &opt))
goto nla_put_failure; goto nla_put_failure;
@@ -325,12 +323,12 @@ static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a,
tcf_tm_dump(&t, &v->tcf_tm); tcf_tm_dump(&t, &v->tcf_tm);
if (nla_put_64bit(skb, TCA_VLAN_TM, sizeof(t), &t, TCA_VLAN_PAD)) if (nla_put_64bit(skb, TCA_VLAN_TM, sizeof(t), &t, TCA_VLAN_PAD))
goto nla_put_failure; goto nla_put_failure;
spin_unlock_bh(&v->tcf_lock); rcu_read_unlock();
return skb->len; return skb->len;
nla_put_failure: nla_put_failure:
spin_unlock_bh(&v->tcf_lock); rcu_read_unlock();
nlmsg_trim(skb, b); nlmsg_trim(skb, b);
return -1; return -1;
} }