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 A229343C60 for ; Thu, 7 Mar 2024 02:32:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9970A40272; Thu, 7 Mar 2024 02:32:47 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 7192A42E9C for ; Thu, 7 Mar 2024 02:32:46 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-412f1fc5613so3643895e9.2 for ; Wed, 06 Mar 2024 17:32:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775166; x=1710379966; 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=gtY6cwavILnAmJ3f84J9CL48+rQ9PM+ubXe/UTBRH0o=; b=cCX2QdngEq6GVkSU/PkImjzu3T+pPn63WUpCP49ErarpvuJ/NfJ8cJ/N1roKoi372M Ikdz0xungKBBvlPFpjKp7CUhD5oz9KtVorbb0wRdzfIUWUMEwm86Uw/3OZKmtDm5+C3o GvcvY1WzUwDhB3Mo5f1IjQL5ctngRLOZQP/kaKOTLQoin3BgJtNKEvOgk2GROuOeEeOR qv1WwpZ4JRBphhdkYKcnOLr2X+VwWkxxU2VeS9X1HFhvb4OFpwHU0znlJ/R8KbBPZYgD TV8bLzgLf1xZ1KCMAEEWEIWeZb9Zg0yGF3IgQNE3IKkkrpH38WD9kyk84P7pTcackQA/ d00A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775166; x=1710379966; 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=gtY6cwavILnAmJ3f84J9CL48+rQ9PM+ubXe/UTBRH0o=; b=QrfyZoxwqrfH9jxbGSaj1isyPcAmY0sgKxNG4weRA8lkbAUp0xOBBSnrq2KLr8WCq4 o95Ld9sPTAsne3Cq3r6UblMnwwgP57HyWHQikHlVG7/NtkuOk4sNBFY32mTzKV6M2op6 YjH+qEnM0hPuUpB7n46WTh3HzWzn8fjKUvDY4D/j9Khrofom7w8UGLp5hCqUJvwTKkHt OmUUI5oidM9Bl+O1JmpCCkWMXvLyE1sEJQsWQXlRUs/NwAh0ZaEVhKcXwoA+y8hOpbl8 fjbbDO2DIm/nVyEvGRAWbP+xAQLDR4VGZa4A9F4uiKKpmatfGaqXwSgChCDcEunPFI/c dfag== X-Forwarded-Encrypted: i=1; AJvYcCVSBSE4FRE9UEXbf71fVWY9ZGZyFJpjMLSliZGxizENra69XqgTfB8H5zqS+m1EoOYhMDoJ6MaMOaRSXxxEWpE= X-Gm-Message-State: AOJu0YxXUCy5+/EVZIYPyjoGaJy7Zb3Zefho4W0wiTctYh8Ge9mkYMBe 0AIbaa7z8SxquqBLxWmhFgU01bOaCx0J6lwszRwuNX7SgB1kOXFRT2xXJBxH X-Google-Smtp-Source: AGHT+IFtRWScZYl5Gn8tA5u3OlSZQuqIYtEGLATjkwZA1JCVKEpPZVzq7EgaGs91OJxs2GRNHYzozw== X-Received: by 2002:a05:600c:350a:b0:412:dca9:aa83 with SMTP id h10-20020a05600c350a00b00412dca9aa83mr9301646wmq.21.1709775166088; Wed, 06 Mar 2024 17:32:46 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id o22-20020a05600c165600b00412a0ce903dsm839515wmn.46.2024.03.06.17.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:32:45 -0800 (PST) From: luca.boccassi@gmail.com To: Kaiwen Deng Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: remove redundant judgment in flow parsing' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:30:25 +0000 Message-Id: <20240307013159.1735343-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/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/599593804be4ed29d757085181b98017c1295aa6 Thanks. Luca Boccassi --- >From 599593804be4ed29d757085181b98017c1295aa6 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Fri, 24 Nov 2023 15:01:03 +0800 Subject: [PATCH] net/i40e: remove redundant judgment in flow parsing [ upstream commit e930f8622e05e410a475c6b57dd7edd73b2e1705 ] if (eth_spec && eth_mask && next_type == RTE_FLOW_ITEM_TYPE_END) { ... if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || ...) { ... } ... } Clearly, that condition in the inner "if" is always "false". This commit will remove the redundant judgment. Fixes: 7d83c152a207 ("net/i40e: parse flow director filter") Signed-off-by: Kaiwen Deng Acked-by: Qi Zhang --- drivers/net/i40e/i40e_flow.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 67df77890a..882152bd4a 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -1708,8 +1708,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, ether_type = rte_be_to_cpu_16(eth_spec->type); - if (next_type == RTE_FLOW_ITEM_TYPE_VLAN || - ether_type == RTE_ETHER_TYPE_IPV4 || + if (ether_type == RTE_ETHER_TYPE_IPV4 || ether_type == RTE_ETHER_TYPE_IPV6 || ether_type == i40e_get_outer_vlan(dev)) { rte_flow_error_set(error, EINVAL, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:35.798779554 +0000 +++ 0008-net-i40e-remove-redundant-judgment-in-flow-parsing.patch 2024-03-07 01:05:34.638936621 +0000 @@ -1 +1 @@ -From e930f8622e05e410a475c6b57dd7edd73b2e1705 Mon Sep 17 00:00:00 2001 +From 599593804be4ed29d757085181b98017c1295aa6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e930f8622e05e410a475c6b57dd7edd73b2e1705 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 877e49151e..92165c8422 100644 +index 67df77890a..882152bd4a 100644 @@ -34 +35 @@ - ether_type = rte_be_to_cpu_16(eth_spec->hdr.ether_type); + ether_type = rte_be_to_cpu_16(eth_spec->type);