Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Yongxin Liu <yongxin.liu@windriver.com>
To:     jacob.e.keller@intel.com, gurucharanx.g@intel.com,
        anthony.l.nguyen@intel.com
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        davem@davemloft.net, jesse.brandeburg@intel.com,
        intel-wired-lan@lists.osuosl.org, kuba@kernel.org
Subject: [PATCH net] ice: check whether PTP is initialized in ice_ptp_release()
Date:   Mon, 11 Oct 2021 15:02:16 +0800
Message-Id: <20211011070216.40657-1-yongxin.liu@windriver.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ho0dzgGv14dTDkO031SG0BXG6P/LhrN84LH/0eSEa7Zmz/5+n2V1QhFQ3hGj?=
 =?us-ascii?Q?q9QA6DLN81xtn5w0FB4HQZLEYB4zhBh27qybBRdYplEcMs9SpPeZMyoS2hNU?=
 =?us-ascii?Q?+CZIz0XVoYgqCmju+eD46uStdjjDKeqe6+GtCoYTy1NFVvD0jIs6Wkz2OvAd?=
 =?us-ascii?Q?YoGQjuzI1mjEl/RDoblFdBGVCsEASYKo5ZKj2bu/GTWz4FELBO+fxENJjKLg?=
 =?us-ascii?Q?oCdEXnUst8tgX7ke/eKwbgbZ6V09bAY+9gXRc8z6iBMbw90LgNgVGjUgT5k5?=
 =?us-ascii?Q?tjePwtKV9MYilrYAqAg5zIAmaHio4s91hH2CZ21EIgA8ZgQ0EYVZSXGn0E99?=
 =?us-ascii?Q?VK0LyCFt2Zu000MWmbh3x4Fy8pe30Fgw5tlYxKSpUTzTS5lMtI+KHh3zIkDV?=
 =?us-ascii?Q?ZQ1jWF83uCdOThrtoT2wJalNdihp8V7tdcjA7B1PgMbws4C18YuhdQ2ytpoN?=
 =?us-ascii?Q?p3/hiLImgtrOQSXElZsgCOvsr+w3x6IAaFRmm9tB1i5HtsmfDFcb8zig9y+c?=
 =?us-ascii?Q?oH9hOUjQJKdw9mdGOIrFZrTYm4rm0Upph2pfeQ7SyTwsRldMATtzUc5nOb5I?=
 =?us-ascii?Q?IEGiV6aqsxV1+wmEBCV1j/tA75kz33pgyzd4F2iNuEUyCC99/MMj28DkwS0B?=
 =?us-ascii?Q?VrMfboe9N9Vljgx7vfJ1/5ZjlHzOc5YcHk3PYxfeSY9MWb9zS8/cUMOzRbpM?=
 =?us-ascii?Q?IptcFh345CIPBtnP6UmkHSXj6wEwYPtYGKvycGaEcRKDYP7UCgIUUihRyzeJ?=
 =?us-ascii?Q?kqe++4rHWW+RfBBPO4FWgNNFe8GFHyUvhzHFZ1lOwpFm4c3RiuVmFzuQQ542?=
 =?us-ascii?Q?pFzE6j3G8e/DKhuLD+t96yK/4yYsurXALWr4Q8PvM2k974+4fK2q99hDRd1Q?=
 =?us-ascii?Q?ZmI5QC7r9SX+YuVeFTKG28fCv+MgHcGgRzoIAEfjyQ16xeGLK1p9G6IhKMdU?=
 =?us-ascii?Q?6y2TGhBAqRr0CQNzhKQ24clSrDQ+CZ9LwD+oL6JqwzxUfMZT/IL/sXtQHuZw?=
 =?us-ascii?Q?XB7XYtgpPdmvhPEikJmk7gkJH6UNdhDM2oUgeV+9YWJ9FCG9/WQI8q2rWpqT?=
 =?us-ascii?Q?nJtNH1CFfqscBCU+npDkojYVaPpok4svGs5XYQfdRtFICgN8FZJMY5/o3/g6?=
 =?us-ascii?Q?gTKr5ABKHiE52XWlDDmJdoYOJ74DlLhxkShqZcRsafr3oBeThkB+ics+I1ek?=
 =?us-ascii?Q?2vK5UU/ZcMfrd7ccm7SHZdVb+xnSHMtbasdl25ZyinQyEmKl0jVjCLxLDzg7?=
 =?us-ascii?Q?cCiwVDP+4lxccc0h4HezIZI8gjGUjJR5waWpGbjA1uxTlxE+0Dvz80WW05ZA?=
 =?us-ascii?Q?GAMfZI48/c8O6CDHLrWBvbjF?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 82244a69-a087-4f9b-8067-08d98c8605af
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5175.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2021 07:09:10.0182
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: geGSeW9puva/OLBOAqI6KrItqQ8y+59YtPhv0+iEZs4BkDDmDRFoktrksOGg6T6pH5ohG3xdhc2bUZdAJVEk4pxqh+3Dgaem+ihVZzsmjg4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4806
X-Proofpoint-GUID: hMDhYxmecA8c4sWeBOpXgGObCo_d4cWR
X-Proofpoint-ORIG-GUID: hMDhYxmecA8c4sWeBOpXgGObCo_d4cWR
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475
 definitions=2021-10-11_02,2021-10-07_02,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=955 clxscore=1011
 lowpriorityscore=0 bulkscore=0 adultscore=0 suspectscore=0 mlxscore=0
 priorityscore=1501 spamscore=0 phishscore=0 malwarescore=0 impostorscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001
 definitions=main-2110110041
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.

  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@windriver.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