From patchwork Wed Nov 23 11:57:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 120117 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 079A3A0542; Wed, 23 Nov 2022 12:57:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B82CF42D89; Wed, 23 Nov 2022 12:57:35 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2054.outbound.protection.outlook.com [40.107.94.54]) by mails.dpdk.org (Postfix) with ESMTP id 7E6DD40E5A for ; Wed, 23 Nov 2022 12:57:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lZ9e2h8GvlgD+AeiBS2CGCwXpS+0OcAhcRxU0nrRoJhWJJWKGGG0wkZodKrwA4xaBG1xRs7fuxM/WJrkZrT89XJg81GPl1Bqttp0jRwlRa2pCalhSi3w4hp4/BIr91IXOZICVs9uBrrj+AzliBpQgK0pQlZLNNZ2DeCP5vNTotMjdBdBWkixkcucWF7/IpYCOIt7B90wu07Zz00JLp+NqXTAL7iT4KUmwITX0cZgHzBwPyFexSfTjY75ggL95oA5ANGfTRTAzMOooZVKuuyqwkPa2zMBIpZg6G7vGgm1AGL0kdkyJlB8pX++/Trb6ztuASggbheg6gJfNV1fYJQUMw== 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=5/Nn6F7xzTnI5UcmkVZ2z+Gb0eRM5K6WeUXIq+v3+UQ=; b=EB3DIuDgg1KisnqhBQtKWJ1tmIcrbfDvVVhjrnjewhf3BV445pzB4RGdF3Jo9JjJjJQZgFksrq4/voCoX2bl0ekeGxsmLZX8969AkrEdUXLLCdz/Ybs9lMfavpoVvjRCeTQOPPeoRNhMaJX288nNr2MuBGZRq67YqZVSgKUczt6smMqSmakp+SJ0Guzcf1VYN6ay3WzpffrUy7v+2gqD1NXXJ7gNqSb++uwAB5hOiWLCi7uE89kYzWh88fSyklXlIuB3Wf988Ep7mpNQtY6Jx9TpLgFNAfLfzBvCaV1d+5kFIvSQR4YNsK6lQDdi7cCV+VaEm/jxtPEsZRkVnjWgKw== 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=5/Nn6F7xzTnI5UcmkVZ2z+Gb0eRM5K6WeUXIq+v3+UQ=; b=R6GLtSyvb4U23RYNHE156nooN23DsbiPZEwcIRNiNGzCfGk0lNzndvMWvEPLZP1zQVqpBawx6wvKr1EbCHxETUUvoI66Z7pEjW+FHRVsdH9MXZtQi5lBlF1iqKvH/T6Ptt9GzOg6oPavEsQeiIPSqKz5CGk2Xh9P0Xgv3g86MEadzU2ppWJjjtO2lPL0Ku/b0oUtuqKcZqzkemc/p7n8Khgm4mejEcZcPfSTCum9gVcd+YfIDBJ9/flPlSmzFRD51fVeYPqLsiJO3YF6WZ2ZgRnBUXalHkPK6o04z8EUwlj6y5pTIVUpD7rtrI33QtmHFjzOqFCOH+Zi8+EqrHECdA== Received: from MW4PR04CA0250.namprd04.prod.outlook.com (2603:10b6:303:88::15) by BL1PR12MB5351.namprd12.prod.outlook.com (2603:10b6:208:317::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.18; Wed, 23 Nov 2022 11:57:32 +0000 Received: from CO1NAM11FT096.eop-nam11.prod.protection.outlook.com (2603:10b6:303:88:cafe::59) by MW4PR04CA0250.outlook.office365.com (2603:10b6:303:88::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.18 via Frontend Transport; Wed, 23 Nov 2022 11:57:32 +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 CO1NAM11FT096.mail.protection.outlook.com (10.13.175.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.8 via Frontend Transport; Wed, 23 Nov 2022 11:57:32 +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.36; Wed, 23 Nov 2022 03:57:27 -0800 Received: from nvidia.com (10.126.231.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.36; Wed, 23 Nov 2022 03:57:25 -0800 From: Suanming Mou To: Matan Azrad , Viacheslav Ovsiienko CC: , Subject: [PATCH] net/mlx5: fix GENEVE resource overwritten Date: Wed, 23 Nov 2022 13:57:12 +0200 Message-ID: <20221123115712.808661-1-suanmingm@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT096:EE_|BL1PR12MB5351:EE_ X-MS-Office365-Filtering-Correlation-Id: 6fa131a7-8585-4df6-44ce-08dacd49e73c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cKtHM4QP/EMb8yUC0TguleLUtRCXMRun9cAzM6lE3KdCjGN/Yn0ofVkJbHtiG74zPt+kofTpJnpdByjRc3R/FdsmZh1fnnn0NKhUCRs1UHBMBy2NXZZrr2hsoCTEsDArOKeguyFYT1QMHSv/4dGMWt8mhCV814kWFXBtgrTMILwbPP2tQrUw3mM9AK0S86mUbKwjewFYYp1Pnpcv6kshkhPP1vaN6+HJo0fF6W45vZm7X0RKgddyn5uudc01JxUeeEemXw9sVkdjH31hp6V9mrx16PUoPyG81eg3tnzLOlTuhL37kcIYu6liwQrO3PvDEuh997W9UX2MdvPVNDP2yKGkalbbKxCfupNF3dSLcZygO8XsAVOAWIbBPv8RQZr4YyzYuYIfiN58MK55uuJSugp9n6B1FUz9QTsQhnRGHMLAWG2gRS9c4co9+kLpyl6UXrHiyV8odfGSIN49/bKoeT05NCEoachkZI0/duIvN7WdoH2t+IFfiqwXqcP2YD6+xFmcp3CMOVcW+bSUyg0DAGSQI0XTWx5m1Qk6dgDwMOKc0WHQIaf6k9TnhH4bV1GouAy2OKUaYVKRq8YmQoHuW/moks8x34XxzqFUzpXd1jMDsnz9v3BLFLHM+BL45DqqNtj0Y1uiEXwWbTVlbrDxuK2qADU0AKGCWjy3G/qIYzWirbyHYTEfioNTJrjVC/nGFdg5tJ4ejpczyBw2//HlJQ== 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:(13230022)(4636009)(39860400002)(396003)(376002)(346002)(136003)(451199015)(36840700001)(46966006)(40470700004)(26005)(83380400001)(16526019)(6286002)(47076005)(186003)(426003)(336012)(2616005)(1076003)(82740400003)(356005)(7636003)(36860700001)(5660300002)(2906002)(40460700003)(40480700001)(55016003)(82310400005)(8936002)(478600001)(6666004)(107886003)(7696005)(110136005)(8676002)(4326008)(41300700001)(70206006)(316002)(6636002)(54906003)(70586007)(86362001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2022 11:57:32.1046 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6fa131a7-8585-4df6-44ce-08dacd49e73c 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: CO1NAM11FT096.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5351 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 Currently, one rte_flow may be split to multiple sub mlx5_flows. While GENEVE option resource was allocated in the first mlx5_flow, the flag will be overwritten by next sub mlx5_flow. This caused GENEVE option resource leakage. This commit adds the check of GENEVE option resource to avoid the GENEVE option flag be overwritten. Fixes: cd4ab742064a ("net/mlx5: split flow item matcher and value translation") Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 62c38b87a1..7ca909999b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -13717,7 +13717,12 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, * is the suffix flow. */ dev_flow->handle->layers |= wks.item_flags; - dev_flow->flow->geneve_tlv_option = wks.geneve_tlv_option; + /* + * Update geneve_tlv_option flag only it is set in workspace. + * Avoid be overwritten by other sub mlx5_flows. + */ + if (wks.geneve_tlv_option) + dev_flow->flow->geneve_tlv_option = wks.geneve_tlv_option; return 0; }