[PATCH net 0/3] Fixes for Felix DSA driver calculation of tc-taprio guard bands

[PATCH net 0/3] Fixes for Felix DSA driver calculation of tc-taprio guard bands

[Vladimir Oltean]

This series fixes some bugs which are not quite new, but date from v5.13
when static guard bands were enabled by Michael Walle to prevent
tc-taprio overruns.

The investigation started when Xiaoliang asked privately what is the
expected max SDU for a traffic class when its minimum gate interval is
10 us. The answer, as it turns out, is not an L1 size of 1250 octets,
but half of that, since otherwise, the switch will not consider frames
for egress scheduling, because the static guard band is larger than the
time interval.

The fix for that (patch 1/3) is relatively small, but during testing, it
became apparent that cut-through forwarding prevents oversized frame
dropping from working properly. This is solved through the larger patch
2/3. Finally, patch 3/3 fixes one more tc-taprio locking problem found
through code inspection.

Vladimir Oltean (3):
  net: dsa: felix: allow small tc-taprio windows to send at least some
    packets
  net: dsa: felix: disable cut-through forwarding for frames oversized
    for tc-taprio
  net: dsa: felix: access QSYS_TAG_CONFIG under tas_lock in
    vsc9959_sched_speed_set

 drivers/net/dsa/ocelot/felix_vsc9959.c | 141 ++++++++++++++++---------
 1 file changed, 93 insertions(+), 48 deletions(-)

-- 
2.34.1

[PATCH net 1/3] net: dsa: felix: allow small tc-taprio windows to send at least some packets

[Vladimir Oltean]

The blamed commit broke tc-taprio schedules such as this one:

tc qdisc replace dev $swp1 root taprio \
	num_tc 8 \
	map 0 1 2 3 4 5 6 7 \
	queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 \
	base-time 0 \
	sched-entry S 0x7f 990000 \
	sched-entry S 0x80  10000 \
	flags 0x2

because the gate entry for TC 7 (S 0x80 10000 ns) now has a static guard
band added earlier than its 'gate close' event, such that packet
overruns won't occur in the worst case of the largest packet possible.

