Commit 1c7fe48a authored by Carolina Jubran's avatar Carolina Jubran Committed by Jakub Kicinski
Browse files

net/mlx5e: Convert to new hwtstamp_get/set interface 



Migrate from the legacy ioctl hardware timestamping interface to the
ndo_hwtstamp_get/set operations.

Signed-off-by: default avatarCarolina Jubran <cjubran@nvidia.com>
Reviewed-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1761819910-1011051-7-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 250da3c8

drivers/net/ethernet/mellanox/mlx5/core/en.h

+7 −4
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ struct mlx5e_rq { 
	struct mlx5e_rq_stats *stats;

	struct mlx5e_cq        cq;

	struct mlx5e_cq_decomp cqd;

	struct hwtstamp_config *hwtstamp_config;

	struct kernel_hwtstamp_config *hwtstamp_config;

	struct mlx5_clock      *clock;

	struct mlx5e_icosq    *icosq;

	struct mlx5e_priv     *priv;
@@ -917,7 +917,7 @@ struct mlx5e_priv { 
	u8                         max_opened_tc;

	bool                       tx_ptp_opened;

	bool                       rx_ptp_opened;

	struct hwtstamp_config     hwtstamp_config;

	struct kernel_hwtstamp_config hwtstamp_config;

	u16                        q_counter[MLX5_SD_MAX_GROUP_SZ];

	u16                        drop_rq_q_counter;

	struct notifier_block      events_nb;
@@ -1026,8 +1026,11 @@ void mlx5e_self_test(struct net_device *ndev, struct ethtool_test *etest, 
		     u64 *buf);

void mlx5e_set_rx_mode_work(struct work_struct *work);



int mlx5e_hwtstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr);

int mlx5e_hwtstamp_get(struct mlx5e_priv *priv, struct ifreq *ifr);

int mlx5e_hwtstamp_set(struct mlx5e_priv *priv,

		       struct kernel_hwtstamp_config *config,

		       struct netlink_ext_ack *extack);

int mlx5e_hwtstamp_get(struct mlx5e_priv *priv,

		       struct kernel_hwtstamp_config *config);

int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool val, bool rx_filter);



int mlx5e_vlan_rx_add_vid(struct net_device *dev, __always_unused __be16 proto,

drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget); 
void mlx5e_free_rx_descs(struct mlx5e_rq *rq);

void mlx5e_free_rx_missing_descs(struct mlx5e_rq *rq);



static inline bool mlx5e_rx_hw_stamp(struct hwtstamp_config *config)

static inline bool mlx5e_rx_hw_stamp(struct kernel_hwtstamp_config *config)

{

	return config->rx_filter == HWTSTAMP_FILTER_ALL;

}

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+31 −26
Original line number Diff line number Diff line
@@ -4740,22 +4740,23 @@ static int mlx5e_hwstamp_config_ptp_rx(struct mlx5e_priv *priv, bool ptp_rx) 
					&new_params.ptp_rx, true);

}



int mlx5e_hwtstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr)

int mlx5e_hwtstamp_set(struct mlx5e_priv *priv,

		       struct kernel_hwtstamp_config *config,

		       struct netlink_ext_ack *extack)

{

	struct hwtstamp_config config;

	bool rx_cqe_compress_def;

	bool ptp_rx;

	int err;



	if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz) ||

	    (mlx5_clock_get_ptp_index(priv->mdev) == -1))

	    (mlx5_clock_get_ptp_index(priv->mdev) == -1)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Timestamps are not supported on this device");

		return -EOPNOTSUPP;



	if (copy_from_user(&config, ifr->ifr_data, sizeof(config)))

		return -EFAULT;

	}



	/* TX HW timestamp */

	switch (config.tx_type) {

	switch (config->tx_type) {

	case HWTSTAMP_TX_OFF:

	case HWTSTAMP_TX_ON:

		break;
@@ -4767,7 +4768,7 @@ int mlx5e_hwtstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr) 
	rx_cqe_compress_def = priv->channels.params.rx_cqe_compress_def;



	/* RX HW timestamp */

	switch (config.rx_filter) {

	switch (config->rx_filter) {

	case HWTSTAMP_FILTER_NONE:

		ptp_rx = false;

		break;
@@ -4786,7 +4787,7 @@ int mlx5e_hwtstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr) 
	case HWTSTAMP_FILTER_PTP_V2_SYNC:

	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:

	case HWTSTAMP_FILTER_NTP_ALL:

		config.rx_filter = HWTSTAMP_FILTER_ALL;

		config->rx_filter = HWTSTAMP_FILTER_ALL;

		/* ptp_rx is set if both HW TS is set and CQE

		 * compression is set

		 */
@@ -4799,47 +4800,50 @@ int mlx5e_hwtstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr) 


	if (!mlx5e_profile_feature_cap(priv->profile, PTP_RX))

		err = mlx5e_hwstamp_config_no_ptp_rx(priv,

						     config.rx_filter != HWTSTAMP_FILTER_NONE);

						     config->rx_filter != HWTSTAMP_FILTER_NONE);

	else

		err = mlx5e_hwstamp_config_ptp_rx(priv, ptp_rx);

	if (err)

		goto err_unlock;



	memcpy(&priv->hwtstamp_config, &config, sizeof(config));

	priv->hwtstamp_config = *config;

	mutex_unlock(&priv->state_lock);



	/* might need to fix some features */

	netdev_update_features(priv->netdev);



	return copy_to_user(ifr->ifr_data, &config,

			    sizeof(config)) ? -EFAULT : 0;

	return 0;

err_unlock:

	mutex_unlock(&priv->state_lock);

	return err;

}



