From: Karol Kolacinski <karol.kolacinski@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: Karol Kolacinski <karol.kolacinski@intel.com>
Subject: [Intel-wired-lan] [PATCH 9/9] ice: stop destroying and reinitalizing Tx tracker during reset
Date: Mon, 7 Aug 2023 12:36:24 +0200 [thread overview]
Message-ID: <20230807103624.468230-10-karol.kolacinski@intel.com> (raw)
In-Reply-To: <20230807103624.468230-1-karol.kolacinski@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().
Change-type: ImplementationChange
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
---
drivers/net/ethernet/intel/ice/ice_ptp.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 5dc0c9a27180..d10c43f9266b 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -2629,18 +2629,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 */
--
2.39.2
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
next prev parent reply other threads:[~2023-08-07 10:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 10:36 [Intel-wired-lan] [PATCH 0/9] ice: fix timestamping in reset process Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 1/9] ice: use ice_pf_src_tmr_owned where available Karol Kolacinski
2023-08-07 10:59 ` Przemek Kitszel
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 2/9] ice: introduce PTP state machine Karol Kolacinski
2023-08-07 11:12 ` Przemek Kitszel
2023-08-07 17:32 ` Jacob Keller
2023-08-08 8:47 ` Przemek Kitszel
2023-08-17 14:04 ` Kolacinski, Karol
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 3/9] ice: pass reset type to PTP reset functions Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 4/9] ice: rename PTP functions and fields Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 5/9] ice: factor out ice_ptp_rebuild_owner() Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 6/9] ice: remove ptp_tx ring parameter flag Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 7/9] ice: modify tstamp_config only during TS mode set Karol Kolacinski
2023-08-07 10:36 ` [Intel-wired-lan] [PATCH 8/9] ice: restore timestamp configuration after reset Karol Kolacinski
2023-10-27 23:50 ` Jacob Keller
2023-08-07 10:36 ` Karol Kolacinski [this message]
2023-08-07 12:20 ` [Intel-wired-lan] [PATCH 9/9] ice: stop destroying and reinitalizing Tx tracker during reset Przemek Kitszel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230807103624.468230-10-karol.kolacinski@intel.com \
--to=karol.kolacinski@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox