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:   "Keller, Jacob E" <jacob.e.keller@intel.com>
To:     Yongxin Liu <yongxin.liu@windriver.com>,
        "G, GurucharanX" <gurucharanx.g@intel.com>,
        "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>
CC:     "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
        "intel-wired-lan@lists.osuosl.org" <intel-wired-lan@lists.osuosl.org>,
        "kuba@kernel.org" <kuba@kernel.org>
Subject: RE: [PATCH net] ice: check whether PTP is initialized in
 ice_ptp_release()
Thread-Topic: [PATCH net] ice: check whether PTP is initialized in
 ice_ptp_release()
Thread-Index: AQHXvm715C75JcNIGkyx4vym/rHCe6vNccpQ
Date:   Mon, 11 Oct 2021 08:10:29 +0000
Message-ID: <CO1PR11MB5089DDA3AE43771D735673E0D6B59@CO1PR11MB5089.namprd11.prod.outlook.com>
References: <20211011070216.40657-1-yongxin.liu@windriver.com>
In-Reply-To: <20211011070216.40657-1-yongxin.liu@windriver.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Fi08AwOWQktSY6WVPvQqB7AQ0Mx8HKC/jx9W37c8uLl+A7rnAtTJxWWcaPEX?=
 =?us-ascii?Q?qlgZFp0rxV8z/kcGHSPFCXTGhDPFFHqEYlFq2dM0TQvzpWwIpRdkjzOWU5xP?=
 =?us-ascii?Q?pRnCbatesS1FvbXoESHf5hD6XHxSYq5Hu7TSDyefZTTJ8fgBbTEy37B8Nthk?=
 =?us-ascii?Q?O5v6EHwlDgAuzC7JbeVkO8RpNszRz6q9WSecaBbi48eBrKbQ4sn0+cQRWHEb?=
 =?us-ascii?Q?+uHOpCdxREjtynwhQItifzjDqmQfYhLT3uURrqbj5F8P2fx6U1z8kEAIPkGY?=
 =?us-ascii?Q?an3bOIt67w5f1YAcCsYMwRB0UsyTy441fJjqmYoETyX6j9Jl0nz4z9QcB/cp?=
 =?us-ascii?Q?lViaLFFWN8X7U9N5/TmyXutwpFNhIAIE9HWizJ9MomkunTU/S4RIGgcn8qcV?=
 =?us-ascii?Q?WUWZe+/P0JQmYIN3VikgkDCWpXl2N0wlBo1q8pTyfTUdwyNVqRVrFZ8H6l5T?=
 =?us-ascii?Q?xsmq4M9T5NFRNEHKmlAieKj1OdK0Nco9Se3zGpXl47hx++H2yxAFMb54dW5S?=
 =?us-ascii?Q?YOPdcjQu4FdnAZ7tWZU8CP6vlR9+VtndIJrQK+Y45SuneARAfzaEuDqXzh1K?=
 =?us-ascii?Q?evyfXX7mCMvuAci89uPE0K6EQR5I0XHic+pssQh3o+71kvjqdbid4Z27A2ot?=
 =?us-ascii?Q?ciAYKfrVn87FAmhCSv1ix3+XIZN1mtZldlp4ZhsAOQSoIAfhUgLpOHnuIOal?=
 =?us-ascii?Q?1HZDVn9NS9CwRRoLt+tKjfwkyDpCICqJq+/Gm4j03bNVnuie4NgCxl9AsB+C?=
 =?us-ascii?Q?jl9yWeovEMs347JpOZ5Aj2mUMv1o1OdAjUcOOKoqBXgaodZeucA86EdyFD4w?=
 =?us-ascii?Q?jAYTt9Vs7+AgC+f+AVGtWpe7gBbRM1TT+urT9i2Rw13Ny/gKBVmtyXZ+Vvrt?=
 =?us-ascii?Q?Ir3VYQJ7W28reSQVJ/ZDHLWp+XjvTE/7mn6dMo1GuekKq7pbA9NTDt+AVX6B?=
 =?us-ascii?Q?yOIegklAfZs1W0iOrcRK19Mg3QEsUcsgv92B4xtkeBU3oCn4FUn0tgRlFLq1?=
 =?us-ascii?Q?sbKNJ1Z/fx1QkqDGJ4hDJfzxOc5pLuYtSBDW5L5EkSgdi4Ya5Hj5fTsuaHby?=
 =?us-ascii?Q?XdbLxHGcOXzntjPAn+UXDA9TjQFzM2z20ghYY4F6r+JeukCGZH0eykRQOW86?=
 =?us-ascii?Q?A+IV+4L5e5mx/OK3Feovs9eIat42RFL5w8fwfUhgX7obHL3SIKZagsokGLdC?=
 =?us-ascii?Q?mGU84JPry0xDupq7uHobB/zCKWkBG20bmaLN9Wm8VPr9l/dEuZM6uCTRzT2g?=
 =?us-ascii?Q?bW7pcxd4137p7Zc2TjD6EezJMifgIeE8acUINF/s5v1bsxhIdTy/tn631Agi?=
 =?us-ascii?Q?Jpk=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5089.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 55a4ca52-1174-42b7-2ebc-08d98c8e96f9
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2021 08:10:29.4837
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: iwOEE0jJ+V0+qTevnOZv5WiRYGHtkKbmYiiOTj3awkXDmBJUMJzE2URxuJN5h8AvGruXD6ZuhUCL8xEhvX0ajhDeNhjn7ZfzUnURLUrVotA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4715
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Yongxin Liu <yongxin.liu@windriver.com>
> Sent: Monday, October 11, 2021 12:02 AM
> To: Keller, Jacob E <jacob.e.keller@intel.com>; G, GurucharanX
> <gurucharanx.g@intel.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org;
> davem@davemloft.net; Brandeburg, Jesse <jesse.brandeburg@intel.com>; inte=
l-
> wired-lan@lists.osuosl.org; kuba@kernel.org
> Subject: [PATCH net] ice: check whether PTP is initialized in ice_ptp_rel=
ease()
>=20
> 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=
.
>=20
> Fix the following calltrace.
>=20


Ahhh. Yep.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.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
>=20
> 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(+)
>=20
> 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);
>=20
> --
> 2.31.1