* [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config @ 2026-01-14 22:44 Vadim Fedorenko 2026-01-14 22:44 ` [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl Vadim Fedorenko 2026-01-15 11:58 ` [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config Kory Maincent 0 siblings, 2 replies; 7+ messages in thread From: Vadim Fedorenko @ 2026-01-14 22:44 UTC (permalink / raw) To: Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kory Maincent Cc: Richard Cochran, Simon Horman, Shuah Khan, netdev, Vadim Fedorenko With all drivers converted to use ndo_hwstamp callbacks the legacy way can be removed, marking ioctl interface as deprecated. Signed-off-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> --- net/core/dev_ioctl.c | 60 ++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 44 deletions(-) diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index 53a53357cfef..7a8966544c9d 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c @@ -287,7 +287,7 @@ static int dev_get_hwtstamp(struct net_device *dev, struct ifreq *ifr) int err; if (!ops->ndo_hwtstamp_get) - return dev_eth_ioctl(dev, ifr, SIOCGHWTSTAMP); /* legacy */ + return -EOPNOTSUPP; if (!netif_device_present(dev)) return -ENODEV; @@ -414,7 +414,7 @@ static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr) } if (!ops->ndo_hwtstamp_set) - return dev_eth_ioctl(dev, ifr, SIOCSHWTSTAMP); /* legacy */ + return -EOPNOTSUPP; if (!netif_device_present(dev)) return -ENODEV; @@ -438,48 +438,23 @@ static int dev_set_hwtstamp(struct net_device *dev, struct ifreq *ifr) return 0; } -static int generic_hwtstamp_ioctl_lower(struct net_device *dev, int cmd, - struct kernel_hwtstamp_config *kernel_cfg) -{ - struct ifreq ifrr; - int err; - - if (!kernel_cfg->ifr) - return -EINVAL; - - strscpy_pad(ifrr.ifr_name, dev->name, IFNAMSIZ); - ifrr.ifr_ifru = kernel_cfg->ifr->ifr_ifru; - - err = dev_eth_ioctl(dev, &ifrr, cmd); - if (err) - return err; - - kernel_cfg->ifr->ifr_ifru = ifrr.ifr_ifru; - kernel_cfg->copied_to_user = true; - - return 0; -} - int generic_hwtstamp_get_lower(struct net_device *dev, struct kernel_hwtstamp_config *kernel_cfg) { const struct net_device_ops *ops = dev->netdev_ops; + int err; if (!netif_device_present(dev)) return -ENODEV; - if (ops->ndo_hwtstamp_get) { - int err; - - netdev_lock_ops(dev); - err = dev_get_hwtstamp_phylib(dev, kernel_cfg); - netdev_unlock_ops(dev); + if (!ops->ndo_hwtstamp_get) + return -EOPNOTSUPP; - return err; - } + netdev_lock_ops(dev); + err = dev_get_hwtstamp_phylib(dev, kernel_cfg); + netdev_unlock_ops(dev); - /* Legacy path: unconverted lower driver */ - return generic_hwtstamp_ioctl_lower(dev, SIOCGHWTSTAMP, kernel_cfg); + return err; } EXPORT_SYMBOL(generic_hwtstamp_get_lower); @@ -488,22 +463,19 @@ int generic_hwtstamp_set_lower(struct net_device *dev, struct netlink_ext_ack *extack) { const struct net_device_ops *ops = dev->netdev_ops; + int err; if (!netif_device_present(dev)) return -ENODEV; - if (ops->ndo_hwtstamp_set) { - int err; - - netdev_lock_ops(dev); - err = dev_set_hwtstamp_phylib(dev, kernel_cfg, extack); - netdev_unlock_ops(dev); + if (!ops->ndo_hwtstamp_set) + return -EOPNOTSUPP; - return err; - } + netdev_lock_ops(dev); + err = dev_set_hwtstamp_phylib(dev, kernel_cfg, extack); + netdev_unlock_ops(dev); - /* Legacy path: unconverted lower driver */ - return generic_hwtstamp_ioctl_lower(dev, SIOCSHWTSTAMP, kernel_cfg); + return err; } EXPORT_SYMBOL(generic_hwtstamp_set_lower); -- 2.47.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl 2026-01-14 22:44 [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config Vadim Fedorenko @ 2026-01-14 22:44 ` Vadim Fedorenko 2026-01-15 12:03 ` Kory Maincent 2026-01-16 4:10 ` Jakub Kicinski 2026-01-15 11:58 ` [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config Kory Maincent 1 sibling, 2 replies; 7+ messages in thread From: Vadim Fedorenko @ 2026-01-14 22:44 UTC (permalink / raw) To: Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kory Maincent Cc: Richard Cochran, Simon Horman, Shuah Khan, netdev, Vadim Fedorenko Extend HW timestamp tests to check that ioctl interface is not broken and configuration setups and requests are equal to netlink interface. Signed-off-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> --- .../selftests/drivers/net/hw/nic_timestamp.py | 121 ++++++++++++++++-- 1 file changed, 113 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/drivers/net/hw/nic_timestamp.py b/tools/testing/selftests/drivers/net/hw/nic_timestamp.py index c1e943d53f19..f016bc65c340 100755 --- a/tools/testing/selftests/drivers/net/hw/nic_timestamp.py +++ b/tools/testing/selftests/drivers/net/hw/nic_timestamp.py @@ -6,10 +6,26 @@ Tests related to configuration of HW timestamping """ import errno +import ctypes, fcntl, socket from lib.py import ksft_run, ksft_exit, ksft_ge, ksft_eq, KsftSkipEx from lib.py import NetDrvEnv, EthtoolFamily, NlError +SIOCSHWTSTAMP = 0x89b0 +SIOCGHWTSTAMP = 0x89b1 +class hwtstamp_config(ctypes.Structure): + _fields_ = [ + ("flags", ctypes.c_int), + ("tx_type", ctypes.c_int), + ("rx_filter", ctypes.c_int), + ] +class ifreq(ctypes.Structure): + _fields_ = [ + ("ifr_name", ctypes.c_char * 16), + ("ifr_data", ctypes.POINTER(hwtstamp_config)), + ] + + def __get_hwtimestamp_support(cfg): """ Retrieve supported configuration information """ @@ -31,8 +47,29 @@ def __get_hwtimestamp_support(cfg): return ctx +def __get_hwtimestamp_config_ioctl(cfg): + """ Retrieve current TS configuration information (via ioctl) """ + + config = hwtstamp_config() + + req = ifreq() + req.ifr_name = cfg.ifname.encode() + req.ifr_data = ctypes.pointer(config) + + try: + sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + fcntl.ioctl(sock.fileno(), SIOCGHWTSTAMP, req) + sock.close() + + except OSError as e: + if e.errno == errno.EOPNOTSUPP: + raise KsftSkipEx("timestamping configuration is not supported via ioctl") from e + raise + return config + + def __get_hwtimestamp_config(cfg): - """ Retrieve current TS configuration information """ + """ Retrieve current TS configuration information (via netLink) """ try: tscfg = cfg.ethnl.tsconfig_get({'header': {'dev-name': cfg.ifname}}) @@ -43,8 +80,27 @@ def __get_hwtimestamp_config(cfg): return tscfg +def __set_hwtimestamp_config_ioctl(cfg, ts): + """ Setup new TS configuration information (via ioctl) """ + config = hwtstamp_config() + config.rx_filter = ts['rx-filters']['bits']['bit'][0]['index'] + config.tx_type = ts['tx-types']['bits']['bit'][0]['index'] + req = ifreq() + req.ifr_name = cfg.ifname.encode() + req.ifr_data = ctypes.pointer(config) + try: + sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + fcntl.ioctl(sock.fileno(), SIOCSHWTSTAMP, req) + sock.close() + + except OSError as e: + if e.errno == errno.EOPNOTSUPP: + raise KsftSkipEx("timestamping configuration is not supported via ioctl") from e + raise + + def __set_hwtimestamp_config(cfg, ts): - """ Setup new TS configuration information """ + """ Setup new TS configuration information (via netlink) """ ts['header'] = {'dev-name': cfg.ifname} try: @@ -56,9 +112,9 @@ def __set_hwtimestamp_config(cfg, ts): return res -def test_hwtstamp_tx(cfg): +def __perform_hwtstamp_tx(cfg, is_ioctl): """ - Test TX timestamp configuration. + Test TX timestamp configuration via either netlink or ioctl. The driver should apply provided config and report back proper state. """ @@ -66,16 +122,37 @@ def test_hwtstamp_tx(cfg): ts = __get_hwtimestamp_support(cfg) tx = ts['tx'] for t in tx: + res = None tscfg = orig_tscfg tscfg['tx-types']['bits']['bit'] = [t] - res = __set_hwtimestamp_config(cfg, tscfg) + if is_ioctl: + __set_hwtimestamp_config_ioctl(cfg, tscfg) + else: + res = __set_hwtimestamp_config(cfg, tscfg) if res is None: res = __get_hwtimestamp_config(cfg) + resioctl = __get_hwtimestamp_config_ioctl(cfg) ksft_eq(res['tx-types']['bits']['bit'], [t]) + ksft_eq(resioctl.tx_type, t['index']) __set_hwtimestamp_config(cfg, orig_tscfg) +def test_hwtstamp_tx_netlink(cfg): + """ + Test TX timestamp configuration setup via netlink. + The driver should apply provided config and report back proper state. + """ + __perform_hwtstamp_tx(cfg, False) + -def test_hwtstamp_rx(cfg): +def test_hwtstamp_tx_ioctl(cfg): + """ + Test TX timestamp configuration setup via ioctl. + The driver should apply provided config and report back proper state. + """ + __perform_hwtstamp_tx(cfg, True) + + +def __perform_hwtstamp_rx(cfg, is_ioctl): """ Test RX timestamp configuration. The filter configuration is taken from the list of supported filters. @@ -87,11 +164,17 @@ def test_hwtstamp_rx(cfg): ts = __get_hwtimestamp_support(cfg) rx = ts['rx'] for r in rx: + res = None tscfg = orig_tscfg tscfg['rx-filters']['bits']['bit'] = [r] - res = __set_hwtimestamp_config(cfg, tscfg) + if is_ioctl: + __set_hwtimestamp_config_ioctl(cfg, tscfg) + else: + res = __set_hwtimestamp_config(cfg, tscfg) if res is None: res = __get_hwtimestamp_config(cfg) + resioctl = __get_hwtimestamp_config_ioctl(cfg) + ksft_eq(resioctl.rx_filter, res['rx-filters']['bits']['bit'][0]['index']) if r['index'] == 0 or r['index'] == 1: ksft_eq(res['rx-filters']['bits']['bit'][0]['index'], r['index']) else: @@ -100,12 +183,34 @@ def test_hwtstamp_rx(cfg): __set_hwtimestamp_config(cfg, orig_tscfg) +def test_hwtstamp_rx_netlink(cfg): + """ + Test RX timestamp configuration via netlink. + The filter configuration is taken from the list of supported filters. + The driver should apply the config without error and report back proper state. + Some extension of the timestamping scope is allowed for PTP filters. + """ + __perform_hwtstamp_rx(cfg, False) + + +def test_hwtstamp_rx_ioctl(cfg): + """ + Test RX timestamp configuration via ioctl. + The filter configuration is taken from the list of supported filters. + The driver should apply the config without error and report back proper state. + Some extension of the timestamping scope is allowed for PTP filters. + """ + __perform_hwtstamp_rx(cfg, True) + + def main() -> None: """ Ksft boiler plate main """ with NetDrvEnv(__file__, nsim_test=False) as cfg: cfg.ethnl = EthtoolFamily() - ksft_run([test_hwtstamp_tx, test_hwtstamp_rx], args=(cfg,)) + ksft_run([test_hwtstamp_tx_ioctl, test_hwtstamp_tx_netlink, + test_hwtstamp_rx_ioctl, test_hwtstamp_rx_netlink], + args=(cfg,)) ksft_exit() -- 2.47.3 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl 2026-01-14 22:44 ` [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl Vadim Fedorenko @ 2026-01-15 12:03 ` Kory Maincent 2026-01-16 4:10 ` Jakub Kicinski 1 sibling, 0 replies; 7+ messages in thread From: Kory Maincent @ 2026-01-15 12:03 UTC (permalink / raw) To: Vadim Fedorenko Cc: Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Richard Cochran, Simon Horman, Shuah Khan, netdev On Wed, 14 Jan 2026 22:44:14 +0000 Vadim Fedorenko <vadim.fedorenko@linux.dev> wrote: > Extend HW timestamp tests to check that ioctl interface is not broken > and configuration setups and requests are equal to netlink interface. I am not a python expert but it seems ok to me. Reviewed-by: Kory Maincent <kory.maincent@bootlin.com> Thank you! -- Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl 2026-01-14 22:44 ` [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl Vadim Fedorenko 2026-01-15 12:03 ` Kory Maincent @ 2026-01-16 4:10 ` Jakub Kicinski 2026-01-16 6:12 ` Vadim Fedorenko 1 sibling, 1 reply; 7+ messages in thread From: Jakub Kicinski @ 2026-01-16 4:10 UTC (permalink / raw) To: Vadim Fedorenko Cc: Andrew Lunn, David S. Miller, Eric Dumazet, Paolo Abeni, Kory Maincent, Richard Cochran, Simon Horman, Shuah Khan, netdev On Wed, 14 Jan 2026 22:44:14 +0000 Vadim Fedorenko wrote: > Extend HW timestamp tests to check that ioctl interface is not broken > and configuration setups and requests are equal to netlink interface. Haven't looked closely but pylint is not happy (pylint --disable=R $file): tools/testing/selftests/drivers/net/hw/nic_timestamp.py:9:0: C0410: Multiple imports on one line (ctypes, fcntl, socket) (multiple-imports) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:16:0: C0115: Missing class docstring (missing-class-docstring) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:16:0: C0103: Class name "hwtstamp_config" doesn't conform to PascalCase naming style (invalid-name) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:86:4: W0201: Attribute 'rx_filter' defined outside __init__ (attribute-defined-outside-init) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:87:4: W0201: Attribute 'tx_type' defined outside __init__ (attribute-defined-outside-init) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:22:0: C0115: Missing class docstring (missing-class-docstring) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:22:0: C0103: Class name "ifreq" doesn't conform to PascalCase naming style (invalid-name) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:56:4: W0201: Attribute 'ifr_name' defined outside __init__ (attribute-defined-outside-init) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:89:4: W0201: Attribute 'ifr_name' defined outside __init__ (attribute-defined-outside-init) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:57:4: W0201: Attribute 'ifr_data' defined outside __init__ (attribute-defined-outside-init) tools/testing/selftests/drivers/net/hw/nic_timestamp.py:90:4: W0201: Attribute 'ifr_data' defined outside __init__ (attribute-defined-outside-init) -- pw-bot: cr ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl 2026-01-16 4:10 ` Jakub Kicinski @ 2026-01-16 6:12 ` Vadim Fedorenko 0 siblings, 0 replies; 7+ messages in thread From: Vadim Fedorenko @ 2026-01-16 6:12 UTC (permalink / raw) To: Jakub Kicinski Cc: Andrew Lunn, David S. Miller, Eric Dumazet, Paolo Abeni, Kory Maincent, Richard Cochran, Simon Horman, Shuah Khan, netdev On 16/01/2026 04:10, Jakub Kicinski wrote: > On Wed, 14 Jan 2026 22:44:14 +0000 Vadim Fedorenko wrote: >> Extend HW timestamp tests to check that ioctl interface is not broken >> and configuration setups and requests are equal to netlink interface. > > Haven't looked closely but pylint is not happy (pylint --disable=R > $file): > > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:9:0: C0410: Multiple imports on one line (ctypes, fcntl, socket) (multiple-imports) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:16:0: C0115: Missing class docstring (missing-class-docstring) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:16:0: C0103: Class name "hwtstamp_config" doesn't conform to PascalCase naming style (invalid-name) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:86:4: W0201: Attribute 'rx_filter' defined outside __init__ (attribute-defined-outside-init) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:87:4: W0201: Attribute 'tx_type' defined outside __init__ (attribute-defined-outside-init) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:22:0: C0115: Missing class docstring (missing-class-docstring) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:22:0: C0103: Class name "ifreq" doesn't conform to PascalCase naming style (invalid-name) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:56:4: W0201: Attribute 'ifr_name' defined outside __init__ (attribute-defined-outside-init) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:89:4: W0201: Attribute 'ifr_name' defined outside __init__ (attribute-defined-outside-init) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:57:4: W0201: Attribute 'ifr_data' defined outside __init__ (attribute-defined-outside-init) > tools/testing/selftests/drivers/net/hw/nic_timestamp.py:90:4: W0201: Attribute 'ifr_data' defined outside __init__ (attribute-defined-outside-init) Most of them are because of ctypes. v2 will have linter happier ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config 2026-01-14 22:44 [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config Vadim Fedorenko 2026-01-14 22:44 ` [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl Vadim Fedorenko @ 2026-01-15 11:58 ` Kory Maincent 2026-01-15 12:31 ` Vadim Fedorenko 1 sibling, 1 reply; 7+ messages in thread From: Kory Maincent @ 2026-01-15 11:58 UTC (permalink / raw) To: Vadim Fedorenko Cc: Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Richard Cochran, Simon Horman, Shuah Khan, netdev On Wed, 14 Jan 2026 22:44:13 +0000 Vadim Fedorenko <vadim.fedorenko@linux.dev> wrote: > With all drivers converted to use ndo_hwstamp callbacks the legacy way > can be removed, marking ioctl interface as deprecated. Thanks for all this work converting drivers to ndo_hwtstamp! Maybe you can also remove this: https://elixir.bootlin.com/linux/v6.19-rc5/source/drivers/infiniband/ulp/ipoib/ipoib_main.c#L1834 And in the driver development part of the documentation to avoid any new driver with it: https://elixir.bootlin.com/linux/v6.19-rc5/source/Documentation/networking/timestamping.rst#L630 Regards, -- Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config 2026-01-15 11:58 ` [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config Kory Maincent @ 2026-01-15 12:31 ` Vadim Fedorenko 0 siblings, 0 replies; 7+ messages in thread From: Vadim Fedorenko @ 2026-01-15 12:31 UTC (permalink / raw) To: Kory Maincent Cc: Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, Richard Cochran, Simon Horman, Shuah Khan, netdev On 15/01/2026 11:58, Kory Maincent wrote: > On Wed, 14 Jan 2026 22:44:13 +0000 > Vadim Fedorenko <vadim.fedorenko@linux.dev> wrote: > >> With all drivers converted to use ndo_hwstamp callbacks the legacy way >> can be removed, marking ioctl interface as deprecated. > > Thanks for all this work converting drivers to ndo_hwtstamp! > > Maybe you can also remove this: > https://elixir.bootlin.com/linux/v6.19-rc5/source/drivers/infiniband/ulp/ipoib/ipoib_main.c#L1834 Hmm... looks like left-over from the drivers cleaning part. I'll remove it in next version. > > And in the driver development part of the documentation to avoid any new driver > with it: > https://elixir.bootlin.com/linux/v6.19-rc5/source/Documentation/networking/timestamping.rst#L630 Good point, I'll adjust it in v2! Thanks! > > Regards, ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-01-16 6:12 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-01-14 22:44 [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config Vadim Fedorenko 2026-01-14 22:44 ` [PATCH net-next 2/2] selftests: drv-net: extend HW timestamp test with ioctl Vadim Fedorenko 2026-01-15 12:03 ` Kory Maincent 2026-01-16 4:10 ` Jakub Kicinski 2026-01-16 6:12 ` Vadim Fedorenko 2026-01-15 11:58 ` [PATCH net-next 1/2] net: remove legacy way to get/set HW timestamp config Kory Maincent 2026-01-15 12:31 ` Vadim Fedorenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox