diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2022-09-05 20:01:25 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-09-07 13:44:04 +0100 |
| commit | a4bb481aeb9d84cb53112a478e6db4705b794c34 (patch) | |
| tree | 76345a71558bc55469a3bf04dd39f975c54a8545 /drivers/net/dsa/ocelot/felix_vsc9959.c | |
| parent | net: dsa: felix: disable cut-through forwarding for frames oversized for tc-taprio (diff) | |
| download | wireguard-linux-a4bb481aeb9d84cb53112a478e6db4705b794c34.tar.xz wireguard-linux-a4bb481aeb9d84cb53112a478e6db4705b794c34.zip | |
net: dsa: felix: access QSYS_TAG_CONFIG under tas_lock in vsc9959_sched_speed_set
The read-modify-write of QSYS_TAG_CONFIG from vsc9959_sched_speed_set()
runs unlocked with respect to the other functions that access it, which
are vsc9959_tas_guard_bands_update(), vsc9959_qos_port_tas_set() and
vsc9959_tas_clock_adjust(). All the others are under ocelot->tas_lock,
so move the vsc9959_sched_speed_set() access under that lock as well, to
resolve the concurrency.
Fixes: 55a515b1f5a9 ("net: dsa: felix: drop oversized frames with tc-taprio instead of hanging the port")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/dsa/ocelot/felix_vsc9959.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c index ad7c795d6612..f8f19a85744c 100644 --- a/drivers/net/dsa/ocelot/felix_vsc9959.c +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c @@ -1759,13 +1759,13 @@ static void vsc9959_sched_speed_set(struct ocelot *ocelot, int port, break; } + mutex_lock(&ocelot->tas_lock); + ocelot_rmw_rix(ocelot, QSYS_TAG_CONFIG_LINK_SPEED(tas_speed), QSYS_TAG_CONFIG_LINK_SPEED_M, QSYS_TAG_CONFIG, port); - mutex_lock(&ocelot->tas_lock); - if (ocelot_port->taprio) vsc9959_tas_guard_bands_update(ocelot, port); |