netdev - Re: [Intel-wired-lan] [PATCH v2 iwl-net] ice: fix PTP cleanup on driver removal in error path

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <92097ccf-e54d-404f-866c-8d6dc808e498@molgen.mpg.de>
Date: Tue, 21 Oct 2025 08:39:55 +0200
From: Paul Menzel <pmenzel@...gen.mpg.de>
To: Grzegorz Nitka <grzegorz.nitka@...el.com>
Cc: intel-wired-lan@...ts.osuosl.org,
 Aleksandr Loktionov <aleksandr.loktionov@...el.com>, netdev@...r.kernel.org,
 vadim.fedorenko@...ux.dev
Subject: Re: [Intel-wired-lan] [PATCH v2 iwl-net] ice: fix PTP cleanup on
 driver removal in error path

Dear Grzegorz,


Am 20.10.25 um 12:02 schrieb Grzegorz Nitka:
> Improve the cleanup on releasing PTP resources in error path.
> The error case might happen either at the driver probe and PTP
> feature initialization or on PTP restart (errors in reset handling, NVM
> update etc). In both cases, calls to PF PTP cleanup (ice_ptp_cleanup_pf
> function) and 'ps_lock' mutex deinitialization were missed.
> Additionally, ptp clock was not unregistered in the latter case.
> 
> Keep PTP state as 'uninitialized' on init to distinguish between error
> scenarios and to avoid resource release duplication at driver removal.
> 
> The consequence of missing ice_ptp_cleanup_pf call is the following call
> trace dumped when ice_adapter object is freed (port list is not empty,
> as it is required at this stage):
> 
> [  T93022] ------------[ cut here ]------------
> [  T93022] WARNING: CPU: 10 PID: 93022 at ice/ice_adapter.c:67 ice_adapter_put+0xef/0x100 [ice]
> ...
> [  T93022] RIP: 0010:ice_adapter_put+0xef/0x100 [ice]
> ...
> [  T93022] Call Trace:
> [  T93022]  <TASK>
> [  T93022]  ? ice_adapter_put+0xef/0x100 [ice 33d2647ad4f6d866d41eefff1806df37c68aef0c]
> [  T93022]  ? __warn.cold+0xb0/0x10e
> [  T93022]  ? ice_adapter_put+0xef/0x100 [ice 33d2647ad4f6d866d41eefff1806df37c68aef0c]
> [  T93022]  ? report_bug+0xd8/0x150
> [  T93022]  ? handle_bug+0xe9/0x110
> [  T93022]  ? exc_invalid_op+0x17/0x70
> [  T93022]  ? asm_exc_invalid_op+0x1a/0x20
> [  T93022]  ? ice_adapter_put+0xef/0x100 [ice 33d2647ad4f6d866d41eefff1806df37c68aef0c]
> [  T93022]  pci_device_remove+0x42/0xb0
> [  T93022]  device_release_driver_internal+0x19f/0x200
> [  T93022]  driver_detach+0x48/0x90
> [  T93022]  bus_remove_driver+0x70/0xf0
> [  T93022]  pci_unregister_driver+0x42/0xb0
> [  T93022]  ice_module_exit+0x10/0xdb0 [ice 33d2647ad4f6d866d41eefff1806df37c68aef0c]
> ...
> [  T93022] ---[ end trace 0000000000000000 ]---
> [  T93022] ice: module unloaded
> 
> Fixes: e800654e85b5 ("ice: Use ice_adapter for PTP shared data instead of auxdev")
> Signed-off-by: Grzegorz Nitka <grzegorz.nitka@...el.com>
> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@...el.com>
> ---
> v1->v2:
>   - rebased
>   - complete full cleanup if failure in PTP intialization path (no need
>     to do a cleanup on PTP release then) and added a comment with clarification
>     why keeping PTP_UNINIT state on failure at init
>   - setting ptp->clock to NULL explicitly in error path
> ---
>   drivers/net/ethernet/intel/ice/ice_ptp.c | 22 +++++++++++++++++++---
>   1 file changed, 19 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
> index fb0f6365a6d6..13b73f835f06 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
> @@ -3246,7 +3246,7 @@ void ice_ptp_init(struct ice_pf *pf)
>   
>   	err = ice_ptp_init_port(pf, &ptp->port);
>   	if (err)
> -		goto err_exit;
> +		goto err_clean_pf;
>   
>   	/* Start the PHY timestamping block */
>   	ice_ptp_reset_phy_timestamping(pf);
> @@ -3263,13 +3263,19 @@ void ice_ptp_init(struct ice_pf *pf)
>   	dev_info(ice_pf_to_dev(pf), "PTP init successful\n");
>   	return;
>   
> +err_clean_pf:
> +	mutex_destroy(&ptp->port.ps_lock);
> +	ice_ptp_cleanup_pf(pf);
>   err_exit:
>   	/* If we registered a PTP clock, release it */
>   	if (pf->ptp.clock) {
>   		ptp_clock_unregister(ptp->clock);
>   		pf->ptp.clock = NULL;
>   	}
> -	ptp->state = ICE_PTP_ERROR;
> +	/* Keep ICE_PTP_UNINIT state to avoid ambiguity at driver unload
> +	 * and to avoid duplicated resources release.
> +	 */
> +	ptp->state = ICE_PTP_UNINIT;
>   	dev_err(ice_pf_to_dev(pf), "PTP failed %d\n", err);
>   }
>   
> @@ -3282,9 +3288,19 @@ void ice_ptp_init(struct ice_pf *pf)
>    */
>   void ice_ptp_release(struct ice_pf *pf)
>   {
> -	if (pf->ptp.state != ICE_PTP_READY)
> +	if (pf->ptp.state == ICE_PTP_UNINIT)
>   		return;
>   
> +	if (pf->ptp.state != ICE_PTP_READY) {
> +		ice_ptp_cleanup_pf(pf);
> +		mutex_destroy(&pf->ptp.port.ps_lock);
> +		if (pf->ptp.clock) {
> +			ptp_clock_unregister(pf->ptp.clock);
> +			pf->ptp.clock = NULL;
> +		}
> +		return;
> +	}
> +
>   	pf->ptp.state = ICE_PTP_UNINIT;
>   
>   	/* Disable timestamping for both Tx and Rx */

Reviewed-by: Paul Menzel <pmenzel@...gen.mpg.de>


Kind regards,

Paul