int mlx5e_hwtstamp_get(struct mlx5e_priv *priv, struct ifreq *ifr)

static int mlx5e_hwtstamp_set_ndo(struct net_device *netdev,

				  struct kernel_hwtstamp_config *config,

				  struct netlink_ext_ack *extack)

{

	struct hwtstamp_config *cfg = &priv->hwtstamp_config;

	struct mlx5e_priv *priv = netdev_priv(netdev);



	return mlx5e_hwtstamp_set(priv, config, extack);

}



int mlx5e_hwtstamp_get(struct mlx5e_priv *priv,

		       struct kernel_hwtstamp_config *config)

{

	if (!MLX5_CAP_GEN(priv->mdev, device_frequency_khz))

		return -EOPNOTSUPP;



	return copy_to_user(ifr->ifr_data, cfg, sizeof(*cfg)) ? -EFAULT : 0;

	*config = priv->hwtstamp_config;



	return 0;

}



static int mlx5e_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

static int mlx5e_hwtstamp_get_ndo(struct net_device *dev,

				  struct kernel_hwtstamp_config *config)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	switch (cmd) {

	case SIOCSHWTSTAMP:

		return mlx5e_hwtstamp_set(priv, ifr);

	case SIOCGHWTSTAMP:

		return mlx5e_hwtstamp_get(priv, ifr);

	default:

		return -EOPNOTSUPP;

	}

	return mlx5e_hwtstamp_get(priv, config);

}



#ifdef CONFIG_MLX5_ESWITCH
@@ -5280,13 +5284,14 @@ const struct net_device_ops mlx5e_netdev_ops = { 
	.ndo_set_features        = mlx5e_set_features,

	.ndo_fix_features        = mlx5e_fix_features,

	.ndo_change_mtu          = mlx5e_change_nic_mtu,

	.ndo_eth_ioctl            = mlx5e_ioctl,

	.ndo_set_tx_maxrate      = mlx5e_set_tx_maxrate,

	.ndo_features_check      = mlx5e_features_check,

	.ndo_tx_timeout          = mlx5e_tx_timeout,

	.ndo_bpf		 = mlx5e_xdp,

	.ndo_xdp_xmit            = mlx5e_xdp_xmit,

	.ndo_xsk_wakeup          = mlx5e_xsk_wakeup,

	.ndo_hwtstamp_get        = mlx5e_hwtstamp_get_ndo,

	.ndo_hwtstamp_set        = mlx5e_hwtstamp_set_ndo,

#ifdef CONFIG_MLX5_EN_ARFS

	.ndo_rx_flow_steer	 = mlx5e_rx_flow_steer,

#endif

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c

+19 −15
Original line number Diff line number Diff line
@@ -45,6 +45,23 @@ static int mlx5i_open(struct net_device *netdev); 
static int mlx5i_close(struct net_device *netdev);

static int mlx5i_change_mtu(struct net_device *netdev, int new_mtu);



int mlx5i_hwtstamp_set(struct net_device *dev,

		       struct kernel_hwtstamp_config *config,

		       struct netlink_ext_ack *extack)

{

	struct mlx5e_priv *epriv = mlx5i_epriv(dev);



	return mlx5e_hwtstamp_set(epriv, config, extack);

}



int mlx5i_hwtstamp_get(struct net_device *dev,

		       struct kernel_hwtstamp_config *config)

{

	struct mlx5e_priv *epriv = mlx5i_epriv(dev);



	return mlx5e_hwtstamp_get(epriv, config);

}



static const struct net_device_ops mlx5i_netdev_ops = {

	.ndo_open                = mlx5i_open,

	.ndo_stop                = mlx5i_close,
@@ -52,7 +69,8 @@ static const struct net_device_ops mlx5i_netdev_ops = { 
	.ndo_init                = mlx5i_dev_init,

	.ndo_uninit              = mlx5i_dev_cleanup,

	.ndo_change_mtu          = mlx5i_change_mtu,

	.ndo_eth_ioctl            = mlx5i_ioctl,

	.ndo_hwtstamp_get        = mlx5i_hwtstamp_get,

	.ndo_hwtstamp_set        = mlx5i_hwtstamp_set,

};



/* IPoIB mlx5 netdev profile */
@@ -557,20 +575,6 @@ int mlx5i_dev_init(struct net_device *dev) 
	return 0;

}



int mlx5i_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	struct mlx5e_priv *priv = mlx5i_epriv(dev);



	switch (cmd) {

	case SIOCSHWTSTAMP:

		return mlx5e_hwtstamp_set(priv, ifr);

	case SIOCGHWTSTAMP:

		return mlx5e_hwtstamp_get(priv, ifr);

	default:

		return -EOPNOTSUPP;

	}

}



void mlx5i_dev_cleanup(struct net_device *dev)

{

	struct mlx5e_priv    *priv   = mlx5i_epriv(dev);

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h

+5 −1
Original line number Diff line number Diff line
@@ -88,7 +88,11 @@ struct net_device *mlx5i_pkey_get_netdev(struct net_device *netdev, u32 qpn); 
/* Shared ndo functions */

int mlx5i_dev_init(struct net_device *dev);

void mlx5i_dev_cleanup(struct net_device *dev);

int mlx5i_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);

int mlx5i_hwtstamp_set(struct net_device *dev,

		       struct kernel_hwtstamp_config *config,

		       struct netlink_ext_ack *extack);

int mlx5i_hwtstamp_get(struct net_device *dev,

		       struct kernel_hwtstamp_config *config);



/* Parent profile functions */

int mlx5i_init(struct mlx5_core_dev *mdev, struct net_device *netdev);