Netdev List
 help / color / mirror / Atom feed
From: Yang Zi <2959243019@qq.com>
To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
	pabeni@redhat.com
Cc: andrew+netdev@lunn.ch, kees@kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH] net: liquidio: avoid sleeping allocation under octeon_devices_lock
Date: Tue, 25 Aug 2026 16:50:55 +0800	[thread overview]
Message-ID: <tencent_6653AA61B6BB17B8D845A89977D199C08C06@qq.com> (raw)

octeon_allocate_device() holds the spinlock octeon_devices_lock while
calling octeon_allocate_device_mem(), which uses vzalloc(). vzalloc()
can sleep, so this is a "scheduling while atomic" bug that can trigger a
sleeping-in-atomic warning (or deadlock on a preemptible kernel).

The memory allocation does not touch octeon_device[], octeon_device_count
or the free-slot search, so it does not need the lock. Move the
octeon_allocate_device_mem() call ahead of the lock: allocate the device
memory first, then take the lock only to find a free slot and register
the new device in the octeon_device[] array. If no slot is available
(all MAX_OCTEON_DEVICES slots in use), free the freshly allocated memory
and return NULL as before.

The lock therefore continues to protect exactly the data it documents:
the octeon_device[] array and octeon_device_count.

Signed-off-by: Yang Zi <2959243019@qq.com>
---
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
index e98118e7b9fd..405ce14d46f5 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
@@ -723,6 +723,10 @@ struct octeon_device *octeon_allocate_device(u32 pci_id,
     u32 oct_idx = 0;
     struct octeon_device *oct = NULL;
 
+    oct = octeon_allocate_device_mem(pci_id, priv_size);
+    if (!oct)
+        return NULL;
+
     spin_lock(&octeon_devices_lock);
 
     for (oct_idx = 0; oct_idx < MAX_OCTEON_DEVICES; oct_idx++)
@@ -730,16 +734,16 @@ struct octeon_device *octeon_allocate_device(u32 pci_id,
             break;
 
     if (oct_idx < MAX_OCTEON_DEVICES) {
-        oct = octeon_allocate_device_mem(pci_id, priv_size);
-        if (oct) {
-            octeon_device_count++;
-            octeon_device[oct_idx] = oct;
-        }
+        octeon_device_count++;
+        octeon_device[oct_idx] = oct;
     }
 
     spin_unlock(&octeon_devices_lock);
-    if (!oct)
+
+    if (oct_idx == MAX_OCTEON_DEVICES) {
+        vfree(oct);
         return NULL;
+    }
 
     spin_lock_init(&oct->pci_win_lock);
     spin_lock_init(&oct->mem_access_lock);



             reply	other threads:[~2026-08-25  8:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-25  8:50 Yang Zi [this message]
2026-09-02 15:54 ` [PATCH] net: liquidio: avoid sleeping allocation under octeon_devices_lock Simon Horman
2026-09-03  0:58   ` Jakub Kicinski
2026-09-03 10:28     ` Simon Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tencent_6653AA61B6BB17B8D845A89977D199C08C06@qq.com \
    --to=2959243019@qq.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kees@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox