net: expect instance lock in netdev_queue_get_dma_dev()
Subsystems (4)
Jakub Kicinski
maintainerPATCH 1/1 net: expect instance lock in netdev_queue_get_dma_dev()
netdev_queue_get_dma_dev() uses "compat" locking assert which wants either the rtnl_lock or netdev instance lock. This is not right, the callers are taking the instance lock unconditionally. All entry points for queue config are purely instance locked.
In other words the callers use netdev_get_by_index_lock(), not netdev_get_by_index_lock_ops_compat(). All the state we will access is effectively instance lock protected (it's const for devices which are not ops-locked).
Update the assert to avoid false positive warnings.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- net/core/netdev_queues.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/netdev_queues.c +1 -1
@@ -40,7 +40,7 @@ struct device *netdev_queue_get_dma_dev(struct net_device *dev,struct netdev_rx_queue *hw_rxq;struct device *dma_dev; -netdev_assert_locked_ops_compat (dev); +netdev_assert_locked (dev);/* Only RX side supports queue leasing today. */ if (type !=NETDEV_QUEUE_TYPE_RX || !netif_rxq_is_leased (dev, idx))
Signature · 1 line
2.55.0
Quoted 10 lines · Jakub Kicinski
netdev_queue_get_dma_dev()uses "compat" locking assert which wants either thertnl_lockor netdev instance lock. This is not right, the callers are taking the instance lock unconditionally. All entry points for queue config are purely instance locked.In other words the callers use
netdev_get_by_index_lock(), notnetdev_get_by_index_lock_ops_compat(). All the state we will access is effectively instance lock protected (it's const for devices which are not ops-locked).
Quoted 6 lines
Update the assert to avoid false positive warnings.
Fixes b6c5f9454ef34 ("io_uring/zcrx: call netdev_queue_get_dma_dev() under instance lock")Reported-by [email protected]Signed-off-by Jakub Kicinski <[email protected]>
Quoted 10 lines · Jakub Kicinski
netdev_queue_get_dma_dev()uses "compat" locking assert which wants either thertnl_lockor netdev instance lock. This is not right, the callers are taking the instance lock unconditionally. All entry points for queue config are purely instance locked.In other words the callers use
netdev_get_by_index_lock(), notnetdev_get_by_index_lock_ops_compat(). All the state we will access is effectively instance lock protected (it's const for devices which are not ops-locked).
Quoted 6 lines
Update the assert to avoid false positive warnings.
Fixes b6c5f9454ef34 ("io_uring/zcrx: call netdev_queue_get_dma_dev() under instance lock")Reported-by [email protected]Signed-off-by Jakub Kicinski <[email protected]>
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 11 lines · On Thu, 6 Aug 2026 15:56:26 -0700 you wrote:
netdev_queue_get_dma_dev()uses "compat" locking assert which wants either thertnl_lockor netdev instance lock. This is not right, the callers are taking the instance lock unconditionally. All entry points for queue config are purely instance locked.In other words the callers use
netdev_get_by_index_lock(), notnetdev_get_by_index_lock_ops_compat(). All the state we will access is effectively instance lock protected (it's const for devices which are not ops-locked).[...]
Here is the summary with links:
- [net] net: expect instance lock in netdev_queue_get_dma_dev()
https://git.kernel.org/netdev/net/c/92465f46f3c3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html