From patchwork Tue May 16 05:40:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 126860 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 552D142B1C; Tue, 16 May 2023 07:41:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A912B42D38; Tue, 16 May 2023 07:41:30 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2068.outbound.protection.outlook.com [40.107.244.68]) by mails.dpdk.org (Postfix) with ESMTP id BB67440A7A; Tue, 16 May 2023 07:41:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EXwnpgbG8+Yoh6D0O8j0Ayzx4Z30H33e+5m4kJ+Knokj0dvSXa5QwXvmoeEMbUjGMgtNpuSAEAZ0c+j0JxIun8JAJXxEAKz0qwrrQYYJjB8/huDwWj6Z+wF9por+ISjRHG/BUR3ezxr781E2YB5dzOUMDCrxNqSe7RQAhrwnbPVKSzccatOFvQQvEDyODIieVdgTmlsaPZrYWGS8ox22T4Rx4Ud3BL5UoIjWin/JoCLp7yyzIp8J9I8SHYWcUZYC0wD/3iHxlslglJNWvsy2M88Wf0uB5n0DnozwWT4bBOu9gENpyBr7KeyvRdYIFreEo+IR+Nx8OWrewbUpU4prww== 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=V9x0vrq8RL9a5OaHxWIesdjkms5RqpzDDItB14StTGI=; b=ca9wGlzib0HKlIHjaPj86MyaQWQL8DKFscKZFtfWLQK4zp2DXE0UYpcMJ/94C43MSna8ls9fkw9YCyBBHbUg0hfiC3Q+Xo+JEQOZK4J6IIu2awPkRxz3w8dtIJD2Mz0hqoQq6kQ8jowqVl2IUNJrJC5pX2RnaJubS9EGZmrBhAucMN1JZJMXEKygxqLtKjXccSkxxVxkUrHxlYu8DtZGMOsWWKCGqHVgouCzmeJhxXMoOyYGJfrdE6NIL/bKnL4hJxJfuoAWB0H2aAV812PC/FCgKKRbYivSWYlUnIS3rkDZ76IeG9X0BuL7dD9QcWHipj30lFszAvMHH4oQ4GVI+g== 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=V9x0vrq8RL9a5OaHxWIesdjkms5RqpzDDItB14StTGI=; b=FEAiY0oDeNTkgfjULsYXYw4BC1t2SlgQhVMGA7wSBYKzwvFMb117S21yEc0akSQKCmcyPc9P+qiR+pvE5ALGUhD3I8ek5aTy0dePZyFKhm05zq2X5vBnfzN2rgzU5BQbj0iOxXbhOjBWFkRbWTbACW39qAPbyn+Gn1c++oybs3F2ZPhZWlFTX3Ow9Xm6SgRq6PtP5CZURFmFhMGAj1lfzRlkHvoIpM1C4rnT1JAa1j0J8GADyU0S/tPHeqHXdkfiTQqYFQGp1QwDWi6N5VNbFdlKyDw2CQhrkO67H2BhUuBElqMGGgZ0vaCcv0B3ravXHw+QE/gT+B7fDXW7ZMHXnA== Received: from MW2PR2101CA0016.namprd21.prod.outlook.com (2603:10b6:302:1::29) by IA1PR12MB6211.namprd12.prod.outlook.com (2603:10b6:208:3e5::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Tue, 16 May 2023 05:41:27 +0000 Received: from CO1NAM11FT088.eop-nam11.prod.protection.outlook.com (2603:10b6:302:1:cafe::6d) by MW2PR2101CA0016.outlook.office365.com (2603:10b6:302:1::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.4 via Frontend Transport; Tue, 16 May 2023 05:41:27 +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 CO1NAM11FT088.mail.protection.outlook.com (10.13.175.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.15 via Frontend Transport; Tue, 16 May 2023 05:41:27 +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; Mon, 15 May 2023 22:41:12 -0700 Received: from nvidia.com (10.126.230.37) 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; Mon, 15 May 2023 22:41:10 -0700 From: Rongwei Liu To: , , , , CC: , Subject: [PATCH v1 2/2] net/mlx5: fix VXLAN matching with zero value Date: Tue, 16 May 2023 08:40:53 +0300 Message-ID: <20230516054053.1396711-3-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230516054053.1396711-1-rongweil@nvidia.com> References: <20230516054053.1396711-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT088:EE_|IA1PR12MB6211:EE_ X-MS-Office365-Filtering-Correlation-Id: 04492973-db0b-4ea4-a980-08db55d03189 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EoIvAyl/fRW8CeZh9UXjEH8/R36p/lJlIfvlrYsnvfbH6O/g64OHM01oe0YONchyYXVCtt1pdIQYqP8vthZqoqYlLKZPZfZsNulqtEd7EsajFNMMLE3JngA0AIoqAJ62DPQY2QIum8QwQYTKoegEhBm2K9WNPFPETjn35ONg4HoJ4UCIrhozUL2u514jUzmITh9LL1CWlfAxI7q968W9Lfly8kU+ITGm0Epekm+wvaGWbIGAf2vIIP8EBhKF9QqJctwmnQF1ROgQbwV6Lhu8MZoaB/zLQYv7xf1DT7ertBYkhSPxFnO0kJ78v6dOcvDYK5/813ccBTsC1Y4ydGbU0afLtBvzWz2XCLh+80ScJT4ebmEKETadt3W81CI3CA0YTUcPk/ukZLIdYzChcdZ55jTa1oJ9fRQdMVy1mkIdNTPTXLjhYGRdbLpn9L6bhwqB8Uzu5U58jSpkA0da+acaZEqDNeClEWweTRNO3HDAlClGhEHDbbwP5ECq1PPWXsgXO2RwWGmlm1eAfcEWTEvkFt5FWNo+/xgwN4TAYDttE6wnaRUxy5PD0keRASXFFsJAQFTpR0Ghg+2YamEL8NBgdbXuMoUrsJb5AzvNdCDXAMygfhij67JzPJ6HVMymcek/HEboaaLYVe+wBhYRjSAY5pnJ+lKo4t4R6eqiYEbjFJfnome4PAquhIaLqAmtPyo2KMlV2Gu4weIe1OInntHDK7sqa0cY+1su9gPdSvLLdxDlXZsnvuKnQnafd57Kjvm7 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)(376002)(39860400002)(396003)(136003)(346002)(451199021)(36840700001)(40470700004)(46966006)(55016003)(86362001)(40460700003)(2906002)(82310400005)(40480700001)(316002)(70206006)(70586007)(4326008)(7696005)(6666004)(36756003)(47076005)(54906003)(478600001)(110136005)(36860700001)(336012)(83380400001)(26005)(8936002)(1076003)(82740400003)(16526019)(186003)(8676002)(356005)(7636003)(6286002)(426003)(41300700001)(2616005)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 05:41:27.4627 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04492973-db0b-4ea4-a980-08db55d03189 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: CO1NAM11FT088.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6211 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org When an application wants to match VxLAN last_rsvd value zero, PMD sets the matching mask field to zero by mistake and it causes traffic with any last_rsvd value hits. The matching mask should be taken from application input directly, no need to perform the bit reset operation. Fixes: cd4ab742064a ("net/mlx5: split flow item matcher and value translation") Cc: suanmingm@nvidia.com Cc: stable@dpdk.org Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index f44d621600..1abc4acad7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9480,12 +9480,10 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, { const struct rte_flow_item_vxlan *vxlan_m; const struct rte_flow_item_vxlan *vxlan_v; - const struct rte_flow_item_vxlan *vxlan_vv = item->spec; void *headers_v; void *misc_v; void *misc5_v; uint32_t tunnel_v; - uint32_t *tunnel_header_v; char *vni_v; uint16_t dport; int size; @@ -9537,24 +9535,11 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, vni_v[i] = vxlan_m->hdr.vni[i] & vxlan_v->hdr.vni[i]; return; } - tunnel_header_v = (uint32_t *)MLX5_ADDR_OF(fte_match_set_misc5, - misc5_v, - tunnel_header_1); tunnel_v = (vxlan_v->hdr.vni[0] & vxlan_m->hdr.vni[0]) | (vxlan_v->hdr.vni[1] & vxlan_m->hdr.vni[1]) << 8 | (vxlan_v->hdr.vni[2] & vxlan_m->hdr.vni[2]) << 16; - *tunnel_header_v = tunnel_v; - if (key_type == MLX5_SET_MATCHER_SW_M) { - tunnel_v = (vxlan_vv->hdr.vni[0] & vxlan_m->hdr.vni[0]) | - (vxlan_vv->hdr.vni[1] & vxlan_m->hdr.vni[1]) << 8 | - (vxlan_vv->hdr.vni[2] & vxlan_m->hdr.vni[2]) << 16; - if (!tunnel_v) - *tunnel_header_v = 0x0; - if (vxlan_vv->hdr.rsvd1 & vxlan_m->hdr.rsvd1) - *tunnel_header_v |= vxlan_v->hdr.rsvd1 << 24; - } else { - *tunnel_header_v |= (vxlan_v->hdr.rsvd1 & vxlan_m->hdr.rsvd1) << 24; - } + tunnel_v |= (vxlan_v->hdr.rsvd1 & vxlan_m->hdr.rsvd1) << 24; + MLX5_SET(fte_match_set_misc5, misc5_v, tunnel_header_1, RTE_BE32(tunnel_v)); } /**