Since guard bands are statically determined based on the per-tc
QSYS_QMAXSDU_CFG_* with a fallback on the port-based QSYS_PORT_MAX_SDU,
we need to discuss depending on kernel version, since the driver, prior
to commit 55a515b1f5a9 ("net: dsa: felix: drop oversized frames with
tc-taprio instead of hanging the port"), did not touch
QSYS_QMAXSDU_CFG_*, and therefore relied on QSYS_PORT_MAX_SDU.

1 (before vsc9959_tas_guard_bands_update): QSYS_PORT_MAX_SDU defaults to
  1518, and at gigabit this introduces a static guard band (independent
  of packet sizes) of 12144 ns. But this is larger than the time window
  itself, of 10000 ns. So, the queue system never considers a frame with
  TC 7 as eligible for transmission, since the gate practically never
  opens, and these frames are forever stuck in the TX queues and hang
  the port.

2 (after vsc9959_tas_guard_bands_update): We make an effort to set
  QSYS_QMAXSDU_CFG_7 to 1230 bytes, and this enables oversized frame
  dropping for everything larger than that. But QSYS_QMAXSDU_CFG_7 plays
  2 roles. One is oversized frame dropping, the other is the per-tc
  static guard band. When we calculated QSYS_QMAXSDU_CFG_7 to be 1230,
  we considered no guard band at all, and the entire time window
  available for transmission, which is not the case. The larger
  QSYS_QMAXSDU_CFG_7 is, the larger the static guard band for the tc is,
  too.

In both cases, frames with any size (even 60 bytes sans FCS) are stuck
on egress rather than being considered for scheduling on TC 7, even if
they fit. This is because the static guard band is way too large.
Considering the current situation, with vsc9959_tas_guard_bands_update(),
frames between 60 octets and 1230 octets in size are not eligible for
oversized dropping (because they are smaller than QSYS_QMAXSDU_CFG_7),
but won't be considered as eligible for scheduling either, because the
min_gate_len[7] (10000 ns) - the guard band determined by
QSYS_QMAXSDU_CFG_7 (1230 octets * 8 ns per octet == 9840 ns) is smaller
than their transmit time.

A solution that is quite outrageous is to limit the minimum valid gate
interval acceptable through tc-taprio, such that intervals, when
transformed into L1 frame bit times, are never smaller than twice the
MTU of the interface. However, the tc-taprio UAPI operates in ns, and
the link speed can change at runtime (to 10 Mbps, where the transmission
time of 1 octet is 800 ns). And since the max MTU is around 9000, we'd
have to limit the tc-taprio intervals to be no smaller than 14.4 ms on
the premise that it is possible for the link to renegotiate to 10 Mbps,
which is astonishingly limiting for real use cases, where the entire
*cycle* (here we're talking about a single interval) must be 100 us or
lower.

The solution is to modify vsc9959_tas_guard_bands_update() to take into
account that the static per-tc guard bands consume time out of our time
window too, not just packet transmission. The unknown which needs to be
determined is the max admissible frame size. Both the useful bit time
and the guard band size will depend on this unknown variable, so
dividing the available 10000 ns into 2 halves sounds like the ideal
strategy. In this case, we will program QSYS_QMAXSDU_CFG_7 with a
maximum frame length (and guard band size) of 605 octets (this includes
FCS but not IPG and preamble/SFD). With this value, everything of L2
size 601 (sans FCS) and higher is considered as oversized, and the guard
band is low enough (605 + HSCH_MISC.FRM_ADJ, at 1Gbps => 5000 ns) in
order to not disturb the scheduling of any frame smaller than L2 size 601.

Fixes: 297c4de6f780 ("net: dsa: felix: re-enable TAS guard band mode")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/dsa/ocelot/felix_vsc9959.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 1cdce8a98d1d..6fa4e0161b34 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1599,9 +1599,10 @@ static void vsc9959_tas_guard_bands_update(struct ocelot *ocelot, int port)
 		u32 max_sdu;
 
 		if (min_gate_len[tc] == U64_MAX /* Gate always open */ ||
-		    min_gate_len[tc] * PSEC_PER_NSEC > needed_bit_time_ps) {
+		    min_gate_len[tc] * PSEC_PER_NSEC > 2 * needed_bit_time_ps) {
 			/* Setting QMAXSDU_CFG to 0 disables oversized frame
-			 * dropping.
+			 * dropping and leaves just the port-based static
+			 * guard band.
 			 */
 			max_sdu = 0;
 			dev_dbg(ocelot->dev,
@@ -1612,9 +1613,17 @@ static void vsc9959_tas_guard_bands_update(struct ocelot *ocelot, int port)
 			/* If traffic class doesn't support a full MTU sized
 			 * frame, make sure to enable oversize frame dropping
 			 * for frames larger than the smallest that would fit.
+			 *
+			 * However, the exact same register, * QSYS_QMAXSDU_CFG_*,
+			 * controls not only oversized frame dropping, but also
+			 * per-tc static guard band lengths. Therefore, the max
+			 * SDU supported by this tc is determined by splitting
+			 * its time window into 2: one for the useful traffic
+			 * and one for the guard band. Both halves have the
+			 * length equal to one max sized packet.
 			 */
 			max_sdu = div_u64(min_gate_len[tc] * PSEC_PER_NSEC,
-					  picos_per_byte);
+					  2 * picos_per_byte);
 			/* A TC gate may be completely closed, which is a
 			 * special case where all packets are oversized.
 			 * Any limit smaller than 64 octets accomplishes this
-- 
2.34.1

Re: [PATCH net 1/3] net: dsa: felix: allow small tc-taprio windows to send at least some packets

[Michael Walle]

Hi,

Am 2022-09-02 23:57, schrieb Vladimir Oltean:
> The blamed commit broke tc-taprio schedules such as this one:
> 
> tc qdisc replace dev $swp1 root taprio \
> 	num_tc 8 \
> 	map 0 1 2 3 4 5 6 7 \
> 	queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 \
> 	base-time 0 \
> 	sched-entry S 0x7f 990000 \
> 	sched-entry S 0x80  10000 \
> 	flags 0x2
> 
> because the gate entry for TC 7 (S 0x80 10000 ns) now has a static 
> guard
> band added earlier than its 'gate close' event, such that packet
> overruns won't occur in the worst case of the largest packet possible.
> 
> Since guard bands are statically determined based on the per-tc
> QSYS_QMAXSDU_CFG_* with a fallback on the port-based QSYS_PORT_MAX_SDU,
> we need to discuss depending on kernel version, since the driver, prior
> to commit 55a515b1f5a9 ("net: dsa: felix: drop oversized frames with
> tc-taprio instead of hanging the port"), did not touch
> QSYS_QMAXSDU_CFG_*, and therefore relied on QSYS_PORT_MAX_SDU.
> 
> 1 (before vsc9959_tas_guard_bands_update): QSYS_PORT_MAX_SDU defaults 
> to
>   1518, and at gigabit this introduces a static guard band (independent
>   of packet sizes) of 12144 ns. But this is larger than the time window
>   itself, of 10000 ns. So, the queue system never considers a frame 
> with
>   TC 7 as eligible for transmission, since the gate practically never
>   opens, and these frames are forever stuck in the TX queues and hang
>   the port.

IIRC we deliberately ignored that problem back then, because we couldn't
set the maxsdu.

> 2 (after vsc9959_tas_guard_bands_update): We make an effort to set
>   QSYS_QMAXSDU_CFG_7 to 1230 bytes, and this enables oversized frame
>   dropping for everything larger than that. But QSYS_QMAXSDU_CFG_7 
> plays
>   2 roles. One is oversized frame dropping, the other is the per-tc
>   static guard band. When we calculated QSYS_QMAXSDU_CFG_7 to be 1230,
>   we considered no guard band at all, and the entire time window
>   available for transmission, which is not the case. The larger
>   QSYS_QMAXSDU_CFG_7 is, the larger the static guard band for the tc 
> is,
>   too.
> 
> In both cases, frames with any size (even 60 bytes sans FCS) are stuck
> on egress rather than being considered for scheduling on TC 7, even if
> they fit. This is because the static guard band is way too large.
> Considering the current situation, with 
> vsc9959_tas_guard_bands_update(),
> frames between 60 octets and 1230 octets in size are not eligible for
> oversized dropping (because they are smaller than QSYS_QMAXSDU_CFG_7),
> but won't be considered as eligible for scheduling either, because the
> min_gate_len[7] (10000 ns) - the guard band determined by
> QSYS_QMAXSDU_CFG_7 (1230 octets * 8 ns per octet == 9840 ns) is smaller
> than their transmit time.
> 
> A solution that is quite outrageous is to limit the minimum valid gate
> interval acceptable through tc-taprio, such that intervals, when
> transformed into L1 frame bit times, are never smaller than twice the
> MTU of the interface. However, the tc-taprio UAPI operates in ns, and
> the link speed can change at runtime (to 10 Mbps, where the 
> transmission
> time of 1 octet is 800 ns). And since the max MTU is around 9000, we'd
> have to limit the tc-taprio intervals to be no smaller than 14.4 ms on
> the premise that it is possible for the link to renegotiate to 10 Mbps,
> which is astonishingly limiting for real use cases, where the entire
> *cycle* (here we're talking about a single interval) must be 100 us or
> lower.
> 
> The solution is to modify vsc9959_tas_guard_bands_update() to take into
> account that the static per-tc guard bands consume time out of our time
> window too, not just packet transmission. The unknown which needs to be
> determined is the max admissible frame size. Both the useful bit time
> and the guard band size will depend on this unknown variable, so
> dividing the available 10000 ns into 2 halves sounds like the ideal
> strategy. In this case, we will program QSYS_QMAXSDU_CFG_7 with a
> maximum frame length (and guard band size) of 605 octets (this includes
> FCS but not IPG and preamble/SFD). With this value, everything of L2
> size 601 (sans FCS) and higher is considered as oversized, and the 
> guard
> band is low enough (605 + HSCH_MISC.FRM_ADJ, at 1Gbps => 5000 ns) in
> order to not disturb the scheduling of any frame smaller than L2 size 
> 601.

So one drawback with this is that you limit the maxsdu to match a
frame half of the gate open time, right?

The switch just schedule the *start* event of the frame. So even if
the guard band takes 99% of the gate open time, it should be able
to send a frame regardless of it's length during the first 1% of
the period (and it doesn't limit the maxsdu by half). IIRC the guard
band is exactly for that, that is that you don't know the frame
length and you can still schedule the frame. I know of switches
which don't use a guard band but know the exact length and the
closing time of the queue and deduce by that if the frame can
still be queued.

Actually, I'd expect it to work after your 
vsc9959_tas_guard_bands_update.
Hmm.

To quote from you above:
> min_gate_len[7] (10000 ns) - the guard band determined by
> QSYS_QMAXSDU_CFG_7 (1230 octets * 8 ns per octet == 9840 ns) is smaller
> than their transmit time.

Are you sure this is the case? There should be 160ns time to
schedule the start of the frame. Maybe the 160ns is just too
small.

-michael

Re: [PATCH net 1/3] net: dsa: felix: allow small tc-taprio windows to send at least some packets

[Vladimir Oltean]

On Mon, Sep 05, 2022 at 09:29:44AM +0200, Michael Walle wrote:
> > 1 (before vsc9959_tas_guard_bands_update): QSYS_PORT_MAX_SDU defaults to
> >   1518, and at gigabit this introduces a static guard band (independent
> >   of packet sizes) of 12144 ns. But this is larger than the time window
> >   itself, of 10000 ns. So, the queue system never considers a frame with
> >   TC 7 as eligible for transmission, since the gate practically never
> >   opens, and these frames are forever stuck in the TX queues and hang
> >   the port.
> 
> IIRC we deliberately ignored that problem back then, because we couldn't
> set the maxsdu.

I don't remember exactly why that is. It seems stupid to ignore a
condition that leads to the port hanging. I think part of the problem
was that I didn't have a test setup at the time the guard band patches
were proposed.

> > The solution is to modify vsc9959_tas_guard_bands_update() to take into
> > account that the static per-tc guard bands consume time out of our time
> > window too, not just packet transmission. The unknown which needs to be
> > determined is the max admissible frame size. Both the useful bit time
> > and the guard band size will depend on this unknown variable, so
> > dividing the available 10000 ns into 2 halves sounds like the ideal
> > strategy. In this case, we will program QSYS_QMAXSDU_CFG_7 with a
> > maximum frame length (and guard band size) of 605 octets (this includes
> > FCS but not IPG and preamble/SFD). With this value, everything of L2
> > size 601 (sans FCS) and higher is considered as oversized, and the guard
> > band is low enough (605 + HSCH_MISC.FRM_ADJ, at 1Gbps => 5000 ns) in
> > order to not disturb the scheduling of any frame smaller than L2 size
> > 601.
> 
> So one drawback with this is that you limit the maxsdu to match a
> frame half of the gate open time, right?

Yes.

> The switch just schedule the *start* event of the frame. So even if
> the guard band takes 99% of the gate open time, it should be able
> to send a frame regardless of it's length during the first 1% of
> the period (and it doesn't limit the maxsdu by half). IIRC the guard
> band is exactly for that, that is that you don't know the frame
> length and you can still schedule the frame. I know of switches
> which don't use a guard band but know the exact length and the
> closing time of the queue and deduce by that if the frame can
> still be queued.
> 
> Actually, I'd expect it to work after your vsc9959_tas_guard_bands_update.
> Hmm.
> 
> To quote from you above:
> > min_gate_len[7] (10000 ns) - the guard band determined by
> > QSYS_QMAXSDU_CFG_7 (1230 octets * 8 ns per octet == 9840 ns) is smaller
> > than their transmit time.
> 
> Are you sure this is the case? There should be 160ns time to
> schedule the start of the frame. Maybe the 160ns is just too
> small.

Yes, I'm absolutely sure that any packet gets dropped on egress with a
10 us window, and I can see from my explanation why that is not obvious.
The reason is because the guard band for tc 7 is not only determined by
QSYS_QMAXSDU_CFG_7, but also by adding the L1 overhead configured
through HSCH_MISC.FRM_ADJ (default 20 decimal).

So from the remaining 160 ns, we also lose 20 * 8 = 160 ns to the L1
overhead, and that's why the switch doesn't schedule anything.

In fact now I finally understand the private message that Xiaoliang sent
to me, where he said that he can make things work by making HSCH_MISC.FRM_ADJ
smaller than the default of 20. I initially didn't understand why you'd
want to do that.

The problem with HSCH_MISC.FRM_ADJ is that it's global to the switch,
and it's also used for some other shaper computations, so altering it is
not such a great idea.

But you (and Xiaoliang) do raise a valid point that the switch doesn't
need a full window size of open gate to schedule a full window size
worth of packet. So cutting the available window size in half is a bit
drastic. I'll think a bit more whether there is any smarter adjustment I
can do to ensure that any window, after trimming the extended static
guard band, still has 32 ns (IIRC, that's the minimum required) of time.
That should still ensure we don't have overruns. If you have any idea,
shoot.

[PATCH net 2/3] net: dsa: felix: disable cut-through forwarding for frames oversized for tc-taprio

[Vladimir Oltean]

Experimentally, it looks like when QSYS_QMAXSDU_CFG_7 is set to 605,
frames even way larger than 601 octets are transmitted even though these
should be considered as oversized, according to the documentation, and
dropped.

Since oversized frame dropping depends on frame size, which is only
known at the EOF stage, and therefore not at SOF when cut-through
forwarding begins, it means that the switch cannot take QSYS_QMAXSDU_CFG_*
into consideration for traffic classes that are cut-through.

Since cut-through forwarding has no UAPI to control it, and the driver
enables it based on the mantra "if we can, then why not", the strategy
is to alter vsc9959_cut_through_fwd() to take into consideration which
tc's have oversize frame dropping enabled, and disable cut-through for
them. Then, from vsc9959_tas_guard_bands_update(), we re-trigger the
cut-through determination process.

There are 2 strategies for vsc9959_cut_through_fwd() to determine
whether a tc has oversized dropping enabled or not. One is to keep a bit
mask of traffic classes per port, and the other is to read back from the
hardware registers (a non-zero value of QSYS_QMAXSDU_CFG_* means the
feature is enabled). We choose reading back from registers, because
struct ocelot_port is shared with drivers (ocelot, seville) that don't
support either cut-through nor tc-taprio, and we don't have a felix
specific extension of struct ocelot_port. Furthermore, reading registers
from the Felix hardware is quite cheap, since they are memory-mapped.

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>
---
 drivers/net/dsa/ocelot/felix_vsc9959.c | 122 ++++++++++++++++---------
 1 file changed, 79 insertions(+), 43 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 6fa4e0161b34..35ce08b485f3 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1539,6 +1539,65 @@ static void vsc9959_tas_min_gate_lengths(struct tc_taprio_qopt_offload *taprio,
 			min_gate_len[tc] = 0;
 }
 
+/* ocelot_write_rix is a macro that concatenates QSYS_MAXSDU_CFG_* with _RSZ,
+ * so we need to spell out the register access to each traffic class in helper
+ * functions, to simplify callers
+ */
+static void vsc9959_port_qmaxsdu_set(struct ocelot *ocelot, int port, int tc,
+				     u32 max_sdu)
+{
+	switch (tc) {
+	case 0:
+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_0,
+				 port);
+		break;
+	case 1:
+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_1,
+				 port);
+		break;
+	case 2:
+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_2,
+				 port);
+		break;
+	case 3:
+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_3,
+				 port);
+		break;
+	case 4:
+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_4,
+				 port);
+		break;
+	case 5:
+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_5,
+				 port);
+		break;
+	case 6:
+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_6,
+				 port);
+		break;
+	case 7:
+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_7,
+				 port);
+		break;
+	}
+}
+
+static u32 vsc9959_port_qmaxsdu_get(struct ocelot *ocelot, int port, int tc)
+{
+	switch (tc) {
+	case 0: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_0, port);
+	case 1: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_1, port);
+	case 2: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_2, port);
+	case 3: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_3, port);
+	case 4: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_4, port);
+	case 5: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_5, port);
+	case 6: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_6, port);
+	case 7: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_7, port);
+	default:
+		return 0;
+	}
+}
+
 /* Update QSYS_PORT_MAX_SDU to make sure the static guard bands added by the
  * switch (see the ALWAYS_GUARD_BAND_SCH_Q comment) are correct at all MTU
  * values (the default value is 1518). Also, for traffic class windows smaller
@@ -1595,6 +1654,8 @@ static void vsc9959_tas_guard_bands_update(struct ocelot *ocelot, int port)
 
 	vsc9959_tas_min_gate_lengths(ocelot_port->taprio, min_gate_len);
 
+	mutex_lock(&ocelot->fwd_domain_lock);
+
 	for (tc = 0; tc < OCELOT_NUM_TC; tc++) {
 		u32 max_sdu;
 
@@ -1646,47 +1707,14 @@ static void vsc9959_tas_guard_bands_update(struct ocelot *ocelot, int port)
 				 max_sdu);
 		}
 
-		/* ocelot_write_rix is a macro that concatenates
-		 * QSYS_MAXSDU_CFG_* with _RSZ, so we need to spell out
-		 * the writes to each traffic class
-		 */
-		switch (tc) {
-		case 0:
-			ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_0,
-					 port);
-			break;
-		case 1:
-			ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_1,
-					 port);
-			break;
-		case 2:
-			ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_2,
-					 port);
-			break;
-		case 3:
-			ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_3,
-					 port);
-			break;
-		case 4:
-			ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_4,
-					 port);
-			break;
-		case 5:
-			ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_5,
-					 port);
-			break;
-		case 6:
-			ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_6,
-					 port);
-			break;
-		case 7:
-			ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_7,
-					 port);
-			break;
-		}
+		vsc9959_port_qmaxsdu_set(ocelot, port, tc, max_sdu);
 	}
 
 	ocelot_write_rix(ocelot, maxlen, QSYS_PORT_MAX_SDU, port);
