a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

team: remove synchronize_rcu() called during port disable

Browse Source 
Check the unlikely case of team->en_port_count == 0 before modulo
operation.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2013-06-10 17:42:25 +02:00 committed by David S. Miller
parent d80b35beac
commit 735d381fa5
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/team/team.c
View File

@ -525,31 +525,26 @@ static void team_set_no_mode(struct team *team)
team->mode = &__team_no_mode; team->mode = &__team_no_mode;
} }
static void __team_adjust_ops(struct team *team, int en_port_count) static void team_adjust_ops(struct team *team)
{ {
/* /*
* To avoid checks in rx/tx skb paths, ensure here that non-null and * To avoid checks in rx/tx skb paths, ensure here that non-null and
* correct ops are always set. * correct ops are always set.
*/ */
if (!en_port_count || !team_is_mode_set(team) || if (!team->en_port_count || !team_is_mode_set(team) ||
!team->mode->ops->transmit) !team->mode->ops->transmit)
team->ops.transmit = team_dummy_transmit; team->ops.transmit = team_dummy_transmit;
else else
team->ops.transmit = team->mode->ops->transmit; team->ops.transmit = team->mode->ops->transmit;
if (!en_port_count || !team_is_mode_set(team) || if (!team->en_port_count || !team_is_mode_set(team) ||
!team->mode->ops->receive) !team->mode->ops->receive)
team->ops.receive = team_dummy_receive; team->ops.receive = team_dummy_receive;
else else
team->ops.receive = team->mode->ops->receive; team->ops.receive = team->mode->ops->receive;
} }
static void team_adjust_ops(struct team *team)
{
__team_adjust_ops(team, team->en_port_count);
}
/* /*
* We can benefit from the fact that it's ensured no port is present * We can benefit from the fact that it's ensured no port is present
* at the time of mode change. Therefore no packets are in fly so there's no * at the time of mode change. Therefore no packets are in fly so there's no
@ -877,14 +872,9 @@ static void team_port_disable(struct team *team,
hlist_del_rcu(&port->hlist); hlist_del_rcu(&port->hlist);
__reconstruct_port_hlist(team, port->index); __reconstruct_port_hlist(team, port->index);
port->index = -1; port->index = -1;
team_queue_override_port_del(team, port);
__team_adjust_ops(team, team->en_port_count - 1);
/*
* Wait until readers see adjusted ops. This ensures that
* readers never see team->en_port_count == 0
*/
synchronize_rcu();
team->en_port_count--; team->en_port_count--;
team_queue_override_port_del(team, port);
team_adjust_ops(team);
} }
#define TEAM_VLAN_FEATURES (NETIF_F_ALL_CSUM | NETIF_F_SG | \ #define TEAM_VLAN_FEATURES (NETIF_F_ALL_CSUM | NETIF_F_SG | \

3
drivers/net/team/team_mode_loadbalance.c
View File

@ -112,9 +112,8 @@ static struct team_port *lb_hash_select_tx_port(struct team *team,
struct sk_buff *skb, struct sk_buff *skb,
unsigned char hash) unsigned char hash)
{ {
int port_index; int port_index = team_num_to_port_index(team, hash);
port_index = hash % team->en_port_count;
return team_get_port_by_index_rcu(team, port_index); return team_get_port_by_index_rcu(team, port_index);
} }

3
drivers/net/team/team_mode_roundrobin.c
View File

@ -30,7 +30,8 @@ static bool rr_transmit(struct team *team, struct sk_buff *skb)
struct team_port *port; struct team_port *port;
int port_index; int port_index;
port_index = rr_priv(team)->sent_packets++ % team->en_port_count; port_index = team_num_to_port_index(team,
rr_priv(team)->sent_packets++);
port = team_get_port_by_index_rcu(team, port_index); port = team_get_port_by_index_rcu(team, port_index);
port = team_get_first_port_txable_rcu(team, port); port = team_get_first_port_txable_rcu(team, port);
if (unlikely(!port)) if (unlikely(!port))

10
include/linux/if_team.h
View File

@ -229,6 +229,16 @@ static inline struct team_port *team_get_port_by_index(struct team *team,
return port; return port;
return NULL; return NULL;
} }
static inline int team_num_to_port_index(struct team *team, int num)
{
int en_port_count = ACCESS_ONCE(team->en_port_count);
if (unlikely(!en_port_count))
return 0;
return num % en_port_count;
}
static inline struct team_port *team_get_port_by_index_rcu(struct team *team, static inline struct team_port *team_get_port_by_index_rcu(struct team *team,
int port_index) int port_index)
{ {