| 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: <efd253a9-c630-654a-dfed-bd1094a8c380@intel.com>
Date: Tue, 4 Feb 2025 17:16:02 +0200
From: "Lifshits, Vitaly" <vitaly.lifshits@...el.com>
To: Piotr Wejman <piotrwejman90@...il.com>
CC: Tony Nguyen <anthony.l.nguyen@...el.com>, Przemek Kitszel
<przemyslaw.kitszel@...el.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>,
<intel-wired-lan@...ts.osuosl.org>, <netdev@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [Intel-wired-lan] [PATCH] net: e1000e: convert to
ndo_hwtstamp_get() and ndo_hwtstamp_set()
On 2/2/2025 7:08 PM, Piotr Wejman wrote:
> Update the driver to the new hw timestamping API. >
> Signed-off-by: Piotr Wejman <piotrwejman90@...il.com>
> ---
> drivers/net/ethernet/intel/e1000e/e1000.h | 2 +-
> drivers/net/ethernet/intel/e1000e/netdev.c | 52 ++++++++--------------
> 2 files changed, 20 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
> index ba9c19e6994c..952898151565 100644
> --- a/drivers/net/ethernet/intel/e1000e/e1000.h
> +++ b/drivers/net/ethernet/intel/e1000e/e1000.h
> @@ -319,7 +319,7 @@ struct e1000_adapter {
> u16 tx_ring_count;
> u16 rx_ring_count;
>
> - struct hwtstamp_config hwtstamp_config;
> + struct kernel_hwtstamp_config hwtstamp_config;
> struct delayed_work systim_overflow_work;
> struct sk_buff *tx_hwtstamp_skb;
> unsigned long tx_hwtstamp_start;
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 286155efcedf..15f0794afddd 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -3587,7 +3587,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)
> * exception of "all V2 events regardless of level 2 or 4".
> **/
> static int e1000e_config_hwtstamp(struct e1000_adapter *adapter,
> - struct hwtstamp_config *config)
> + struct kernel_hwtstamp_config *config)
> {
> struct e1000_hw *hw = &adapter->hw;
> u32 tsync_tx_ctl = E1000_TSYNCTXCTL_ENABLED;
> @@ -6140,7 +6140,8 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
> /**
> * e1000e_hwtstamp_set - control hardware time stamping
> * @netdev: network interface device structure
> - * @ifr: interface request
> + * @config: timestamp configuration
> + * @extack: netlink extended ACK report
> *
> * Outgoing time stamping can be enabled and disabled. Play nice and
> * disable it when requested, although it shouldn't cause any overhead
> @@ -6153,20 +6154,18 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
> * specified. Matching the kind of event packet is not supported, with the
> * exception of "all V2 events regardless of level 2 or 4".
> **/
> -static int e1000e_hwtstamp_set(struct net_device *netdev, struct ifreq *ifr)
> +static int e1000e_hwtstamp_set(struct net_device *netdev,
> + struct kernel_hwtstamp_config *config,
> + struct netlink_ext_ack *extack)
> {
> struct e1000_adapter *adapter = netdev_priv(netdev);
> - struct hwtstamp_config config;
> int ret_val;
>
> - if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))
> - return -EFAULT;
> -
> - ret_val = e1000e_config_hwtstamp(adapter, &config);
> + ret_val = e1000e_config_hwtstamp(adapter, config);
> if (ret_val)
> return ret_val;
>
> - switch (config.rx_filter) {
> + switch (config->rx_filter) {
> case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
> case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
> case HWTSTAMP_FILTER_PTP_V2_SYNC:
> @@ -6178,38 +6177,23 @@ static int e1000e_hwtstamp_set(struct net_device *netdev, struct ifreq *ifr)
> * by hardware so notify the caller the requested packets plus
> * some others are time stamped.
> */
> - config.rx_filter = HWTSTAMP_FILTER_SOME;
> + config->rx_filter = HWTSTAMP_FILTER_SOME;
> break;
> default:
> break;
> }
>
> - return copy_to_user(ifr->ifr_data, &config,
> - sizeof(config)) ? -EFAULT : 0;
> + return 0;
> }
>
> -static int e1000e_hwtstamp_get(struct net_device *netdev, struct ifreq *ifr)
> +static int e1000e_hwtstamp_get(struct net_device *netdev,
> + struct kernel_hwtstamp_config *kernel_config)
> {
> struct e1000_adapter *adapter = netdev_priv(netdev);
>
> - return copy_to_user(ifr->ifr_data, &adapter->hwtstamp_config,
> - sizeof(adapter->hwtstamp_config)) ? -EFAULT : 0;
> -}
> + *kernel_config = adapter->hwtstamp_config;
>
> -static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
> -{
> - switch (cmd) {
> - case SIOCGMIIPHY:
> - case SIOCGMIIREG:
> - case SIOCSMIIREG:
> - return e1000_mii_ioctl(netdev, ifr, cmd);
> - case SIOCSHWTSTAMP:
> - return e1000e_hwtstamp_set(netdev, ifr);
> - case SIOCGHWTSTAMP:
> - return e1000e_hwtstamp_get(netdev, ifr);
> - default:
> - return -EOPNOTSUPP;
> - }
> + return 0;
> }
>
> static int e1000_init_phy_wakeup(struct e1000_adapter *adapter, u32 wufc)
> @@ -7337,7 +7321,7 @@ static const struct net_device_ops e1000e_netdev_ops = {
> .ndo_set_rx_mode = e1000e_set_rx_mode,
> .ndo_set_mac_address = e1000_set_mac,
> .ndo_change_mtu = e1000_change_mtu,
> - .ndo_eth_ioctl = e1000_ioctl,
> + .ndo_eth_ioctl = e1000_mii_ioctl,
Now that you removed e1000_ioctl there is no reason to call this
function e1000_mii_ioctl.
Please rename it to e1000_ioctl.
> .ndo_tx_timeout = e1000_tx_timeout,
> .ndo_validate_addr = eth_validate_addr,
>
> @@ -7346,9 +7330,11 @@ static const struct net_device_ops e1000e_netdev_ops = {
> #ifdef CONFIG_NET_POLL_CONTROLLER
> .ndo_poll_controller = e1000_netpoll,
> #endif
> - .ndo_set_features = e1000_set_features,
> - .ndo_fix_features = e1000_fix_features,
> + .ndo_set_features = e1000_set_features,
> + .ndo_fix_features = e1000_fix_features,
> .ndo_features_check = passthru_features_check,
> + .ndo_hwtstamp_get = e1000e_hwtstamp_get,
> + .ndo_hwtstamp_set = e1000e_hwtstamp_set,
> };
>
> /**
>
Powered by blists - more mailing lists