From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.51 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794529965; b=Kc7fwKMiV/rJdARqo3jk73m72WnOUa7AlYys5VrWL7XMDSo2gbsPjZ8nfJDJ5Fo/cOH2 LcOVWZXd2Yt6rCGtmRvn14qU2Q7lQdS8jgovvWcq/ABw1jUvR6DvaidlijiR0DqlaDWch 5RPSGfzDfGaRoGhQdjbz8pvAShD17DQLGkFAWuP2q5CDGwMFh1y/F/qKTbCpZWn9kwZUS k9SLyndz02GGUMwlCTS57447GzOdRkubxn0VczRUKnkgRScsxmuKKfZhLPyXsKvYigfi+ W27wW3rJT9WdKe/mH1V8KapwcESX91jHlGSB3tMY89YhmzT2vbYY07DLwfgHrbNZ9aA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794529965; 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=i5OFynf0yQ74EmgbLuwy7WCyI+wmTmFQ0TT8iw9nuIc=; b=K6y8XyDgqxRZkw6koWL87StNyWB0KkcauQrk12FCQKGm4HQG1M+4DDP7oK1RJ+eqJIU1 +s7Ih+vZL7G2DC5WCxISLpK1u0kO+i42kB58SObcHVPmFeiLklRTdiwadsKQMuZV8ujEd A2MilRyPjPUfgCTWYYln8y8ODgP8MPgUS12QuBY0M1J7tQAQDfKktU97oeqRRhHwuC68t NFdezVpuZdvNxeaXHsNG4xZhH1RK/1WnPuuEekPQf8OqQkfCPOgpTqvgNMrdzQd37C45Q K5QvqpkNC+kpe+QAgusn6yoDNhbH270kLCs553Vx7dmFRJfJU/lWGOQzCRa+S/OWfnw== 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=s6Zqrcms; arc=none smtp.remote-ip=209.85.221.51 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 E85E7606A894 for ; Fri, 13 Nov 2026 00:32:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E85E7606A894 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=s6Zqrcms Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-491971ac844so384389f8f.2 for ; Thu, 12 Nov 2026 16:32:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794529963; x=1795134763; 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=i5OFynf0yQ74EmgbLuwy7WCyI+wmTmFQ0TT8iw9nuIc=; b=s6ZqrcmsfrZxKw51u0kIJBbXbxP1aIplLOFEAF2AEon8PK9evOz3a/LxZRmDm4Eq7Z qau2gRwBQYkzBLsf9GIFaawrSn1G1wf2s0YdQNKby5/MPCOea0zFNbFeRW+rN/A3RQz9 vBpUi37Pd0jjyCSCRZsUdK7DZ+RtcvxJCfgKAHXAoWqH4+PSe1gCBD+eLvDSpInxTLAh 2De8XWBr0RojPqk6BzkkHFu0PanZB5Vb+cvZWZbVAWwqJ03ibU2JXEAXfMaYaBuBmmS4 YWTwYC7FwQwHSa9Q+CFHBwRsVuyCOHIGKkc8Bxhwrsjd8c5B8pkUWYOGT/dmI7Rj+2xE +QnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794529963; x=1795134763; 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=i5OFynf0yQ74EmgbLuwy7WCyI+wmTmFQ0TT8iw9nuIc=; b=mJLelSpfwMd/w3IycHsAbKCpDNcL6aPJADmIp2ILFdclxdBd3vnzY22SmI3vMq40bB WjwidA3wYw59Hgrsqohk0cbZDo1JhgwMOjpxS1rnYGW8YWoEFDINWQZ6BucHI4400RQQ JrqRTb43IYJGy1F15azY/wr0zkECXaPBH/5M7WeoXoGPwaWUxw8sw/Aduw3/i560PyPJ HgQZ1OhxTueTPYn66iRyY+85rmAsq8mN4RMcBNCiwlMZM/Vz0dKmbw1DrWZcUrL+BgpZ /wKIIxDaziI3vKfqT6yYjcalf7XfFPtn/uWiApXiVzE3KcCqnu/Bt+adAnhDd1KarXDT 7Tzg== X-Forwarded-Encrypted: i=1; AL+hErG5G3AqEQ5+Mf5LMlispzN9RABbYw4j6s9whFz4iCwop7CEYSkU3gySDJrKErusW2BwldLdMbDvJciD@vger.kernel.org X-Gm-Message-State: APuU4Z8neDoptiuLt1QST5jQoIXFu6okA2qU3jZbhregAOevVBHhoXK/ QpbS2oF7J2Xy8tL9d2xnjJ3I7GugR6gMFNRFmF+aOu4ywfxB4zktOJXS X-Gm-Gg: AYBFou3H3mFl93BO1h6vjplv2r0F2V3vn3LHWOw0DUlgXkZ/vgKEa/FwT4ZiBXpfG9r ndbEgvk/2EVFylX1R9X/vdD+gN+vKpth++DF2RG9PTDDwT6QQ+DNhGvuSqTAhXDlSu3SvSD9ik9 VrlxeOU6AzUTel8gpbxjeQeqP3TA5ZoeGA2JpSHTbLomyrs5JixmpBeqwQAggqez54FTxGLkYPn ThcKWarCUMkauUMqyetpJcN3/Pc86HVnOfEU//C16XOYWqYs5rtXikGWNsI8d1V6PRO9IkB4dGm jrMON9PTbQheXivri9Sd0kp0JjEd3U2O8jSj3LnTi0CXyzarGVABU45wEnrot3dpaomGR2HoTQ9 BYGFN9XQrzdF6puffhoujuTP57Gij6NniwzDIzVfNJi2ByB0FA9ue/duLjOGSieP03nE/dlltC6 nSG0cy7bOh/lMIkzZ+jqN3IamMjkw7lFvE7KaVY8L/mZjCv/SEKC4AoCna99lk59sXimExENnTe rHxoSKoWvddNVw6B4lXFhgwlT43hxm7JGE3YsgqvvH311BJ0p1ECfiGByritACR18P9d7Q1jTct bUtH7OaWr6cU4lcVdeft/CGjy/TnX2e175e+Eab8qQUULac94GHXGTy/4OQFky8VaPKqdysguZP c4e7GuUMJtvM9pcaz5GZDiUEauhCZdPfpqGS4uQyb7P8nRVn91UjelXixBnFjp7J3gFoh2sHUN+ w= X-Received: by 2002:a05:6000:2085:b0:48e:4e00:b737 with SMTP id ffacd0b85a97d-49c73a050e5mr2244067f8f.54.1794529963290; Thu, 12 Nov 2026 16:32:43 -0800 (PST) Received: from Ansuel-XPS24.localdomain (host-212-171-11-167.retail.telecomitalia.it. [212.171.11.167]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-49c5f7828a4sm2029768f8f.23.2026.11.12.16.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2026 16:32:42 -0800 (PST) From: Christian Marangi To: Maxime Chevallier , 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 , Philipp Zabel , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , 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 v19 06/15] net: phylink: make phylink_validate state locked Date: Fri, 13 Nov 2026 01:31:56 +0100 Message-ID: <20261113003217.197757-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261113003217.197757-1-ansuelsmth@gmail.com> References: <20261113003217.197757-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. Signed-off-by: Christian Marangi --- drivers/net/phy/phylink.c | 47 +++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index e2e0b313fd61..918aa95e5a64 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -550,6 +551,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,6 +631,8 @@ 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; @@ -648,15 +653,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,8 +674,22 @@ 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; + + mutex_lock(&pl->state_mutex); + ret = __phylink_validate_mask(pl, phy, supported, state, interfaces); + mutex_unlock(&pl->state_mutex); + + return ret; +} + +static int __phylink_validate(struct phylink *pl, unsigned long *supported, + struct phylink_link_state *state) { const unsigned long *interfaces = pl->supported_interfaces; @@ -682,6 +703,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 +2150,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