| Message ID | 20230822124044.301654-10-karol.kolacinski@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ice: fix timestamping in reset process | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
On 8/22/2023 5:40 AM, 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. How come this isn't for iwl-net? Some of the other patches in the series also sound like bug fixes. Is there a reason everything is going to -next? > 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>
On 8/7/23 10:53 PM, Anthony L Nguyen wrote: > How come this isn't for iwl-net? Some of the other patches in the series > also sound like bug fixes. Is there a reason everything is going to -next? This patch series depends on new features introduced in other patch series on iwl-next. Bug fixes are not possible without auxiliary bus feature for PTP. Some of the bug fixes could probably be sent separately to iwl-net, but PTP reset won't work properly without all patches anyway. Kind regards, Karol
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c index 8f783004f4a9..5c8f3dda64b9 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c @@ -868,6 +868,22 @@ ice_ptp_mark_tx_tracker_stale(struct ice_ptp_tx *tx) spin_unlock(&tx->lock); } +/** + * 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 @@ -2575,6 +2591,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); @@ -2610,18 +2631,6 @@ void ice_ptp_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type) if (ice_pf_src_tmr_owned(pf) && reset_type != ICE_RESET_PFR) ice_ptp_rebuild_owner(pf); - /* 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_e822(pf, &ptp->port.tx, - ptp->port.port_num); - } - if (err) - goto err; - ptp->state = ICE_PTP_READY; /* Start periodic work going */