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 76383A0350 for ; Mon, 21 Feb 2022 16:40:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71A994068C; Mon, 21 Feb 2022 16:40:30 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 78D5C410F7 for ; Mon, 21 Feb 2022 16:40:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CPN6A0yLkCJIL5MTYuBJRi0VfyJVNHE8U9lLKx4J9jg=; b=BUNnFqgjRTvg5rRe92eO68jZMuxIZqauSgLcJRPKFJDq4xGjFEeHPNA1lVtLxHmgEydohk 3EjKfSy0SOstzSRPsNAo9Obl34CxPED8pMc364z4Kjb6y+pKrAjsYKSXj4BqnRRrPykFzh XAviXkBbzpBMbg3WEPf6dE5h0z49CF0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-68-JVFBKLUoNGaXSoIDcS0rwA-1; Mon, 21 Feb 2022 10:40:25 -0500 X-MC-Unique: JVFBKLUoNGaXSoIDcS0rwA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90B121DDEA; Mon, 21 Feb 2022 15:40:24 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C3B77E131; Mon, 21 Feb 2022 15:40:23 +0000 (UTC) From: Kevin Traynor To: Harold Huang Cc: Chenbo Xia , dpdk stable Subject: patch 'net/virtio-user: fix resource leak on probing failure' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:59 +0000 Message-Id: <20220221153625.152324-110-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/4210bb89d806c0898c9594f52213af4069e8fb36 Thanks. Kevin --- >From 4210bb89d806c0898c9594f52213af4069e8fb36 Mon Sep 17 00:00:00 2001 From: Harold Huang Date: Thu, 23 Dec 2021 12:42:37 +0800 Subject: [PATCH] net/virtio-user: fix resource leak on probing failure [ upstream commit edca47a1d9e01cb6f9bd174cc1cbefce1af7fd37 ] When eth_virtio_dev_init is failed, the registered virtio user memory event cb is not released and the backend created tap device is not destroyed. It would cause some residual tap device existed in the host and creating a new vdev could be failed because the new virtio_user_dev could use the same address pointer and register memory event cb to the same address is not allowed. Fixes: ca8326a94365 ("net/virtio_user: fix error management during init") Signed-off-by: Harold Huang Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_user_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 0271098f0d..16eca2f940 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -667,4 +667,5 @@ virtio_user_pmd_probe(struct rte_vdev_device *vdev) if (eth_virtio_dev_init(eth_dev) < 0) { PMD_INIT_LOG(ERR, "eth_virtio_dev_init fails"); + virtio_user_dev_uninit(dev); virtio_user_eth_dev_free(eth_dev); goto end; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.988793410 +0000 +++ 0110-net-virtio-user-fix-resource-leak-on-probing-failure.patch 2022-02-21 15:22:44.215704405 +0000 @@ -1 +1 @@ -From edca47a1d9e01cb6f9bd174cc1cbefce1af7fd37 Mon Sep 17 00:00:00 2001 +From 4210bb89d806c0898c9594f52213af4069e8fb36 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit edca47a1d9e01cb6f9bd174cc1cbefce1af7fd37 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org