+
+	ocelot->ops->cut_through_fwd(ocelot);
+
+	mutex_unlock(&ocelot->fwd_domain_lock);
 }
 
 static void vsc9959_sched_speed_set(struct ocelot *ocelot, int port,
@@ -2779,7 +2807,7 @@ static void vsc9959_cut_through_fwd(struct ocelot *ocelot)
 {
 	struct felix *felix = ocelot_to_felix(ocelot);
 	struct dsa_switch *ds = felix->ds;
-	int port, other_port;
+	int tc, port, other_port;
 
 	lockdep_assert_held(&ocelot->fwd_domain_lock);
 
@@ -2823,19 +2851,27 @@ static void vsc9959_cut_through_fwd(struct ocelot *ocelot)
 				min_speed = other_ocelot_port->speed;
 		}
 
-		/* Enable cut-through forwarding for all traffic classes. */
-		if (ocelot_port->speed == min_speed)
+		/* Enable cut-through forwarding for all traffic classes that
+		 * don't have oversized dropping enabled, since this check is
+		 * bypassed in cut-through mode.
+		 */
+		if (ocelot_port->speed == min_speed) {
 			val = GENMASK(7, 0);
 
+			for (tc = 0; tc < OCELOT_NUM_TC; tc++)
+				if (vsc9959_port_qmaxsdu_get(ocelot, port, tc))
+					val &= ~BIT(tc);
+		}
+
 set:
 		tmp = ocelot_read_rix(ocelot, ANA_CUT_THRU_CFG, port);
 		if (tmp == val)
 			continue;
 
 		dev_dbg(ocelot->dev,
-			"port %d fwd mask 0x%lx speed %d min_speed %d, %s cut-through forwarding\n",
+			"port %d fwd mask 0x%lx speed %d min_speed %d, %s cut-through forwarding on TC mask 0x%x\n",
 			port, mask, ocelot_port->speed, min_speed,
-			val ? "enabling" : "disabling");
+			val ? "enabling" : "disabling", val);
 
 		ocelot_write_rix(ocelot, val, ANA_CUT_THRU_CFG, port);
 	}
-- 
2.34.1

[PATCH net 3/3] net: dsa: felix: access QSYS_TAG_CONFIG under tas_lock in vsc9959_sched_speed_set

[Vladimir Oltean]

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>
---
 drivers/net/dsa/ocelot/felix_vsc9959.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 35ce08b485f3..db0aec807965 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1741,13 +1741,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);
 
-- 
2.34.1

Re: [PATCH net 0/3] Fixes for Felix DSA driver calculation of tc-taprio guard bands

[Vladimir Oltean]

On Sat, Sep 03, 2022 at 12:56:59AM +0300, Vladimir Oltean wrote:
> This series fixes some bugs which are not quite new, but date from v5.13
> when static guard bands were enabled by Michael Walle to prevent
> tc-taprio overruns.

Please discard this patch set, I've sent v2 here:
https://patchwork.kernel.org/project/netdevbpf/cover/20220905170125.1269498-1-vladimir.oltean@nxp.com/