sugar/linux
1
0
Fork 0
Code Activity

net: protect napi->irq with netdev_lock()

Browse Source 
Take netdev_lock() in netif_napi_set_irq(). All NAPI "control fields"
are now protected by that lock (most of the other ones are set during
napi add/del). The napi_hash_node is fully protected by the hash
spin lock, but close enough for the kdoc...

Reviewed-by: Joe Damato <jdamato@fastly.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250115035319.559603-10-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-01-14 19:53:17 -08:00
parent 1bb86cf8f4
commit 53ed30800d
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/netdevice.h
View File

@@ -388,6 +388,7 @@ struct napi_struct {
unsigned long gro_flush_timeout;
unsigned long irq_suspend_timeout;
u32 defer_hard_irqs;
/* all fields past this point are write-protected by netdev_lock */
/* control-path-only fields follow */
struct list_head dev_list;
struct hlist_node napi_hash_node;
@@ -2706,11 +2707,18 @@ static inline void netdev_assert_locked_or_invisible(struct net_device *dev)
netdev_assert_locked(dev);
}
static inline void netif_napi_set_irq(struct napi_struct *napi, int irq)
static inline void netif_napi_set_irq_locked(struct napi_struct *napi, int irq)
{
napi->irq = irq;
}
static inline void netif_napi_set_irq(struct napi_struct *napi, int irq)
{
netdev_lock(napi->dev);
netif_napi_set_irq_locked(napi, irq);
netdev_unlock(napi->dev);
}
/* Default NAPI poll() weight
* Device drivers are strongly advised to not use bigger value
*/

2
net/core/dev.c
View File

@@ -6957,7 +6957,7 @@ void netif_napi_add_weight_locked(struct net_device *dev,
*/
if (dev->threaded && napi_kthread_create(napi))
dev->threaded = false;
netif_napi_set_irq(napi, -1);
netif_napi_set_irq_locked(napi, -1);
}
EXPORT_SYMBOL(netif_napi_add_weight_locked);