From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1DE1FA0093 for ; Thu, 28 May 2020 18:26:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C6941DC30; Thu, 28 May 2020 18:26:10 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id A68071DC10 for ; Thu, 28 May 2020 18:26:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683169; 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=3Oau1NfIBf2C61upRcrMidFoicO4Ig8yB7C778yxG1w=; b=eQjirIBda89hWED5+DsgnM5sP3NQHEyDXAFn7NmpXB6kT0/229c6/DliZyO5JryrmDE/oe cDY/QW9Q8jcpQn1PFCEcJ5DPhLgQ5upQoUFBsDo3f2+HcW2vGc+VIKzB36wNwRuscOUJGo VwhD8LYQ8EPA7ZkDSmAeueNBQjqtlys= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-ACeD6_r8OVqz90uPHk-t7w-1; Thu, 28 May 2020 12:26:05 -0400 X-MC-Unique: ACeD6_r8OVqz90uPHk-t7w-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 F1BF0461; Thu, 28 May 2020 16:26:03 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id E401460C87; Thu, 28 May 2020 16:26:02 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ferruh Yigit , Stephen Hemminger , dpdk stable Date: Thu, 28 May 2020 17:23:08 +0100 Message-Id: <20200528162322.7863-81-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: fix file close on remove' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/15b5f477f3178079673afe4ed34719b0096d15ab Thanks. Kevin. --- >From 15b5f477f3178079673afe4ed34719b0096d15ab Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 16 Apr 2020 11:04:45 +0800 Subject: [PATCH] net/tap: fix file close on remove [ upstream commit f9d5da4ab686b331c55bb98f43237d64ab820d0b ] The internal structure is freed and set to NULL in the rte_eth_dev_release_port() and zero is a valid fd. Ultimately leads to a valid fd was closed by mistake. Fixes: 3101191c63ab ("net/tap: fix device removal when no queue exist") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit Acked-by: Stephen Hemminger --- drivers/net/tap/rte_eth_tap.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 5b486dacfc..5e627bbdd8 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -2344,8 +2344,4 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) rte_eth_dev_release_port(eth_dev); - if (internals->ka_fd != -1) { - close(internals->ka_fd); - internals->ka_fd = -1; - } return 0; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.297394757 +0100 +++ 0081-net-tap-fix-file-close-on-remove.patch 2020-05-28 17:12:59.168554884 +0100 @@ -1 +1 @@ -From f9d5da4ab686b331c55bb98f43237d64ab820d0b Mon Sep 17 00:00:00 2001 +From 15b5f477f3178079673afe4ed34719b0096d15ab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f9d5da4ab686b331c55bb98f43237d64ab820d0b ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 2846ce0d3e..41ea54888e 100644 +index 5b486dacfc..5e627bbdd8 100644 @@ -24 +25 @@ -@@ -2451,8 +2451,4 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) +@@ -2344,8 +2344,4 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)