From: Jay Vosburgh <jay.vosburgh@canonical.com>
To: "Köry Maincent" <kory.maincent@bootlin.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Jonathan Corbet <corbet@lwn.net>,
Andy Gospodarek <andy@greyhouse.net>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Claudiu Beznea <claudiu.beznea@tuxon.dev>,
Horatiu Vultur <horatiu.vultur@microchip.com>,
UNGLinuxDriver@microchip.com,
Florian Fainelli <florian.fainelli@broadcom.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Richard Cochran <richardcochran@gmail.com>,
Radu Pirea <radu-nicolae.pirea@oss.nxp.com>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
Michael Walle <michael@walle.cc>,
Jacob Keller <jacob.e.keller@intel.com>,
Maxime Chevallier <maxime.chevallier@bootlin.com>
Subject: Re: [PATCH net-next v5 03/16] net: ethtool: Refactor identical get_ts_info implementations.
Date: Wed, 11 Oct 2023 14:41:15 -0700 [thread overview]
Message-ID: <6355.1697060475@famine> (raw)
In-Reply-To: <20231009155138.86458-4-kory.maincent@bootlin.com>
Köry Maincent <kory.maincent@bootlin.com> wrote:
>From: Richard Cochran <richardcochran@gmail.com>
>
>The vlan, macvlan and the bonding drivers call their "real" device driver
>in order to report the time stamping capabilities. Provide a core
>ethtool helper function to avoid copy/paste in the stack.
>
>Signed-off-by: Richard Cochran <richardcochran@gmail.com>
>Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
For the bonding portion:
Reviewed-by: Jay Vosburgh <jay.vosburgh@canonical.com>
>---
>
>Change in v5:
>- Fixe typo
>---
> drivers/net/bonding/bond_main.c | 27 ++-------------------------
> drivers/net/macvlan.c | 14 +-------------
> include/linux/ethtool.h | 8 ++++++++
> net/8021q/vlan_dev.c | 15 +--------------
> net/ethtool/common.c | 6 ++++++
> 5 files changed, 18 insertions(+), 52 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index ed7212e61c54..18af563d20b2 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -5763,29 +5763,12 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
> rcu_read_unlock();
>
> if (real_dev) {
>- ops = real_dev->ethtool_ops;
>- phydev = real_dev->phydev;
>-
>- if (phy_has_tsinfo(phydev)) {
>- ret = phy_ts_info(phydev, info);
>- goto out;
>- } else if (ops->get_ts_info) {
>- ret = ops->get_ts_info(real_dev, info);
>- goto out;
>- }
>+ ret = ethtool_get_ts_info_by_layer(real_dev, info);
> } else {
> /* Check if all slaves support software tx timestamping */
> rcu_read_lock();
> bond_for_each_slave_rcu(bond, slave, iter) {
>- ret = -1;
>- ops = slave->dev->ethtool_ops;
>- phydev = slave->dev->phydev;
>-
>- if (phy_has_tsinfo(phydev))
>- ret = phy_ts_info(phydev, &ts_info);
>- else if (ops->get_ts_info)
>- ret = ops->get_ts_info(slave->dev, &ts_info);
>-
>+ ret = ethtool_get_ts_info_by_layer(slave->dev, &ts_info);
> if (!ret && (ts_info.so_timestamping & SOF_TIMESTAMPING_TX_SOFTWARE)) {
> sw_tx_support = true;
> continue;
>@@ -5797,15 +5780,9 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
> rcu_read_unlock();
> }
>
>- ret = 0;
>- info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
>- SOF_TIMESTAMPING_SOFTWARE;
> if (sw_tx_support)
> info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE;
>
>- info->phc_index = -1;
>-
>-out:
> dev_put(real_dev);
> return ret;
> }
>diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
>index 02bd201bc7e5..759406fbaea8 100644
>--- a/drivers/net/macvlan.c
>+++ b/drivers/net/macvlan.c
>@@ -1086,20 +1086,8 @@ static int macvlan_ethtool_get_ts_info(struct net_device *dev,
> struct ethtool_ts_info *info)
> {
> struct net_device *real_dev = macvlan_dev_real_dev(dev);
>- const struct ethtool_ops *ops = real_dev->ethtool_ops;
>- struct phy_device *phydev = real_dev->phydev;
>
>- if (phy_has_tsinfo(phydev)) {
>- return phy_ts_info(phydev, info);
>- } else if (ops->get_ts_info) {
>- return ops->get_ts_info(real_dev, info);
>- } else {
>- info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
>- SOF_TIMESTAMPING_SOFTWARE;
>- info->phc_index = -1;
>- }
>-
>- return 0;
>+ return ethtool_get_ts_info_by_layer(real_dev, info);
> }
>
> static netdev_features_t macvlan_fix_features(struct net_device *dev,
>diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
>index 62b61527bcc4..1159daac776e 100644
>--- a/include/linux/ethtool.h
>+++ b/include/linux/ethtool.h
>@@ -1043,6 +1043,14 @@ static inline int ethtool_mm_frag_size_min_to_add(u32 val_min, u32 *val_add,
> return -EINVAL;
> }
>
>+/**
>+ * ethtool_get_ts_info_by_layer - Obtains time stamping capabilities from the MAC or PHY layer.
>+ * @dev: pointer to net_device structure
>+ * @info: buffer to hold the result
>+ * Returns zero on success, non-zero otherwise.
>+ */
>+int ethtool_get_ts_info_by_layer(struct net_device *dev, struct ethtool_ts_info *info);
>+
> /**
> * ethtool_sprintf - Write formatted string to ethtool string data
> * @data: Pointer to start of string to update
>diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
>index 2a7f1b15714a..407b2335f091 100644
>--- a/net/8021q/vlan_dev.c
>+++ b/net/8021q/vlan_dev.c
>@@ -702,20 +702,7 @@ static int vlan_ethtool_get_ts_info(struct net_device *dev,
> struct ethtool_ts_info *info)
> {
> const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
>- const struct ethtool_ops *ops = vlan->real_dev->ethtool_ops;
>- struct phy_device *phydev = vlan->real_dev->phydev;
>-
>- if (phy_has_tsinfo(phydev)) {
>- return phy_ts_info(phydev, info);
>- } else if (ops->get_ts_info) {
>- return ops->get_ts_info(vlan->real_dev, info);
>- } else {
>- info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
>- SOF_TIMESTAMPING_SOFTWARE;
>- info->phc_index = -1;
>- }
>-
>- return 0;
>+ return ethtool_get_ts_info_by_layer(vlan->real_dev, info);
> }
>
> static void vlan_dev_get_stats64(struct net_device *dev,
>diff --git a/net/ethtool/common.c b/net/ethtool/common.c
>index f5598c5f50de..e2315e24d695 100644
>--- a/net/ethtool/common.c
>+++ b/net/ethtool/common.c
>@@ -661,6 +661,12 @@ int ethtool_get_phc_vclocks(struct net_device *dev, int **vclock_index)
> }
> EXPORT_SYMBOL(ethtool_get_phc_vclocks);
>
>+int ethtool_get_ts_info_by_layer(struct net_device *dev, struct ethtool_ts_info *info)
>+{
>+ return __ethtool_get_ts_info(dev, info);
>+}
>+EXPORT_SYMBOL(ethtool_get_ts_info_by_layer);
>+
> const struct ethtool_phy_ops *ethtool_phy_ops;
>
> void ethtool_set_ethtool_phy_ops(const struct ethtool_phy_ops *ops)
>--
>2.25.1
>
>
next prev parent reply other threads:[~2023-10-11 21:41 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 15:51 [PATCH net-next v5 00/16] net: Make timestamping selectable Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 01/16] net: Convert PHYs hwtstamp callback to use kernel_hwtstamp_config Köry Maincent
2023-10-09 21:02 ` Florian Fainelli
2023-10-10 15:37 ` Simon Horman
2023-10-11 8:27 ` Köry Maincent
2023-10-20 20:23 ` kernel test robot
2023-10-09 15:51 ` [PATCH net-next v5 02/16] net: phy: Remove the call to phy_mii_ioctl in phy_hwstamp_get/set Köry Maincent
2023-10-09 21:04 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 03/16] net: ethtool: Refactor identical get_ts_info implementations Köry Maincent
2023-10-09 19:56 ` kernel test robot
2023-10-09 21:06 ` Florian Fainelli
2023-10-11 21:41 ` Jay Vosburgh [this message]
2023-10-09 15:51 ` [PATCH net-next v5 04/16] net: macb: Convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() Köry Maincent
2023-10-09 21:08 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 05/16] net: Make dev_set_hwtstamp_phylib accessible Köry Maincent
2023-10-09 21:09 ` Florian Fainelli
2023-10-10 7:40 ` Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 06/16] net_tstamp: Add TIMESTAMPING SOFTWARE and HARDWARE mask Köry Maincent
2023-10-09 21:11 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 07/16] net: phy: micrel: fix ts_info value in case of no phc Köry Maincent
2023-10-09 21:14 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 08/16] net: ethtool: Add a command to expose current time stamping layer Köry Maincent
2023-10-09 21:20 ` Florian Fainelli
2023-10-10 8:23 ` Köry Maincent
2023-10-13 16:00 ` Jakub Kicinski
2023-10-13 16:11 ` Andrew Lunn
2023-10-16 10:41 ` Köry Maincent
2023-10-16 14:22 ` Jakub Kicinski
2023-10-16 15:00 ` Köry Maincent
2023-10-16 15:43 ` Jakub Kicinski
2023-10-16 16:23 ` Köry Maincent
2023-10-16 17:03 ` Jakub Kicinski
2023-10-16 23:03 ` Jacob Keller
2023-10-17 9:21 ` Köry Maincent
2023-10-16 23:50 ` Richard Cochran
2023-10-17 8:29 ` Köry Maincent
2023-10-13 16:14 ` Vladimir Oltean
2023-10-13 16:30 ` Jakub Kicinski
2023-10-13 17:09 ` Vladimir Oltean
2023-10-13 17:46 ` Jakub Kicinski
2023-10-13 17:56 ` Vladimir Oltean
2023-10-13 20:15 ` Jakub Kicinski
2023-10-09 15:51 ` [PATCH net-next v5 09/16] netlink: specs: Introduce new netlink command to get current timestamp Köry Maincent
2023-10-09 21:21 ` Florian Fainelli
2023-10-10 8:40 ` Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 10/16] net: ethtool: Add a command to list available time stamping layers Köry Maincent
2023-10-13 22:52 ` kernel test robot
2023-10-09 15:51 ` [PATCH net-next v5 11/16] netlink: specs: Introduce new netlink " Köry Maincent
2023-10-09 21:22 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 12/16] net: Replace hwtstamp_source by timestamping layer Köry Maincent
2023-10-09 21:23 ` Florian Fainelli
2023-10-09 15:51 ` [PATCH net-next v5 13/16] net: Change the API of PHY default timestamp to MAC Köry Maincent
2023-10-09 22:23 ` Florian Fainelli
2023-10-10 15:52 ` Simon Horman
2023-10-13 1:37 ` kernel test robot
2023-10-09 15:51 ` [PATCH net-next v5 14/16] net: ethtool: ts: Update GET_TS to reply the current selected timestamp Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 15/16] net ethtool: net: Let the active time stamping layer be selectable Köry Maincent
2023-10-09 21:28 ` Florian Fainelli
2023-10-10 8:31 ` Köry Maincent
2023-10-09 15:51 ` [PATCH net-next v5 16/16] netlink: specs: Introduce time stamping set command Köry Maincent
2023-10-09 21:29 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6355.1697060475@famine \
--to=jay.vosburgh@canonical.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=andy@greyhouse.net \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=hkallweit1@gmail.com \
--cc=horatiu.vultur@microchip.com \
--cc=jacob.e.keller@intel.com \
--cc=kory.maincent@bootlin.com \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=maxime.chevallier@bootlin.com \
--cc=michael@walle.cc \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=pabeni@redhat.com \
--cc=radu-nicolae.pirea@oss.nxp.com \
--cc=richardcochran@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=vladimir.oltean@nxp.com \
--cc=willemdebruijn.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).