linux-kernel - RE: [PATCH net] ice: check whether PTP is initialized in ice_ptp

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CO1PR11MB5089DDA3AE43771D735673E0D6B59@CO1PR11MB5089.namprd11.prod.outlook.com>
Date:   Mon, 11 Oct 2021 08:10:29 +0000
From:   "Keller, Jacob E" <jacob.e.keller@...el.com>
To:     Yongxin Liu <yongxin.liu@...driver.com>,
        "G, GurucharanX" <gurucharanx.g@...el.com>,
        "Nguyen, Anthony L" <anthony.l.nguyen@...el.com>
CC:     "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "davem@...emloft.net" <davem@...emloft.net>,
        "Brandeburg, Jesse" <jesse.brandeburg@...el.com>,
        "intel-wired-lan@...ts.osuosl.org" <intel-wired-lan@...ts.osuosl.org>,
        "kuba@...nel.org" <kuba@...nel.org>
Subject: RE: [PATCH net] ice: check whether PTP is initialized in
 ice_ptp_release()



> -----Original Message-----
> From: Yongxin Liu <yongxin.liu@...driver.com>
> Sent: Monday, October 11, 2021 12:02 AM
> To: Keller, Jacob E <jacob.e.keller@...el.com>; G, GurucharanX
> <gurucharanx.g@...el.com>; Nguyen, Anthony L <anthony.l.nguyen@...el.com>
> Cc: netdev@...r.kernel.org; linux-kernel@...r.kernel.org;
> davem@...emloft.net; Brandeburg, Jesse <jesse.brandeburg@...el.com>; intel-
> wired-lan@...ts.osuosl.org; kuba@...nel.org
> Subject: [PATCH net] ice: check whether PTP is initialized in ice_ptp_release()
> 
> PTP is currently only supported on E810 devices, it is checked
> in ice_ptp_init(). However, there is no check in ice_ptp_release().
> For other E800 series devices, ice_ptp_release() will be wrongly executed.
> 
> Fix the following calltrace.
> 


Ahhh. Yep.

Reviewed-by: Jacob Keller <jacob.e.keller@...el.com>

>   INFO: trying to register non-static key.
>   The code is fine but needs lockdep annotation, or maybe
>   you didn't initialize this object before use?
>   turning off the locking correctness validator.
>   Workqueue: ice ice_service_task [ice]
>   Call Trace:
>    dump_stack_lvl+0x5b/0x82
>    dump_stack+0x10/0x12
>    register_lock_class+0x495/0x4a0
>    ? find_held_lock+0x3c/0xb0
>    __lock_acquire+0x71/0x1830
>    lock_acquire+0x1e6/0x330
>    ? ice_ptp_release+0x3c/0x1e0 [ice]
>    ? _raw_spin_lock+0x19/0x70
>    ? ice_ptp_release+0x3c/0x1e0 [ice]
>    _raw_spin_lock+0x38/0x70
>    ? ice_ptp_release+0x3c/0x1e0 [ice]
>    ice_ptp_release+0x3c/0x1e0 [ice]
>    ice_prepare_for_reset+0xcb/0xe0 [ice]
>    ice_do_reset+0x38/0x110 [ice]
>    ice_service_task+0x138/0xf10 [ice]
>    ? __this_cpu_preempt_check+0x13/0x20
>    process_one_work+0x26a/0x650
>    worker_thread+0x3f/0x3b0
>    ? __kthread_parkme+0x51/0xb0
>    ? process_one_work+0x650/0x650
>    kthread+0x161/0x190
>    ? set_kthread_struct+0x40/0x40
>    ret_from_fork+0x1f/0x30
> 
> Fixes: 4dd0d5c33c3e ("ice: add lock around Tx timestamp tracker flush")
> Signed-off-by: Yongxin Liu <yongxin.liu@...driver.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_ptp.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c
> b/drivers/net/ethernet/intel/ice/ice_ptp.c
> index 05cc5870e4ef..b1cd26a5ad33 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
> @@ -1572,6 +1572,9 @@ void ice_ptp_init(struct ice_pf *pf)
>   */
>  void ice_ptp_release(struct ice_pf *pf)
>  {
> +	if (!test_bit(ICE_FLAG_PTP, pf->flags))
> +		return;
> +
>  	/* Disable timestamping for both Tx and Rx */
>  	ice_ptp_cfg_timestamp(pf, false);
> 
> --
> 2.31.1