From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC3E9C433EF for ; Mon, 8 Nov 2021 19:32:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E7216112D for ; Mon, 8 Nov 2021 19:32:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237503AbhKHTfH (ORCPT ); Mon, 8 Nov 2021 14:35:07 -0500 Received: from smtp05.smtpout.orange.fr ([80.12.242.127]:52055 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230136AbhKHTfD (ORCPT ); Mon, 8 Nov 2021 14:35:03 -0500 Received: from [192.168.1.18] ([86.243.171.122]) by smtp.orange.fr with ESMTPA id kANKmH4qYOvR0kANKmraDP; Mon, 08 Nov 2021 20:32:16 +0100 X-ME-Helo: [192.168.1.18] X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Mon, 08 Nov 2021 20:32:16 +0100 X-ME-IP: 86.243.171.122 Subject: Re: [PATCH 1/2] eni_vdpa: Fix an error handling path in 'eni_vdpa_probe()' To: Jason Wang Cc: mst , Wu Zongyong , Arnd Bergmann , virtualization , linux-kernel , kernel-janitors@vger.kernel.org References: From: Christophe JAILLET Message-ID: <393fb7b7-653b-eae6-16bd-5ffc7d600619@wanadoo.fr> Date: Mon, 8 Nov 2021 20:32:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 08/11/2021 à 06:55, Jason Wang a écrit : > On Mon, Nov 8, 2021 at 12:15 AM Christophe JAILLET > wrote: >> >> In the error handling path, a successful 'vp_legacy_probe()' should be >> balanced by a corresponding 'vp_legacy_remove()' call, as already done in >> the remove function. >> >> Add the missing call and update gotos accordingly. >> >> Fixes: e85087beedca ("eni_vdpa: add vDPA driver for Alibaba ENI") >> Signed-off-by: Christophe JAILLET >> --- >> drivers/vdpa/alibaba/eni_vdpa.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdpa.c >> index 3f788794571a..12b3db6b4517 100644 >> --- a/drivers/vdpa/alibaba/eni_vdpa.c >> +++ b/drivers/vdpa/alibaba/eni_vdpa.c >> @@ -501,7 +501,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) >> if (!eni_vdpa->vring) { >> ret = -ENOMEM; >> ENI_ERR(pdev, "failed to allocate virtqueues\n"); >> - goto err; >> + goto err_remove_vp_legacy; >> } >> >> for (i = 0; i < eni_vdpa->queues; i++) { >> @@ -513,11 +513,13 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) >> ret = vdpa_register_device(&eni_vdpa->vdpa, eni_vdpa->queues); >> if (ret) { >> ENI_ERR(pdev, "failed to register to vdpa bus\n"); >> - goto err; >> + goto err_remove_vp_legacy; >> } >> >> return 0; >> >> +err_remove_vp_legacy: >> + vp_legacy_remove(&eni_vdpa->ldev); > > Won't vp_legacy_remove() be triggered by the put_devic() below? Hi, I'm sorry but i don't see how. My understanding is that: - on "put_device(&eni_vdpa->vdpa.dev);", the corresponding release function will be called. - This release function is the one recorded in the '__vdpa_alloc_device()' function. - So it should be 'vdpa_release_dev()'. - This function, AFAIU, has no knowledge of 'vp_legacy_remove()' or anything that could call it. Unless I misread something or miss something obvious, I don't see how 'vp_legacy_remove() would be called. Could you elaborate? CJ > > Thanks > >> err: >> put_device(&eni_vdpa->vdpa.dev); >> return ret; >> -- >> 2.30.2 >> > >