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 1528E45804 for ; Fri, 23 Aug 2024 18:20:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F5224337C; Fri, 23 Aug 2024 18:20:20 +0200 (CEST) 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 46F8B40295 for ; Fri, 23 Aug 2024 18:20:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430017; 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=bynbEWnUsc4NVT0xVGdD30k2WjVTkNlPFZPFzU09y5I=; b=UXG9USri7qQMRAx1TXqAXNW67diy8kMMdHyD0nY0QPiO9NQwCxkycAaV21fb/hAHzcHQzn MR5JdWkB5LsqVMAviIel1vgDh+O2QAgi49SkdCComlqq+IFgzQmJ2FHWF95HZEzY+Ht12W FK5cOJcUxKx5NTQseA3mw4N8em73Ns0= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-RXygWHoeNceZPdFNGVu7Bw-1; Fri, 23 Aug 2024 12:20:14 -0400 X-MC-Unique: RXygWHoeNceZPdFNGVu7Bw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8E9C11955D56; Fri, 23 Aug 2024 16:20:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2802D1956053; Fri, 23 Aug 2024 16:20:11 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/tap: fix file descriptor check in isolated flow' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:17:24 +0100 Message-ID: <20240823161929.1004778-16-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/a599aacf12d5804af8ea8b01c67780f3cbb1f2dc Thanks. Kevin --- >From a599aacf12d5804af8ea8b01c67780f3cbb1f2dc Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 21 May 2024 13:12:46 -0700 Subject: [PATCH] net/tap: fix file descriptor check in isolated flow [ upstream commit e9e6089a41c275f3dcd7491f4df903a284653bb9 ] The check for receive queue FD in flow_isolate is incorrect. If queue has not been setup then FD will be -1 not 0. Fixes: f503d2694825 ("net/tap: support flow API isolated mode") Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit --- drivers/net/tap/tap_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c index b4879d3f93..44ef948ae3 100644 --- a/drivers/net/tap/tap_flow.c +++ b/drivers/net/tap/tap_flow.c @@ -1598,5 +1598,5 @@ tap_flow_isolate(struct rte_eth_dev *dev, * Otherwise it will be set when bringing up the netdevice (tun_alloc). */ - if (!process_private->rxq_fds[0]) + if (process_private->rxq_fds[0] == -1) return 0; if (set) { -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:10.491658948 +0100 +++ 0016-net-tap-fix-file-descriptor-check-in-isolated-flow.patch 2024-08-23 17:18:09.635429808 +0100 @@ -1 +1 @@ -From e9e6089a41c275f3dcd7491f4df903a284653bb9 Mon Sep 17 00:00:00 2001 +From a599aacf12d5804af8ea8b01c67780f3cbb1f2dc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e9e6089a41c275f3dcd7491f4df903a284653bb9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index fa50fe45d7..79cd6a12ca 100644 +index b4879d3f93..44ef948ae3 100644 @@ -22 +23 @@ -@@ -1596,5 +1596,5 @@ tap_flow_isolate(struct rte_eth_dev *dev, +@@ -1598,5 +1598,5 @@ tap_flow_isolate(struct rte_eth_dev *dev,