| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <375eed92-0f76-4df1-9837-2c29208417fa@engleder-embedded.com>
Date: Mon, 20 Oct 2025 19:51:57 +0200
From: Gerhard Engleder <gerhard@...leder-embedded.com>
To: Vadim Fedorenko <vadim.fedorenko@...ux.dev>
Cc: Richard Cochran <richardcochran@...il.com>,
Russell King <linux@...linux.org.uk>,
Vladimir Oltean <vladimir.oltean@....com>, Simon Horman <horms@...nel.org>,
netdev@...r.kernel.org, Shyam Sundar S K <Shyam-sundar.S-k@....com>,
Andrew Lunn <andrew+netdev@...n.ch>, "David S. Miller"
<davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Egor Pomozov <epomozov@...vell.com>, Potnuri Bharat Teja
<bharat@...lsio.com>, Dimitris Michailidis <dmichail@...gible.com>,
MD Danish Anwar <danishanwar@...com>, Roger Quadros <rogerq@...nel.org>
Subject: Re: [PATCH net-next v3 6/7] tsnep: convert to ndo_hwtstatmp API
On 16.10.25 17:25, Vadim Fedorenko wrote:
> Convert to .ndo_hwtstamp_get()/.ndo_hwtstamp_set() callbacks.
> After conversions the rest of tsnep_netdev_ioctl() becomes pure
> phy_do_ioctl_running(), so remove tsnep_netdev_ioctl() and replace
> it with phy_do_ioctl_running() in .ndo_eth_ioctl.
>
> Reviewed-by: Simon Horman <horms@...nel.org>
> Signed-off-by: Vadim Fedorenko <vadim.fedorenko@...ux.dev>
> ---
> drivers/net/ethernet/engleder/tsnep.h | 8 +-
> drivers/net/ethernet/engleder/tsnep_main.c | 14 +---
> drivers/net/ethernet/engleder/tsnep_ptp.c | 88 +++++++++++-----------
> 3 files changed, 51 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/net/ethernet/engleder/tsnep.h b/drivers/net/ethernet/engleder/tsnep.h
> index f188fba021a6..03e19aea9ea4 100644
> --- a/drivers/net/ethernet/engleder/tsnep.h
> +++ b/drivers/net/ethernet/engleder/tsnep.h
> @@ -176,7 +176,7 @@ struct tsnep_adapter {
> struct tsnep_gcl gcl[2];
> int next_gcl;
>
> - struct hwtstamp_config hwtstamp_config;
> + struct kernel_hwtstamp_config hwtstamp_config;
> struct ptp_clock *ptp_clock;
> struct ptp_clock_info ptp_clock_info;
> /* ptp clock lock */
> @@ -203,7 +203,11 @@ extern const struct ethtool_ops tsnep_ethtool_ops;
>
> int tsnep_ptp_init(struct tsnep_adapter *adapter);
> void tsnep_ptp_cleanup(struct tsnep_adapter *adapter);
> -int tsnep_ptp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
> +int tsnep_ptp_hwtstamp_get(struct net_device *netdev,
> + struct kernel_hwtstamp_config *config);
> +int tsnep_ptp_hwtstamp_set(struct net_device *netdev,
> + struct kernel_hwtstamp_config *config,
> + struct netlink_ext_ack *extack);
>
> int tsnep_tc_init(struct tsnep_adapter *adapter);
> void tsnep_tc_cleanup(struct tsnep_adapter *adapter);
> diff --git a/drivers/net/ethernet/engleder/tsnep_main.c b/drivers/net/ethernet/engleder/tsnep_main.c
> index eba73246f986..b118407c30e8 100644
> --- a/drivers/net/ethernet/engleder/tsnep_main.c
> +++ b/drivers/net/ethernet/engleder/tsnep_main.c
> @@ -2168,16 +2168,6 @@ static netdev_tx_t tsnep_netdev_xmit_frame(struct sk_buff *skb,
> return tsnep_xmit_frame_ring(skb, &adapter->tx[queue_mapping]);
> }
>
> -static int tsnep_netdev_ioctl(struct net_device *netdev, struct ifreq *ifr,
> - int cmd)
> -{
> - if (!netif_running(netdev))
> - return -EINVAL;
> - if (cmd == SIOCSHWTSTAMP || cmd == SIOCGHWTSTAMP)
> - return tsnep_ptp_ioctl(netdev, ifr, cmd);
> - return phy_mii_ioctl(netdev->phydev, ifr, cmd);
> -}
> -
> static void tsnep_netdev_set_multicast(struct net_device *netdev)
> {
> struct tsnep_adapter *adapter = netdev_priv(netdev);
> @@ -2384,7 +2374,7 @@ static const struct net_device_ops tsnep_netdev_ops = {
> .ndo_open = tsnep_netdev_open,
> .ndo_stop = tsnep_netdev_close,
> .ndo_start_xmit = tsnep_netdev_xmit_frame,
> - .ndo_eth_ioctl = tsnep_netdev_ioctl,
> + .ndo_eth_ioctl = phy_do_ioctl_running,
> .ndo_set_rx_mode = tsnep_netdev_set_multicast,
> .ndo_get_stats64 = tsnep_netdev_get_stats64,
> .ndo_set_mac_address = tsnep_netdev_set_mac_address,
> @@ -2394,6 +2384,8 @@ static const struct net_device_ops tsnep_netdev_ops = {
> .ndo_bpf = tsnep_netdev_bpf,
> .ndo_xdp_xmit = tsnep_netdev_xdp_xmit,
> .ndo_xsk_wakeup = tsnep_netdev_xsk_wakeup,
> + .ndo_hwtstamp_get = tsnep_ptp_hwtstamp_get,
> + .ndo_hwtstamp_set = tsnep_ptp_hwtstamp_set,
> };
>
> static int tsnep_mac_init(struct tsnep_adapter *adapter)
> diff --git a/drivers/net/ethernet/engleder/tsnep_ptp.c b/drivers/net/ethernet/engleder/tsnep_ptp.c
> index 54fbf0126815..ae1308eb813d 100644
> --- a/drivers/net/ethernet/engleder/tsnep_ptp.c
> +++ b/drivers/net/ethernet/engleder/tsnep_ptp.c
> @@ -19,57 +19,53 @@ void tsnep_get_system_time(struct tsnep_adapter *adapter, u64 *time)
> *time = (((u64)high) << 32) | ((u64)low);
> }
>
> -int tsnep_ptp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
> +int tsnep_ptp_hwtstamp_get(struct net_device *netdev,
> + struct kernel_hwtstamp_config *config)
> {
> struct tsnep_adapter *adapter = netdev_priv(netdev);
> - struct hwtstamp_config config;
> -
> - if (!ifr)
> - return -EINVAL;
> -
> - if (cmd == SIOCSHWTSTAMP) {
> - if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
> - return -EFAULT;
> -
> - switch (config.tx_type) {
> - case HWTSTAMP_TX_OFF:
> - case HWTSTAMP_TX_ON:
> - break;
> - default:
> - return -ERANGE;
> - }
> -
> - switch (config.rx_filter) {
> - case HWTSTAMP_FILTER_NONE:
> - break;
> - case HWTSTAMP_FILTER_ALL:
> - case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
> - case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
> - case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
> - case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
> - case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
> - case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
> - case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
> - case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
> - case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
> - case HWTSTAMP_FILTER_PTP_V2_EVENT:
> - case HWTSTAMP_FILTER_PTP_V2_SYNC:
> - case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
> - case HWTSTAMP_FILTER_NTP_ALL:
> - config.rx_filter = HWTSTAMP_FILTER_ALL;
> - break;
> - default:
> - return -ERANGE;
> - }
> -
> - memcpy(&adapter->hwtstamp_config, &config,
> - sizeof(adapter->hwtstamp_config));
> +
> + *config = adapter->hwtstamp_config;
> + return 0;
> +}
> +
> +int tsnep_ptp_hwtstamp_set(struct net_device *netdev,
> + struct kernel_hwtstamp_config *config,
> + struct netlink_ext_ack *extack)
> +{
> + struct tsnep_adapter *adapter = netdev_priv(netdev);
> +
> + switch (config->tx_type) {
> + case HWTSTAMP_TX_OFF:
> + case HWTSTAMP_TX_ON:
> + break;
> + default:
> + return -ERANGE;
> }
>
> - if (copy_to_user(ifr->ifr_data, &adapter->hwtstamp_config,
> - sizeof(adapter->hwtstamp_config)))
> - return -EFAULT;
> + switch (config->rx_filter) {
> + case HWTSTAMP_FILTER_NONE:
> + break;
> + case HWTSTAMP_FILTER_ALL:
> + case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
> + case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
> + case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
> + case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
> + case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
> + case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
> + case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
> + case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
> + case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:
> + case HWTSTAMP_FILTER_PTP_V2_EVENT:
> + case HWTSTAMP_FILTER_PTP_V2_SYNC:
> + case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
> + case HWTSTAMP_FILTER_NTP_ALL:
> + config->rx_filter = HWTSTAMP_FILTER_ALL;
> + break;
> + default:
> + return -ERANGE;
> + }
>
> + adapter->hwtstamp_config = *config;
> return 0;
> }
As you were first, I skip my patch.
Reviewed-by: Gerhard Engleder <gerhard@...leder-embedded.com>
Powered by blists - more mailing lists