From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ED23AA0540; Tue, 8 Nov 2022 08:55:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 88CFB400D7; Tue, 8 Nov 2022 08:55:08 +0100 (CET) Received: from cvbackendsmtp001.nmdf.navercorp.com (cvbackendsmtp001.nmdf.navercorp.com [125.209.246.146]) by mails.dpdk.org (Postfix) with ESMTP id B64BD4003C; Tue, 8 Nov 2022 08:30:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=navercorp.com; s=s20171120; t=1667892626; bh=amawbf9Eh/d7PrPQhMNTJU63PQ3vhzlPRILhnJfnKQA=; h=Date:From:To:Subject:Message-ID:From:Subject:Feedback-ID: X-Works-Security; b=UrxfjkFZosraVDLmHxR11tfNB3WMKFDWTpzkLUZsJE4X/EfXTQinN0gsrbgmUHr+w SlrOs339YCzUKMTQlAqQNCjRrKkyRViYScrQXu/iorVEi2TGHPrmiJ0GtTo0iTg9TO BMs7+SKnrz+GqbOkO1EM3KBOqdEUyQh5/4D8Uko3yuz0wW28aKvKMyhWZdNoizYxd/ EHcVGSah9CS6bADzXxkDfJMgWnzqVRHq6Kk647swuBEHvFyc6toRAFJ1z7NQ/S1NRK RMpvqRC1M1mrPwdq9qb+/Y7NKvEs1h1Xgts0YHMsmHQytGaZFFXdNAVwtjxO25UkLh wnMbl+4XQbxrg== X-Session-ID: QzAWKqJ4SYKC8o+H78uC+Q X-Works-Smtp-Source: VdbraAbrFoJCpNmrKoUmWHF0 Received: from dev-tkkim-git-send-email-ncl.nfra.io ([10.113.149.62]) by cvbackendsmtp001.nmdf.navercorp.com with ESMTP id QzAWKqJ4SYKC8o+H78uC+Q for ; Tue, 08 Nov 2022 07:30:26 -0000 Date: Tue, 8 Nov 2022 16:30:26 +0900 From: Taekyung Kim To: "Xia, Chenbo" Cc: "dev@dpdk.org" , "stable@dpdk.org" , "maxime.coquelin@redhat.com" , "Wang, Xiao W" Subject: Re: [PATCH v3] vdpa/ifc: fix update_datapath error handling Message-ID: References: <20221107053411.98653-1-kim.tae.kyung@navercorp.com> <20221107085943.116357-1-kim.tae.kyung@navercorp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailman-Approved-At: Tue, 08 Nov 2022 08:55:07 +0100 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: SN6PR11MB35049D5B2E6A4A3185A4671D9C3F9@sn6pr11mb3504.namprd11.prod.outlook.com Errors-To: dev-bounces@dpdk.org Hi Chenbo, Thanks for your review. On Tue, Nov 08, 2022 at 01:46:37AM +0000, Xia, Chenbo wrote: > > -----Original Message----- > > From: Taekyung Kim > > Sent: Monday, November 7, 2022 5:00 PM > > To: dev@dpdk.org > > Cc: stable@dpdk.org; maxime.coquelin@redhat.com; Xia, Chenbo > > ; Wang, Xiao W ; > > kim.tae.kyung@navercorp.com > > Subject: [PATCH v3] vdpa/ifc: fix update_datapath error handling > > > > Stop and return the error code when update_datapath fails. > > update_datapath prepares resources for the vdpa device. > > The driver should not perform any further actions > > if update_datapath returns an error. > > > > Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver") > > Cc: stable@dpdk.org > > > > Signed-off-by: Taekyung Kim > > --- > > v3: > > * Fix coding style > > > > v2: > > * Revert the prepared resources before returning an error > > * Rebase to 22.11 rc2 > > * Add fixes and cc for backport > > > > --- > > drivers/vdpa/ifc/ifcvf_vdpa.c | 26 ++++++++++++++++++++++---- > > 1 file changed, 22 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c > > index 8dfd49336e..0396d49122 100644 > > --- a/drivers/vdpa/ifc/ifcvf_vdpa.c > > +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c > > @@ -1098,7 +1098,12 @@ ifcvf_dev_config(int vid) > > internal = list->internal; > > internal->vid = vid; > > rte_atomic32_set(&internal->dev_attached, 1); > > - update_datapath(internal); > > + if (update_datapath(internal) < 0) { > > + DRV_LOG(ERR, "failed to update datapath for vDPA device %s", > > + vdev->device->name); > > + rte_atomic32_set(&internal->dev_attached, 0); > > + return -1; > > + } > > > > hw = &internal->hw; > > for (i = 0; i < hw->nr_vring; i++) { > > @@ -1146,7 +1151,12 @@ ifcvf_dev_close(int vid) > > internal->sw_fallback_running = false; > > } else { > > rte_atomic32_set(&internal->dev_attached, 0); > > - update_datapath(internal); > > + if (update_datapath(internal) < 0) { > > + DRV_LOG(ERR, "failed to update datapath for vDPA > > device %s", > > + vdev->device->name); > > + internal->configured = 0; > > + return -1; > > + } > > } > > > > internal->configured = 0; > > @@ -1752,7 +1762,14 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv > > __rte_unused, > > } > > > > rte_atomic32_set(&internal->started, 1); > > - update_datapath(internal); > > + if (update_datapath(internal) < 0) { > > + DRV_LOG(ERR, "failed to update datapath %s", pci_dev->name); > > + rte_atomic32_set(&internal->started, 0); > > + pthread_mutex_lock(&internal_list_lock); > > + TAILQ_REMOVE(&internal_list, list, next); > > + pthread_mutex_unlock(&internal_list_lock); > > + goto error; > > + } > > > > rte_kvargs_free(kvlist); > > return 0; > > @@ -1781,7 +1798,8 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev) > > > > internal = list->internal; > > rte_atomic32_set(&internal->started, 0); > > - update_datapath(internal); > > + if (update_datapath(internal) < 0) > > + DRV_LOG(ERR, "failed to update datapath %s", pci_dev->name); > > > > rte_pci_unmap_device(internal->pdev); > > rte_vfio_container_destroy(internal->vfio_container_fd); > > -- > > 2.34.1 > > Reviewed-by: Chenbo Xia