]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
netpoll: Fix race condition in netpoll_owner_active
authorBreno Leitao <leitao@debian.org>
Mon, 29 Apr 2024 10:04:33 +0000 (03:04 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 1 May 2024 02:03:47 +0000 (19:03 -0700)
KCSAN detected a race condition in netpoll:

BUG: KCSAN: data-race in net_rx_action / netpoll_send_skb
write (marked) to 0xffff8881164168b0 of 4 bytes by interrupt on cpu 10:
net_rx_action (./include/linux/netpoll.h:90 net/core/dev.c:6712 net/core/dev.c:6822)
<snip>
read to 0xffff8881164168b0 of 4 bytes by task 1 on cpu 2:
netpoll_send_skb (net/core/netpoll.c:319 net/core/netpoll.c:345 net/core/netpoll.c:393)
netpoll_send_udp (net/core/netpoll.c:?)
<snip>
value changed: 0x0000000a -> 0xffffffff

This happens because netpoll_owner_active() needs to check if the
current CPU is the owner of the lock, touching napi->poll_owner
non atomically. The ->poll_owner field contains the current CPU holding
the lock.

Use an atomic read to check if the poll owner is the current CPU.

Signed-off-by: Breno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/r/20240429100437.3487432-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/netpoll.c

index 543007f159f99767c9865928f791a6f5bfcd54fb..55bcacf67df3b672280c905c3572cd86d773fa3d 100644 (file)
@@ -316,7 +316,7 @@ static int netpoll_owner_active(struct net_device *dev)
        struct napi_struct *napi;
 
        list_for_each_entry_rcu(napi, &dev->napi_list, dev_list) {
-               if (napi->poll_owner == smp_processor_id())
+               if (READ_ONCE(napi->poll_owner) == smp_processor_id())
                        return 1;
        }
        return 0;