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 0FFBC42D46 for ; Sun, 25 Jun 2023 08:44:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0AE9A42D0B; Sun, 25 Jun 2023 08:44:03 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2081.outbound.protection.outlook.com [40.107.94.81]) by mails.dpdk.org (Postfix) with ESMTP id 540DE40ED8 for ; Sun, 25 Jun 2023 08:44:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DnTNgC8XJNHQbxnujrzx6cB0/Br3nl6YhT2CwJ20GgT2kKqmrNi9/CpUKIsu0al5TiAahep0BVAzcAjCDopl6S1APPGFVQ3sSp5yqjhMKJ6/8ilhcF6Nm2zhkoE8c8RcxhVeV8meFyGYOvre5Os53enlwVA1KFzC57GuMHsY93oQabLuPB1sZ96DJawJGtyAPHcxihtVg6nBUXqE/L+coQjLtWcuyhL8P0B7rqm/Td6g2YmbNB3UNSIjxq4hk8kWp16LKRf2/vdg+aVNW5tuYP7SjzjfTwxR9BO7zA0t4RY9UCeHTjv2JlXA54lxZgQRa3GiRORDItVn5CIBxL7xnA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3tScsi4VE7Edh9PcxJTMklmE/SPCwizp4u8TnruQcLo=; b=FMfF+OJlEY8MUdiAclXyb+aiLP6G3MFoHbTkFaBuTssSWpKolpDQWt9E9BMopL+yyQUiV0iO6Ks0Io/OpEVdLMNlsZzMWFDhrX6/SsAWhCiO7Hy+vn0XxN8BSN8wvtmW/jnv8KCVD6YWs4qt7Obf4WB7VBqYQVKa0jppz4ybNMd0mq7QyqEvNc/SOXcz+t+g3WRwKO3/s4+rU1sH/DWJttPpuIagSka+fYSpzVPy8Yto+bcd2kcErqW1KJ2siLU3L45t8KlhwNIHQ8y98oeUxGu0yDnom3PgjqSTaWn05DZwQ8ubTYcdLpXx4Yruy2cxHLRNO59XjJLbwE0BHdcYSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=3tScsi4VE7Edh9PcxJTMklmE/SPCwizp4u8TnruQcLo=; b=MZWauW+qHoFv8YZv0iP3J9LXQrb58dlBk3FGgrerH20sv/SdZBTFRfWuDx+1eQLvqVX1ti1HF6CYArNNTvgrvaCUjTCCn8IlfObDBMhaH5HwBcnv0jLBrDvZEhbDJVtmHpcPOyt+dywcyEPAWlYKzL0V2f4DAiMXjO9U81dmQoO7P0/pmqulZvt1HYJv1lRngxpnbshSfz/lP1ySQeRNTERQ5XJBehZ5l3ZnRn7ws219TIU+tLkVD73vXJztjAoYrFNkMPhHRCgcsRnSsXgUj4zaviYPoBX9/9Mj71RTKP5wQo8SOB+elvrJ9OpFm/DjacqjuNAoD6Ij92PbwzVjoQ== Received: from MW4P223CA0022.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::27) by DM4PR12MB5229.namprd12.prod.outlook.com (2603:10b6:5:398::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:43:59 +0000 Received: from CO1NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:303:80:cafe::2b) by MW4P223CA0022.outlook.office365.com (2603:10b6:303:80::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:43:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT009.mail.protection.outlook.com (10.13.175.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:43:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sat, 24 Jun 2023 23:43:50 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sat, 24 Jun 2023 23:43:48 -0700 From: Xueming Li To: Rongwei Liu CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix duplicated tag index matching in SWS' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:09 +0800 Message-ID: <20230625063544.11183-92-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT009:EE_|DM4PR12MB5229:EE_ X-MS-Office365-Filtering-Correlation-Id: 787a8dd9-3103-4033-8ffc-08db75478e24 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kBHFp5kTu4Iu37upOwBFdJzbcRbvzhzFPliSTU2V/YYTh9Bv6Qn/BAwb0aGg+lbpPuSzQxQUXWhg/y+i7kanx4vWTm9/GPQ16hFjHzWQxsEZapzkjLzwLokK/PmaYwXxed+X4Jt4q0Qo0Hno0w9iPiuS77RdEa6RR5NxfdI0PwanAwp8SBsi4Mlr3ze9sblGKJjyuvN/YvlfhNmsBNq1POtc+e4Ojn2i/XwdkZwssSKgEbzVuJH3ID/IcS7eyw9x44tm8iDLxPPkJLRL+dC1EdwG1Uy5DJgqAh8kdCHpgRopH/wrpC5LoEQjb6zQYuyy/kfctfNW/zepWIMkSV3U9MBr61yXfPOFXTkjS0xy+qv5oh8hlodHWVrKwPcO18Q2Zua9qNj15pf6eWAVJBKpwdf9vTa01iX/wTiVKALY1MFqkl1TkjSVPEQHBnYtXJEl1FClPQkmQd78S0LOutU7uSjap2EvRNWKtD53OIP6TU9obokF1DfhSdx8emgsnaSo8bK/kz/H+uy1zpKrdVVB+JOjduDwKb18unI4/+73OHLRLQyLiiMOZpjJRlbLvphqU+YYb6Nxpcm887Lzh2djMkz8PpWsN3Z8KU5xckLY6x67Ny8iyhHlS06F2N6cvckoO4Qs/KjEXVxJwJohj7KIjn8yzyOU4gov806qI0TQICTddxIe4hJ098oZ4QbbbPe6UBn/MAyAZUwicrCxxVRDJpNvqnz2g0D2l3+e25SvTxezhDi3gjVPLU7ug2PtGNrXrS+3nM9BXFdGsqBEtTflsQ== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(376002)(396003)(136003)(39860400002)(451199021)(40470700004)(46966006)(36840700001)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(6666004)(37006003)(54906003)(2616005)(426003)(83380400001)(336012)(53546011)(1076003)(26005)(6286002)(186003)(16526019)(2906002)(5660300002)(40460700003)(36756003)(6862004)(70206006)(356005)(4326008)(6636002)(7636003)(70586007)(82740400003)(55016003)(40480700001)(8936002)(8676002)(41300700001)(316002)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:43:58.9852 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 787a8dd9-3103-4033-8ffc-08db75478e24 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5229 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.3 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/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=b53417d63b259a1e8b43303f7077231f81a69c21 Thanks. Xueming Li --- >From b53417d63b259a1e8b43303f7077231f81a69c21 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Tue, 16 May 2023 08:43:29 +0300 Subject: [PATCH] net/mlx5: fix duplicated tag index matching in SWS Cc: Xueming Li [ upstream commit d5a7699c10651cb1cea2b18f94099e984c466b75 ] Duplicated matching tag index is not allowed in SWS because they are using the same matching field in the underlayer layout. For example: "tag index is 0 data spec 0x12 mask 0xff / tag index is 0 data spec 0x1234 mask 0xffff" is paradoxical matching condition and "tag index is 0 data spec 0x12 mask 0xff / tag index is 0 data spec 0x3400 mask 0xff00" should be "tag index is 0 data spec 0x3412 mask 0xffff" Add checking logic against it. Fixes: e554b672aa05 ("net/mlx5: support flow tag") Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 485afdf5ca..3d252f736b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -2129,6 +2129,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, * Pointer to the rte_eth_dev structure. * @param[in] item * Item specification. + * @param[in] tag_bitmap + * Tag index bitmap. * @param[in] attr * Attributes of flow that includes this item. * @param[out] error @@ -2140,6 +2142,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, static int flow_dv_validate_item_tag(struct rte_eth_dev *dev, const struct rte_flow_item *item, + uint32_t *tag_bitmap, const struct rte_flow_attr *attr __rte_unused, struct rte_flow_error *error) { @@ -2183,6 +2186,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev, if (ret < 0) return ret; MLX5_ASSERT(ret != REG_NON); + if (*tag_bitmap & (1 << ret)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, + item->spec, + "Duplicated tag index"); + *tag_bitmap |= 1 << ret; return 0; } @@ -7051,9 +7060,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, bool def_policy = false; bool shared_count = false; uint16_t udp_dport = 0; - uint32_t tag_id = 0; + uint32_t tag_id = 0, tag_bitmap = 0; const struct rte_flow_action_age *non_shared_age = NULL; const struct rte_flow_action_count *count = NULL; + const struct mlx5_rte_flow_item_tag *mlx5_tag; struct mlx5_priv *act_priv = NULL; int aso_after_sample = 0; @@ -7371,7 +7381,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, last_item = MLX5_FLOW_LAYER_ICMP6; break; case RTE_FLOW_ITEM_TYPE_TAG: - ret = flow_dv_validate_item_tag(dev, items, + ret = flow_dv_validate_item_tag(dev, items, &tag_bitmap, attr, error); if (ret < 0) return ret; @@ -7381,6 +7391,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, last_item = MLX5_FLOW_ITEM_SQ; break; case MLX5_RTE_FLOW_ITEM_TYPE_TAG: + mlx5_tag = (const struct mlx5_rte_flow_item_tag *)items->spec; + if (tag_bitmap & (1 << mlx5_tag->id)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, + items->spec, + "Duplicated tag index"); + tag_bitmap |= 1 << mlx5_tag->id; break; case RTE_FLOW_ITEM_TYPE_GTP: ret = flow_dv_validate_item_gtp(dev, items, item_flags, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.950336700 +0800 +++ 0091-net-mlx5-fix-duplicated-tag-index-matching-in-SWS.patch 2023-06-25 14:31:58.515773900 +0800 @@ -1 +1 @@ -From d5a7699c10651cb1cea2b18f94099e984c466b75 Mon Sep 17 00:00:00 2001 +From b53417d63b259a1e8b43303f7077231f81a69c21 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d5a7699c10651cb1cea2b18f94099e984c466b75 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 9ef9f13cbb..27e8b3a5a9 100644 +index 485afdf5ca..3d252f736b 100644 @@ -30 +32 @@ -@@ -2295,6 +2295,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, +@@ -2129,6 +2129,8 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, @@ -39 +41 @@ -@@ -2306,6 +2308,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, +@@ -2140,6 +2142,7 @@ flow_dv_validate_item_meta(struct rte_eth_dev *dev __rte_unused, @@ -47 +49 @@ -@@ -2349,6 +2352,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev, +@@ -2183,6 +2186,12 @@ flow_dv_validate_item_tag(struct rte_eth_dev *dev, @@ -60 +62 @@ -@@ -7280,9 +7289,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7051,9 +7060,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -72 +74 @@ -@@ -7611,7 +7621,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7371,7 +7381,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -81 +83 @@ -@@ -7621,6 +7631,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7381,6 +7391,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,