Received-SPF: pass (google.com: domain of linux-kernel+bounces-159933-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Hariprasad Kelam <hkelam@marvell.com>
To: Jijie Shao <shaojijie@huawei.com>,
        "yisen.zhuang@huawei.com"
	<yisen.zhuang@huawei.com>,
        "salil.mehta@huawei.com" <salil.mehta@huawei.com>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "edumazet@google.com"
	<edumazet@google.com>,
        "kuba@kernel.org" <kuba@kernel.org>,
        "pabeni@redhat.com" <pabeni@redhat.com>,
        "jiri@resnulli.us"
	<jiri@resnulli.us>
CC: "shenjian15@huawei.com" <shenjian15@huawei.com>,
        "wangjie125@huawei.com"
	<wangjie125@huawei.com>,
        "liuyonglong@huawei.com" <liuyonglong@huawei.com>,
        "chenhao418@huawei.com" <chenhao418@huawei.com>,
        "netdev@vger.kernel.org"
	<netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>
Subject: [PATCH V2 net 3/7] net: hns3: release PTP resources if pf
 initialization failed
Thread-Topic: [PATCH V2 net 3/7] net: hns3: release PTP resources if pf
 initialization failed
Thread-Index: AQHal8vuaXc5OkjYgE2P3Y6eJHWDXQ==
Date: Fri, 26 Apr 2024 11:21:49 +0000
Message-ID: 
 <PH0PR18MB44740CF5F8A3DB7C992A3190DE162@PH0PR18MB4474.namprd18.prod.outlook.com>
References: <20240426100045.1631295-1-shaojijie@huawei.com>
 <20240426100045.1631295-4-shaojijie@huawei.com>
In-Reply-To: <20240426100045.1631295-4-shaojijie@huawei.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?euTPLXY+CYaxBY101lrZT3Zh1yyq9mfqU5qGGAInQMwJDjMhDvdnnqzx0dGd?=
 =?us-ascii?Q?QpvSA8LE4JiaD0vu+fA6WNktqXoHk4Tbekmo9xhzjrGeRObTw7PP90laqOEt?=
 =?us-ascii?Q?RaXtzQheR1ycDFOQHsnwnpNB3YVVcFOdj/oSjzZSBSfJmOFWcx4WWYsUudDG?=
 =?us-ascii?Q?Qz/Jfbk/YgNXvBEs+dFLTBLzJBWhzJgwyhQJ063NnuKZjXRUjx4m4ArCPtXV?=
 =?us-ascii?Q?zw8cRT3AhV/qFBiVwH9V5c98vBi5rkt23VTiXaqspO1yQ771mrz6oZs+2OgB?=
 =?us-ascii?Q?d9LIIxJjAiHsDnnt+sBsHo7YiUZmgQ/BH46LjF3Th/SXJ5ru5843s2GU8vl1?=
 =?us-ascii?Q?4FNT4jPAFS7OC4CLj+DGimB7ORL2sI5qIRVHZ0fDA8zbOpaEr04kD8zW3n1Q?=
 =?us-ascii?Q?gi1HW1oKDip/WnzgX6Pu3UtxNllL1LhGElreqmhyqqNwWP+HCNtaQoqqS+1A?=
 =?us-ascii?Q?QhHIj3EwSnFxXqdqNXWlQde3HHV5PrfzosbCRaR6r4SljMuTBcT0Zno5NYvU?=
 =?us-ascii?Q?gJIm/i6E5+/LNrewinuLcmmoqVSQuslRPEIHXLyWHntbhlksLzXgngjBGk1w?=
 =?us-ascii?Q?d3EJ4z0ckCHvW5xzd0FQ8WLc8fCXqsaOXLgu1Tf72C2u3Zh3zAOYhuvq+jCO?=
 =?us-ascii?Q?RCq5rzh3nCIW5s/SC326Wqeh5Nl6hcdCXgbfUhIdespb/YhV0o7EfC75uqaS?=
 =?us-ascii?Q?DhzNI4PNSvPFWfaseGb/Y+3OphGk4M6fu8IbKmqZ0nbr/ZBA92YjRcNjcZxD?=
 =?us-ascii?Q?jMASgGYHTbNdN4GN6JF7HaP8JRVPzTkVP5O8UcPXHn2nSlDu41WQgBKgLmei?=
 =?us-ascii?Q?dn42f2P0aUDBdn3dc1yHOS0glWH0RD2GP3Jx2eQBKHuLcriSKcNHw8rzHVH9?=
 =?us-ascii?Q?BNmYmtSdl0PKzxdGG8+eThldBraifW9Etl4deIatwFv1ZIM8JY4wbqU/GxbB?=
 =?us-ascii?Q?p6AInXAvxvL5/QegN9xPZvGXn1bGi0ZURE6Z39ldR8d0hJxpLZ8J49CZd94k?=
 =?us-ascii?Q?NDdpt438l3dJgieTCJyuewer/sCfykzzAKMINGpsEnxcJ85G1W334cg9YGYz?=
 =?us-ascii?Q?JWSv/Eo+tHoaQ9pKGAc6nNrFg3JT2vdlo9PuRrIKn2ravX93v1lAb5ZySIrg?=
 =?us-ascii?Q?5zL23UQ1nx5ygeWfqXGaOUFFpjR9ZQQ4fXMMf3W7VJUK2Pi+dEmXzMqFEQ7L?=
 =?us-ascii?Q?HVjQi/acDiDtKPuGPKNrMQGhH59CZYwYj+y6fqoKvuumY+h4x16OsnGh5oaN?=
 =?us-ascii?Q?J6F0+N/ivNemgPWqz1O/ptFaQvcjo83MPysd9bVLQAzm3rYu3SPIdpMyGuVQ?=
 =?us-ascii?Q?pndT4ElEf78wpqKEEZ1km+YvM8qaO+bmfHOhZG+ODWlVD94MND+8mwvcwwq1?=
 =?us-ascii?Q?RHv/pl1yG9LMx2l2tSjjWkm3pxesgqzlxvx2527VWoXiGfyBlfYrGwMv0G6D?=
 =?us-ascii?Q?05V5KNNe+VWrnkkoVHMwsIFQBLZ1hlIGiUSS2FjtyaAEGiauj4uX6DRbuCwj?=
 =?us-ascii?Q?9OtOb7GSaUL8fh//I/k4BP2YH2fMgFeU9AUzzXs2wBM+3lok8XaR+CeQOF3z?=
 =?us-ascii?Q?wFDbmMaX9aYP0+k8mc0=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: marvell.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH0PR18MB4474.namprd18.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ba027c77-0fff-4b11-946c-08dc65e31117
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2024 11:21:49.8107
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: R67R5YAPVi3o7KDPJrPWPiw6aNfNqToKFx5d9Pa4T4OyPDgBoQmdEyaPlF3evnzC3aj3xSadhX16pnKEgNZIjg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR18MB4271
X-Proofpoint-GUID: MIAUoqGBIoAUfUXhgmgU1yOlf0EokhtM
X-Proofpoint-ORIG-GUID: MIAUoqGBIoAUfUXhgmgU1yOlf0EokhtM
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-04-26_12,2024-04-26_02,2023-05-22_02

> From: Peiyang Wang <wangpeiyang1@huawei.com>
>=20
> During the PF initialization process, hclge_update_port_info may return a=
n
> error code for some reason. At this point,  the ptp initialization has be=
en
> completed. To void memory leaks, the resources that are applied by ptp
> should be released. Therefore, when hclge_update_port_info returns an err=
or
> code, hclge_ptp_uninit is called to release the corresponding resources.
>=20
> Fixes: eaf83ae59e18 ("net: hns3: add querying fec ability from firmware")
> Signed-off-by: Peiyang Wang <wangpeiyang1@huawei.com>
> Signed-off-by: Jijie Shao <shaojijie@huawei.com>
> ---
>  drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>=20
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> index 62ddce05fa2b..a068cd745eb4 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
> @@ -11761,7 +11761,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev
> *ae_dev)
>=20
>  	ret =3D hclge_update_port_info(hdev);
>  	if (ret)
> -		goto err_mdiobus_unreg;
> +		goto err_ptp_uninit;
>=20
>  	INIT_KFIFO(hdev->mac_tnl_log);
>=20
> @@ -11812,6 +11812,8 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev
> *ae_dev)
>  	devl_unlock(hdev->devlink);
>  	return 0;
>=20
> +err_ptp_uninit:
> +	hclge_ptp_uninit(hdev);
>  err_mdiobus_unreg:
>  	if (hdev->hw.mac.phydev)
>  		mdiobus_unregister(hdev->hw.mac.mdio_bus);
> --
> 2.30.0
>=20
Reviewed-by: Hariprasad Kelam <hkelam@marvell.com>