From: Jakub Kicinski <kuba@kernel.org>
To: Hangbin Liu <liuhangbin@gmail.com>
Cc: netdev@vger.kernel.org, Jay Vosburgh <j.vosburgh@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Jonathan Toppins <jtoppins@redhat.com>,
Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>, Liang Li <liali@redhat.com>,
Simon Horman <simon.horman@corigine.com>,
Miroslav Lichvar <mlichvar@redhat.com>
Subject: Re: [PATCHv3 net-next] bonding: add software tx timestamping support
Date: Tue, 11 Apr 2023 21:30:18 -0700 [thread overview]
Message-ID: <20230411213018.0b5b37ec@kernel.org> (raw)
In-Reply-To: <20230410082351.1176466-1-liuhangbin@gmail.com>
On Mon, 10 Apr 2023 16:23:51 +0800 Hangbin Liu wrote:
> @@ -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);
Do we _really_ need to hold RCU lock over this?
Imposing atomic context restrictions on driver callbacks should not be
taken lightly. I'm 75% sure .ethtool_get_ts_info can only be called
under rtnl lock off the top of my head, is that not the case?
> + if (!ret && (ts_info.so_timestamping & SOF_TIMESTAMPING_SOFTRXTX) ==
> + SOF_TIMESTAMPING_SOFTRXTX) {
You could check in this loop if TX is supported...
> + 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;
...make this unconditional and conditionally add TX...
> + }
> 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)
..then you won't need this define in uAPI.
next prev parent reply other threads:[~2023-04-12 4:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 8:23 [PATCHv3 net-next] bonding: add software tx timestamping support Hangbin Liu
2023-04-12 0:19 ` Jay Vosburgh
2023-04-12 4:30 ` Jakub Kicinski [this message]
2023-04-12 6:33 ` Jay Vosburgh
2023-04-12 12:28 ` Hangbin Liu
2023-04-12 14:25 ` Jakub Kicinski
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=20230411213018.0b5b37ec@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=j.vosburgh@gmail.com \
--cc=jtoppins@redhat.com \
--cc=liali@redhat.com \
--cc=liuhangbin@gmail.com \
--cc=mlichvar@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=simon.horman@corigine.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).