Received-SPF: pass (google.com: domain of linux-kernel+bounces-159856-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <9c402089-1aed-4777-84af-5879bf72624b@huawei.com>
Date: Fri, 26 Apr 2024 18:17:36 +0800
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
CC: <shaojijie@huawei.com>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>, <linuxarm@huawei.com>,
	<prime.zeng@hisilicon.com>, <chenhao418@huawei.com>
Subject: Re: [PATCH 3/3] drivers/perf: hisi: hns3: Actually use
 devm_add_action_or_reset()
To: Junhao He <hejunhao3@huawei.com>, <will@kernel.org>,
	<jonathan.cameron@huawei.com>, <yangyicong@huawei.com>
References: <20240425124627.13764-1-hejunhao3@huawei.com>
 <20240425124627.13764-4-hejunhao3@huawei.com>
From: Jijie Shao <shaojijie@huawei.com>
In-Reply-To: <20240425124627.13764-4-hejunhao3@huawei.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit

Reviewed-by: Jijie Shao<shaojijie@huawei.com>

on 2024/4/25 20:46, Junhao He wrote:
> From: Hao Chen <chenhao418@huawei.com>
>
> pci_alloc_irq_vectors() allocates an irq vector. When devm_add_action()
> fails, the irq vector is not freed, which leads to a memory leak.
>
> Replace the devm_add_action with devm_add_action_or_reset to ensure
> the irq vector can be destroyed when it fails.
>
> Fixes: 66637ab137b4 ("drivers/perf: hisi: add driver for HNS3 PMU")
> Signed-off-by: Hao Chen <chenhao418@huawei.com>
> Signed-off-by: Junhao He <hejunhao3@huawei.com>
> ---
>   drivers/perf/hisilicon/hns3_pmu.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns3_pmu.c
> index cbdd53b0a034..60062eaa342a 100644
> --- a/drivers/perf/hisilicon/hns3_pmu.c
> +++ b/drivers/perf/hisilicon/hns3_pmu.c
> @@ -1527,7 +1527,7 @@ static int hns3_pmu_irq_register(struct pci_dev *pdev,
>   		return ret;
>   	}
>   
> -	ret = devm_add_action(&pdev->dev, hns3_pmu_free_irq, pdev);
> +	ret = devm_add_action_or_reset(&pdev->dev, hns3_pmu_free_irq, pdev);
>   	if (ret) {
>   		pci_err(pdev, "failed to add free irq action, ret = %d.\n", ret);
>   		return ret;