| Message ID | 20240123105131.2842935-8-karol.kolacinski@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ice: fix timestamping in reset process | expand |
On Tue, Jan 23, 2024 at 11:51:31AM +0100, Karol Kolacinski wrote: > From: Jacob Keller <jacob.e.keller@intel.com> > > The ice driver currently attempts to destroy and re-initialize the Tx > timestamp tracker during the reset flow. The release of the Tx tracker > only happened during CORE reset or GLOBAL reset. The ice_ptp_rebuild() > function always calls the ice_ptp_init_tx function which will allocate > a new tracker data structure, resulting in memory leaks during PF reset. > > Certainly the driver should not be allocating a new tracker without > removing the old tracker data, as this results in a memory leak. > Additionally, there's no reason to remove the tracker memory during a > reset. Remove this logic from the reset and rebuild flow. Instead of > releasing the Tx tracker, flush outstanding timestamps just before we > reset the PHY timestamp block in ice_ptp_cfg_phy_interrupt(). > > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> > Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com> > Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Reviewed-by: Simon Horman <horms@kernel.org>
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Karol Kolacinski > Sent: Tuesday, January 23, 2024 4:22 PM > To: intel-wired-lan@lists.osuosl.org > Cc: Keller, Jacob E <jacob.e.keller@intel.com>; netdev@vger.kernel.org; Kolacinski, Karol <karol.kolacinski@intel.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; Brandeburg, Jesse <jesse.brandeburg@intel.com> > Subject: [Intel-wired-lan] [PATCH v7 iwl-next 7/7] ice: stop destroying and reinitalizing Tx tracker during reset > > From: Jacob Keller <jacob.e.keller@intel.com> > > The ice driver currently attempts to destroy and re-initialize the Tx > timestamp tracker during the reset flow. The release of the Tx tracker > only happened during CORE reset or GLOBAL reset. The ice_ptp_rebuild() > function always calls the ice_ptp_init_tx function which will allocate > a new tracker data structure, resulting in memory leaks during PF reset. > > Certainly the driver should not be allocating a new tracker without > removing the old tracker data, as this results in a memory leak. > Additionally, there's no reason to remove the tracker memory during a > reset. Remove this logic from the reset and rebuild flow. Instead of > releasing the Tx tracker, flush outstanding timestamps just before we > reset the PHY timestamp block in ice_ptp_cfg_phy_interrupt(). > > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> > Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com> > Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_ptp.c | 33 +++++++++++++++--------- > 1 file changed, 21 insertions(+), 12 deletions(-) > Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c index 5ede4f61c054..c11eba07283c 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c @@ -963,6 +963,22 @@ ice_ptp_mark_tx_tracker_stale(struct ice_ptp_tx *tx) spin_unlock_irqrestore(&tx->lock, flags); } +/** + * ice_ptp_flush_all_tx_tracker - Flush all timestamp trackers on this clock + * @pf: Board private structure + * + * Called by the clock owner to flush all the Tx timestamp trackers associated + * with the clock. + */ +static void +ice_ptp_flush_all_tx_tracker(struct ice_pf *pf) +{ + struct ice_ptp_port *port; + + list_for_each_entry(port, &pf->ptp.ports_owner.ports, list_member) + ice_ptp_flush_tx_tracker(ptp_port_to_pf(port), &port->tx); +} + /** * ice_ptp_release_tx_tracker - Release allocated memory for Tx tracker * @pf: Board private structure @@ -2715,6 +2731,11 @@ static int ice_ptp_rebuild_owner(struct ice_pf *pf) /* Release the global hardware lock */ ice_ptp_unlock(hw); + /* Flush software tracking of any outstanding timestamps since we're + * about to flush the PHY timestamp block. + */ + ice_ptp_flush_all_tx_tracker(pf); + if (!ice_is_e810(hw)) { /* Enable quad interrupts */ err = ice_ptp_cfg_phy_interrupt(pf, true, 1); @@ -2751,18 +2772,6 @@ void ice_ptp_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type) goto err; } - /* Init Tx structures */ - if (ice_is_e810(&pf->hw)) { - err = ice_ptp_init_tx_e810(pf, &ptp->port.tx); - } else { - kthread_init_delayed_work(&ptp->port.ov_work, - ice_ptp_wait_for_offsets); - err = ice_ptp_init_tx_e82x(pf, &ptp->port.tx, - ptp->port.port_num); - } - if (err) - goto err; - ptp->state = ICE_PTP_READY; /* Start periodic work going */