From: Daniel Zahka <daniel.zahka@gmail.com>
To: Jakub Kicinski <kuba@kernel.org>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Shuah Khan <skhan@linuxfoundation.org>,
Randy Dunlap <rdunlap@infradead.org>,
Donald Hunter <donald.hunter@gmail.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Shuah Khan <shuah@kernel.org>
Cc: Daniel Zahka <daniel.zahka@gmail.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org
Subject: [PATCH net-next v5 3/6] psp: document lock ordering with the netdev instance lock
Date: Wed, 18 Nov 2026 06:08:05 -0800 [thread overview]
Message-ID: <20261118-psp-v5-3-b9ec840e0296@gmail.com> (raw)
In-Reply-To: <20261118-psp-v5-0-b9ec840e0296@gmail.com>
PSP core calls driver ops with psp_dev::lock held, and drivers may take
the netdev instance lock inside them. mlx5e_psp_set_config() has done so
since commit 1e6e0cec0dab ("net/mlx5e: psp: Make PSP steering config
dynamic"). That commit established a lock ordering that was not
documented anywhere.
Document it. psp_dev_create() and psp_dev_unregister() take
psp_devs_lock and psp_dev::lock, so assert that they are not called
with the netdev instance lock held. The next patch adds a work item to
PSP core which relies on this ordering.
Signed-off-by: Daniel Zahka <daniel.zahka@gmail.com>
---
v5:
- new patch
---
net/psp/psp_main.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/net/psp/psp_main.c b/net/psp/psp_main.c
index 273b010d2355..ba44154cf8dc 100644
--- a/net/psp/psp_main.c
+++ b/net/psp/psp_main.c
@@ -19,6 +19,8 @@ struct mutex psp_devs_lock;
*
* psp_devs_lock protects the psp_devs xarray.
* Ordering is take the psp_devs_lock and then the instance lock.
+ * The PSP instance lock must be taken before its main netdev's instance
+ * lock.
* Each instance is protected by RCU, and has a refcount.
* When driver unregisters the instance gets flushed, but struct sticks around.
*/
@@ -53,6 +55,7 @@ int psp_dev_check_access(struct psp_dev *psd, struct net *net, bool admin)
* @psd_caps: device capabilities
* @priv_ptr: back-pointer to driver private data
*
+ * Context: Must not be called with the netdev instance lock held.
* Return: pointer to allocated PSP device, or ERR_PTR.
*/
struct psp_dev *
@@ -64,6 +67,8 @@ psp_dev_create(struct net_device *netdev,
static u32 last_id;
int err;
+ lockdep_assert_not_held(&netdev->lock);
+
if (WARN_ON(!psd_caps->versions ||
!psd_ops->set_config ||
!psd_ops->key_rotate ||
@@ -127,12 +132,16 @@ void psp_dev_free(struct psp_dev *psd)
/**
* psp_dev_unregister() - unregister PSP device
* @psd: PSP device structure
+ *
+ * Context: Must not be called with the netdev instance lock held.
*/
void psp_dev_unregister(struct psp_dev *psd)
{
struct psp_assoc_dev *entry, *entry_tmp;
struct psp_assoc *pas, *next;
+ lockdep_assert_not_held(&psd->main_netdev->lock);
+
mutex_lock(&psp_devs_lock);
mutex_lock(&psd->lock);
--
2.52.1
next prev parent reply other threads:[~2026-11-18 14:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 14:08 [PATCH net-next v5 0/6] psp: support rekeying psp protected tcp connections Daniel Zahka
2026-11-18 14:08 ` [PATCH net-next v5 1/6] psp: support rx rekey operation Daniel Zahka
2026-11-18 14:08 ` [PATCH net-next v5 2/6] psp: support tx " Daniel Zahka
2026-11-18 14:08 ` Daniel Zahka [this message]
2026-11-18 14:08 ` [PATCH net-next v5 4/6] psp: defer tx key deletions for SADB drivers Daniel Zahka
2026-11-18 14:08 ` [PATCH net-next v5 5/6] selftests: drv-net: psp: factor out psp connection setup Daniel Zahka
2026-11-18 14:08 ` [PATCH net-next v5 6/6] selftests: drv-net: psp: add rekey tests Daniel Zahka
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=20261118-psp-v5-3-b9ec840e0296@gmail.com \
--to=daniel.zahka@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=edumazet@kernel.org \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rdunlap@infradead.org \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=willemdebruijn.kernel@gmail.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