Re: [PATCHv3 net-next] bonding: add software tx timestamping support

[Jay Vosburgh <jay.vosburgh@canonical.com>]

Hangbin Liu <liuhangbin@gmail.com> wrote:

>Currently, bonding only obtain the timestamp (ts) information of
>the active slave, which is available only for modes 1, 5, and 6.
>For other modes, bonding only has software rx timestamping support.
>
>However, some users who use modes such as LACP also want tx timestamp
>support. To address this issue, let's check the ts information of each
>slave. If all slaves support tx timestamping, we can enable tx
>timestamping support for the bond.
>
>Suggested-by: Miroslav Lichvar <mlichvar@redhat.com>
>Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>

Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>

>---
>v3: remove dev_hold/dev_put. remove the '\' for line continuation.
>v2: check each slave's ts info to make sure bond support sw tx
>    timestamping
>---
> drivers/net/bonding/bond_main.c | 36 +++++++++++++++++++++++++++++++--
> include/uapi/linux/net_tstamp.h |  3 +++
> 2 files changed, 37 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index 00646aa315c3..3b643739bbe7 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -5686,9 +5686,13 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
> 				    struct ethtool_ts_info *info)
> {
> 	struct bonding *bond = netdev_priv(bond_dev);
>+	struct ethtool_ts_info ts_info;
> 	const struct ethtool_ops *ops;
> 	struct net_device *real_dev;
> 	struct phy_device *phydev;
>+	bool soft_support = false;
>+	struct list_head *iter;
>+	struct slave *slave;
> 	int ret = 0;
> 
> 	rcu_read_lock();
>@@ -5707,10 +5711,38 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
> 			ret = ops->get_ts_info(real_dev, info);
> 			goto out;
> 		}
>+	} else {
>+		/* Check if all slaves support software rx/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);
>+
>+			if (!ret && (ts_info.so_timestamping & SOF_TIMESTAMPING_SOFTRXTX) ==
>+				    SOF_TIMESTAMPING_SOFTRXTX) {
>+				soft_support = true;
>+				continue;
>+			}
>+
>+			soft_support = false;
>+			break;
>+		}
>+		rcu_read_unlock();
> 	}
> 
>-	info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
>-				SOF_TIMESTAMPING_SOFTWARE;
>+	ret = 0;
>+	if (soft_support) {
>+		info->so_timestamping = SOF_TIMESTAMPING_SOFTRXTX;
>+	} else {
>+		info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
>+					SOF_TIMESTAMPING_SOFTWARE;
>+	}
> 	info->phc_index = -1;
> 
> out:
>diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h
>index a2c66b3d7f0f..2adaa0008434 100644
>--- a/include/uapi/linux/net_tstamp.h
>+++ b/include/uapi/linux/net_tstamp.h
>@@ -48,6 +48,9 @@ enum {
> 					 SOF_TIMESTAMPING_TX_SCHED | \
> 					 SOF_TIMESTAMPING_TX_ACK)
> 
>+#define SOF_TIMESTAMPING_SOFTRXTX (SOF_TIMESTAMPING_TX_SOFTWARE | \
>+				   SOF_TIMESTAMPING_RX_SOFTWARE | \
>+				   SOF_TIMESTAMPING_SOFTWARE)
> /**
>  * struct so_timestamping - SO_TIMESTAMPING parameter
>  *
>-- 
>2.38.1
>