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 6EC76A0A02 for ; Mon, 17 May 2021 18:17:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6513C410F7; Mon, 17 May 2021 18:17:39 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id EFE2F40041 for ; Mon, 17 May 2021 18:17:35 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifvw-00005T-Pe; Mon, 17 May 2021 16:17:32 +0000 From: Christian Ehrhardt To: Chengchang Tang Cc: Min Hu , Ferruh Yigit , dpdk stable Date: Mon, 17 May 2021 18:10:06 +0200 Message-Id: <20210517161039.3132619-177-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: check ioctl on restore' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/04959f203abfa7076ad51e68695a8e75b0bacf11 Thanks. Christian Ehrhardt --- >From 04959f203abfa7076ad51e68695a8e75b0bacf11 Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Tue, 27 Apr 2021 08:54:22 +0800 Subject: [PATCH] net/tap: check ioctl on restore [ upstream commit 8f3ca7f9a8b1df13f06236b8ab2dbed238b65ba4 ] After restoring the remote states, the return value of ioctl() is not checked. Therefore, users cannot know whether the remote state is restored successfully. This patch add log for restoring failure. Fixes: 4810d3af8343 ("net/tap: restore state of remote device when closing") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) Reviewed-by: Ferruh Yigit --- drivers/net/tap/rte_eth_tap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index cfbd579cd6..653f9db64e 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1066,8 +1066,11 @@ tap_dev_close(struct rte_eth_dev *dev) if (internals->remote_if_index) { /* Restore initial remote state */ - ioctl(internals->ioctl_sock, SIOCSIFFLAGS, + int ret = ioctl(internals->ioctl_sock, SIOCSIFFLAGS, &internals->remote_initial_flags); + if (ret) + TAP_LOG(ERR, "restore remote state failed: %d", ret); + } rte_mempool_free(internals->gso_ctx_mp); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.313190182 +0200 +++ 0177-net-tap-check-ioctl-on-restore.patch 2021-05-17 17:40:29.507812121 +0200 @@ -1 +1 @@ -From 8f3ca7f9a8b1df13f06236b8ab2dbed238b65ba4 Mon Sep 17 00:00:00 2001 +From 04959f203abfa7076ad51e68695a8e75b0bacf11 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f3ca7f9a8b1df13f06236b8ab2dbed238b65ba4 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 68baa18523..854abf4b30 100644 +index cfbd579cd6..653f9db64e 100644 @@ -26 +27 @@ -@@ -1133,8 +1133,11 @@ tap_dev_close(struct rte_eth_dev *dev) +@@ -1066,8 +1066,11 @@ tap_dev_close(struct rte_eth_dev *dev)