forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

team: use rcu_dereference_bh() in tx path

Browse source 
Should be used instead of rcu_dereference, since rcu_read_lock_bh is
held.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2012-06-19 05:54:21 +00:00 • committed by David S. Miller
parent 2fcdb2c9e6
commit d1904fbd88
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/team/team_mode_activebackup.c
View file

@ -40,7 +40,7 @@ static bool ab_transmit(struct team *team, struct sk_buff *skb)
{ {
struct team_port *active_port; struct team_port *active_port;
active_port = rcu_dereference(ab_priv(team)->active_port); active_port = rcu_dereference_bh(ab_priv(team)->active_port);
if (unlikely(!active_port)) if (unlikely(!active_port))
goto drop; goto drop;
skb->dev = active_port->dev; skb->dev = active_port->dev;

6
drivers/net/team/team_mode_loadbalance.c
View file

@ -124,7 +124,7 @@ static struct team_port *lb_htpm_select_tx_port(struct team *team,
struct sk_buff *skb, struct sk_buff *skb,
unsigned char hash) unsigned char hash)
{ {
return rcu_dereference(LB_HTPM_PORT_BY_HASH(lb_priv, hash)); return rcu_dereference_bh(LB_HTPM_PORT_BY_HASH(lb_priv, hash));
} }
struct lb_select_tx_port { struct lb_select_tx_port {
@ -179,7 +179,7 @@ static unsigned int lb_get_skb_hash(struct lb_priv *lb_priv,
uint32_t lhash; uint32_t lhash;
unsigned char *c; unsigned char *c;
fp = rcu_dereference(lb_priv->fp); fp = rcu_dereference_bh(lb_priv->fp);
if (unlikely(!fp)) if (unlikely(!fp))
return 0; return 0;
lhash = SK_RUN_FILTER(fp, skb); lhash = SK_RUN_FILTER(fp, skb);
@ -213,7 +213,7 @@ static bool lb_transmit(struct team *team, struct sk_buff *skb)
unsigned int tx_bytes = skb->len; unsigned int tx_bytes = skb->len;
hash = lb_get_skb_hash(lb_priv, skb); hash = lb_get_skb_hash(lb_priv, skb);
select_tx_port_func = rcu_dereference(lb_priv->select_tx_port_func); select_tx_port_func = rcu_dereference_bh(lb_priv->select_tx_port_func);
port = select_tx_port_func(team, lb_priv, skb, hash); port = select_tx_port_func(team, lb_priv, skb, hash);
if (unlikely(!port)) if (unlikely(!port))
goto drop; goto drop;