]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
netpoll: Use rcu_access_pointer() in netpoll_poll_lock
authorBreno Leitao <leitao@debian.org>
Mon, 18 Nov 2024 11:15:18 +0000 (03:15 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:53:28 +0000 (13:53 +0100)
[ Upstream commit a57d5a72f8dec7db8a79d0016fb0a3bdecc82b56 ]

The ndev->npinfo pointer in netpoll_poll_lock() is RCU-protected but is
being accessed directly for a NULL check. While no RCU read lock is held
in this context, we should still use proper RCU primitives for
consistency and correctness.

Replace the direct NULL check with rcu_access_pointer(), which is the
appropriate primitive when only checking for NULL without dereferencing
the pointer. This function provides the necessary ordering guarantees
without requiring RCU read-side protection.

Fixes: bea3348eef27 ("[NET]: Make NAPI polling independent of struct net_device objects.")
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
Link: https://patch.msgid.link/20241118-netpoll_rcu-v1-2-a1888dcb4a02@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/linux/netpoll.h

index bd19c4b91e31204e85d30884720b761116d5c036..3ddf205b7e2c38ecad6fbae2c04181b3d2732b50 100644 (file)
@@ -71,7 +71,7 @@ static inline void *netpoll_poll_lock(struct napi_struct *napi)
 {
        struct net_device *dev = napi->dev;
 
-       if (dev && dev->npinfo) {
+       if (dev && rcu_access_pointer(dev->npinfo)) {
                int owner = smp_processor_id();
 
                while (cmpxchg(&napi->poll_owner, -1, owner) != -1)