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 7CBC4C433F5 for ; Tue, 9 Nov 2021 21:23:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A74C611F0 for ; Tue, 9 Nov 2021 21:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245071AbhKIVZw (ORCPT ); Tue, 9 Nov 2021 16:25:52 -0500 Received: from smtp03.smtpout.orange.fr ([80.12.242.125]:51013 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245063AbhKIVZu (ORCPT ); Tue, 9 Nov 2021 16:25:50 -0500 Received: from [192.168.1.18] ([86.243.171.122]) by smtp.orange.fr with ESMTPA id kYYqmHJaVIEdlkYYqmbLNx; Tue, 09 Nov 2021 22:22:53 +0100 X-ME-Helo: [192.168.1.18] X-ME-Auth: YWZlNiIxYWMyZDliZWIzOTcwYTEyYzlhMmU3ZiQ1M2U2MzfzZDfyZTMxZTBkMTYyNDBjNDJlZmQ3ZQ== X-ME-Date: Tue, 09 Nov 2021 22:22:53 +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: Arnd Bergmann , mst , kernel-janitors@vger.kernel.org, linux-kernel , virtualization , Wu Zongyong References: <393fb7b7-653b-eae6-16bd-5ffc7d600619@wanadoo.fr> From: Christophe JAILLET Message-ID: <069ed3fb-ef99-ff36-136d-a0221ba85a96@wanadoo.fr> Date: Tue, 9 Nov 2021 22:21:44 +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 09/11/2021 à 03:54, Jason Wang a écrit : > On Tue, Nov 9, 2021 at 3:32 AM Christophe JAILLET > wrote: >> >> 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? > > I think the device should release the driver (see > device_release_driver()) during during its deleting. Hi, I still don't follow the logic and I don't understand how 'vp_legacy_remove()' will finely be called, but it is not that important. If it's fine for you, it's fine for me :) CJ > > Thanks > >> >> CJ >> >>> >>> Thanks >>> >>>> err: >>>> put_device(&eni_vdpa->vdpa.dev); >>>> return ret; >>>> -- >>>> 2.30.2 >>>> >>> >>> >> > > _______________________________________________ > Virtualization mailing list > Virtualization@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/virtualization >