From: Vadim Fedorenko <vadim.fedorenko@linux.dev>
To: Kory Maincent <kory.maincent@bootlin.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>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Richard Cochran <richardcochran@gmail.com>,
Radu Pirea <radu-nicolae.pirea@oss.nxp.com>,
Jay Vosburgh <j.vosburgh@gmail.com>,
Andy Gospodarek <andy@greyhouse.net>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Claudiu Beznea <claudiu.beznea@tuxon.dev>,
Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
Jonathan Corbet <corbet@lwn.net>,
Horatiu Vultur <horatiu.vultur@microchip.com>,
UNGLinuxDriver@microchip.com, Simon Horman <horms@kernel.org>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
donald.hunter@gmail.com, danieller@nvidia.com,
ecree.xilinx@gmail.com, Andrew Lunn <andrew+netdev@lunn.ch>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-doc@vger.kernel.org,
Maxime Chevallier <maxime.chevallier@bootlin.com>,
Rahul Rameshbabu <rrameshbabu@nvidia.com>,
Willem de Bruijn <willemb@google.com>,
Shannon Nelson <shannon.nelson@amd.com>,
Alexandra Winter <wintera@linux.ibm.com>
Subject: Re: [PATCH net-next v19 09/10] net: ethtool: Add support for tsconfig command to get/set hwtstamp config
Date: Sat, 9 Nov 2024 01:43:30 +0000 [thread overview]
Message-ID: <955dde4b-b4ba-439f-b7d4-f64d90c58d55@linux.dev> (raw)
In-Reply-To: <20241030-feature_ptp_netnext-v19-9-94f8aadc9d5c@bootlin.com>
On 30/10/2024 13:54, Kory Maincent wrote:
> Introduce support for ETHTOOL_MSG_TSCONFIG_GET/SET ethtool netlink socket
> to read and configure hwtstamp configuration of a PHC provider. Note that
> simultaneous hwtstamp isn't supported; configuring a new one disables the
> previous setting.
>
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
[ ... ]
> +static int ethnl_set_tsconfig(struct ethnl_req_info *req_base,
> + struct genl_info *info)
> +{
> + struct kernel_hwtstamp_config hwtst_config = {0}, _hwtst_config = {0};
> + unsigned long mask = 0, req_rx_filter, req_tx_type;
> + struct hwtstamp_provider *hwtstamp = NULL;
> + struct net_device *dev = req_base->dev;
> + struct nlattr **tb = info->attrs;
> + bool mod = false;
> + int ret;
> +
> + BUILD_BUG_ON(__HWTSTAMP_TX_CNT > 32);
> + BUILD_BUG_ON(__HWTSTAMP_FILTER_CNT > 32);
> +
> + if (!netif_device_present(dev))
> + return -ENODEV;
> +
> + if (tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER]) {
> + struct hwtst_provider __hwtst = {.index = -1};
> + struct hwtstamp_provider *__hwtstamp;
> +
> + __hwtstamp = rtnl_dereference(dev->hwtstamp);
> + if (__hwtstamp) {
> + __hwtst.index = ptp_clock_index(__hwtstamp->ptp);
> + __hwtst.qualifier = __hwtstamp->qualifier;
> + }
> +
> + ret = ts_parse_hwtst_provider(tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER],
> + &__hwtst, info->extack,
> + &mod);
> + if (ret < 0)
> + return ret;
> +
> + if (mod) {
> + hwtstamp = kzalloc(sizeof(*hwtstamp), GFP_KERNEL);
> + if (!hwtstamp)
> + return -ENOMEM;
> +
> + hwtstamp->ptp = ptp_clock_get_by_index(&dev->dev,
> + __hwtst.index);
> + if (!hwtstamp->ptp) {
> + NL_SET_ERR_MSG_ATTR(info->extack,
> + tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER],
> + "no phc at such index");
> + ret = -ENODEV;
> + goto err_free_hwtstamp;
> + }
> + hwtstamp->qualifier = __hwtst.qualifier;
> + hwtstamp->dev = &dev->dev;
> +
> + /* Does the hwtstamp supported in the netdev topology */
> + if (!netdev_support_hwtstamp(dev, hwtstamp)) {
> + NL_SET_ERR_MSG_ATTR(info->extack,
> + tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER],
> + "phc not in this net device topology");
> + ret = -ENODEV;
> + goto err_clock_put;
> + }
> + }
> + }
> +
> + /* Get the hwtstamp config from netlink */
> + if (tb[ETHTOOL_A_TSCONFIG_TX_TYPES]) {
> + ret = ethnl_parse_bitset(&req_tx_type, &mask,
> + __HWTSTAMP_TX_CNT,
> + tb[ETHTOOL_A_TSCONFIG_TX_TYPES],
> + ts_tx_type_names, info->extack);
> + if (ret < 0)
> + goto err_clock_put;
> +
> + /* Select only one tx type at a time */
> + if (ffs(req_tx_type) != fls(req_tx_type)) {
> + ret = -EINVAL;
> + goto err_clock_put;
> + }
> +
> + hwtst_config.tx_type = ffs(req_tx_type) - 1;
> + }
> + if (tb[ETHTOOL_A_TSCONFIG_RX_FILTERS]) {
> + ret = ethnl_parse_bitset(&req_rx_filter, &mask,
> + __HWTSTAMP_FILTER_CNT,
> + tb[ETHTOOL_A_TSCONFIG_RX_FILTERS],
> + ts_rx_filter_names, info->extack);
> + if (ret < 0)
> + goto err_clock_put;
> +
> + /* Select only one rx filter at a time */
> + if (ffs(req_rx_filter) != fls(req_rx_filter)) {
> + ret = -EINVAL;
> + goto err_clock_put;
> + }
> +
> + hwtst_config.rx_filter = ffs(req_rx_filter) - 1;
> + }
> + if (tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS]) {
> + ret = nla_get_u32(tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS]);
> + if (ret < 0)
> + goto err_clock_put;
> + hwtst_config.flags = ret;
> + }
> +
> + ret = net_hwtstamp_validate(&hwtst_config);
> + if (ret)
> + goto err_clock_put;
> +
> + if (mod) {
> + struct kernel_hwtstamp_config zero_config = {0};
> + struct hwtstamp_provider *__hwtstamp;
> +
> + /* Disable current time stamping if we try to enable
> + * another one
> + */
> + ret = dev_set_hwtstamp_phylib(dev, &zero_config, info->extack);
_hwtst_config is still inited to 0 here, maybe it can be used to avoid
another stack allocation?
> + if (ret < 0)
> + goto err_clock_put;
> +
> + /* Change the selected hwtstamp source */
> + __hwtstamp = rcu_replace_pointer_rtnl(dev->hwtstamp, hwtstamp);
> + if (__hwtstamp)
> + call_rcu(&__hwtstamp->rcu_head,
> + remove_hwtstamp_provider);
> + } else {
> + /* Get current hwtstamp config if we are not changing the
> + * hwtstamp source
> + */
> + ret = dev_get_hwtstamp_phylib(dev, &_hwtst_config);
This may be tricky whithout ifr set properly. But it should force
drivers to be converted.
> + if (ret < 0 && ret != -EOPNOTSUPP)
> + goto err_clock_put;
> + }
> +
> + if (memcmp(&hwtst_config, &_hwtst_config, sizeof(hwtst_config))) {
better to use kernel_hwtstamp_config_changed() helper here
> + ret = dev_set_hwtstamp_phylib(dev, &hwtst_config,
> + info->extack);
> + if (ret < 0)
> + return ret;
> +
> + ret = tsconfig_send_reply(dev, info);
> + if (ret && ret != -EOPNOTSUPP) {
> + NL_SET_ERR_MSG(info->extack,
> + "error while reading the new configuration set");
> + return ret;
> + }
> +
> + return 1;
> + }
> +
> + if (mod)
> + return 1;
> +
> + return 0;
> +
> +err_clock_put:
> + if (hwtstamp)
> + ptp_clock_put(&dev->dev, hwtstamp->ptp);
> +err_free_hwtstamp:
> + kfree(hwtstamp);
> +
> + return ret;
> +}
> +
> +const struct ethnl_request_ops ethnl_tsconfig_request_ops = {
> + .request_cmd = ETHTOOL_MSG_TSCONFIG_GET,
> + .reply_cmd = ETHTOOL_MSG_TSCONFIG_GET_REPLY,
> + .hdr_attr = ETHTOOL_A_TSCONFIG_HEADER,
> + .req_info_size = sizeof(struct tsconfig_req_info),
> + .reply_data_size = sizeof(struct tsconfig_reply_data),
> +
> + .prepare_data = tsconfig_prepare_data,
> + .reply_size = tsconfig_reply_size,
> + .fill_reply = tsconfig_fill_reply,
> +
> + .set_validate = ethnl_set_tsconfig_validate,
> + .set = ethnl_set_tsconfig,
> + .set_ntf_cmd = ETHTOOL_MSG_TSCONFIG_NTF,
> +};
>
next prev parent reply other threads:[~2024-11-09 1:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-30 13:54 [PATCH net-next v19 00/10] net: Make timestamping selectable Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 01/10] net: Make dev_get_hwtstamp_phylib accessible Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 02/10] net: Make net_hwtstamp_validate accessible Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 03/10] ptp: Add phc source and helpers to register specific PTP clock or get information Kory Maincent
2024-11-11 23:06 ` Jakub Kicinski
2024-11-12 10:12 ` Kory Maincent
2024-11-13 2:22 ` Jakub Kicinski
2024-11-13 10:38 ` Kory Maincent
2024-11-14 0:39 ` Jakub Kicinski
2024-11-14 10:46 ` Kory Maincent
2024-11-15 1:39 ` Jakub Kicinski
2024-11-15 9:12 ` Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 04/10] net: Add the possibility to support a selected hwtstamp in netdevice Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 05/10] net: netdevsim: ptp_mock: Convert to netdev_ptp_clock_register Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 06/10] net: macb: " Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 07/10] net: ptp: Move ptp_clock_index() to builtin symbol Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 08/10] net: ethtool: tsinfo: Add support for reading tsinfo for a specific hwtstamp provider Kory Maincent
2024-11-11 23:12 ` Jakub Kicinski
2024-10-30 13:54 ` [PATCH net-next v19 09/10] net: ethtool: Add support for tsconfig command to get/set hwtstamp config Kory Maincent
2024-11-09 1:43 ` Vadim Fedorenko [this message]
2024-11-12 10:16 ` Kory Maincent
2024-10-30 13:54 ` [PATCH net-next v19 10/10] netlink: specs: Enhance tsinfo netlink attributes and add a tsconfig set command Kory Maincent
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=955dde4b-b4ba-439f-b7d4-f64d90c58d55@linux.dev \
--to=vadim.fedorenko@linux.dev \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew+netdev@lunn.ch \
--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=danieller@nvidia.com \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=ecree.xilinx@gmail.com \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=hkallweit1@gmail.com \
--cc=horatiu.vultur@microchip.com \
--cc=horms@kernel.org \
--cc=j.vosburgh@gmail.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=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=rrameshbabu@nvidia.com \
--cc=shannon.nelson@amd.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=vladimir.oltean@nxp.com \
--cc=willemb@google.com \
--cc=willemdebruijn.kernel@gmail.com \
--cc=wintera@linux.ibm.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
Powered by JetHome