netdev - Re: [PATCH net-next v17 02/14] net: sfp: pass the phy_device when disconnecting an sfp module's PHY

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <0938ca9e-01c7-4faa-a418-5871bb5de421@csgroup.eu>
Date: Wed, 14 Aug 2024 16:29:00 +0200
From: Christophe Leroy <christophe.leroy@...roup.eu>
To: Maxime Chevallier <maxime.chevallier@...tlin.com>, davem@...emloft.net
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
 thomas.petazzoni@...tlin.com, Andrew Lunn <andrew@...n.ch>,
 Jakub Kicinski <kuba@...nel.org>, Eric Dumazet <edumazet@...gle.com>,
 Paolo Abeni <pabeni@...hat.com>, Russell King <linux@...linux.org.uk>,
 linux-arm-kernel@...ts.infradead.org, Herve Codina
 <herve.codina@...tlin.com>, Florian Fainelli <f.fainelli@...il.com>,
 Heiner Kallweit <hkallweit1@...il.com>,
 Vladimir Oltean <vladimir.oltean@....com>,
 Köry Maincent <kory.maincent@...tlin.com>,
 Jesse Brandeburg <jesse.brandeburg@...el.com>, Marek Behún
 <kabel@...nel.org>, Piergiorgio Beruto <piergiorgio.beruto@...il.com>,
 Oleksij Rempel <o.rempel@...gutronix.de>,
 Nicolò Veronese <nicveronese@...il.com>,
 Simon Horman <horms@...nel.org>, mwojtas@...omium.org,
 Nathan Chancellor <nathan@...nel.org>, Antoine Tenart <atenart@...nel.org>,
 Marc Kleine-Budde <mkl@...gutronix.de>,
 Dan Carpenter <dan.carpenter@...aro.org>,
 Romain Gantois <romain.gantois@...tlin.com>
Subject: Re: [PATCH net-next v17 02/14] net: sfp: pass the phy_device when
 disconnecting an sfp module's PHY



Le 09/07/2024 à 08:30, Maxime Chevallier a écrit :
> Pass the phy_device as a parameter to the sfp upstream .disconnect_phy
> operation. This is preparatory work to help track phy devices across
> a net_device's link.
> 
> Signed-off-by: Maxime Chevallier <maxime.chevallier@...tlin.com>
> Reviewed-by: Andrew Lunn <andrew@...n.ch>

Reviewed-by: Christophe Leroy <christophe.leroy@...roup.eu>
Tested-by: Christophe Leroy <christophe.leroy@...roup.eu>

> ---
>   drivers/net/phy/phylink.c | 3 ++-
>   drivers/net/phy/sfp-bus.c | 4 ++--
>   include/linux/sfp.h       | 2 +-
>   3 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
> index 51c526d227fa..ab4e9fc03017 100644
> --- a/drivers/net/phy/phylink.c
> +++ b/drivers/net/phy/phylink.c
> @@ -3423,7 +3423,8 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)
>   	return ret;
>   }
>   
> -static void phylink_sfp_disconnect_phy(void *upstream)
> +static void phylink_sfp_disconnect_phy(void *upstream,
> +				       struct phy_device *phydev)
>   {
>   	phylink_disconnect_phy(upstream);
>   }
> diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
> index 2f44fc51848f..56953e66bb7b 100644
> --- a/drivers/net/phy/sfp-bus.c
> +++ b/drivers/net/phy/sfp-bus.c
> @@ -487,7 +487,7 @@ static void sfp_unregister_bus(struct sfp_bus *bus)
>   			bus->socket_ops->stop(bus->sfp);
>   		bus->socket_ops->detach(bus->sfp);
>   		if (bus->phydev && ops && ops->disconnect_phy)
> -			ops->disconnect_phy(bus->upstream);
> +			ops->disconnect_phy(bus->upstream, bus->phydev);
>   	}
>   	bus->registered = false;
>   }
> @@ -743,7 +743,7 @@ void sfp_remove_phy(struct sfp_bus *bus)
>   	const struct sfp_upstream_ops *ops = sfp_get_upstream_ops(bus);
>   
>   	if (ops && ops->disconnect_phy)
> -		ops->disconnect_phy(bus->upstream);
> +		ops->disconnect_phy(bus->upstream, bus->phydev);
>   	bus->phydev = NULL;
>   }
>   EXPORT_SYMBOL_GPL(sfp_remove_phy);
> diff --git a/include/linux/sfp.h b/include/linux/sfp.h
> index b14be59550e3..54abb4d22b2e 100644
> --- a/include/linux/sfp.h
> +++ b/include/linux/sfp.h
> @@ -550,7 +550,7 @@ struct sfp_upstream_ops {
>   	void (*link_down)(void *priv);
>   	void (*link_up)(void *priv);
>   	int (*connect_phy)(void *priv, struct phy_device *);
> -	void (*disconnect_phy)(void *priv);
> +	void (*disconnect_phy)(void *priv, struct phy_device *);
>   };
>   
>   #if IS_ENABLED(CONFIG_SFP)