From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29A5912D741; Tue, 30 Apr 2024 11:57:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.197 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714478267; cv=none; b=TUm61O6zRUkiS2zDOOK0AMGy4FxlYm/46nRbaNyHaPICFwXaXl+a0AT+bYb7tNoiI+Ho12HTsj0dWkIZb2ZqJQd9BNp9Errq/NmONoPUObnilodT8PBCeLt6OiNAKxXLznQL+tyi4DSjQY7o2MIJH5x/qSQZC6vPMM14N25XLkc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714478267; c=relaxed/simple; bh=ZIJ29Szzwh9M5zYnF3qlR6KBC0TlksaMUVdF4NkQ8Ek=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KW2zauCZ6snoRfHA+9UfTv3PBNhSUdzAoCWif2+UXis/+7DhbYcv44/Zr9ycrC63L0/wswDIB3xPZI3W/iE9qIzWtek8dF3SsH4091LxHLjxY4rpVZGWIzl9AW+sFWXtrTRGhwuYVFmDNh/6gqwOUYSBfD4o/dfg/1teG+r1vrw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=T+IwUXyA; arc=none smtp.client-ip=217.70.183.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="T+IwUXyA" Received: by mail.gandi.net (Postfix) with ESMTPSA id 6D07E1C0009; Tue, 30 Apr 2024 11:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1714478262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m2HIuXOxxXCgZkw0XsjUo+QE130qanWOjxQaANrRc0w=; b=T+IwUXyAzz36ab/71Ll7jL6I21BUNWFq10zkqhke9HmIV4LyY12sJXlI6U7gXnZuHg7M10 cnw5spz6UNDzR9T0Sm3esk2/IQXS1Pirem95mt1FB23J9/dU6A/jF0oukoKuR+qxAjwJWW fZ7nnvh+fzDNUKY5aLufDpHAHiZXnQASRWrIbTnXWNABCWqkjdxf7Myr3Bawv11L5DS63b bd86R9P83BaEPKenSP15ToLNFaSq2nqdKx3G++29N5Qzi8hckc0Fz28o/hJbCs3rz/NgZW NhhGDu8gnZfS+kbtyJznUuzfxtJ5etx9xEsqmTjbtNcHpVs+rtbI3CdSFrUdWQ== Date: Tue, 30 Apr 2024 13:57:34 +0200 From: Maxime Chevallier To: Heiner Kallweit Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Russell King , linux-arm-kernel@lists.infradead.org, Christophe Leroy , Herve Codina , Florian Fainelli , Vladimir Oltean , =?UTF-8?B?S8O2cnk=?= Maincent , Jesse Brandeburg , Marek =?UTF-8?B?QmVow7pu?= , Piergiorgio Beruto , Oleksij Rempel , =?UTF-8?B?Tmljb2zDsg==?= Veronese , Simon Horman , mwojtas@chromium.org, Nathan Chancellor , Antoine Tenart Subject: Re: [PATCH net-next] net: phy: Don't conditionally compile the phy_link_topology creation Message-ID: <20240430135734.503f51a2@device-28.home> In-Reply-To: <1ed5b8cb-c79b-44b9-8dbe-f78d7505b3b4@gmail.com> References: <20240429131008.439231-1-maxime.chevallier@bootlin.com> <1ed5b8cb-c79b-44b9-8dbe-f78d7505b3b4@gmail.com> Organization: Bootlin X-Mailer: Claws Mail 4.2.0 (GTK 3.24.41; x86_64-redhat-linux-gnu) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-GND-Sasl: maxime.chevallier@bootlin.com Hello Heiner, On Tue, 30 Apr 2024 10:17:31 +0200 Heiner Kallweit wrote: > On 29.04.2024 15:10, Maxime Chevallier wrote: > > The core of the phy_link_topology isn't directly tied to phylib, and at > > the moment it's initialized, phylib might not be loaded yet. Move the > > initialization of the topology to the phy_link_topology_core header, > > which contains the bare minimum so that we can initialize it at netdev > > creation. > > > > The change fixes the issue for me, but according to my personal taste > the code isn't intuitive and still error-prone. Also there's no good > reason to inline a function like phy_link_topo_create() and make it > publicly available. Do you expect it to be ever used outside net core? > In general it may make sense to add a config symbol for the topology > extension, there seem to be very few, specialized use cases for it. I think I'm missing the point here then. Do you mean adding a Kconfig option to explicitely turn phy_link_topology on ? or build it as a dedicated kernel module ? Or do you see something such as "if phylib is M or Y, then build the topology stuff and make sure it's allocated when a netdev gets created ?" Thanks, Maxime > > > Signed-off-by: Maxime Chevallier > > Closes: https://lore.kernel.org/netdev/2e11b89d-100f-49e7-9c9a-834cc0b82f97@gmail.com/ > > Closes: https://lore.kernel.org/netdev/20240409201553.GA4124869@dev-arch.thelio-3990X/ > > --- > > drivers/net/phy/phy_link_topology.c | 23 -------------------- > > include/linux/phy_link_topology.h | 5 ----- > > include/linux/phy_link_topology_core.h | 30 +++++++++++++++++--------- > > 3 files changed, 20 insertions(+), 38 deletions(-) > > > > diff --git a/drivers/net/phy/phy_link_topology.c b/drivers/net/phy/phy_link_topology.c > > index 985941c5c558..960aedd73308 100644 > > --- a/drivers/net/phy/phy_link_topology.c > > +++ b/drivers/net/phy/phy_link_topology.c > > @@ -12,29 +12,6 @@ > > #include > > #include > > > > -struct phy_link_topology *phy_link_topo_create(struct net_device *dev) > > -{ > > - struct phy_link_topology *topo; > > - > > - topo = kzalloc(sizeof(*topo), GFP_KERNEL); > > - if (!topo) > > - return ERR_PTR(-ENOMEM); > > - > > - xa_init_flags(&topo->phys, XA_FLAGS_ALLOC1); > > - topo->next_phy_index = 1; > > - > > - return topo; > > -} > > - > > -void phy_link_topo_destroy(struct phy_link_topology *topo) > > -{ > > - if (!topo) > > - return; > > - > > - xa_destroy(&topo->phys); > > - kfree(topo); > > -} > > - > > int phy_link_topo_add_phy(struct phy_link_topology *topo, > > struct phy_device *phy, > > enum phy_upstream upt, void *upstream) > > diff --git a/include/linux/phy_link_topology.h b/include/linux/phy_link_topology.h > > index 6b79feb607e7..ad72d7881257 100644 > > --- a/include/linux/phy_link_topology.h > > +++ b/include/linux/phy_link_topology.h > > @@ -32,11 +32,6 @@ struct phy_device_node { > > struct phy_device *phy; > > }; > > > > -struct phy_link_topology { > > - struct xarray phys; > > - u32 next_phy_index; > > -}; > > - > > static inline struct phy_device * > > phy_link_topo_get_phy(struct phy_link_topology *topo, u32 phyindex) > > { > > diff --git a/include/linux/phy_link_topology_core.h b/include/linux/phy_link_topology_core.h > > index 0a6479055745..0116ec49cd1b 100644 > > --- a/include/linux/phy_link_topology_core.h > > +++ b/include/linux/phy_link_topology_core.h > > @@ -2,24 +2,34 @@ > > #ifndef __PHY_LINK_TOPOLOGY_CORE_H > > #define __PHY_LINK_TOPOLOGY_CORE_H > > > > -struct phy_link_topology; > > +#include > > > > -#if IS_REACHABLE(CONFIG_PHYLIB) > > - > > -struct phy_link_topology *phy_link_topo_create(struct net_device *dev); > > -void phy_link_topo_destroy(struct phy_link_topology *topo); > > - > > -#else > > +struct phy_link_topology { > > + struct xarray phys; > > + u32 next_phy_index; > > +}; > > > > static inline struct phy_link_topology *phy_link_topo_create(struct net_device *dev) > > { > > - return NULL; > > + struct phy_link_topology *topo; > > + > > + topo = kzalloc(sizeof(*topo), GFP_KERNEL); > > + if (!topo) > > + return ERR_PTR(-ENOMEM); > > + > > + xa_init_flags(&topo->phys, XA_FLAGS_ALLOC1); > > + topo->next_phy_index = 1; > > + > > + return topo; > > } > > > > static inline void phy_link_topo_destroy(struct phy_link_topology *topo) > > { > > -} > > + if (!topo) > > + return; > > > > -#endif > > + xa_destroy(&topo->phys); > > + kfree(topo); > > +} > > > > #endif /* __PHY_LINK_TOPOLOGY_CORE_H */ >