net: airoha: Fix skb->priority underflow in airoha_dev_select_queue()
Subsystems (4)
PATCH v5 1/1 net: airoha: Fix skb->priority underflow in airoha_dev_select_queue()
In airoha_dev_select_queue(), the expression:
queue = (skb->priority - 1) % AIROHA_NUM_QOS_QUEUES;
implicitly converts to unsigned arithmetic: when skb->priority is 0 (the default for unclassified traffic), (0u - 1u) wraps to UINT_MAX, and UINT_MAX % 8 = 7, routing default best-effort packets to the highest-priority QoS queue. This causes QoS inversion where the majority of traffic on a PON gateway starves actual high-priority flows (VoIP, gaming, etc.).
The "- 1" offset was a leftover from the ETS offload implementation that has since been removed. The correct mapping is a direct modulo:
queue = skb->priority % AIROHA_NUM_QOS_QUEUES;
This maps priority 0 → queue 0 (lowest), priority 7 → queue 7 (highest), with higher priorities wrapping around. This is the standard Linux sk_prio → HW queue mapping used by other drivers.
---
Changes in v5:
- Rebase on net/main (previous version was incorrectly based on net-next/origin/master, causing Patchwork CI apply failure).
--- drivers/net/ethernet/airoha/airoha_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/airoha/airoha_eth.c +1 -1
@@ -2110,7 +2110,7 @@ static u16 airoha_dev_select_queue(struct net_device *netdev,*/ channel =netdev_uses_dsa (netdev) ?skb_get_queue_mapping (skb) : port->id; channel = channel %AIROHA_NUM_QOS_CHANNELS ; - queue = (skb->priority -1 ) %AIROHA_NUM_QOS_QUEUES ;/* QoS queue */ + queue = skb->priority %AIROHA_NUM_QOS_QUEUES ; queue = channel *AIROHA_NUM_QOS_QUEUES + queue;return queue < netdev->num_tx_queues ? queue :0 ;
Signature · 1 line
2.51.0
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 4 lines · On Sat, 20 Jun 2026 16:17:44 +0800 you wrote:
In
airoha_dev_select_queue(), the expression:queue = (skb->priority - 1) % AIROHA_NUM_QOS_QUEUES;
Quoted 8 lines
implicitly converts to unsigned arithmetic: when
skb->priorityis 0 (the default for unclassified traffic), (0u - 1u) wraps toUINT_MAX, andUINT_MAX% 8 = 7, routing default best-effort packets to the highest-priority QoS queue. This causes QoS inversion where the majority of traffic on a PON gateway starves actual high-priority flows (VoIP, gaming, etc.).[...]
Here is the summary with links:
- [net,v5] net: airoha: Fix skb->priority underflow in airoha_dev_select_queue()
https://git.kernel.org/netdev/net/c/86e51aa24686
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html