net: dsa: Introduce dsa_is_port_initialized
Subsystems (3)
PATCH 1/1 net: dsa: Introduce dsa_is_port_initialized
To avoid race conditions when using the ds->ports[] array, we need to check if the accessed port has been initialized. Introduce and use helper function dsa_is_port_initialized for that purpose and use it where needed.
Signed-off-by Guenter Roeck <[email protected]>
---
Applies to net-next on top of Florian's patches adding HW bridging support to dsa.
include/net/dsa.h | 5 +++++ net/dsa/dsa.c | 4 ++-- net/dsa/slave.c | 5 +---- 3 files changed, 8 insertions(+), 6 deletions(-)
include/net/dsa.h +5 -0
@@ -165,6 +165,11 @@ static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port); } +static inline bool dsa_is_port_initialized (struct dsa_switch *ds,int p) +{ +return ds->phys_port_mask & (1 << p) && ds->ports[p]; +} +static inline u8 dsa_upstream_port (struct dsa_switch *ds) {struct dsa_switch_tree *dst = ds->dst;
net/dsa/dsa.c +2 -2
@@ -374,7 +374,7 @@ static int dsa_switch_suspend(struct dsa_switch *ds)/* Suspend slave network devices */ for (i =0 ; i <DSA_MAX_PORTS ; i++) { -if (!(ds->phys_port_mask & (1 << i))) +if (!dsa_is_port_initialized (ds, i))continue ; ret =dsa_slave_suspend (ds->ports[i]);
@@ -400,7 +400,7 @@ static int dsa_switch_resume(struct dsa_switch *ds)/* Resume slave network devices */ for (i =0 ; i <DSA_MAX_PORTS ; i++) { -if (!(ds->phys_port_mask & (1 << i))) +if (!dsa_is_port_initialized (ds, i))continue ; ret =dsa_slave_resume (ds->ports[i]);
net/dsa/slave.c +1 -4
@@ -222,10 +222,7 @@ static u32 dsa_slave_br_port_mask(struct dsa_switch *ds,u32 mask =0 ;for (port =0 ; port <DSA_MAX_PORTS ; port++) { -if (!((1 << port) & ds->phys_port_mask)) -continue ; - -if (!ds->ports[port]) +if (!dsa_is_port_initialized (ds, port))continue ; p =netdev_priv (ds->ports[port]);
Signature · 1 line
2.1.0
From: Guenter Roeck <[email protected]>
Date: Tue, 24 Feb 2015 23:02:02 -0800
Quoted 6 lines
To avoid race conditions when using the ds->ports[] array, we need to check if the accessed port has been initialized. Introduce and use helper function
dsa_is_port_initializedfor that purpose and use it where needed.Signed-off-by Guenter Roeck <[email protected]>
Applied, thanks.