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 24182A0A0E for ; Mon, 10 May 2021 18:21:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1EAB04003E; Mon, 10 May 2021 18:21:44 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2070.outbound.protection.outlook.com [40.107.95.70]) by mails.dpdk.org (Postfix) with ESMTP id 3486F4003E for ; Mon, 10 May 2021 18:21:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=adVLsuFCHnn2+gSw887yOtoe6Z4ZyOb/C39dkb2cyHAycPjsS0fIV9tvZmxdCdQQc/kLpkG3S2+/95ieChLz3MQHyfz0XPUq/isErWN29KDtLLP9vuG8OtohvOUb6OWTlCwCtxZ3c0aBcz1H/bb0Ydu0apZP6zOp/zfjvCxf1HgquFOKsYSf/ZZlU2AfR/turneU6xI3RQj49CyhdpyEL5bOmtU2TkSFslaUuoTL/HZlXDQHEYToFTQybaR2hmFT1Z5htJUR/1tsZl6tY/rF7PeJkdn4EXyK19Ma96bqM2aynCbctUIGertRi4RmkTXuVr9s7YEx35mmed30ySjaeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0U0V6ivJgewrpcC2TpDnrYsYCtnaE6wrK2cz+i4IhVo=; b=UQiRJ1+VoKvhtvx89u1SvA2k6u7gALN/1ZP2WJvvh+4NkEs+3MHXrRNzdcTN4dJANB/x/uz73k3dulCF6P4wRIjE7aBSuCU9QOrlLBtZbohTKthOEz+gofy3ODm6tII0azlgiKHwsbFMkm0RmKMmVrS6lq2YbZVpHIQ2DZLkansJPTwE0sqgfDvtrAvsBjcsp0OKHqtEHMOduHwTlQPWUX4DlvDpK+dVJZqyKhU1X2pQ7g0/fuejwZtdP5VCW2Vtc1owyTA8YekD4Q9xQb4tuz72AIh8rCMjuD/4T4TblJj3GZ0wK6XP3m2Y6la7QijyNPjU0A7lH0g63HuI8ajjYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0U0V6ivJgewrpcC2TpDnrYsYCtnaE6wrK2cz+i4IhVo=; b=O5AkPXOHJuy5Y1Cfeg9Zpx7Ap5QvvMmzdDlMjeTZ8q4p1TXDrxW6vz8ayup1EllyN77HOOB5e6R2lOvgF0IU+Ciu/C2x0VmKd82VTbZ4cSOmitkmk6RziPxHLPBgYj/J8dEWPhrzKD7yp4LPys5tNIQTX3Jrg1qieikOXOo0/Tl9+tdTZooSDKxWml2tOS89pmj8wFLcAgQtZM4lgDpPq1pdQKsvQAPmMH/v5NiSYcbb4G7aZ5M25UuHgWHI/mBByz2RI344L2+Mv1IE9/Y3QwUlX9V6fb3GHoeVHxeZMJoVzVkdy3VWDYUyYNIPpGCuSEC8WollVu1mV4Z4Rqvb3g== Received: from BN8PR15CA0063.namprd15.prod.outlook.com (2603:10b6:408:80::40) by MN2PR12MB4342.namprd12.prod.outlook.com (2603:10b6:208:264::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:21:40 +0000 Received: from BN8NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:408:80:cafe::f0) by BN8PR15CA0063.outlook.office365.com (2603:10b6:408:80::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT060.mail.protection.outlook.com (10.13.177.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:40 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:21:27 +0000 From: Xueming Li To: Xiaoyu Min CC: Luca Boccassi , Matan Azrad , "dpdk stable" Date: Tue, 11 May 2021 00:02:14 +0800 Message-ID: <20210510160258.30982-185-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 12fc6124-89f5-439e-c790-08d913cfb18e X-MS-TrafficTypeDiagnostic: MN2PR12MB4342: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cbW+2lBOUN09NTZ+h9nSBIltCuiEgXrbyyjzWvOzLpVmKDl5jbeg5g53bJf3z0uYmjhLFIVYkKWhLk0BUEPzDrH13OFa7XnSo1XKfInsjQvoHDMiEYlTV0o3fI/z/bTs0ql/4slfR8+HS2Em2g/iDPCI8B/VYHkBIcqYB0VKu1UgHG3aQACRvvwGeSvFbbO+vYad9jgbdEFom0wDHpssUEzwbdGIdIshvculBAJIuTUehPjhpsFFMzdjhFTvv5SFadGO9+VeLFHTQXdkviyc7EYRCdz9EoP+YcbqjRqBr73GsxmxbbCI2ZxXozA8YtqivaoKtTL9vrShw8RAC+/kSi3gLz636y/81fnVuN0dFlqJQHyIRQlc0Aq+opbDKgoEoMt6SAMPBmyNjaw20qDFJdl6jCW6JioidBs9rICNKD+YiZveD51tMLQoZF1ywVAx34XU82qT75YhvApbMFNCutGFgRRrRsKHgzsiSoVYLvHVr+4p7eLBs2FIDBZxNrcAXYvfm5U8CkopRnlPGbnpvIMoi3AIu3pi4k2nh3jJc/sPh+Pp9kW++DSNuPDU9LMc7aQoO9SWQpkU9IzYccC03PK+N/E1t+BTun92wfFIS297l29LNMDwdYxDKJwSczK6ygi1yFtUu+cxZNndlzkJVhm4hQYkK8oaRiU0avIIbtHte//8bnm9/rYlurpwxjK/SgJjytyWDPxmEfLhmGoihMUIH9vstm9rYObm3HYdOIw= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(376002)(396003)(346002)(39860400002)(36840700001)(46966006)(47076005)(966005)(70586007)(2616005)(70206006)(7636003)(86362001)(478600001)(82740400003)(336012)(186003)(5660300002)(16526019)(4326008)(356005)(7696005)(36756003)(55016002)(6636002)(36860700001)(8936002)(2906002)(6666004)(82310400003)(6286002)(8676002)(37006003)(6862004)(426003)(1076003)(36906005)(53546011)(54906003)(316002)(83380400001)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:21:40.5979 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12fc6124-89f5-439e-c790-08d913cfb18e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4342 Subject: [dpdk-stable] patch 'net/mlx5: fix redundant flow after RSS expansion' has been queued to stable release 20.11.2 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 20.11.2 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/12/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/fb455a8129a59c07719a6092aaaa96bfd310fadc Thanks. Xueming Li --- >From fb455a8129a59c07719a6092aaaa96bfd310fadc Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Tue, 30 Mar 2021 21:40:32 +0800 Subject: [PATCH] net/mlx5: fix redundant flow after RSS expansion Cc: Luca Boccassi [ upstream commit c1d397a67eed3b9d7adce5e73c5352de040b3b65 ] When RSS expand, if there is no expansion happened but completion happened because user only input next protocol field instead of item i.e, ether type == 0x8100 instead of VLAN, an extra flow is created with missing item in order to filter traffic strictly. However, after [1] and [2] the rte_flow_item_eth itself is enough to filter out VLAN traffic, the VLAN item is not needed. [1]: commit 09315fc83861 ("ethdev: add VLAN attributes to ethernet and VLAN items") [2]: commit 86b59a1af671 ("net/mlx5: support VLAN matching fields") This redundant flow will cause failure in some scenarios on group 0 due to they are the same FTE. Fixes: fc2dd8dd492f ("ethdev: fix expand RSS flows") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 2fe810c6b5..5c2712329b 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -385,22 +385,6 @@ mlx5_flow_expand_rss(struct mlx5_flow_expand_rss *buf, size_t size, } node = *next_node ? &graph[*next_node] : NULL; }; - /* no expanded flows but we have missed item, create one rule for it */ - if (buf->entries == 1 && missed != 0) { - elt = 2; - lsize += elt * sizeof(*item) + user_pattern_size; - if (lsize <= size) { - buf->entry[buf->entries].priority = 1; - buf->entry[buf->entries].pattern = addr; - buf->entries++; - flow_items[0].type = missed_item.type; - flow_items[1].type = RTE_FLOW_ITEM_TYPE_END; - rte_memcpy(addr, buf->entry[0].pattern, - user_pattern_size); - addr = (void *)(((uintptr_t)addr) + user_pattern_size); - rte_memcpy(addr, flow_items, elt * sizeof(*item)); - } - } return lsize; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.366052200 +0800 +++ 0186-net-mlx5-fix-redundant-flow-after-RSS-expansion.patch 2021-05-10 23:59:26.630000000 +0800 @@ -1 +1 @@ -From c1d397a67eed3b9d7adce5e73c5352de040b3b65 Mon Sep 17 00:00:00 2001 +From fb455a8129a59c07719a6092aaaa96bfd310fadc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit c1d397a67eed3b9d7adce5e73c5352de040b3b65 ] @@ -21 +23,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index 0f1a9c5ed9..b34d2952b1 100644 +index 2fe810c6b5..5c2712329b 100644 @@ -33 +35 @@ -@@ -384,22 +384,6 @@ mlx5_flow_expand_rss(struct mlx5_flow_expand_rss *buf, size_t size, +@@ -385,22 +385,6 @@ mlx5_flow_expand_rss(struct mlx5_flow_expand_rss *buf, size_t size,