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 2F1F5A00C4 for ; Mon, 14 Nov 2022 23:14:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2A63542D0C; Mon, 14 Nov 2022 23:14:33 +0100 (CET) Received: from cvbackendsmtp003.nmdf.navercorp.com (cvbackendsmtp003.nmdf.navercorp.com [125.209.242.248]) by mails.dpdk.org (Postfix) with ESMTP id B3F024003C; Tue, 8 Nov 2022 09:56:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=navercorp.com; s=s20171120; t=1667897795; bh=oyLP8bbS6fGM04uxOI55BAFkV8ExcgI3tUQ9JhAP5hw=; h=From:To:Subject:Date:Message-Id:From:Subject:Feedback-ID: X-Works-Security; b=YBr5s8wlCmkJHOKcwbRQb+AOIwlMzqIGI+LCSGztA59hL5Ot4Fhz5Ak5cE7PmfKL8 9k/tvoAc7onhJ7RIfjTWiDIqqryHa23HOYYMJB0xzDs9c+std0CU93mcLTPdXY4j1D dnt71+TAsSLC3t+NifkfGdjVpzoCDQOKpozU4N/l57xR0tYCBzEYx0Jmz9UbFR7est Vs0iJpHPAHMaKfWJmBJHkIh6G4JcSLtlM1Q8FkNwI1RvI4hdqstStAlzkCKc/YnjPq wlFBYVgkcd6eeiyP9YMT9wK9FWCxrWRusEXUW7jWyb6qEvK4pUVEsJIERqGX4aBhrN g/HPL8RFXXvkQ== X-Session-ID: Ia0cQAI-S+OXzGkpa5O7gg X-Works-Smtp-Source: VXbraAbrFoJCpNm9axK9WHF0 Received: from dev-tkkim-git-send-email-ncl.nfra.io ([10.113.149.62]) by cvbackendsmtp003.nmdf.navercorp.com with ESMTP id Ia0cQAI-S+OXzGkpa5O7gg for ; Tue, 08 Nov 2022 08:56:35 -0000 From: Taekyung Kim To: dev@dpdk.org Cc: chenbo.xia@intel.com, andy.pei@intel.com, kim.tae.kyung@navercorp.com, maxime.coquelin@redhat.com, stable@dpdk.org, xiao.w.wang@intel.com Subject: [PATCH v4] vdpa/ifc: fix update_datapath error handling Date: Tue, 8 Nov 2022 17:56:24 +0900 Message-Id: <20221108085624.53989-1-kim.tae.kyung@navercorp.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Mon, 14 Nov 2022 23:14:32 +0100 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 --- v4: * Add rte_vdpa_unregister_device in ifcvf_pci_probe 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 | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index 8dfd49336e..49d68ad1b1 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,15 @@ 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); + rte_vdpa_unregister_device(internal->vdev); + 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 +1799,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