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 E1303454E9 for ; Tue, 25 Jun 2024 02:00:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCDEE410DC; Tue, 25 Jun 2024 02:00:26 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 2F84D4026F for ; Tue, 25 Jun 2024 02:00:25 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-421eab59723so37301025e9.3 for ; Mon, 24 Jun 2024 17:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273625; x=1719878425; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7m3XtIt47Z1AnkUyqdrlhA4ZyaxX+G3uESCtA3I5ONc=; b=TDHE44A5fT7gzmtbSeAhWGpZgoL794VS3FRr06M+UdgBZ1P9FKl34+hf7PRIc43Yjm fFZ2ZPTmzn4UhJrfbXJhaj9wk67UAPPSMfVUGUjFzjRiVyj3Igu/gNfzSUbc9xruSJ4h y+MAbmZdg3rDyb9K9rdX08GU1P9W4Wbvr78WTAaSeHbp4BRrB3+jAEHvVwA+TKcSjyCN ZnBgxa2cQvDQJdrvMBVdQDQLC9rPk0JRodgx0dAtctq374JbrxaCBmCnUfYzy/nlzkfN zGRtwqS5v1Ye7FLd8g84hcP9u5jQs9nGR/+KDORe1LLBzaEKRiMzsHtwEx8NUA2PzQlk xNEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273625; x=1719878425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7m3XtIt47Z1AnkUyqdrlhA4ZyaxX+G3uESCtA3I5ONc=; b=SxJzSSNiXWNVnr3lZ3SfgeoVF+9/EP+L9/wAm0dS0cGMw9phT7Mc/MiDXuWYvIcbJw 7O5HYqd5FgNzMntNjG/lzYAjPIjw5CimFhTLsWDOorcNRJtU1R6abEnopMZMkDayhN6S VbeeU5EjAyM5lryVcy3whHCSGaMHzznRM7U6Msx2x8/QFLTHXWPvNlaFiQwHBbnqAPLw mtYPxrRWuxyv5OxofQuXN96mQaC8R/ajYy1XlEJxcK9+01Usu6rETUNvOcYp1xEO43Y/ o4XYM/azrYAOprVDwoQ+wF39u3KRen03EulQ/O4+/Fbx0ID1LBYR+0dtLPOKuvKAzFHs UEJg== X-Forwarded-Encrypted: i=1; AJvYcCUibokyLxs7ADSph2xBPiT92K4wRnSyR7aBB3sKMVbJLF2aF08jh+Qa+mhivNpKw1P8/OWKav04Cv4iksT2V4Y= X-Gm-Message-State: AOJu0Yw0golw1xWEgX0KHR8QN9nt6Jsx8YCNCqrX2uA0ipdmkwTbOIPW 4tTzBkNdNgcy4bgbLJcxlrAYyPXOg5owUwu5/aRCVWPuSH+0cI6E X-Google-Smtp-Source: AGHT+IE9oOGiWFLaXlk7gn6A4dFLAr/nIG/FOsFFVMjXA2DrNHDimfctBBXubYRbEu7Fe/yJ4hYDJg== X-Received: by 2002:a05:600c:68c9:b0:421:aace:7a94 with SMTP id 5b1f17b1804b1-42489e6762fmr47237385e9.40.1719273624728; Mon, 24 Jun 2024 17:00:24 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d0b636bsm194753135e9.6.2024.06.24.17.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:00:24 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.6 Date: Tue, 25 Jun 2024 00:58:07 +0100 Message-Id: <20240624235907.885628-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 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/27/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/2f9077766d3c0ab959a5bb9d896aceccf781527b Thanks. Luca Boccassi --- >From 2f9077766d3c0ab959a5bb9d896aceccf781527b 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 741ef09fc6..7468c3f0ea 100644 --- a/drivers/net/tap/tap_flow.c +++ b/drivers/net/tap/tap_flow.c @@ -1595,7 +1595,7 @@ tap_flow_isolate(struct rte_eth_dev *dev, * If netdevice is there, setup appropriate flow rules immediately. * 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) { struct rte_flow *remote_flow; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:14.871775310 +0100 +++ 0021-net-tap-fix-file-descriptor-check-in-isolated-flow.patch 2024-06-25 00:22:13.105184018 +0100 @@ -1 +1 @@ -From e9e6089a41c275f3dcd7491f4df903a284653bb9 Mon Sep 17 00:00:00 2001 +From 2f9077766d3c0ab959a5bb9d896aceccf781527b 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 741ef09fc6..7468c3f0ea 100644