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 0737FA0093 for ; Tue, 19 May 2020 15:11:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E0EA41D6A4; Tue, 19 May 2020 15:11:02 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id E031B1D6A4 for ; Tue, 19 May 2020 15:11:01 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id m12so3027349wmc.0 for ; Tue, 19 May 2020 06:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9GxcMwLHswi+zpoy3fZ1ObLDdMDjIUKx4Awmu7QK3+8=; b=ebr2zHpXx59aOWPQFByBQHI8mENTwZP44F/0AKdzm8/VisiROHGr2gEwSIroxKT2Zg ODvZqM7Mb5inLi3TTKReZSmSF0c4pEg1FEH4P/WZQ/fBcYp1sBvLta/rKyPM79jaaWce 0I19vAxLsSeABGmoSYGN8BaDCdL4arD4BLDcTpAErLbRbEOnWZuEwMdN5TRd3K4oOgF6 0vaxmOCrIavAXPqGwXx1xMDrs3mmdaipKNgy20Dl0kcdUahefgrlr7HdXbfV0CKk5hoW 8kmYCaeuwk2tG3YDldtKeupCpVm/Ub42A3awRGPKimb8QifQKAkylBlQhGFZ1+QPJqCT mxpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9GxcMwLHswi+zpoy3fZ1ObLDdMDjIUKx4Awmu7QK3+8=; b=X1nZUd+V23nGS/Y+LlRlejksFMbEAR9IBH/PIA1mnGPjkR2IbN7MkxS0xcWrqmUkQD luIXpJrnQg1ww/Hss5EgQHmUPsIhEg70pjgxcM9UL/eIFKCoup6qL37Dc4gil7uzrT+G tquUsOpOSRvsh2GWMV1rSmIs1TMNmvCH7rhmVL7jj7SjC2b2D8qkQv+TTxfGmVzRDvhv iFr2G0hT6cZsSD98vIUvx97rkXLG2k8s/H+dVhOUo3+ekFw6Px9CUccyKIpAYOAdPDfA Bm18myFqjNh4XwzJYYGMblqsDjuxU/EWNAbRuGPUagDmjP6d1QiCPNt5uKNqZYDU1PTX paFA== X-Gm-Message-State: AOAM532IZhF38d4s0XNeblnVmCtB+dgU/6/ASUX0m+4QjrWmN9gzfHkt kpK9keuOJFuRoDQcyoaFbg8= X-Google-Smtp-Source: ABdhPJxqqQF4iuvojOuyWg4SgQSMphDhGQICNw1weFODZwfZC4U0iHSYqdHVyjqDe6/54m5zm8PpLQ== X-Received: by 2002:a7b:c086:: with SMTP id r6mr5255650wmh.29.1589893860739; Tue, 19 May 2020 06:11:00 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z12sm4210014wmc.6.2020.05.19.06.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:10:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Ferruh Yigit , Stephen Hemminger , dpdk stable Date: Tue, 19 May 2020 14:03:51 +0100 Message-Id: <20200519130549.112823-96-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: fix file close on remove' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From 2523e877dcbf0ede8baf9223af113b6974225515 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 2846ce0d3e..41ea54888e 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -2450,10 +2450,6 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) tap_devices_count--; rte_eth_dev_release_port(eth_dev); - if (internals->ka_fd != -1) { - close(internals->ka_fd); - internals->ka_fd = -1; - } return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:48.383133582 +0100 +++ 0096-net-tap-fix-file-close-on-remove.patch 2020-05-19 14:04:44.308650040 +0100 @@ -1,14 +1,15 @@ -From f9d5da4ab686b331c55bb98f43237d64ab820d0b Mon Sep 17 00:00:00 2001 +From 2523e877dcbf0ede8baf9223af113b6974225515 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") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit