From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.161.43 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795010986; b=Y8V6iVqy09LOZPzjBYHN9KTIC9lbmeUCQkufD2fdgNxm+ioB7MvCDKVTJoI3pu0laXN6 LXdpTeOGOG6yiEE/gMiOC5Y+7pqAVvQsH4TbUJs5WTy06C7QXxBfRrzMQsh3k2szyMAW4 rpIuFIMGHhlXQusTCqGMguI+D/iK+7HH2OGDkUqi+qLXpj/najL9JbQ0cOxi5QdmWoEM3 2F7dLTg6gd91SSRx//kp8TieSPQgYiR/avolUmVwRGFeBc3m6JAjkiAxbBttZLaf02hZj plZYrLne+QgTg8Uq9KcAwyicbG6mAjs9GIh96F2T0H78ZATy/0QfFg9j2rltApUEAQQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795010986; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=tcgPJyrG/tkBCFtIrUZsvk3sWZQyrMsvPzB+MTHh/GA=; b=gMU3+ZG1qeb4uvSKsG9qji/tRCsDqeJkks8lN78uvAOm/5RsWsuD0NR2At8+zn5hm0G7 AM09yfs/u2MuCifrI2BEOUL4e/NrXQV/hNfcxgs65gAzZu2YjwKgv++6RR+9VAThUWz9Y IluMNAjzlGrqk8mwmGD+PWoJoKgErdyVF1wGvRQcHPajLWQKZ5EeO+RM6NKUhp0IuQAfN ZGbfvh69QUguoWxR2a80M84WJg0cWpQ+tRh2B5EncyqgMb1KpgK4Z1zn5x5sAcxezUfLj xxoD9OKRB/NEpzXclibqY82myXSZjHIThZjJpdWEw/x+9EvOiGze47U7zcqAdUIfdPQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=LAnecXSD; arc=none smtp.remote-ip=209.85.161.43 Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C535560A262C for ; Wed, 18 Nov 2026 14:09:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C535560A262C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=LAnecXSD Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-71aed54d4c5so643781eaf.0 for ; Wed, 18 Nov 2026 06:09:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1795010985; x=1795615785; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=tcgPJyrG/tkBCFtIrUZsvk3sWZQyrMsvPzB+MTHh/GA=; b=LAnecXSDfxZKBC7lRKXezKA7kvBi80WIMW4p7syBsLb2sx99DS24F+9izV7rEHKh4S uUDaCJTRi/Blg/8pyTYCFCnPvM6viGAohCKP/iLaIN4+hvlWWxJIFKrcrHJ0DGj1VCEJ 97hSq8VH09GnRuruyRZAKJHcn6hzf4r2gnfxEZIvU++MHl4EHk0pbdVQ6VpHv+wNV7B9 cgZijaS4+K2FrnG3Z93Pw7fQnwMKQFsmo8yqd4h0zgW6sAk9kN0WWH1C9ERMbjlbvjAy u+adpm7CzPFKDzBomD4Jr8f8lGd+A5d3qtKpO29CPK+x+R6AL7R6f4HEaidVejdM7Kpi GzYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795010985; x=1795615785; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=tcgPJyrG/tkBCFtIrUZsvk3sWZQyrMsvPzB+MTHh/GA=; b=fCMKClk3aIXBcXwHyRPtN6uO1VL/SH0CMAAyCxIM9ZG5Qwc2dClcz2tL+WLMVIAVER +DE9weHgTdTnmMWMfdgzXsgdY2TRn52HnuRjRYEi00ks3ztq8o3ObVq0vFJiNK+zgXjh ZoYgeDapX8qgf6W6Ep3UWTEPsAgQO7mFgTAKEjVIMHsQExazheoJlkXDSXxqaTUiHGDM s5QyLQwIN46QYVEfUVPq42+ZP2etMeg9nyFi9wAA0Qw6i2MXFXbj7ukogJbnD137f94k R3v4d5dD7r6cFdCJ+0ifKRLA2uXx+Hqzua5S4bclHaw43D/WMIkSK+09lzsR40Hj5v04 mIoA== X-Forwarded-Encrypted: i=1; AL+hErGXMDk8aVDjDZ12K9DWj3pR67i3n7rAJN3QCbSG2TYluHtyqen1R133gsXBoxeSMfRzIdSpWkQeOFVK5t8=@vger.kernel.org X-Gm-Message-State: APuU4Z9YO2zz6UCEBSFatq/5D8TRDRHPpSRWll/hIAmSxpzQruQxZ1gp f/EWtzcSdwDhiIIWz5VDQC3fE5Lphb68DGA0xnhwDU0a/k17xdnxoIzN X-Gm-Gg: AYBFou2Sd80vKaFRBfnP20M+K0rSjdojFjdZ9A67YBEn5+2n57Wh1emJQRmniHLC+ot gwQGynnakfGFYku2mWvi0CSj8oT+w9iRi8hCo+qb31SygJiJnK0wRJ5MK18yNbnEJ7cN9XFEFhd SKvzBx0tnXGp6MrCuCu5Owy1h5X4SGnQqTSDd+X7/l4DRSV3m/+Uf7pEkiR2DafuiBCCfbZL4YK s06SEm10nBZmUsQ6DcVrBoeELTcL/ht+HGwZxVsG2skY1su5ygd4Y/SLeenmbMpCQl9WgMie0cu 0xy8meW00acMUteILFoADJZgCX7fvp919WROSRrtagf5/6Z1tTvv+qJvwu2EQ81Pe8NDzGdhoaL 7D1GxObvXjtOOE6MTcDPNGbVk3Jr9dxamcFbCFbaPxuncDYJla4Sj+doBLJcGutkZ5K2IUseIXJ qfCPFCzyhG3+K/RjT8AqJrfLII5JO2zYxpEEr2eXirv3pJ3x+I9oqEn0beESOy0bzpg7JsZPI53 6WkLfq/fFpS6ylwvwPCosmsJ+/VgtFqcVgkMkJtJwr+qQhsUP4aoZ2s5P1SUiwfjX0GdwpdNRsP RnDxnH037hVMEwdCCLXe507afpA= X-Received: by 2002:a05:6820:1355:b0:71a:ee31:7b87 with SMTP id 006d021491bc7-71b18460540mr1709015eaf.32.1795010984713; Wed, 18 Nov 2026 06:09:44 -0800 (PST) Received: from localhost ([2a03:2880:30ff:42::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-71b19516ea1sm1983557eaf.11.2026.11.18.06.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 06:09:44 -0800 (PST) From: Daniel Zahka Date: Wed, 18 Nov 2026 06:08:05 -0800 Subject: [PATCH net-next v5 3/6] psp: document lock ordering with the netdev instance lock X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261118-psp-v5-3-b9ec840e0296@gmail.com> References: <20261118-psp-v5-0-b9ec840e0296@gmail.com> In-Reply-To: <20261118-psp-v5-0-b9ec840e0296@gmail.com> To: Jakub Kicinski , Willem de Bruijn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Shuah Khan , Randy Dunlap , Donald Hunter , Andrew Lunn , Shuah Khan Cc: Daniel Zahka , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org X-Mailer: b4 0.13.0 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 --- 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