From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.47 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794919222; b=qyI68I4pAF4N5+TXliL5Ebpgz0YMHc6rFkNe6t7WASWHBxSSlqFR/2t+PwKmmQb3JxLx Xo5OBrmlfe7iOxGzwuYIrzoKSG6S4UzvyCa3cdCDNpF8Fp7iEHTs5qaIvHNhgaJ8kPEYA Jk0xRpXQQhfPTU8J1JJdoBkllPNXjGIcu7kbDgix7xeLGOcD69hGQeuAQcDf2uLLSsiIM xVB+iRHfmRMixzhQvYsqwU0Wa5ko42cQzdK6OZg+WrVn+93QuE//JcWm2HmDjAtubH8vX K9TIgXL3ibqi1eCX2DwSBRPIiKyvCyqwBT7VlHWkqJPcRbg1paL+rWFZ7uLHve69VNw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794919222; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=C0jscx5DDVxF6lxNWbtWfTXvaQUi2T5SH8k3EmxiaYE=; b=XclaYFsD0xJvHiiZO27El+5xOgAXedhErcQGB9d1Ps8pJpmMYdSOa05jrVcXbP1JuYQl 3KsgqZyZtFb9o/WcmpzeVP8L0EZsOWcFSnYURYnWz/CXUTnsTm1xytzfF4GbH3/ShyKr0 mZ8okVlamjgGTKuw4xRwLn5/pe4YuY2YPrMhVwXFuX/IEdpLFpuww8mjF9XFCyxSW0WHH rs4Q3ZjX1QO7INR5dcOCKSjNEnDjfW7DADb8C7O8wbfyOUtpzn8TTsgqSceCeJhZ7s1CC 9sIAMJhAM0qU/syHKVgvObKrT+GYsM9wIOXKPOsXTct0IG7g4SKvioBQw4DAqhquksg== 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=PvbUuoKk; arc=none smtp.remote-ip=209.85.128.47 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 B17CA60A6F53 for ; Tue, 17 Nov 2026 12:40:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org B17CA60A6F53 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=PvbUuoKk Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4a5b2be99a8so32240945e9.2 for ; Tue, 17 Nov 2026 04:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794919220; x=1795524020; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=C0jscx5DDVxF6lxNWbtWfTXvaQUi2T5SH8k3EmxiaYE=; b=PvbUuoKkay1J0oM52rRPK2yyo7fiOCNbc5CJM9OUhy6/ZyPbv7gQasiwGl+aINsTID GYSfM9S2+r9FrG/f7nb6WpEDsJqpy8uGmX888c5rdGj14K/pfYW2CJc2u9MSlwB5c1xs Za8kZ9ft2G1RMrtgsaMbsrEa5jEfjbe9Eq4bhKqa1YfRugakNIn6dwOetX2XljjUoH1X kkfNuXOYvWwyBOqDhAQYT3rxOgPISCswAKeorSNNVfepFpukt8W2b4Sir6JES1gmci/F k+dycsg8xL8QDaGXY+ExqpA/jTh0VQNGcUF9QXYElH0/H7AtQVPQ5fGHqK7CZsjhSUP5 famg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794919220; x=1795524020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=C0jscx5DDVxF6lxNWbtWfTXvaQUi2T5SH8k3EmxiaYE=; b=EnyS3CB1t3mWyBd91WKfGuU7+T6B0AGHMvnLdrY/iY7gVTWfSNRSYbxG2g5vrClGdM oxW7xKFHZzMQI4PpH95XcTD3KdlyAtoMOdV5nQ2jH5znnG/gBW+tNUtxtbWhpwJWPbZ4 JL0T54VvqaaamVIBPGVIzfiXA0xt5x7lrx2OGM0DQgNm5qQ802f7121W/1a4Uh67Trk1 o9aiah+hmiaqFdMGHwWVwOLwigqEQ+LEgY+TnsXu7orrSOaJBAz0zf6/no5LZrPGlepP TSMj6WWf9ibs+PrbjjkauIy+bIsNL1oaMO1cX6PlSxhB80+/dqF7kSQPeuSm0yerL0/Z 44bA== X-Forwarded-Encrypted: i=1; AL+hErEahQX+YFjSDznNy4jvu213GWLZL3d3HGnUiCGAmx0kWSYrowxvudPfOt5aorpUlpKMFLcLK9uhvCza@vger.kernel.org X-Gm-Message-State: APuU4Z+UqHq6q3ObAau2rEpIe0IX+/HlwAR/oEYT0scu395LlCA7y3Xh YIsQAdXdNnOp4bbqApdM1+0lGJYPyD9jVzwvDyubez/u/Gb0mqmtNUc9 X-Gm-Gg: AYBFou30t3V/fUDhclp995aJHEIMyz9eAy0Uj5tbMxBPz1yRJAJrpEA3Rvm/na2MlpU xJJWA7F3HMCTkClMmFSt2TAbcw31N3HmW12w2xePFBbZL4QXqOOYLhoAGIMUybiueBCGZeDb0by +C07tilvMGe7SqtlJP0h/UJ5n2qyu5TgskMxghFeAWrKAa4cvK8ZHaWLoD5g9TiSoc9UBJwOcUJ ms0mw9cDOTThiLPzIAfgXxDmY8t15ZK4zKPpr1vE4bNgzJ65mukz9hZuo+K3zX43OsdPJ1pUXOR LfRR1Bqa9BG1y/z9L9VeHg57oVDVBCNS6AcT2xqEpudmEJR+CQB0AWHpuEWSbwlMTVBk5kPKvvh lgdoOkxdz5GHdoDqu1ir2dXwG09nWDCR8oIIUp2WUS2yCB4gyZwMhmXDttYIctXNg8ZXGXnLFLo hqphrql/Lpx3eo5U3milfUJBKdC0LdlkisanYCykByJ/EGLfeCfiTKowMGKw9D9ZtfQ7VAQvaM8 +a094PokRsxBDDyCJSdPG3msl9SLbqee1dJ69V/AtJ3t9JZ8TwrP1vX6EMv6vD+Non1ZpY85sEt kXyGJkHs3jVr+64hSYeEUkZuNLKLu+drWNenWehnyKr8vNTQ5j3X3mjv4JAMSXPRzt1biwgf0In aam/tyHxuxE23UFH/sdxxLC2h8guadr0Cng== X-Received: by 2002:a05:600c:3b98:b0:4b7:6a8b:9df2 with SMTP id 5b1f17b1804b1-4bb55a8c128mr293542685e9.25.1794919220027; Tue, 17 Nov 2026 04:40:20 -0800 (PST) Received: from Ansuel-XPS24.localdomain (93-34-92-103.ip49.fastwebnet.it. [93.34.92.103]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4bb78386902sm73367065e9.1.2026.11.17.04.40.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 04:40:19 -0800 (PST) From: Christian Marangi To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Simon Horman , Jonathan Corbet , Shuah Khan , Randy Dunlap , Christian Marangi , Lorenzo Bianconi , Heiner Kallweit , Russell King , Maxime Chevallier , Philipp Zabel , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , "Russell King (Oracle)" , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, llvm@lists.linux.dev Subject: [PATCH net-next v22 06/15] net: phylink: make phylink_validate state locked Date: Tue, 17 Nov 2026 13:39:46 +0100 Message-ID: <20261117123956.11981-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261117123956.11981-1-ansuelsmth@gmail.com> References: <20261117123956.11981-1-ansuelsmth@gmail.com> X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In preparation for support for PCS release/late attach, rework the phylink_validate functions to be locked under the state mutex. With the introduction of a notifier that can be called concurrently while a phylink_create is called or an interface mode validation is being run, on recalculating the supported interface and capabilities, an inconsistency can be introduced with 2 validation run at the same time. To handle this, make the phylink_validate lock under the phylink state mutex, add lockless variant for phylink_validate_mask and phylink_validate and add lockdep check to make sure the mutex is held in the inner validate functions. Function that already run phylink_validate under state mutex, are updated to use the lockless variant. Special care was needed for phy_get_rate_matching that required a lockless variant. This is introduced by adding an internal phy header. Signed-off-by: Christian Marangi --- drivers/net/phy/phy-internal.h | 22 ++++++++++++ drivers/net/phy/phy.c | 11 +++--- drivers/net/phy/phylink.c | 62 ++++++++++++++++++++++++++++------ 3 files changed, 79 insertions(+), 16 deletions(-) create mode 100644 drivers/net/phy/phy-internal.h diff --git a/drivers/net/phy/phy-internal.h b/drivers/net/phy/phy-internal.h new file mode 100644 index 000000000000..56d87495e1f0 --- /dev/null +++ b/drivers/net/phy/phy-internal.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef __PHY_INTERNAL_H +#define __PHY_INTERNAL_H + +#include +#include + +static inline int __phy_get_rate_matching(struct phy_device *phydev, + phy_interface_t iface) +{ + int ret = RATE_MATCH_NONE; + + lockdep_assert_held(&phydev->lock); + + if (phydev->drv->get_rate_matching) + return phydev->drv->get_rate_matching(phydev, iface); + + return ret; +} + +#endif /* __PHY_INTERNAL_H */ diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index fce9bc7be330..e305bbff16ad 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -38,6 +38,7 @@ #include "phylib-internal.h" #include "phy-caps.h" +#include "phy-internal.h" #define PHY_STATE_TIME HZ @@ -146,13 +147,11 @@ EXPORT_SYMBOL(phy_print_status); int phy_get_rate_matching(struct phy_device *phydev, phy_interface_t iface) { - int ret = RATE_MATCH_NONE; + int ret; - if (phydev->drv->get_rate_matching) { - mutex_lock(&phydev->lock); - ret = phydev->drv->get_rate_matching(phydev, iface); - mutex_unlock(&phydev->lock); - } + mutex_lock(&phydev->lock); + ret = __phy_get_rate_matching(phydev, iface); + mutex_unlock(&phydev->lock); return ret; } diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 091c3a79c120..88280866c19a 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -24,6 +25,7 @@ #include #include "phy-caps.h" +#include "phy-internal.h" #include "sfp.h" #include "swphy.h" @@ -550,6 +552,8 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, unsigned long capabilities; int ret; + lockdep_assert_held(&pl->state_mutex); + /* Get the PCS for this interface mode */ if (pl->mac_ops->mac_select_pcs) { pcs = pl->mac_ops->mac_select_pcs(pl->config, state->interface); @@ -628,13 +632,15 @@ static void phylink_validate_one(struct phylink *pl, struct phy_device *phy, __ETHTOOL_DECLARE_LINK_MODE_MASK(tmp_supported); struct phylink_link_state tmp_state; + lockdep_assert_held(&pl->state_mutex); + linkmode_copy(tmp_supported, supported); tmp_state = *state; tmp_state.interface = interface; if (phy) - tmp_state.rate_matching = phy_get_rate_matching(phy, interface); + tmp_state.rate_matching = __phy_get_rate_matching(phy, interface); if (!phylink_validate_mac_and_pcs(pl, tmp_supported, &tmp_state)) { phylink_dbg(pl, " interface %u (%s) rate match %s supports %*pbl\n", @@ -648,15 +654,17 @@ static void phylink_validate_one(struct phylink *pl, struct phy_device *phy, } } -static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy, - unsigned long *supported, - struct phylink_link_state *state, - const unsigned long *interfaces) +static int __phylink_validate_mask(struct phylink *pl, struct phy_device *phy, + unsigned long *supported, + struct phylink_link_state *state, + const unsigned long *interfaces) { __ETHTOOL_DECLARE_LINK_MODE_MASK(all_adv) = { 0, }; __ETHTOOL_DECLARE_LINK_MODE_MASK(all_s) = { 0, }; int interface; + lockdep_assert_held(&pl->state_mutex); + for_each_set_bit(interface, interfaces, PHY_INTERFACE_MODE_MAX) phylink_validate_one(pl, phy, supported, state, interface, all_s, all_adv); @@ -667,14 +675,36 @@ static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy, return phylink_is_empty_linkmode(supported) ? -EINVAL : 0; } -static int phylink_validate(struct phylink *pl, unsigned long *supported, - struct phylink_link_state *state) +static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy, + unsigned long *supported, + struct phylink_link_state *state, + const unsigned long *interfaces) +{ + int ret; + + if (phy) + mutex_lock(&phy->lock); + + mutex_lock(&pl->state_mutex); + ret = __phylink_validate_mask(pl, phy, supported, state, interfaces); + mutex_unlock(&pl->state_mutex); + + if (phy) + mutex_unlock(&phy->lock); + + return ret; +} + +static int __phylink_validate(struct phylink *pl, unsigned long *supported, + struct phylink_link_state *state) { const unsigned long *interfaces = pl->supported_interfaces; + lockdep_assert_held(&pl->state_mutex); + if (state->interface == PHY_INTERFACE_MODE_NA) - return phylink_validate_mask(pl, NULL, supported, state, - interfaces); + return __phylink_validate_mask(pl, NULL, supported, state, + interfaces); if (!test_bit(state->interface, interfaces)) return -EINVAL; @@ -682,6 +712,18 @@ static int phylink_validate(struct phylink *pl, unsigned long *supported, return phylink_validate_mac_and_pcs(pl, supported, state); } +static int phylink_validate(struct phylink *pl, unsigned long *supported, + struct phylink_link_state *state) +{ + int ret; + + mutex_lock(&pl->state_mutex); + ret = __phylink_validate(pl, supported, state); + mutex_unlock(&pl->state_mutex); + + return ret; +} + static void phylink_fill_fixedlink_supported(unsigned long *supported) { linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported); @@ -2117,7 +2159,7 @@ void phylink_update_mac_pause_capabilities(struct phylink *pl, unsigned long mac else if (pl->sfp_bus) linkmode_and(pl->supported, pl->supported, pl->sfp_support); - phylink_validate(pl, pl->supported, config); + __phylink_validate(pl, pl->supported, config); pause_state = config->pause; -- 2.55.0