net: ethtool: Add support for tsconfig command to get/set hwtstamp config
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b9e3f7dc9e
commit
6e9e2eed4f
10 changed files with 655 additions and 26 deletions
|
@ -1489,6 +1489,33 @@ attribute-sets:
|
|||
-
|
||||
name: downstream-sfp-name
|
||||
type: string
|
||||
-
|
||||
name: tsconfig
|
||||
attr-cnt-name: __ethtool-a-tsconfig-cnt
|
||||
attributes:
|
||||
-
|
||||
name: unspec
|
||||
type: unused
|
||||
value: 0
|
||||
-
|
||||
name: header
|
||||
type: nest
|
||||
nested-attributes: header
|
||||
-
|
||||
name: hwtstamp-provider
|
||||
type: nest
|
||||
nested-attributes: ts-hwtstamp-provider
|
||||
-
|
||||
name: tx-types
|
||||
type: nest
|
||||
nested-attributes: bitset
|
||||
-
|
||||
name: rx-filters
|
||||
type: nest
|
||||
nested-attributes: bitset
|
||||
-
|
||||
name: hwtstamp-flags
|
||||
type: u32
|
||||
|
||||
operations:
|
||||
enum-model: directional
|
||||
|
@ -2314,3 +2341,32 @@ operations:
|
|||
name: phy-ntf
|
||||
doc: Notification for change in PHY devices.
|
||||
notify: phy-get
|
||||
-
|
||||
name: tsconfig-get
|
||||
doc: Get hwtstamp config.
|
||||
|
||||
attribute-set: tsconfig
|
||||
|
||||
do: &tsconfig-get-op
|
||||
request:
|
||||
attributes:
|
||||
- header
|
||||
reply:
|
||||
attributes: &tsconfig
|
||||
- header
|
||||
- hwtstamp-provider
|
||||
- tx-types
|
||||
- rx-filters
|
||||
- hwtstamp-flags
|
||||
dump: *tsconfig-get-op
|
||||
-
|
||||
name: tsconfig-set
|
||||
doc: Set hwtstamp config.
|
||||
|
||||
attribute-set: tsconfig
|
||||
|
||||
do:
|
||||
request:
|
||||
attributes: *tsconfig
|
||||
reply:
|
||||
attributes: *tsconfig
|
||||
|
|
|
@ -237,6 +237,8 @@ Userspace to kernel:
|
|||
``ETHTOOL_MSG_MM_SET`` set MAC merge layer parameters
|
||||
``ETHTOOL_MSG_MODULE_FW_FLASH_ACT`` flash transceiver module firmware
|
||||
``ETHTOOL_MSG_PHY_GET`` get Ethernet PHY information
|
||||
``ETHTOOL_MSG_TSCONFIG_GET`` get hw timestamping configuration
|
||||
``ETHTOOL_MSG_TSCONFIG_SET`` set hw timestamping configuration
|
||||
===================================== =================================
|
||||
|
||||
Kernel to userspace:
|
||||
|
@ -286,6 +288,8 @@ Kernel to userspace:
|
|||
``ETHTOOL_MSG_MODULE_FW_FLASH_NTF`` transceiver module flash updates
|
||||
``ETHTOOL_MSG_PHY_GET_REPLY`` Ethernet PHY information
|
||||
``ETHTOOL_MSG_PHY_NTF`` Ethernet PHY information change
|
||||
``ETHTOOL_MSG_TSCONFIG_GET_REPLY`` hw timestamping configuration
|
||||
``ETHTOOL_MSG_TSCONFIG_SET_REPLY`` new hw timestamping configuration
|
||||
======================================== =================================
|
||||
|
||||
``GET`` requests are sent by userspace applications to retrieve device
|
||||
|
@ -2244,6 +2248,75 @@ Kernel response contents:
|
|||
When ``ETHTOOL_A_PHY_UPSTREAM_TYPE`` is PHY_UPSTREAM_PHY, the PHY's parent is
|
||||
another PHY.
|
||||
|
||||
TSCONFIG_GET
|
||||
============
|
||||
|
||||
Retrieves the information about the current hardware timestamping source and
|
||||
configuration.
|
||||
|
||||
It is similar to the deprecated ``SIOCGHWTSTAMP`` ioctl request.
|
||||
|
||||
Request contents:
|
||||
|
||||
==================================== ====== ==========================
|
||||
``ETHTOOL_A_TSCONFIG_HEADER`` nested request header
|
||||
==================================== ====== ==========================
|
||||
|
||||
Kernel response contents:
|
||||
|
||||
======================================== ====== ============================
|
||||
``ETHTOOL_A_TSCONFIG_HEADER`` nested request header
|
||||
``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` nested PTP hw clock provider
|
||||
``ETHTOOL_A_TSCONFIG_TX_TYPES`` bitset hwtstamp Tx type
|
||||
``ETHTOOL_A_TSCONFIG_RX_FILTERS`` bitset hwtstamp Rx filter
|
||||
``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS`` u32 hwtstamp flags
|
||||
======================================== ====== ============================
|
||||
|
||||
When set the ``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` attribute identifies the
|
||||
source of the hw timestamping provider. It is composed by
|
||||
``ETHTOOL_A_TS_HWTSTAMP_PROVIDER_INDEX`` attribute which describe the index of
|
||||
the PTP device and ``ETHTOOL_A_TS_HWTSTAMP_PROVIDER_QUALIFIER`` which describe
|
||||
the qualifier of the timestamp.
|
||||
|
||||
When set the ``ETHTOOL_A_TSCONFIG_TX_TYPES``, ``ETHTOOL_A_TSCONFIG_RX_FILTERS``
|
||||
and the ``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS`` attributes identify the Tx
|
||||
type, the Rx filter and the flags configured for the current hw timestamping
|
||||
provider. The attributes are propagated to the driver through the following
|
||||
structure:
|
||||
|
||||
.. kernel-doc:: include/linux/net_tstamp.h
|
||||
:identifiers: kernel_hwtstamp_config
|
||||
|
||||
TSCONFIG_SET
|
||||
============
|
||||
|
||||
Set the information about the current hardware timestamping source and
|
||||
configuration.
|
||||
|
||||
It is similar to the deprecated ``SIOCSHWTSTAMP`` ioctl request.
|
||||
|
||||
Request contents:
|
||||
|
||||
======================================== ====== ============================
|
||||
``ETHTOOL_A_TSCONFIG_HEADER`` nested request header
|
||||
``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` nested PTP hw clock provider
|
||||
``ETHTOOL_A_TSCONFIG_TX_TYPES`` bitset hwtstamp Tx type
|
||||
``ETHTOOL_A_TSCONFIG_RX_FILTERS`` bitset hwtstamp Rx filter
|
||||
``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS`` u32 hwtstamp flags
|
||||
======================================== ====== ============================
|
||||
|
||||
Kernel response contents:
|
||||
|
||||
======================================== ====== ============================
|
||||
``ETHTOOL_A_TSCONFIG_HEADER`` nested request header
|
||||
``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` nested PTP hw clock provider
|
||||
``ETHTOOL_A_TSCONFIG_TX_TYPES`` bitset hwtstamp Tx type
|
||||
``ETHTOOL_A_TSCONFIG_RX_FILTERS`` bitset hwtstamp Rx filter
|
||||
``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS`` u32 hwtstamp flags
|
||||
======================================== ====== ============================
|
||||
|
||||
For a description of each attribute, see ``TSCONFIG_GET``.
|
||||
|
||||
Request translation
|
||||
===================
|
||||
|
||||
|
@ -2352,4 +2425,6 @@ are netlink only.
|
|||
n/a ``ETHTOOL_MSG_MM_SET``
|
||||
n/a ``ETHTOOL_MSG_MODULE_FW_FLASH_ACT``
|
||||
n/a ``ETHTOOL_MSG_PHY_GET``
|
||||
``SIOCGHWTSTAMP`` ``ETHTOOL_MSG_TSCONFIG_GET``
|
||||
``SIOCSHWTSTAMP`` ``ETHTOOL_MSG_TSCONFIG_SET``
|
||||
=================================== =====================================
|
||||
|
|
|
@ -525,8 +525,8 @@ implicitly defined. ts[0] holds a software timestamp if set, ts[1]
|
|||
is again deprecated and ts[2] holds a hardware timestamp if set.
|
||||
|
||||
|
||||
3. Hardware Timestamping configuration: SIOCSHWTSTAMP and SIOCGHWTSTAMP
|
||||
=======================================================================
|
||||
3. Hardware Timestamping configuration: ETHTOOL_MSG_TSCONFIG_SET/GET
|
||||
====================================================================
|
||||
|
||||
Hardware time stamping must also be initialized for each device driver
|
||||
that is expected to do hardware time stamping. The parameter is defined in
|
||||
|
@ -539,12 +539,14 @@ include/uapi/linux/net_tstamp.h as::
|
|||
};
|
||||
|
||||
Desired behavior is passed into the kernel and to a specific device by
|
||||
calling ioctl(SIOCSHWTSTAMP) with a pointer to a struct ifreq whose
|
||||
ifr_data points to a struct hwtstamp_config. The tx_type and
|
||||
rx_filter are hints to the driver what it is expected to do. If
|
||||
the requested fine-grained filtering for incoming packets is not
|
||||
supported, the driver may time stamp more than just the requested types
|
||||
of packets.
|
||||
calling the tsconfig netlink socket ``ETHTOOL_MSG_TSCONFIG_SET``.
|
||||
The ``ETHTOOL_A_TSCONFIG_TX_TYPES``, ``ETHTOOL_A_TSCONFIG_RX_FILTERS`` and
|
||||
``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS`` netlink attributes are then used to set
|
||||
the struct hwtstamp_config accordingly.
|
||||
|
||||
The ``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` netlink nested attribute is used
|
||||
to select the source of the hardware time stamping. It is composed of an index
|
||||
for the device source and a qualifier for the type of time stamping.
|
||||
|
||||
Drivers are free to use a more permissive configuration than the requested
|
||||
configuration. It is expected that drivers should only implement directly the
|
||||
|
@ -563,9 +565,16 @@ Only a processes with admin rights may change the configuration. User
|
|||
space is responsible to ensure that multiple processes don't interfere
|
||||
with each other and that the settings are reset.
|
||||
|
||||
Any process can read the actual configuration by passing this
|
||||
structure to ioctl(SIOCGHWTSTAMP) in the same way. However, this has
|
||||
not been implemented in all drivers.
|
||||
Any process can read the actual configuration by requesting tsconfig netlink
|
||||
socket ``ETHTOOL_MSG_TSCONFIG_GET``.
|
||||
|
||||
The legacy configuration is the use of the ioctl(SIOCSHWTSTAMP) with a pointer
|
||||
to a struct ifreq whose ifr_data points to a struct hwtstamp_config.
|
||||
The tx_type and rx_filter are hints to the driver what it is expected to do.
|
||||
If the requested fine-grained filtering for incoming packets is not
|
||||
supported, the driver may time stamp more than just the requested types
|
||||
of packets. ioctl(SIOCGHWTSTAMP) is used in the same way as the
|
||||
ioctl(SIOCSHWTSTAMP). However, this has not been implemented in all drivers.
|
||||
|
||||
::
|
||||
|
||||
|
@ -610,9 +619,10 @@ not been implemented in all drivers.
|
|||
--------------------------------------------------------
|
||||
|
||||
A driver which supports hardware time stamping must support the
|
||||
SIOCSHWTSTAMP ioctl and update the supplied struct hwtstamp_config with
|
||||
the actual values as described in the section on SIOCSHWTSTAMP. It
|
||||
should also support SIOCGHWTSTAMP.
|
||||
ndo_hwtstamp_set NDO or the legacy SIOCSHWTSTAMP ioctl and update the
|
||||
supplied struct hwtstamp_config with the actual values as described in
|
||||
the section on SIOCSHWTSTAMP. It should also support ndo_hwtstamp_get or
|
||||
the legacy SIOCGHWTSTAMP.
|
||||
|
||||
Time stamps for received packets must be stored in the skb. To get a pointer
|
||||
to the shared time stamp structure of the skb call skb_hwtstamps(). Then
|
||||
|
|
|
@ -694,6 +694,18 @@ enum {
|
|||
ETHTOOL_A_PHY_MAX = (__ETHTOOL_A_PHY_CNT - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
ETHTOOL_A_TSCONFIG_UNSPEC,
|
||||
ETHTOOL_A_TSCONFIG_HEADER,
|
||||
ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER,
|
||||
ETHTOOL_A_TSCONFIG_TX_TYPES,
|
||||
ETHTOOL_A_TSCONFIG_RX_FILTERS,
|
||||
ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS,
|
||||
|
||||
__ETHTOOL_A_TSCONFIG_CNT,
|
||||
ETHTOOL_A_TSCONFIG_MAX = (__ETHTOOL_A_TSCONFIG_CNT - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
ETHTOOL_MSG_USER_NONE = 0,
|
||||
ETHTOOL_MSG_STRSET_GET = 1,
|
||||
|
@ -741,6 +753,8 @@ enum {
|
|||
ETHTOOL_MSG_MM_SET,
|
||||
ETHTOOL_MSG_MODULE_FW_FLASH_ACT,
|
||||
ETHTOOL_MSG_PHY_GET,
|
||||
ETHTOOL_MSG_TSCONFIG_GET,
|
||||
ETHTOOL_MSG_TSCONFIG_SET,
|
||||
|
||||
__ETHTOOL_MSG_USER_CNT,
|
||||
ETHTOOL_MSG_USER_MAX = (__ETHTOOL_MSG_USER_CNT - 1)
|
||||
|
@ -794,6 +808,8 @@ enum {
|
|||
ETHTOOL_MSG_MODULE_FW_FLASH_NTF,
|
||||
ETHTOOL_MSG_PHY_GET_REPLY,
|
||||
ETHTOOL_MSG_PHY_NTF,
|
||||
ETHTOOL_MSG_TSCONFIG_GET_REPLY,
|
||||
ETHTOOL_MSG_TSCONFIG_SET_REPLY,
|
||||
|
||||
__ETHTOOL_MSG_KERNEL_CNT,
|
||||
ETHTOOL_MSG_KERNEL_MAX = (__ETHTOOL_MSG_KERNEL_CNT - 1)
|
||||
|
|
|
@ -9,4 +9,4 @@ ethtool_nl-y := netlink.o bitset.o strset.o linkinfo.o linkmodes.o rss.o \
|
|||
channels.o coalesce.o pause.o eee.o tsinfo.o cabletest.o \
|
||||
tunnels.o fec.o eeprom.o stats.o phc_vclocks.o mm.o \
|
||||
module.o cmis_fw_update.o cmis_cdb.o pse-pd.o plca.o mm.o \
|
||||
phy.o
|
||||
phy.o tsconfig.o
|
||||
|
|
|
@ -797,7 +797,7 @@ int ethtool_net_get_ts_info_by_phc(struct net_device *dev,
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
int
|
||||
struct phy_device *
|
||||
ethtool_phy_get_ts_info_by_phc(struct net_device *dev,
|
||||
struct kernel_ethtool_ts_info *info,
|
||||
struct hwtstamp_provider_desc *hwprov_desc)
|
||||
|
@ -806,7 +806,7 @@ ethtool_phy_get_ts_info_by_phc(struct net_device *dev,
|
|||
|
||||
/* Only precise qualifier is supported in phydev */
|
||||
if (hwprov_desc->qualifier != HWTSTAMP_PROVIDER_QUALIFIER_PRECISE)
|
||||
return -ENODEV;
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
/* Look in the phy topology */
|
||||
if (dev->link_topo) {
|
||||
|
@ -820,12 +820,12 @@ ethtool_phy_get_ts_info_by_phc(struct net_device *dev,
|
|||
ethtool_init_tsinfo(info);
|
||||
err = phy_ts_info(pdn->phy, info);
|
||||
if (err)
|
||||
return err;
|
||||
return ERR_PTR(err);
|
||||
|
||||
if (info->phc_index == hwprov_desc->index)
|
||||
return 0;
|
||||
return pdn->phy;
|
||||
}
|
||||
return -ENODEV;
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
|
||||
/* Look on the dev->phydev */
|
||||
|
@ -833,13 +833,13 @@ ethtool_phy_get_ts_info_by_phc(struct net_device *dev,
|
|||
ethtool_init_tsinfo(info);
|
||||
err = phy_ts_info(dev->phydev, info);
|
||||
if (err)
|
||||
return err;
|
||||
return ERR_PTR(err);
|
||||
|
||||
if (info->phc_index == hwprov_desc->index)
|
||||
return 0;
|
||||
return dev->phydev;
|
||||
}
|
||||
|
||||
return -ENODEV;
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
|
||||
int ethtool_get_ts_info_by_phc(struct net_device *dev,
|
||||
|
@ -849,8 +849,15 @@ int ethtool_get_ts_info_by_phc(struct net_device *dev,
|
|||
int err;
|
||||
|
||||
err = ethtool_net_get_ts_info_by_phc(dev, info, hwprov_desc);
|
||||
if (err == -ENODEV)
|
||||
err = ethtool_phy_get_ts_info_by_phc(dev, info, hwprov_desc);
|
||||
if (err == -ENODEV) {
|
||||
struct phy_device *phy;
|
||||
|
||||
phy = ethtool_phy_get_ts_info_by_phc(dev, info, hwprov_desc);
|
||||
if (IS_ERR(phy))
|
||||
err = PTR_ERR(phy);
|
||||
else
|
||||
err = 0;
|
||||
}
|
||||
|
||||
info->so_timestamping |= SOF_TIMESTAMPING_RX_SOFTWARE |
|
||||
SOF_TIMESTAMPING_SOFTWARE;
|
||||
|
|
|
@ -56,7 +56,7 @@ int ethtool_get_ts_info_by_phc(struct net_device *dev,
|
|||
int ethtool_net_get_ts_info_by_phc(struct net_device *dev,
|
||||
struct kernel_ethtool_ts_info *info,
|
||||
struct hwtstamp_provider_desc *hwprov_desc);
|
||||
int
|
||||
struct phy_device *
|
||||
ethtool_phy_get_ts_info_by_phc(struct net_device *dev,
|
||||
struct kernel_ethtool_ts_info *info,
|
||||
struct hwtstamp_provider_desc *hwprov_desc);
|
||||
|
|
|
@ -394,6 +394,8 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {
|
|||
[ETHTOOL_MSG_PLCA_GET_STATUS] = ðnl_plca_status_request_ops,
|
||||
[ETHTOOL_MSG_MM_GET] = ðnl_mm_request_ops,
|
||||
[ETHTOOL_MSG_MM_SET] = ðnl_mm_request_ops,
|
||||
[ETHTOOL_MSG_TSCONFIG_GET] = ðnl_tsconfig_request_ops,
|
||||
[ETHTOOL_MSG_TSCONFIG_SET] = ðnl_tsconfig_request_ops,
|
||||
};
|
||||
|
||||
static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)
|
||||
|
@ -1243,6 +1245,22 @@ static const struct genl_ops ethtool_genl_ops[] = {
|
|||
.policy = ethnl_phy_get_policy,
|
||||
.maxattr = ARRAY_SIZE(ethnl_phy_get_policy) - 1,
|
||||
},
|
||||
{
|
||||
.cmd = ETHTOOL_MSG_TSCONFIG_GET,
|
||||
.doit = ethnl_default_doit,
|
||||
.start = ethnl_default_start,
|
||||
.dumpit = ethnl_default_dumpit,
|
||||
.done = ethnl_default_done,
|
||||
.policy = ethnl_tsconfig_get_policy,
|
||||
.maxattr = ARRAY_SIZE(ethnl_tsconfig_get_policy) - 1,
|
||||
},
|
||||
{
|
||||
.cmd = ETHTOOL_MSG_TSCONFIG_SET,
|
||||
.flags = GENL_UNS_ADMIN_PERM,
|
||||
.doit = ethnl_default_set_doit,
|
||||
.policy = ethnl_tsconfig_set_policy,
|
||||
.maxattr = ARRAY_SIZE(ethnl_tsconfig_set_policy) - 1,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
|
||||
|
|
|
@ -435,6 +435,7 @@ extern const struct ethnl_request_ops ethnl_plca_cfg_request_ops;
|
|||
extern const struct ethnl_request_ops ethnl_plca_status_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_mm_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_phy_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_tsconfig_request_ops;
|
||||
|
||||
extern const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_FLAGS + 1];
|
||||
extern const struct nla_policy ethnl_header_policy_stats[ETHTOOL_A_HEADER_FLAGS + 1];
|
||||
|
@ -485,6 +486,8 @@ extern const struct nla_policy ethnl_mm_get_policy[ETHTOOL_A_MM_HEADER + 1];
|
|||
extern const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1];
|
||||
extern const struct nla_policy ethnl_module_fw_flash_act_policy[ETHTOOL_A_MODULE_FW_FLASH_PASSWORD + 1];
|
||||
extern const struct nla_policy ethnl_phy_get_policy[ETHTOOL_A_PHY_HEADER + 1];
|
||||
extern const struct nla_policy ethnl_tsconfig_get_policy[ETHTOOL_A_TSCONFIG_HEADER + 1];
|
||||
extern const struct nla_policy ethnl_tsconfig_set_policy[ETHTOOL_A_TSCONFIG_MAX + 1];
|
||||
|
||||
int ethnl_set_features(struct sk_buff *skb, struct genl_info *info);
|
||||
int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info);
|
||||
|
|
444
net/ethtool/tsconfig.c
Normal file
444
net/ethtool/tsconfig.c
Normal file
|
@ -0,0 +1,444 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
#include <linux/net_tstamp.h>
|
||||
#include <linux/ptp_clock_kernel.h>
|
||||
|
||||
#include "netlink.h"
|
||||
#include "common.h"
|
||||
#include "bitset.h"
|
||||
#include "../core/dev.h"
|
||||
#include "ts.h"
|
||||
|
||||
struct tsconfig_req_info {
|
||||
struct ethnl_req_info base;
|
||||
};
|
||||
|
||||
struct tsconfig_reply_data {
|
||||
struct ethnl_reply_data base;
|
||||
struct hwtstamp_provider_desc hwprov_desc;
|
||||
struct {
|
||||
u32 tx_type;
|
||||
u32 rx_filter;
|
||||
u32 flags;
|
||||
} hwtst_config;
|
||||
};
|
||||
|
||||
#define TSCONFIG_REPDATA(__reply_base) \
|
||||
container_of(__reply_base, struct tsconfig_reply_data, base)
|
||||
|
||||
const struct nla_policy ethnl_tsconfig_get_policy[ETHTOOL_A_TSCONFIG_HEADER + 1] = {
|
||||
[ETHTOOL_A_TSCONFIG_HEADER] =
|
||||
NLA_POLICY_NESTED(ethnl_header_policy),
|
||||
};
|
||||
|
||||
static int tsconfig_prepare_data(const struct ethnl_req_info *req_base,
|
||||
struct ethnl_reply_data *reply_base,
|
||||
const struct genl_info *info)
|
||||
{
|
||||
struct tsconfig_reply_data *data = TSCONFIG_REPDATA(reply_base);
|
||||
struct hwtstamp_provider *hwprov = NULL;
|
||||
struct net_device *dev = reply_base->dev;
|
||||
struct kernel_hwtstamp_config cfg = {};
|
||||
int ret;
|
||||
|
||||
if (!dev->netdev_ops->ndo_hwtstamp_get)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = ethnl_ops_begin(dev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = dev_get_hwtstamp_phylib(dev, &cfg);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
data->hwtst_config.tx_type = BIT(cfg.tx_type);
|
||||
data->hwtst_config.rx_filter = BIT(cfg.rx_filter);
|
||||
data->hwtst_config.flags = BIT(cfg.flags);
|
||||
|
||||
data->hwprov_desc.index = -1;
|
||||
hwprov = rtnl_dereference(dev->hwprov);
|
||||
if (hwprov) {
|
||||
data->hwprov_desc.index = hwprov->desc.index;
|
||||
data->hwprov_desc.qualifier = hwprov->desc.qualifier;
|
||||
} else {
|
||||
struct kernel_ethtool_ts_info ts_info = {};
|
||||
|
||||
ts_info.phc_index = -1;
|
||||
ret = __ethtool_get_ts_info(dev, &ts_info);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
if (ts_info.phc_index == -1)
|
||||
return -ENODEV;
|
||||
|
||||
data->hwprov_desc.index = ts_info.phc_index;
|
||||
data->hwprov_desc.qualifier = ts_info.phc_qualifier;
|
||||
}
|
||||
|
||||
out:
|
||||
ethnl_ops_complete(dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int tsconfig_reply_size(const struct ethnl_req_info *req_base,
|
||||
const struct ethnl_reply_data *reply_base)
|
||||
{
|
||||
const struct tsconfig_reply_data *data = TSCONFIG_REPDATA(reply_base);
|
||||
bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
|
||||
int len = 0;
|
||||
int ret;
|
||||
|
||||
BUILD_BUG_ON(__HWTSTAMP_TX_CNT > 32);
|
||||
BUILD_BUG_ON(__HWTSTAMP_FILTER_CNT > 32);
|
||||
|
||||
if (data->hwtst_config.flags)
|
||||
/* _TSCONFIG_HWTSTAMP_FLAGS */
|
||||
len += nla_total_size(sizeof(u32));
|
||||
|
||||
if (data->hwtst_config.tx_type) {
|
||||
ret = ethnl_bitset32_size(&data->hwtst_config.tx_type,
|
||||
NULL, __HWTSTAMP_TX_CNT,
|
||||
ts_tx_type_names, compact);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
len += ret; /* _TSCONFIG_TX_TYPES */
|
||||
}
|
||||
if (data->hwtst_config.rx_filter) {
|
||||
ret = ethnl_bitset32_size(&data->hwtst_config.rx_filter,
|
||||
NULL, __HWTSTAMP_FILTER_CNT,
|
||||
ts_rx_filter_names, compact);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
len += ret; /* _TSCONFIG_RX_FILTERS */
|
||||
}
|
||||
|
||||
if (data->hwprov_desc.index >= 0)
|
||||
/* _TSCONFIG_HWTSTAMP_PROVIDER */
|
||||
len += nla_total_size(0) +
|
||||
2 * nla_total_size(sizeof(u32));
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
static int tsconfig_fill_reply(struct sk_buff *skb,
|
||||
const struct ethnl_req_info *req_base,
|
||||
const struct ethnl_reply_data *reply_base)
|
||||
{
|
||||
const struct tsconfig_reply_data *data = TSCONFIG_REPDATA(reply_base);
|
||||
bool compact = req_base->flags & ETHTOOL_FLAG_COMPACT_BITSETS;
|
||||
int ret;
|
||||
|
||||
if (data->hwtst_config.flags) {
|
||||
ret = nla_put_u32(skb, ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS,
|
||||
data->hwtst_config.flags);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (data->hwtst_config.tx_type) {
|
||||
ret = ethnl_put_bitset32(skb, ETHTOOL_A_TSCONFIG_TX_TYPES,
|
||||
&data->hwtst_config.tx_type, NULL,
|
||||
__HWTSTAMP_TX_CNT,
|
||||
ts_tx_type_names, compact);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (data->hwtst_config.rx_filter) {
|
||||
ret = ethnl_put_bitset32(skb, ETHTOOL_A_TSCONFIG_RX_FILTERS,
|
||||
&data->hwtst_config.rx_filter,
|
||||
NULL, __HWTSTAMP_FILTER_CNT,
|
||||
ts_rx_filter_names, compact);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (data->hwprov_desc.index >= 0) {
|
||||
struct nlattr *nest;
|
||||
|
||||
nest = nla_nest_start(skb, ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER);
|
||||
if (!nest)
|
||||
return -EMSGSIZE;
|
||||
|
||||
if (nla_put_u32(skb, ETHTOOL_A_TS_HWTSTAMP_PROVIDER_INDEX,
|
||||
data->hwprov_desc.index) ||
|
||||
nla_put_u32(skb,
|
||||
ETHTOOL_A_TS_HWTSTAMP_PROVIDER_QUALIFIER,
|
||||
data->hwprov_desc.qualifier)) {
|
||||
nla_nest_cancel(skb, nest);
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
nla_nest_end(skb, nest);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* TSCONFIG_SET */
|
||||
const struct nla_policy ethnl_tsconfig_set_policy[ETHTOOL_A_TSCONFIG_MAX + 1] = {
|
||||
[ETHTOOL_A_TSCONFIG_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),
|
||||
[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER] =
|
||||
NLA_POLICY_NESTED(ethnl_ts_hwtst_prov_policy),
|
||||
[ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS] = { .type = NLA_U32 },
|
||||
[ETHTOOL_A_TSCONFIG_RX_FILTERS] = { .type = NLA_NESTED },
|
||||
[ETHTOOL_A_TSCONFIG_TX_TYPES] = { .type = NLA_NESTED },
|
||||
};
|
||||
|
||||
static int tsconfig_send_reply(struct net_device *dev, struct genl_info *info)
|
||||
{
|
||||
struct tsconfig_reply_data *reply_data;
|
||||
struct tsconfig_req_info *req_info;
|
||||
struct sk_buff *rskb;
|
||||
void *reply_payload;
|
||||
int reply_len = 0;
|
||||
int ret;
|
||||
|
||||
req_info = kzalloc(sizeof(*req_info), GFP_KERNEL);
|
||||
if (!req_info)
|
||||
return -ENOMEM;
|
||||
reply_data = kmalloc(sizeof(*reply_data), GFP_KERNEL);
|
||||
if (!reply_data) {
|
||||
kfree(req_info);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
ASSERT_RTNL();
|
||||
reply_data->base.dev = dev;
|
||||
ret = tsconfig_prepare_data(&req_info->base, &reply_data->base, info);
|
||||
if (ret < 0)
|
||||
goto err_cleanup;
|
||||
|
||||
ret = tsconfig_reply_size(&req_info->base, &reply_data->base);
|
||||
if (ret < 0)
|
||||
goto err_cleanup;
|
||||
|
||||
reply_len = ret + ethnl_reply_header_size();
|
||||
rskb = ethnl_reply_init(reply_len, dev, ETHTOOL_MSG_TSCONFIG_SET_REPLY,
|
||||
ETHTOOL_A_TSCONFIG_HEADER, info, &reply_payload);
|
||||
if (!rskb)
|
||||
goto err_cleanup;
|
||||
|
||||
ret = tsconfig_fill_reply(rskb, &req_info->base, &reply_data->base);
|
||||
if (ret < 0)
|
||||
goto err_cleanup;
|
||||
|
||||
genlmsg_end(rskb, reply_payload);
|
||||
ret = genlmsg_reply(rskb, info);
|
||||
|
||||
err_cleanup:
|
||||
kfree(reply_data);
|
||||
kfree(req_info);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ethnl_set_tsconfig_validate(struct ethnl_req_info *req_base,
|
||||
struct genl_info *info)
|
||||
{
|
||||
const struct net_device_ops *ops = req_base->dev->netdev_ops;
|
||||
|
||||
if (!ops->ndo_hwtstamp_set || !ops->ndo_hwtstamp_get)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static struct hwtstamp_provider *
|
||||
tsconfig_set_hwprov_from_desc(struct net_device *dev,
|
||||
struct genl_info *info,
|
||||
struct hwtstamp_provider_desc *hwprov_desc)
|
||||
{
|
||||
struct kernel_ethtool_ts_info ts_info;
|
||||
struct hwtstamp_provider *hwprov;
|
||||
struct nlattr **tb = info->attrs;
|
||||
struct phy_device *phy = NULL;
|
||||
enum hwtstamp_source source;
|
||||
int ret;
|
||||
|
||||
ret = ethtool_net_get_ts_info_by_phc(dev, &ts_info, hwprov_desc);
|
||||
if (!ret) {
|
||||
/* Found */
|
||||
source = HWTSTAMP_SOURCE_NETDEV;
|
||||
} else {
|
||||
phy = ethtool_phy_get_ts_info_by_phc(dev, &ts_info, hwprov_desc);
|
||||
if (IS_ERR(phy)) {
|
||||
if (PTR_ERR(phy) == -ENODEV)
|
||||
NL_SET_ERR_MSG_ATTR(info->extack,
|
||||
tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER],
|
||||
"phc not in this net device topology");
|
||||
return ERR_CAST(phy);
|
||||
}
|
||||
|
||||
source = HWTSTAMP_SOURCE_PHYLIB;
|
||||
}
|
||||
|
||||
hwprov = kzalloc(sizeof(*hwprov), GFP_KERNEL);
|
||||
if (!hwprov)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
hwprov->desc.index = hwprov_desc->index;
|
||||
hwprov->desc.qualifier = hwprov_desc->qualifier;
|
||||
hwprov->source = source;
|
||||
hwprov->phydev = phy;
|
||||
|
||||
return hwprov;
|
||||
}
|
||||
|
||||
static int ethnl_set_tsconfig(struct ethnl_req_info *req_base,
|
||||
struct genl_info *info)
|
||||
{
|
||||
struct kernel_hwtstamp_config hwtst_config = {0};
|
||||
bool hwprov_mod = false, config_mod = false;
|
||||
struct hwtstamp_provider *hwprov = NULL;
|
||||
struct net_device *dev = req_base->dev;
|
||||
struct nlattr **tb = info->attrs;
|
||||
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 hwtstamp_provider_desc __hwprov_desc = {.index = -1};
|
||||
struct hwtstamp_provider *__hwprov;
|
||||
|
||||
__hwprov = rtnl_dereference(dev->hwprov);
|
||||
if (__hwprov) {
|
||||
__hwprov_desc.index = __hwprov->desc.index;
|
||||
__hwprov_desc.qualifier = __hwprov->desc.qualifier;
|
||||
}
|
||||
|
||||
ret = ts_parse_hwtst_provider(tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER],
|
||||
&__hwprov_desc, info->extack,
|
||||
&hwprov_mod);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (hwprov_mod) {
|
||||
hwprov = tsconfig_set_hwprov_from_desc(dev, info,
|
||||
&__hwprov_desc);
|
||||
if (IS_ERR(hwprov))
|
||||
return PTR_ERR(hwprov);
|
||||
}
|
||||
}
|
||||
|
||||
/* Get current hwtstamp config if we are not changing the
|
||||
* hwtstamp source. It will be zeroed in the other case.
|
||||
*/
|
||||
if (!hwprov_mod) {
|
||||
ret = dev_get_hwtstamp_phylib(dev, &hwtst_config);
|
||||
if (ret < 0 && ret != -EOPNOTSUPP)
|
||||
goto err_free_hwprov;
|
||||
}
|
||||
|
||||
/* Get the hwtstamp config from netlink */
|
||||
if (tb[ETHTOOL_A_TSCONFIG_TX_TYPES]) {
|
||||
u32 req_tx_type;
|
||||
|
||||
req_tx_type = BIT(hwtst_config.tx_type);
|
||||
ret = ethnl_update_bitset32(&req_tx_type,
|
||||
__HWTSTAMP_TX_CNT,
|
||||
tb[ETHTOOL_A_TSCONFIG_TX_TYPES],
|
||||
ts_tx_type_names, info->extack,
|
||||
&config_mod);
|
||||
if (ret < 0)
|
||||
goto err_free_hwprov;
|
||||
|
||||
/* Select only one tx type at a time */
|
||||
if (ffs(req_tx_type) != fls(req_tx_type)) {
|
||||
ret = -EINVAL;
|
||||
goto err_free_hwprov;
|
||||
}
|
||||
|
||||
hwtst_config.tx_type = ffs(req_tx_type) - 1;
|
||||
}
|
||||
|
||||
if (tb[ETHTOOL_A_TSCONFIG_RX_FILTERS]) {
|
||||
u32 req_rx_filter;
|
||||
|
||||
req_rx_filter = BIT(hwtst_config.rx_filter);
|
||||
ret = ethnl_update_bitset32(&req_rx_filter,
|
||||
__HWTSTAMP_FILTER_CNT,
|
||||
tb[ETHTOOL_A_TSCONFIG_RX_FILTERS],
|
||||
ts_rx_filter_names, info->extack,
|
||||
&config_mod);
|
||||
if (ret < 0)
|
||||
goto err_free_hwprov;
|
||||
|
||||
/* Select only one rx filter at a time */
|
||||
if (ffs(req_rx_filter) != fls(req_rx_filter)) {
|
||||
ret = -EINVAL;
|
||||
goto err_free_hwprov;
|
||||
}
|
||||
|
||||
hwtst_config.rx_filter = ffs(req_rx_filter) - 1;
|
||||
}
|
||||
|
||||
if (tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS]) {
|
||||
ethnl_update_u32(&hwtst_config.flags,
|
||||
tb[ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS],
|
||||
&config_mod);
|
||||
}
|
||||
|
||||
ret = net_hwtstamp_validate(&hwtst_config);
|
||||
if (ret)
|
||||
goto err_free_hwprov;
|
||||
|
||||
if (hwprov_mod) {
|
||||
struct kernel_hwtstamp_config zero_config = {0};
|
||||
struct hwtstamp_provider *__hwprov;
|
||||
|
||||
/* Disable current time stamping if we try to enable
|
||||
* another one
|
||||
*/
|
||||
ret = dev_set_hwtstamp_phylib(dev, &zero_config, info->extack);
|
||||
if (ret < 0)
|
||||
goto err_free_hwprov;
|
||||
|
||||
/* Change the selected hwtstamp source */
|
||||
__hwprov = rcu_replace_pointer_rtnl(dev->hwprov, hwprov);
|
||||
if (__hwprov)
|
||||
kfree_rcu(__hwprov, rcu_head);
|
||||
}
|
||||
|
||||
if (config_mod) {
|
||||
ret = dev_set_hwtstamp_phylib(dev, &hwtst_config,
|
||||
info->extack);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (hwprov_mod || config_mod) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
/* tsconfig has no notification */
|
||||
return 0;
|
||||
|
||||
err_free_hwprov:
|
||||
kfree(hwprov);
|
||||
|
||||
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,
|
||||
};
|
Loading…
Add table
Reference in a new issue