| Message ID | 20250331-airoha-ets-validate-priomap-v1-1-60a524488672@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: airoha: Fix ETS priomap validation | expand |
On Mon, Mar 31, 2025 at 06:17:31PM +0200, Lorenzo Bianconi wrote: > ETS Qdisc schedules SP bands in a priority order assigning band-0 the > highest priority (band-0 > band-1 > .. > band-n) while EN7581 arranges > SP bands in a priority order assigning band-7 the highest priority > (band-7 > band-6, .. > band-n). > Fix priomap check in airoha_qdma_set_tx_ets_sched routine in order to > align ETS Qdisc and airoha_eth driver SP priority ordering. > > Fixes: b56e4d660a96 ("net: airoha: Enforce ETS Qdisc priomap") > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Reviewed-by: Simon Horman <horms@kernel.org>
On Mon, Mar 31, 2025 at 06:17:31PM +0200, Lorenzo Bianconi wrote: > ETS Qdisc schedules SP bands in a priority order assigning band-0 the > highest priority (band-0 > band-1 > .. > band-n) while EN7581 arranges > SP bands in a priority order assigning band-7 the highest priority > (band-7 > band-6, .. > band-n). > Fix priomap check in airoha_qdma_set_tx_ets_sched routine in order to > align ETS Qdisc and airoha_eth driver SP priority ordering. > > Fixes: b56e4d660a96 ("net: airoha: Enforce ETS Qdisc priomap") > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> LGTM! Reviewed-by: Davide Caratti <dcaratti@redhat.com>
diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index c0a642568ac115ea9df6fbaf7133627a4405a36c..5a1039c95241ad943ce6d42e8aa290f693653471 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -2028,7 +2028,7 @@ static int airoha_qdma_set_tx_ets_sched(struct airoha_gdm_port *port, struct tc_ets_qopt_offload_replace_params *p = &opt->replace_params; enum tx_sched_mode mode = TC_SCH_SP; u16 w[AIROHA_NUM_QOS_QUEUES] = {}; - int i, nstrict = 0, nwrr, qidx; + int i, nstrict = 0; if (p->bands > AIROHA_NUM_QOS_QUEUES) return -EINVAL; @@ -2046,17 +2046,17 @@ static int airoha_qdma_set_tx_ets_sched(struct airoha_gdm_port *port, * lowest priorities with respect to SP ones. * e.g: WRR0, WRR1, .., WRRm, SP0, SP1, .., SPn */ - nwrr = p->bands - nstrict; - qidx = nstrict && nwrr ? nstrict : 0; - for (i = 1; i <= p->bands; i++) { - if (p->priomap[i % AIROHA_NUM_QOS_QUEUES] != qidx) + for (i = 0; i < nstrict; i++) { + if (p->priomap[p->bands - i - 1] != i) return -EINVAL; - - qidx = i == nwrr ? 0 : qidx + 1; } - for (i = 0; i < nwrr; i++) + for (i = 0; i < p->bands - nstrict; i++) { + if (p->priomap[i] != nstrict + i) + return -EINVAL; + w[i] = p->weights[nstrict + i]; + } if (!nstrict) mode = TC_SCH_WRR8;
ETS Qdisc schedules SP bands in a priority order assigning band-0 the highest priority (band-0 > band-1 > .. > band-n) while EN7581 arranges SP bands in a priority order assigning band-7 the highest priority (band-7 > band-6, .. > band-n). Fix priomap check in airoha_qdma_set_tx_ets_sched routine in order to align ETS Qdisc and airoha_eth driver SP priority ordering. Fixes: b56e4d660a96 ("net: airoha: Enforce ETS Qdisc priomap") Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/net/ethernet/airoha/airoha_eth.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- base-commit: 4f1eaabb4b66a1f7473f584e14e15b2ac19dfaf3 change-id: 20250331-airoha-ets-validate-priomap-8cb3f027b511 Best regards,