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 C0C1BA0527 for ; Mon, 9 Nov 2020 19:44:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B672772ED; Mon, 9 Nov 2020 19:44:20 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by dpdk.org (Postfix) with ESMTP id 2368D6A6F for ; Mon, 9 Nov 2020 19:44:18 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id j7so2624957wrp.3 for ; Mon, 09 Nov 2020 10:44:18 -0800 (PST) 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=jPQh68r30d5iphDZbhIpvTZBXxPRmOmVOgg3PL34ahg=; b=mqd2xBphy0+Scn6/CvedAaixDN98LltMTL2/skIaS3iJJjw3ie084zcQ0tfDqKBP1t ZZo3zPdzivlW3qcC/dJF+viqPpTgbaZc70QbpcW5g3f82dcPjIJdbp2wLelAoPR//UcE 2Ip03I8E3cQXG9kt+GXfzx5WrxigkYqfxoHjQwJqL6BaFCdWC0Jeu2Xb0dvuyYybDRjX uFzhQidTwFuLURYlpxnGbw4N4dJ9FkeUi/hYUIrGwB+0T9LxMzil1NRkYIYOMMy3DsvX d/slM3IwcQr73OESWYLUGtPoQgqC6V824KHRuWebgaTUbUwgVsxMY4dbiG6WLHsQznAz UL8A== 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=jPQh68r30d5iphDZbhIpvTZBXxPRmOmVOgg3PL34ahg=; b=rCKaDT+mCoCtrbslXJyNWH9Abr9oVHhT9tJmCKfX6DKQ2r1f3XACf5aM/yUffLs+/D V95KSSo/jyPR5qKHkf2nkJbQ2fZIP0FW3X/xplArOfacLxbRQ2IftanrAlyfG2s2q/m+ qkS7ycFcb8KN3CzxSvXXvYAK2Q2+QA+W2Bf/JT0dc9C1IsrnQYEf5BSuQ54Wr74in2KN L5X3AsiYueI6afIGJAikltpbk++3nr+RQwJC1VHxhGzT/hdQ2q00xiIu9eZCePEbD4k1 HAOjfs4pLDpswjjf6eT3Dd7qIoGbuFr+0ouxWwS/F+kizgKcUQP5OZ3wlfAg5HCz776R G4+Q== X-Gm-Message-State: AOAM53107hpoygo+lspZcD34MN7px2ZKZl3RRO6XiX2qkLZSMQ+MBV8g xuoO+Cg+iL1j3uXPlbmUabPle7V2O3Lh92Ez X-Google-Smtp-Source: ABdhPJwbx0cypxm6VslmAJhjF5eZOkDAIhzHgTN0qjRajGWgg1Dm9mDEx5p1zwwK0T7aDS4sCBWv6g== X-Received: by 2002:a5d:4248:: with SMTP id s8mr19264956wrr.161.1604947457904; Mon, 09 Nov 2020 10:44:17 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u5sm323735wml.13.2020.11.09.10.44.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:17 -0800 (PST) From: luca.boccassi@gmail.com To: Beilei Xing Cc: Jeff Guo , dpdk stable Date: Mon, 9 Nov 2020 18:40:42 +0000 Message-Id: <20201109184111.3463090-54-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix flow director for eth + VLAN pattern' has been queued to stable release 19.11.6 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.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 11/11/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. 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/0d41210ce1b01327d7896a34fc39d090d5843235 Thanks. Luca Boccassi --- >From 0d41210ce1b01327d7896a34fc39d090d5843235 Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Tue, 27 Oct 2020 14:21:47 +0800 Subject: [PATCH] net/i40e: fix flow director for eth + VLAN pattern [ upstream commit 81aebb47d1895ae34c7469faa2544433cc9bf6a6 ] Currently, can't create more than one following flow for ETH + VLAN pattern. 1. flow create 0 ingress pattern eth / vlan vid is 350 / end actions queue index 2 / end 2. flow create 0 ingress pattern eth / vlan vid is 351 / end actions queue index 3 / end The root cause is the vlan_tci is not set correctly, it will cause the keys of both of the two flows are the same. Fixes: 42044b69c67d ("net/i40e: support input set selection for FDIR") Signed-off-by: Beilei Xing Acked-by: Jeff Guo --- drivers/net/i40e/i40e_flow.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 7fe22e3007..d650544900 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -26,7 +26,10 @@ #define I40E_IPV6_TC_MASK (0xFF << I40E_FDIR_IPv6_TC_OFFSET) #define I40E_IPV6_FRAG_HEADER 44 #define I40E_TENANT_ARRAY_NUM 3 -#define I40E_TCI_MASK 0xFFFF +#define I40E_VLAN_TCI_MASK 0xFFFF +#define I40E_VLAN_PRI_MASK 0xE000 +#define I40E_VLAN_CFI_MASK 0x1000 +#define I40E_VLAN_VID_MASK 0x0FFF static int i40e_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -2564,12 +2567,22 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, RTE_ASSERT(!(input_set & I40E_INSET_LAST_ETHER_TYPE)); if (vlan_spec && vlan_mask) { - if (vlan_mask->tci == - rte_cpu_to_be_16(I40E_TCI_MASK)) { - input_set |= I40E_INSET_VLAN_INNER; - filter->input.flow_ext.vlan_tci = - vlan_spec->tci; + if (vlan_mask->tci != + rte_cpu_to_be_16(I40E_VLAN_TCI_MASK) && + vlan_mask->tci != + rte_cpu_to_be_16(I40E_VLAN_PRI_MASK) && + vlan_mask->tci != + rte_cpu_to_be_16(I40E_VLAN_CFI_MASK) && + vlan_mask->tci != + rte_cpu_to_be_16(I40E_VLAN_VID_MASK)) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "Unsupported TCI mask."); } + input_set |= I40E_INSET_VLAN_INNER; + filter->input.flow_ext.vlan_tci = + vlan_spec->tci; } if (vlan_spec && vlan_mask && vlan_mask->inner_type) { if (vlan_mask->inner_type != RTE_BE16(0xffff)) { @@ -3423,10 +3436,10 @@ i40e_flow_parse_vxlan_pattern(__rte_unused struct rte_eth_dev *dev, if (vlan_spec && vlan_mask) { if (vlan_mask->tci == - rte_cpu_to_be_16(I40E_TCI_MASK)) + rte_cpu_to_be_16(I40E_VLAN_TCI_MASK)) filter->inner_vlan = rte_be_to_cpu_16(vlan_spec->tci) & - I40E_TCI_MASK; + I40E_VLAN_TCI_MASK; filter_type |= ETH_TUNNEL_FILTER_IVLAN; } break; @@ -3654,10 +3667,10 @@ i40e_flow_parse_nvgre_pattern(__rte_unused struct rte_eth_dev *dev, if (vlan_spec && vlan_mask) { if (vlan_mask->tci == - rte_cpu_to_be_16(I40E_TCI_MASK)) + rte_cpu_to_be_16(I40E_VLAN_TCI_MASK)) filter->inner_vlan = rte_be_to_cpu_16(vlan_spec->tci) & - I40E_TCI_MASK; + I40E_VLAN_TCI_MASK; filter_type |= ETH_TUNNEL_FILTER_IVLAN; } break; @@ -4274,7 +4287,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev, vlan_mask = item->mask; if (vlan_spec && vlan_mask) { if (vlan_mask->tci == - rte_cpu_to_be_16(I40E_TCI_MASK)) { + rte_cpu_to_be_16(I40E_VLAN_TCI_MASK)) { info->region[0].user_priority[0] = (rte_be_to_cpu_16( vlan_spec->tci) >> 13) & 0x7; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.279555026 +0000 +++ 0054-net-i40e-fix-flow-director-for-eth-VLAN-pattern.patch 2020-11-09 18:40:11.187312154 +0000 @@ -1 +1 @@ -From 81aebb47d1895ae34c7469faa2544433cc9bf6a6 Mon Sep 17 00:00:00 2001 +From 0d41210ce1b01327d7896a34fc39d090d5843235 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 81aebb47d1895ae34c7469faa2544433cc9bf6a6 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 8e7a9989b3..5bec0c7a84 100644 +index 7fe22e3007..d650544900 100644 @@ -30 +31 @@ -@@ -27,7 +27,10 @@ +@@ -26,7 +26,10 @@ @@ -42 +43 @@ -@@ -2705,12 +2708,22 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, +@@ -2564,12 +2567,22 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, @@ -70 +71 @@ -@@ -3894,10 +3907,10 @@ i40e_flow_parse_vxlan_pattern(__rte_unused struct rte_eth_dev *dev, +@@ -3423,10 +3436,10 @@ i40e_flow_parse_vxlan_pattern(__rte_unused struct rte_eth_dev *dev, @@ -83 +84 @@ -@@ -4125,10 +4138,10 @@ i40e_flow_parse_nvgre_pattern(__rte_unused struct rte_eth_dev *dev, +@@ -3654,10 +3667,10 @@ i40e_flow_parse_nvgre_pattern(__rte_unused struct rte_eth_dev *dev, @@ -96 +97 @@ -@@ -4800,7 +4813,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev, +@@ -4274,7 +4287,7 @@ i40e_flow_parse_rss_pattern(__rte_unused struct rte_eth_dev *dev,