[PATCH 4.12 096/106] net/mlx5e: Schedule overflow check work to mlx5e workqueue
4.12-stable review patch. If anyone has any objections, please let me know. -- From: Eugenia Emantayev[ Upstream commit f08c39ed0bfb503c7b3e013cd40d036ce6a0941a ] This is done in order to ensure that work will not run after the cleanup. Fixes: ef9814deafd0 ('net/mlx5e: Add HW timestamping (TS) support') Signed-off-by: Eugenia Emantayev Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c @@ -114,13 +114,14 @@ static void mlx5e_timestamp_overflow(str struct delayed_work *dwork = to_delayed_work(work); struct mlx5e_tstamp *tstamp = container_of(dwork, struct mlx5e_tstamp, overflow_work); + struct mlx5e_priv *priv = container_of(tstamp, struct mlx5e_priv, tstamp); unsigned long flags; write_lock_irqsave(>lock, flags); timecounter_read(>clock); write_unlock_irqrestore(>lock, flags); - schedule_delayed_work(>overflow_work, - msecs_to_jiffies(tstamp->overflow_period * 1000)); + queue_delayed_work(priv->wq, >overflow_work, + msecs_to_jiffies(tstamp->overflow_period * 1000)); } int mlx5e_hwstamp_set(struct net_device *dev, struct ifreq *ifr) @@ -578,7 +579,7 @@ void mlx5e_timestamp_init(struct mlx5e_p INIT_WORK(>pps_info.out_work, mlx5e_pps_out); INIT_DELAYED_WORK(>overflow_work, mlx5e_timestamp_overflow); if (tstamp->overflow_period) - schedule_delayed_work(>overflow_work, 0); + queue_delayed_work(priv->wq, >overflow_work, 0); else mlx5_core_warn(priv->mdev, "invalid overflow period, overflow_work is not scheduled\n"); @@ -614,8 +615,6 @@ void mlx5e_timestamp_cleanup(struct mlx5 } cancel_work_sync(>pps_info.out_work); - - kfree(tstamp->ptp_info.pin_config); - cancel_delayed_work_sync(>overflow_work); + kfree(tstamp->ptp_info.pin_config); }
[PATCH 4.12 096/106] net/mlx5e: Schedule overflow check work to mlx5e workqueue
4.12-stable review patch. If anyone has any objections, please let me know. -- From: Eugenia Emantayev [ Upstream commit f08c39ed0bfb503c7b3e013cd40d036ce6a0941a ] This is done in order to ensure that work will not run after the cleanup. Fixes: ef9814deafd0 ('net/mlx5e: Add HW timestamping (TS) support') Signed-off-by: Eugenia Emantayev Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_clock.c @@ -114,13 +114,14 @@ static void mlx5e_timestamp_overflow(str struct delayed_work *dwork = to_delayed_work(work); struct mlx5e_tstamp *tstamp = container_of(dwork, struct mlx5e_tstamp, overflow_work); + struct mlx5e_priv *priv = container_of(tstamp, struct mlx5e_priv, tstamp); unsigned long flags; write_lock_irqsave(>lock, flags); timecounter_read(>clock); write_unlock_irqrestore(>lock, flags); - schedule_delayed_work(>overflow_work, - msecs_to_jiffies(tstamp->overflow_period * 1000)); + queue_delayed_work(priv->wq, >overflow_work, + msecs_to_jiffies(tstamp->overflow_period * 1000)); } int mlx5e_hwstamp_set(struct net_device *dev, struct ifreq *ifr) @@ -578,7 +579,7 @@ void mlx5e_timestamp_init(struct mlx5e_p INIT_WORK(>pps_info.out_work, mlx5e_pps_out); INIT_DELAYED_WORK(>overflow_work, mlx5e_timestamp_overflow); if (tstamp->overflow_period) - schedule_delayed_work(>overflow_work, 0); + queue_delayed_work(priv->wq, >overflow_work, 0); else mlx5_core_warn(priv->mdev, "invalid overflow period, overflow_work is not scheduled\n"); @@ -614,8 +615,6 @@ void mlx5e_timestamp_cleanup(struct mlx5 } cancel_work_sync(>pps_info.out_work); - - kfree(tstamp->ptp_info.pin_config); - cancel_delayed_work_sync(>overflow_work); + kfree(tstamp->ptp_info.pin_config); }