From nobody Mon Apr 6 10:44:17 2026 Received: from mail-dl1-f42.google.com (mail-dl1-f42.google.com [74.125.82.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6583C2D0617 for ; Fri, 20 Mar 2026 01:25:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773969907; cv=none; b=ZfNC62NTGHgrVZ0WJiBMumRRxmGpG0DdXXrbhTgMemx1CcSb1KF9jqyrmZhldKZePtZl0m9Eo4RZlz7U2mTof03ruKeJSoh8n8MiXWlP9oGe0KVuJet1VNP+b8xT2ml2/rI8q8RK10ALmX9K7F4eSRdNxgeyGaFpplgPrVXM07Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773969907; c=relaxed/simple; bh=fiWuZ9fcbL8sdigaSwTTvp8tHDm8kXTBMV+vvmAza+E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GUkddBNB1WPPTjBfP94PKjVKdSm4ka133OM2O5CSlcQ97sI+nPhC7b8U93843jdEBVORqYUtm+Qg0hwrup/z3n9CaEYr18PC9aJk7USY+ETsPMaMbR6Xa2B4UDxl8T4PkQOaCRtHYRbQVzksra04THJgfkgK8P8HjYLbH5kobTg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=74.125.82.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-dl1-f42.google.com with SMTP id a92af1059eb24-128e4d0cc48so153580c88.1 for ; Thu, 19 Mar 2026 18:25:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773969906; x=1774574706; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7EJnW3kdUcA/mWdICiYp+Buoz7NoSHqg/f92gpxvDwE=; b=IrUQy2smjfwoNZJ7FD7wMl7POHQQDkjFNFbY+tWBn7ihT+hQwiFZqnxfv1Qb9MIN/n QBPQGqYEZ7gtApN5umzWuYA3TVNjmmD4iu3pjzYPkNfrycAM9SU7nTEvCgxAY3raM68/ RZtz4/dDRkZMrj9iXHwPPKZuH8B4x/ZCLBYXjNoSvfJ1zxR8PS60PLD5ymcb6C3BDi2P sJ67Zv747kbmkotXOaN/gHqf7o1B5T5A1OjC4HIs45Q+mv4rJq4B3UJVqJm3/u2/B1J3 115Ks++7OwdllHkb0Y6eqykM796hKVfDA88bm4nmc7Gbb5itMdnTBxkD27kZxmfp7mmt srnw== X-Forwarded-Encrypted: i=1; AJvYcCVApO0WrR1FRTmoCQVI2L9VlfiQacNKdd3bhfW5Ax2xlnn0JksF0VPTFqWXd9JTmAU358DxzVmKf1foirY=@vger.kernel.org X-Gm-Message-State: AOJu0YwMz+n638brndFcFWH8FVaARcS74QB3qOUW3vQ78G2lAI76rk7f 4Uc0ArVDFSenSVL+YgDJEXAkF4Pcdhy5CqZcvPU5xpIwRuJvkt6sgZE= X-Gm-Gg: ATEYQzzTGPVBKJ9FCu5d4/1l9OOF9kOxedLVHpkWU+j+U9ZLdFyVCGfTVsGv++9iMvq 7Ddc3Rn3Cvq0jx2iuK7JCYpgLCdfQpEw9llb5xg8mxUvpBW+LlJr81p9EaL8cFemPhVqJWSl/pj Jr8x+/NGMb1W9p3V+LpzZw24t5sUAHJwx2WqXLErlUXQDEwpU4yyOITw+ReUrb2+HP6AmFNzhoX sLO+lRclqsHRIBZ9UBdbtnpkNXw98AcE6p0b4CngklGvkjmGQG0HHx0iLGdjimvSINjzQWevKvJ 4FT0XyqdlJIGlGUdhuOlhxZ42iswYM9uAapkDCdWMioLwdJifpixcKLkM409Rjuqmc0iIc0w2GK m8SB9sVJhsiUbP7Rblfyex2VO46+79dEFLIYvl84TDbhDtGcRSHiPKMAjxWKrZhVyFCqGWRMX2T xDuC/Ry7xj11wUl9n03xwLym6mUtW2q32HRVHcuSUl1KJE6mT+96zy3hELnaI7hZtNyW1atG/DS mr83v3NtfY90Bt8iA== X-Received: by 2002:a05:7022:ec18:b0:128:d17b:e7ab with SMTP id a92af1059eb24-12a726f6573mr546108c88.36.1773969905386; Thu, 19 Mar 2026 18:25:05 -0700 (PDT) Received: from localhost (c-76-102-12-149.hsd1.ca.comcast.net. [76.102.12.149]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12a736b952asm749391c88.12.2026.03.19.18.25.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 18:25:05 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, corbet@lwn.net, skhan@linuxfoundation.org, andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, saeedm@nvidia.com, tariqt@nvidia.com, mbloch@nvidia.com, alexanderduyck@fb.com, kernel-team@meta.com, johannes@sipsolutions.net, sd@queasysnail.net, jianbol@nvidia.com, dtatulea@nvidia.com, sdf@fomichev.me, mohsin.bashr@gmail.com, jacob.e.keller@intel.com, willemb@google.com, skhawaja@google.com, bestswngs@gmail.com, aleksandr.loktionov@intel.com, kees@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kselftest@vger.kernel.org, leon@kernel.org Subject: [PATCH net-next v3 02/13] wifi: cfg80211: use __rtnl_unlock in nl80211_pre_doit Date: Thu, 19 Mar 2026 18:24:50 -0700 Message-ID: <20260320012501.2033548-3-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320012501.2033548-1-sdf@fomichev.me> References: <20260320012501.2033548-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" nl80211_pre_doit acquires rtnl_lock and then wiphy_lock, releasing rtnl while keeping wiphy_lock held until post_doit. With the introduction of rx_mode_wq and its flush in netdev_run_todo, calling rtnl_unlock here creates a circular lock dependency: Chain exists of: (wq_completion)rx_mode_wq --> rtnl_mutex --> &rdev->wiphy.mtx Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&rdev->wiphy.mtx); lock(rtnl_mutex); lock(&rdev->wiphy.mtx); lock((wq_completion)rx_mode_wq); Switch to __rtnl_unlock to skip netdev_run_todo in nl80211_pre_doit. This seems safe because we run before the op. Link: http://lore.kernel.org/netdev/69b5ad67.a00a0220.3b25d1.001a.GAE@googl= e.com Signed-off-by: Stanislav Fomichev --- net/core/rtnetlink.c | 1 + net/wireless/core.c | 1 + net/wireless/nl80211.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index dad4b1054955..b1bfb4a4aedd 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -150,6 +150,7 @@ void __rtnl_unlock(void) head =3D next; } } +EXPORT_SYMBOL_NS_GPL(__rtnl_unlock, "NETDEV_INTERNAL"); =20 void rtnl_unlock(void) { diff --git a/net/wireless/core.c b/net/wireless/core.c index 23afc250bc10..a78a9b613c94 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -41,6 +41,7 @@ MODULE_AUTHOR("Johannes Berg"); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("wireless configuration support"); MODULE_ALIAS_GENL_FAMILY(NL80211_GENL_NAME); +MODULE_IMPORT_NS("NETDEV_INTERNAL"); =20 /* RCU-protected (and RTNL for writers) */ LIST_HEAD(cfg80211_rdev_list); diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index e15cd26f3a79..f8ed8730cf1c 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -18203,7 +18203,7 @@ static int nl80211_pre_doit(const struct genl_split= _ops *ops, __release(&rdev->wiphy.mtx); } if (!(internal_flags & NL80211_FLAG_NEED_RTNL)) - rtnl_unlock(); + __rtnl_unlock(); =20 return 0; out_unlock: --=20 2.53.0