From patchwork Tue Dec 3 20:49:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13892968 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2056.outbound.protection.outlook.com [40.107.220.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D2CD208982 for ; Tue, 3 Dec 2024 20:50:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259022; cv=fail; b=BSdD/z6iv24jZCeIGNapdocYSfAcn5cskEqB+IlFal9WffeGl78uLAa63OVL8AIcJAlypyV9HOjrhnAKOuj3JRyd5rFzoj9pwbK0jSzgXAaHTPPSmRhV+CJYAbmTm0n/d4sIz4VvCu0IUl7kSdBDXxRcX7f/yQqGm5Mp9vBjRBE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259022; c=relaxed/simple; bh=iptCM5v3ga8gQ65h6eC02EyYSG3XxTwnm2EBMZr9vbQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Dd39b4b3qGOIQRBdYHY4SshB9ZPvqGyOOOCVF/1qI1xfpcXsmGl/9Qds+uTAXTnF0/LOv/2qZfkc2c5zLlX1qwhfeNEPZ0GuVSGG6HFmA7zSD6cvHJHgFmBsQyrOzZdHmVEuNu2CL+FUVZm3Vc6j23PUZEx6i6fz3YJf0CpJg2M= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=GETezyNY; arc=fail smtp.client-ip=40.107.220.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="GETezyNY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DKJFXidARJAW6t+rqyeHQWGOqz/n0VujgplSiIMWdFTnvQJgcinKcymjs+xbxhF1TSXGrmlmg4+m7N2qpv+RCvZD00NJjk8Wepu6iLwsn8rGkMFEL+ypY+nlcwMY6Vabqx0U7eeukc0xb8xzxNjusAfKndNHfZg2XUgQFTKGSkS6wv3AuGML+3q37uxjGPThg3LrjdE+YTMCxmm6HIIFJjSCyRI+meSTke4kQ3GqI+j6XfjMeTqfnBNZCwLaynF+O2Q1pORlOTCMuE5E5K0bO/JKTC1B4jT3pmP3AgexcyCQ9JZT+Adhq9/xxHlA1hn2y4DqVaE1YHS4JvFdcCbhDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=LDFlAPiDITW85m0oIbhYBYtoiB1qmxRuRVMLh5ZqSx8=; b=IW1jRnIibEqIzRCGVo2eNLF7S5ALdCnlgBwhR7jVbgNoG8k17cvUIn98gDv4AUSyh8sPz4U7NmodSPk/oJcdVtt5dJacFXBk7LH2QiQoG/mJ/F+cFrF3/NhS7oo5b6usREIjo9Sz9zvHHOhwIsov25tWQXY2zgb9UjpMLvzKDnfCofKGdi/iq91KqH6T2xaiJ/neQlK/Xb9mnJFlG4fjpsV0VDgJYt6ej2VpJE8YGNFJqjZn5qS+iysV4OZnZqbmhydJukze11vBEwZLQIvO8ffk7Nd3lFWMFB9OY+oEnvgUAGn8rsbuS+J4BrSGbF2WhhZ83MZiM0lTztH809ilMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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 (0) 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=LDFlAPiDITW85m0oIbhYBYtoiB1qmxRuRVMLh5ZqSx8=; b=GETezyNYHHBsNR/efJC/6RKHR179/hhi1HUE+RYep4efaT3j75RGp8nEJ5mmvg1j6nir5RBbhl2WooYNOwM4iQeEZWQfAonYeG07iTxpiLeVT0WKWFTPQOARFuAXVlRupKdN7FpyB1iBr5N9NvmyTPo43G1c0AIFiSNcLyexngWBXNMVikS/6zC8erVJxC4qWMkaJd2tXyPKHD30hPHS6OA9hQ0h8FRXl2c13bbufT/VUXkZE8ikv/DI3nZ2UP5huerSCM4slQSXWAfZpuYViFhzIeIK6r+nSE8OjeRnPGjP+07tDcIaGWSQATkKxOAqk/nQivAJEN6A/mQFV19K3g== Received: from MN0P221CA0009.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:52a::27) by IA1PR12MB7685.namprd12.prod.outlook.com (2603:10b6:208:423::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.17; Tue, 3 Dec 2024 20:50:15 +0000 Received: from BN1PEPF00004681.namprd03.prod.outlook.com (2603:10b6:208:52a:cafe::a7) by MN0P221CA0009.outlook.office365.com (2603:10b6:208:52a::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.19 via Frontend Transport; Tue, 3 Dec 2024 20:50:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF00004681.mail.protection.outlook.com (10.167.243.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 20:50:14 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 12:49:55 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 12:49:54 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Tue, 3 Dec 2024 12:49:51 -0800 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Cosmin Ratiu , Yevgeny Kliteynik , Tariq Toukan Subject: [PATCH net 1/6] net/mlx5: HWS: Fix memory leak in mlx5hws_definer_calc_layout Date: Tue, 3 Dec 2024 22:49:15 +0200 Message-ID: <20241203204920.232744-2-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241203204920.232744-1-tariqt@nvidia.com> References: <20241203204920.232744-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004681:EE_|IA1PR12MB7685:EE_ X-MS-Office365-Filtering-Correlation-Id: 31a71819-78ac-4f05-f0f5-08dd13dc1662 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: iDy89sQl18KKCjk5dYjNpFOKOEtPKlDo3lpy5jfrokpHaxzwPxsn980tcDfX9JR9QlZhThbiLOm+Puzr6GvovK6jxT0dPa1VBnLF5qde+YBtLVHAzU6N+8vTPsuOfsZ/G3MjBvUHL5gMn9xJ4QsJNE/7GuFEe1Far2Ako1jfSUfTIY/uKoC+iLaTn51uBTRaDxlGYCtyM3EIZ5HlaznlX4zln5LQZOZ7NouqCNO2pq0q8FBirhs6SLFHZg/cWC3uXld0FE1xKYADDqU28ASw6IIsN/DTMD7Qw+AfitrthBNsgWgqiVlQAEvZDfuBx/jQZ14aRIBpRyWFPfJ+GocR070IePYoIg/uRKMylbDR4/NJTNpkm8oSuLqvYe+7THUuASVSXFoiB8l/Jk2QTWNLhNjukhFaok5HkYdwG9heD5JD9ICUvkF6eFm76wAORPmipp1J8V2H/Deb0BSf9TDAuK2214qB8p5wPPzKuh9iBU9C4duVKlA59ZrcLhd4IK6BXkF21jLuD+Xl6O4FKFfvnLnY61siWXfhkqEEw6fwfbXYwt9Gq5vGfVXAk6agWuFNrCd4GfxrziT6WRw2E2eQt+1syCvpX9/7hi5kbh1HY1bYP/hiR/fteOHDmDpmhJm5guczFPG8JGDtEvPvlnqersHVpzYy4E5aWOdjmI4xYHWaCkOpWr78Kg0hQdscw1rbo+waG6peZJgChyLNLvFZTVyWGZHKK47nqZ4jY1JjXkp1HeDDSl/JoV+u/m+WvybwkENpckoAXSqrJtty2T4vq8ru9zZ4B/0r9hvU5/gS6GRpu6QVbBdEacuXX1KljRTVieCpQVnraBadOIiuvt3qgerasJK/adXbSoajsiie+yo2MP54d/0ywlpTv5+V6QLdRgxvYa2GhU6ZPo26lsjreCz4H91gPte+JXpxAcY1FtGAcPuXGfcHgQRhbi0YMJi/0AYUr23UdQO0eUVnbbh0csxgb+6zQvy7J+NRKaN39cXOD1bmLyNhKFf4P8Xw5CdeYRvCmgNBHk9KarIp4Ss+ImV+DIGIUKBMceQ6rwEeq7/NErfJdMeu2KtruJZ8fPMoiBdhqubWLn8AShylOz9Z1E38ydezCVY/kPP9gDsU4xpWSt3KgYOcWiuobteBPHIesXCDxy9TPqu6UVP+jpKX3SY5Q516p/Exd8z1HJO7lvSKXNrouQnJCAKpP0jxOfIcrFgaoSt4gWrvO8yGbvw4iXzzGs/YTLndyg7jBTa7LOtTQFD466+ImC4IVPLQypqsSlBXbpeVQ9aTzjb/PF62lqEVTmqD+XyNG9UtuL6gg/2rsG2VjRHVRRzvmC6oVVaxhyUWAAHOFmK/JySFhe3VtvKs6X8GrdvGwBrD6ql4UsKqD5yN+mUjbWnUXqp6offF/HgQyJ8LR74uAjrOhA0eYALWDOALhB9bQEqhdQ08yZrvBNTYgcPUDyXngawR0OAn X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 20:50:14.3763 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31a71819-78ac-4f05-f0f5-08dd13dc1662 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.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00004681.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7685 X-Patchwork-Delegate: kuba@kernel.org From: Cosmin Ratiu It allocates a match template, which creates a compressed definer fc struct, but that is not deallocated. This commit fixes that. Fixes: 74a778b4a63f ("net/mlx5: HWS, added definers handling") Signed-off-by: Cosmin Ratiu Reviewed-by: Yevgeny Kliteynik Signed-off-by: Tariq Toukan --- .../net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.c index c00010ca86bd..9fb059a6511f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.c @@ -39,6 +39,8 @@ bool mlx5hws_bwc_match_params_is_complex(struct mlx5hws_context *ctx, } else { mlx5hws_err(ctx, "Failed to calculate matcher definer layout\n"); } + } else { + kfree(mt->fc); } mlx5hws_match_template_destroy(mt); From patchwork Tue Dec 3 20:49:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13892970 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2088.outbound.protection.outlook.com [40.107.244.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3175E207A0A for ; Tue, 3 Dec 2024 20:50:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259024; cv=fail; b=XhzQFX1B25bPmN2ZYcfU2liOYKp3EQ0ZUoUO6fUImEXpi6sYg8y8RNgC/QTD2rr8B00P2giiYiIk5CdBbeOJf/p+Kdje62VM0FzPNqw2oGBlSR+faHLOf//9Kgx78Y87xW5z/pgO3d96YBSVN4p4qKppyRgXY/ErDJststx37hU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259024; c=relaxed/simple; bh=iytt+XPlSsqRu3Pq4Y/35UxkbBnhogG1DviI/K7KoLk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JizhDGX6arUQl2/p6+taD/zPHKpf8TEwUauMseQDhB0qrqtzFTVga1ij/TjhViilzcx4MJI6y5wi6andJ5+/fFpZUyNwBXZU31V4RzRohgSK0BuCH2d3VpiAeV8gD5JKPGpuWb6kaZ0To/S5YJDKqs6SwvnQvIEHDvi2EzZ8BH4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=rdxYfTxg; arc=fail smtp.client-ip=40.107.244.88 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="rdxYfTxg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Bt8xDKuBYLrrm/beso6PM2Jb4OdmdIZ6U9VIOBBvxMLEukT7oW+YzajlCAKwjPVmY3f+K0T3fm+4F+NNihn97/zdPYYxiBblbgC/CYulaXTit1Co106/RgbCkc1IOwIQ+gg6jidMOe/bnbpgWvE8FIBz3h83yrHmhRiUUr12lp8bN1SpdrsgJ83bZUXDLFbJARqQbKU60ThlEhL9/iUN7Tzk9Re5gTyxVMBzDHTRDiCAzv7PDhzkP6EUo02NP7g1b2QV7Kfno9YkT5ugUS70L5lUu+2aFZe9DXEw8UgisxIV8eyo4ZaQJetJOcFjcpX4ZP0pjOeL7b8bSc/9BGEw/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=CEVvuyTa4KCxlT0KkoRTlNX4GRpy5vKKszSkT1YdPgI=; b=fic9B4koW9lLLRzb5n+YirxWnZ9ui6Ry9PwYSWG1VcnvTrza/cKjBVyJEwDRTYJCtih0s+num9pqQRsojqfR/8JI9SmDX5awyRy+vqTCsbOhj3zAdha/Ke+fz0WZsTXP5vNKjMtFZ/UeVJkHMKKN/x0xraWPkJTLbpwsl0EyRG+h/5seyIAo+Kq0RNriospfhx6HF+IgCcHlkuaYj8UPZAxFVHVzll88DqiZCxydOSq4Jam5goFZF/qRKv0LE21vt7dj4f3U3QcRo7SjtmXTH5/3c5CKXiMzuCos7NXVSlnPs+x21KwK5A66/lrmeLmuUSx7b09zliI9GJPqOWa44A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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 (0) 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=CEVvuyTa4KCxlT0KkoRTlNX4GRpy5vKKszSkT1YdPgI=; b=rdxYfTxgNoS5DwKz+dskeQutQsIHcr4NOggt+jV2Wi6hPclXNF6+eIkRfqI0n8vALiaLS73bR6LhOSLNU+u7qqsD9fJJbtZd08STzNRJbjX/sYDPhZobDC1GrcttvMph0zXrEjongumKV//ETZ6s43g5BlNTzSc1ou4KUmvv+dysGvI4dNsT+8aDexaEhazpy+IwDSCJRQSPEwfeaCR2YOQyrjW8G1om3OR7/7hX4C9rGH8PddFPwPX0tSPxEPd05RXfByKH0r0b+hD0YvDc9aUjfnI2wJXMbdGzHWK4cHbxJjLdLFUozq/rvzVEBsjNaeMda5EqOhZFlOmujMtImw== Received: from MN2PR22CA0022.namprd22.prod.outlook.com (2603:10b6:208:238::27) by MN0PR12MB6054.namprd12.prod.outlook.com (2603:10b6:208:3ce::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.17; Tue, 3 Dec 2024 20:50:17 +0000 Received: from BN1PEPF0000467F.namprd03.prod.outlook.com (2603:10b6:208:238:cafe::c0) by MN2PR22CA0022.outlook.office365.com (2603:10b6:208:238::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.18 via Frontend Transport; Tue, 3 Dec 2024 20:50:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF0000467F.mail.protection.outlook.com (10.167.243.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 20:50:16 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 12:49:59 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 12:49:58 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Tue, 3 Dec 2024 12:49:55 -0800 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Cosmin Ratiu , Yevgeny Kliteynik , Tariq Toukan Subject: [PATCH net 2/6] net/mlx5: HWS: Properly set bwc queue locks lock classes Date: Tue, 3 Dec 2024 22:49:16 +0200 Message-ID: <20241203204920.232744-3-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241203204920.232744-1-tariqt@nvidia.com> References: <20241203204920.232744-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0000467F:EE_|MN0PR12MB6054:EE_ X-MS-Office365-Filtering-Correlation-Id: 36f27a15-8359-4749-4c1d-08dd13dc17ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: XROWr0ubFwmhmP6f6Nq53jXzwwrAZoBtzXbpZ8/cpyx28oa/7wCVbWJAzSbR4KDgb4Z7At8T6EYgsOND1djum3lcAjhKDcfNkPJGG3tpIgHo3FkdLbitjlyI7dIH1ghBIiJyZ0Nwvf/+ILyH26vdNhHjFOJzU/MmFro6/p1E500PcOLyB0Yrq+8fGg1VKUXh2jDr+ToyX2gGbYzOtwcYDEqRQEvRTWQZQfNGvbOBHs3B/CVBsYBgAX/XR5Vk3WJjjUbdsv5nkzmIAPs6663oMIQqJkeNjkV1fhGzMtqp+CNyPRaLISfTKq5d3g1YDnrtjGF3LN/0cG69Xcq6sk/QSTXQOn1N/zmhVH4SWQeB4RB5cBPP+ifkLqCNP34Aj+m5DcP53yf9dC39A3sF1dWt9E6vMXk00h3HvCmFQ/Sgv7MUHM2e0QFr5mkLDmNemfk77WGAGxuHjx5AuLxdL2cMdDb3UgPUgvP39lh8hs8jcpgU42UzjCO0OaI821J7M3qMGXU/74+0nEUua2v7DPqa5oDCKSx3FA6gLSOX545Q0Rw3FhzYwWPdB7UyzEv+XcMdUL1dBtvD4xmkjwu1KC/KofrksW2qmOI8j7rUiX+Eb/Tk+v04Tq7XfbEN2Suo70hF0A28RJyCR0aToPH8C5uQVBHOtF2IypRFd/MjebgjHRxopBWMOlmEb/chZgq3U9TygT4mneAuhoFp/EhMvqgrdQUP05RAF+XyfTfE/rePDbbTa+HtBWUkSA2EA7D1EyznJPgP9jzTmXWcZQnfp4z3XHw33XlJMgFCDXUHBBJFjtXc6ffj8ArEuZa3NUHGYth8cjl8vxaeKh41xe+MKyhlYc2XRQXC6KTPXAdqCP+g7MFo3/jtXFacShf6dIFbmMSiE8sHwj2THs1/AkMctEzrOWm6nhP4ZZU1pd0pIkvBh+UMSLzMX8l4LGqvPP8P9G5rNyGBLfhYHl9R3gGyyV0WwOXutoSK8E9ARg6kwFD4YnpCQdw4zSqf6N4Ci9NxtSo5Yyg5mKKViP5vzIXUzxLZ7JMcUQWyilj9w2w4R/WZKb/wbkW2/pLI4WyqxZnxGYDZh5+Io2nX58fO/RYXqGlWphU8JiJNCJwo1ymgqbg+56eB7rwPTDkDPj18FJPJn5130OXGEfIAuXpzthfuA87ITNoQ24EoxTVLgfVY6FXc0iVJLgeNiYFXKaD3ZN+F9T4DXWDtOL/wkyRWvTFMM+P5l0Eg6BP8z9DTzTkl1D2qw8WG+f/fMziK1zfuUL6kRHv2OaUQC0IenQJYMgS5vbqKPrLvC5mcUiZVAxwf6nv4FWKbKNnA4lHg47YkEj1D7n7J0jReAjLunlAEzQDe3p2FbijvvGDTmg+DebyR9QRB95KqLCME23L+/9zggrjD3V0UjkK10K+yu7q7aRZT/khQa1prF6wsR35EKX9Ub++wCasN72X1cVXupulxENirhO88 X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 20:50:16.9269 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 36f27a15-8359-4749-4c1d-08dd13dc17ef 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.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF0000467F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6054 X-Patchwork-Delegate: kuba@kernel.org From: Cosmin Ratiu The mentioned "Fixes" patch forgot to do that. Fixes: 9addffa34359 ("net/mlx5: HWS, use lock classes for bwc locks") Signed-off-by: Cosmin Ratiu Reviewed-by: Yevgeny Kliteynik Signed-off-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c index 424797b6d802..883b4ed30892 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c @@ -990,6 +990,7 @@ static int hws_bwc_send_queues_init(struct mlx5hws_context *ctx) for (i = 0; i < bwc_queues; i++) { mutex_init(&ctx->bwc_send_queue_locks[i]); lockdep_register_key(ctx->bwc_lock_class_keys + i); + lockdep_set_class(ctx->bwc_send_queue_locks + i, ctx->bwc_lock_class_keys + i); } return 0; From patchwork Tue Dec 3 20:49:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13892969 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2055.outbound.protection.outlook.com [40.107.94.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A00D7209692 for ; Tue, 3 Dec 2024 20:50:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259024; cv=fail; b=WzhM533kh1DHxBtGJf0eMQdU1aPYeZpfZaaKRT8w7onmel/qMSYc9ekmLwpUe4OH6ZNWTG6ywwGU/tFDRCmUuH3DMwYkVpKXE6RF4CYghfPrS9eJ/3N9/I41XL25BatE+cxpvLZz5eWcKd3G3KwTxSYQf7bKff3Dr7XxBSxrPDY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259024; c=relaxed/simple; bh=sA1Q5KsvpvU652oFRacRtTIzkCUQo8deI42RmuiR6GY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U5IuJCZ9OVUazU8y/V8kEKtLlsyente6F5mMxKda/wjcul6yApiuWsr7FUyBYnnG2/o0A9/gsK+z+OVKEhYIptlZqSGRw1ThaZya6Zn5dWBAXECuPo14kWIi1+MIQvby0zJeKEruJH1mrwKRrptxn086lhI2my4nP+lxx79k3z8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=gt7Caahk; arc=fail smtp.client-ip=40.107.94.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="gt7Caahk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xDF6E5YCAm00koPEnb1Gzu/oYSV3vN+8B6jE4x2BWqqGqR/SBMGeYgNI6qcyXFgYALQxTwTdulMHDUoXFNSeZRh3lhzGn6kjoY7ZRnC2dM6pN4LNOSNxHgriz495rjE8LUgjIORlq1OZxTPhlOkBQ4urMUIByhaf0zcbrV3g49fIj+i9Dq7TjP/PJO18NA8fudSdS9AP2Bu4HXQqpzdbwN190MqAHEoRmvHLLziBEoAT7QET8xDNx7z0RspqYxKluMBRruK9eyUGo79+/BCkC6eDXHaNwj+/9abu0VgQxGBZwwYRApv30bf3IkjnE89MBEmDyaSVkscs6U78sAX5Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Kqylk6MZn9V//8AH24TTjlGI/kvzV8kgrpCbK1OtZxU=; b=tur00Li3NoHxqqwcYIJ17cjJr6CoocawmV9V6ecC/mZwj1Hp5g4saoC/EEbPHTj/EvhzsopUk3cTMwEudtNxw13qhIUbjkBZiqlOL08To10AOWfDHGBWfAseMX7EWQn1sza6Jlzoh+Y1YIcUVHglfsr14/zU8DUa9Mo0uIhDWWze22SGR6j4D1I0phBdTTI10eId2j3c3G6U/MVbRO+f3VvbGg4WYXwvZ5nVhRZVJ1JeYzj6TaAz01L5ABlMH0T5+rRv1z+gp3CDSfD3AiJzZOG8xYjQvX0p+oakbhCQ5N61RJcpXf4z0otBk+ocHJk+sFggazEKKDD9bT0mW0vZEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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 (0) 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=Kqylk6MZn9V//8AH24TTjlGI/kvzV8kgrpCbK1OtZxU=; b=gt7CaahkOLy8knAprCRB9OmXhiI0GYNQdxLy4K1/paLiG870tEG0p5wQ5bn72zNQfwbKQKRbTY03E74j4mkp6y+kXGAuB2eLSH2ud7tS9wIBAJbjAxtrUXUwtCkSOs09PoNQRzM6x9jjsYucFN5aea/33pgItD8Um9DmKz341mzhSurD621kBbMGOn89DejFXTiyitHfy/u9ArTbt/QKk85KS9r68wArl4EEFBQy+dm5CfARDej2KGKQ6G/dSl5ciwDAgCfvirTv4UxoJS208RyL/Rl095OCCA/oFZP5tEmQBJv8mYVYrPSJDOufCGMyPo8iTTi2uXDe5NpEag5a9Q== Received: from CH0PR03CA0439.namprd03.prod.outlook.com (2603:10b6:610:10e::8) by DS0PR12MB8454.namprd12.prod.outlook.com (2603:10b6:8:15e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Tue, 3 Dec 2024 20:50:19 +0000 Received: from CH1PEPF0000AD74.namprd04.prod.outlook.com (2603:10b6:610:10e:cafe::d2) by CH0PR03CA0439.outlook.office365.com (2603:10b6:610:10e::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.19 via Frontend Transport; Tue, 3 Dec 2024 20:50:18 +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 CH1PEPF0000AD74.mail.protection.outlook.com (10.167.244.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 20:50:18 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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.1544.4; Tue, 3 Dec 2024 12:50:03 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 12:50:02 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Tue, 3 Dec 2024 12:49:59 -0800 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Patrisious Haddad , Mark Bloch , Tariq Toukan Subject: [PATCH net 3/6] net/mlx5: E-Switch, Fix switching to switchdev mode with IB device disabled Date: Tue, 3 Dec 2024 22:49:17 +0200 Message-ID: <20241203204920.232744-4-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241203204920.232744-1-tariqt@nvidia.com> References: <20241203204920.232744-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD74:EE_|DS0PR12MB8454:EE_ X-MS-Office365-Filtering-Correlation-Id: 6728214b-1a96-4977-cbb1-08dd13dc18c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: JcokZq5/FaqsHNNmKxa+1UhFBLV2TdO8DyIkCZbOphzqmKUjjxZDpFKXwGhLCU+u9zoiiczZn0L/3QFtNE+MHGgwftelZJ/+G1HOlv+z5wPfdajOHoSl6JQArvPDQ69eCwqFHmyGyurJv9XoISC/pJf/JAR4hV2H5s8hbFzVO3cLB3QmAhPW/uCadBezjzA0Ket3zx3IxyjyGr9/LE2QbwTcI4BHJpf+5761RLHvUc7QRp3GvQWpPDIxGbrjt0YyCN+6j7JUuob581bu3C1NfscW6E/3I8z/ULwDqeAXmpqRsmCBHZG2Osz5DTZKEqv3hkgN0Cc/7ybpYU0yaG5gVLIOl0MSEmQVNxnirkIfkNbAZHaUo2UufY1Ohi3XBHKc/bqSYwARstPI5sRDuypHjnq3WpgPGHu6eoEx3IZ/Ot2wcurhAcPQ6eNMNzT2hsYrNalEUqqWsoWqN2V8wDYKVpgZ8i6fP8dQLpMaybEa9pgbZ2eFFO04wlD++t6vcgqVMeBg8Bshi6WhDi4K/liuvxKCGrax+nMBhYnUcA3gRt9YDlKkyEHZ5IE3Az0w9LhZzoSiDv7yucZaB0OfktwFI2E1LMK3lIpdsRxI92oJLIMmOGzgElkcs4wlU4kEw4qGeV3uw3mz+wkUDPXTTlITXSrZ+4LIb61qdk0YtU7ut2gSJjiox67EFRyouhz1QT+VesFJl7I6PrLoYOIHHYFeyCTcccjmQZDwoILzhwQ4ukLSU5UtgOZJTqwCkaMta5zZNc86OqKBcl54E7vPfkmut1taTjWxAbJrAJmIol0r0zHT0m1bD86BZVtnZHs1Xq4sz6DZ4ctJpq6LM2Usarq4zVKO5+SoMibXW2Bi9TSsE7E8aeXdw89X0A/yQCzKbUhhDncbikg6+DFRaA6furt1bGxh5BnSRly8ZnyUx6Fn4floT5faLom6nunaJfRWiNFIgXRMYp+5bje4f5xlzIsBpFtqJ929F2NOyH3/WiktereXHjTSmqeJZP2nSB2U7dk/L2Hdh3FCvWB7YKqu00eAjiRHDgwERrzlzY2R1acSXbqQp+0BX02dfus27Wbcl3gyTDSLq8ehquU+7lxvVL5xflte6LYeOVh/gk0ebfRlnveNMHLnz+qBwJejdf48a/SBaRhdutb7iJt+nn73YdZQHBGaNpdwAww/VGz8kiKiREjxJgyTmZZzhcY0YK8pZ9Hz5u4GnSeh86VsZgUGyTapw/d40Hb9LXA2HR4bY78OCsvJF1rCHv1Uqzmz0r10bbxBYEYbJEbKeEVo8AZrN6mbqAwgD1NPJqzxrWFPCfwJsgus6jWd8Ze4+rHKig99t5RVWJ6ZYuXBC86bW4ehxvgmcspzfEKgmXp+Q8h8kBJz8AKSu3MtZlywaI0DIqvJMDuA14Z3OFqaLwBpgfFa+jreCuh+WpOwtYJ9iypjnOBgWZh9G+25I677a/CgYm8m5vly 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:(13230040)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 20:50:18.3055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6728214b-1a96-4977-cbb1-08dd13dc18c8 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: CH1PEPF0000AD74.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8454 X-Patchwork-Delegate: kuba@kernel.org From: Patrisious Haddad In case that IB device is already disabled when moving to switchdev mode, which can happen when working with LAG, need to do rescan_drivers() before leaving in order to add ethernet representor auxiliary device. Fixes: ab85ebf43723 ("net/mlx5: E-switch, refactor eswitch mode change") Signed-off-by: Patrisious Haddad Reviewed-by: Mark Bloch Signed-off-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index d6ff2dc4c19e..5213d5b2cad5 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -2338,6 +2338,7 @@ static void esw_mode_change(struct mlx5_eswitch *esw, u16 mode) if (esw->dev->priv.flags & MLX5_PRIV_FLAGS_DISABLE_IB_ADEV) { esw->mode = mode; + mlx5_rescan_drivers_locked(esw->dev); mlx5_devcom_comp_unlock(esw->dev->priv.hca_devcom_comp); return; } From patchwork Tue Dec 3 20:49:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13892972 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2067.outbound.protection.outlook.com [40.107.100.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F554207A01 for ; Tue, 3 Dec 2024 20:50:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259038; cv=fail; b=sWX256JWHdadYGkpK0ujoQstxerGJ1Z3ko3RYSj64NConDrtA2vC40ZVLGRhZSSQtH4ARqT/+zHyOf8fFAgqPX5mr86f8qcZ9FzcNkXsKqYVNtvMU0Qp5Qo/G+HbcrdUAoXeR76CGwbjB/6dHJnRL4Nlt26YukUvYjJjBXchCLY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259038; c=relaxed/simple; bh=kSOHsY89zawPDFu6s6ta2comrsvaR92zcm4QTfJP7Nw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p8pE161rLj2wdZr9JZ/Me3beZtlPmhigAb9rFNAUU8qQhKn9HpL2qLkfkX37G4yH9SZEGieZIvl/pifLI+Us6epwx/lnW8A7roO4DiH8ZI/7iJBjWEvSZlOqneJn4j7HnjF88I6XTCz5oKFq+2kdYZIjT79iIgfH818/2Hb0mNo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=T9T3TOyw; arc=fail smtp.client-ip=40.107.100.67 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="T9T3TOyw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AF2suhakJx7eGGWl2CEa9rZ9Xl3qmHL+LZmMp+pW7XcwkhCA7mQBnzEChBCPzmKCa28FM5vzXjy4wvqOVSGkEzCL3HtL0cj85fz5fNaawrickk41MzYYo7mpWRuv8DjXfZghvYCPUWPxYYy5+rcxxqaOk32zVEutARjt2RX00qGMbxPLJ2nvB3UrQsJJlHcmSeE0JSZt+DamnO05WhVA6x+CxH1b1X6lvRBfq5H6TmyPqbNfy9gGNODcr2/1jT02P2uP7JeOX8a5L6PwqQHLUT5clq2dh6OpoYNm9krKFR+R85LRxufdyLHsfGGn3FMqtYYlQLAAJYBcaULrTg6OLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=tbSQKWIFpXDg+/eZFkVDeUNl1MM5Xb61rHfErMkk8zU=; b=XF8I9nzcQE+lU2AkR+Y4oxm8Fy6WGLduheQTCI8IB7MZE9PFcnM1pzFxZ9TA0/cORPKZpgSYLurOpumGvFe5o3hlPML+sOE/OrJeP8OZP22ttQG6MN9s7xysQ4SRzJQeIXQ2ZndwF6GnpWd5ZWedNCvuLdvyNeefdjoVdQTEY4ki+gw8Z0Ska0n/lM7hZpreyoQtDEOHRH7N4xZ2sCEkC3/Sdi4SMvcEjp+LKNMdQRtKorcWI1ZygtkIoRo//rp8YTXmTFq7c57JZrCdJUiegRx1HwnZXTpapAO60ZLE+/INA/if1nK4PEifH5x+tQe6CjIhrWtsW65QJGfAMH+wxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net 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 (0) 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=tbSQKWIFpXDg+/eZFkVDeUNl1MM5Xb61rHfErMkk8zU=; b=T9T3TOyw+GwE/Q36Nw6zF7HMaMoPBD3aZYqprvs6/2kvgjfKACK+KN1pIyt3uv1udIfefZXTk6cimXCxcA8Lbi96T9iQJgtgZ7rJwhv1zLqCwIhXTcwaVDfJHoQqndmdt24U87gxJEzmi82N2OK/NjbtOLuMuDdFq9LyRfxq+dDpjZzD76d24rmswyKO8xPuXdmggGRJoiwwkOtLkxu3eO2qtuDQMWAUDjEjOqsVgTkzx5RxKM77SrjDhOzh16Lba637z2P/JVM/Ew9kgRSyccti9nMOBD1oSgoHomueCXbMs8VJ0RDUcrbj1YG9hFVdjBtObAzi/440jwmEsh8tfg== Received: from BN9PR03CA0749.namprd03.prod.outlook.com (2603:10b6:408:110::34) by IA1PR12MB6530.namprd12.prod.outlook.com (2603:10b6:208:3a5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.18; Tue, 3 Dec 2024 20:50:27 +0000 Received: from BN1PEPF00004680.namprd03.prod.outlook.com (2603:10b6:408:110:cafe::c5) by BN9PR03CA0749.outlook.office365.com (2603:10b6:408:110::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.17 via Frontend Transport; Tue, 3 Dec 2024 20:50:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF00004680.mail.protection.outlook.com (10.167.243.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 20:50:26 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 3 Dec 2024 12:50:07 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Tue, 3 Dec 2024 12:50:06 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Tue, 3 Dec 2024 12:50:02 -0800 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Patrisious Haddad , Mark Bloch , Tariq Toukan Subject: [PATCH net 4/6] net/mlx5: E-Switch, Fix switching to switchdev mode in MPV Date: Tue, 3 Dec 2024 22:49:18 +0200 Message-ID: <20241203204920.232744-5-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241203204920.232744-1-tariqt@nvidia.com> References: <20241203204920.232744-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004680:EE_|IA1PR12MB6530:EE_ X-MS-Office365-Filtering-Correlation-Id: efb6a51d-071d-4ab5-a674-08dd13dc1d8f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: 4aakeQljvespho5biM0r+LtsgbgfPNLcVau0hh9ldQS6pnptwEs0vcI9VMHNbzKeSD0mIABwYlnbURYOVIhoOWT/ADUCVebWJZEpsQfYz75yLyAGVM8WCKkWvT5gUpecJaVVRqg23QKQqPKYPEvt1yNwGJNVsEwLK1T0ghIbGW1S3amDARho/n8Wz7FNLeoBivAQuEpVHqGc9+7vHkrJlwWid8lE7aMFUNg8uxfpIEcmK43zz1YofgaywZNx7ALDDPYuu0LvA6V/maNLcuoF2daAH9Arsj7aAzxk5MrBL2UsjPLhboB8+VGFX1YpyT3C7kQhPe/7TQq+nApnovZ5Pp6Jvs2CBpnMqs9BrTwTYTooDU1XwSklB++Hcvpoq2tMkLQ39j4BVm2Qo30RvSD2qK26jVe8rrqQ778F6M1TRy1SjCVmmoxBqLfSmbSEDVeAefBxSkQ1HGHhOOIGPE4d1Sa8uEzoAiRAz6VGMlI/QTgzwzrrs9ypY0XM0nLMfNJXEtmiC4XqfoJt89RwHs8ikrGhGa/rfDzeEi40Ukew1n9sHjoCMvNq6pSq1Jt48jtXLk9Zq/iNEE1Hy86Lhki0aIcaPKNMCm97LyRC7/D+ehXLTabuYAxD2FLaPSQZSiAj5/wNXa6C5W9MynycpAwhpSlQY5Qe91IQd1gtaj7hhuttPWaH07sY+j4HEzsvbaTI0HXV+v6U1RHEEiyzUKinaf64EGCL/8HdfR7IoE0fepAtyB0gKbOl0jNs0cQSAkUwJdVR2514ug1S0JXE+1mSD27kX0E2cVYeuijp3jNgm41adTS++lVFB8mglg+FkNtHQ26m4pbKNq3o2kykbcOc/iHqKhKJW5MAL4Utph12CesNg1WIo+K4V0BLppBYQg4NQfKI9A6IH5duO+/eFODPj8fDqPHmT/WkhonbNDSgLFUdqjqctpGxuttLO9j4I+9HW4OPT6N+PWvCK2TNhuyyUExYWt7SzYYisHQvmR/uqFIAAVd7tGsLkm3Xv3e0o2kWhqoiFprZAKezEaQ3C8j1oorxCkZj7jJBFR0LTYcSBtSWS0CiAPikRB/JcH659J6d0gM9KQ3iNLNDKMlDqG7BeiBf6+JPPc5AXuKTU3NtWzuwmUXZJpMBKPT0TgoBwtceNbEyhagacDPUJDaV8t65D0RL6xuA8qwXDbHL0hEGVTosdHlBSmqwWc/1pQRYD5TuotwQdCELnfug0BkJQdA8/G4K4ccPEaGv+WoKeAVI6SxG/rmGU84p5y+hP64L/powPpT3kUd+7WUnXfo7v6S4oVhRPev84w0Xr8bEdNS+HuH9QAaw2chMH3rFw3qWyM4b2EQkLOqUrHrg4ErK4yd+U6QfvjnR2M5YriHow9IU8MDzyzaaYQEfTrmJSj/qfJc3SMnWVQPY55Rfm8T9Wgbog9C8bvrBO6TlGKfChBFsDa3Rtqc+JrA0J3OqLaeMDPgu X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 20:50:26.3977 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efb6a51d-071d-4ab5-a674-08dd13dc1d8f 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.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00004680.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6530 X-Patchwork-Delegate: kuba@kernel.org From: Patrisious Haddad Fix the mentioned commit change for MPV mode, since in MPV mode the IB device is shared between different core devices, so under this change when moving both devices simultaneously to switchdev mode the IB device removal and re-addition can race with itself causing unexpected behavior. In such case do rescan_drivers() only once in order to add the ethernet representor auxiliary device, and skip adding and removing IB devices. Fixes: ab85ebf43723 ("net/mlx5: E-switch, refactor eswitch mode change") Signed-off-by: Patrisious Haddad Reviewed-by: Mark Bloch Signed-off-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c index 5213d5b2cad5..d5b42b3a19fd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c @@ -2335,8 +2335,8 @@ static int esw_create_restore_table(struct mlx5_eswitch *esw) static void esw_mode_change(struct mlx5_eswitch *esw, u16 mode) { mlx5_devcom_comp_lock(esw->dev->priv.hca_devcom_comp); - - if (esw->dev->priv.flags & MLX5_PRIV_FLAGS_DISABLE_IB_ADEV) { + if (esw->dev->priv.flags & MLX5_PRIV_FLAGS_DISABLE_IB_ADEV || + mlx5_core_mp_enabled(esw->dev)) { esw->mode = mode; mlx5_rescan_drivers_locked(esw->dev); mlx5_devcom_comp_unlock(esw->dev->priv.hca_devcom_comp); From patchwork Tue Dec 3 20:49:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13892971 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2076.outbound.protection.outlook.com [40.107.220.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DE2B1D79A0 for ; Tue, 3 Dec 2024 20:50:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.76 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259037; cv=fail; b=M9EyEawF7GMepH8nJFPy58zFC6jv27U/mrRWjlzpTD01CCUXdLWzq6cyH4CA3I1Jrq9jUTuL63t0NrNNGRUVY3zE54j/1JGnLwXD/snPVN3MX7a0wF86+Wu4/SpvzvShxoTEmlCB18sKGmZxuAES9nxIfnSCUMd3ZTn+FdTN/Mc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259037; c=relaxed/simple; bh=dIy19cxv1jY8jGSsADt+UmVp+zkSj2+DGqjhFyDqh2s=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CWbYcU03bQvkNy4O3vqDN+F2q+wq8Nj+gDkbzvMTm+XavNBxCxSknyJzWz+ljUGVv5zO4bwWHSrhuU2KtsPK5iSMcccVHbO5RUpQw0NBdf4S81R4tw65pBKbWDIewE7FxL2sawLhw95PO/3/G5Ow110oh3+dFwJfQzf5f/YDwks= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=Mt+K7SKA; arc=fail smtp.client-ip=40.107.220.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="Mt+K7SKA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MTmKg02wscwQGtyzifS6MflILAo1Iqwc+lqO1/8T0Ww7o4W/o+6puH0ub43brjirPd/PDxMBk9y+Z8mW2JdHn/Z3VdHzGOzbemOpjl0fLFOjHmuO5z6mHDqIakDDi+uAOAncmSImjqchvYnqxfR8y8FL5T70xob13taw6oDTDNOgBs6eMAXr3HJLFV+6wIKMk66coLZiTwA9WoPqJXdHQTw1mt1ooSlmRefoq/WA3Qqbqe0hHjkgQ5YPMiIhApXprCvKf4OCdWJ9rvJ/RgZ+y1NVXbb25TvfM/QbMa39sXm8VAP5BWMu0oDJt/ysoLD0mXM3Ef5aRGw298NXqkS7Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=EfiUDM1/vy9D7v2Z/solIi9QNNAH0ekD3nAFAcRaHYk=; b=LPBD4k4XmKHwfm4B9EFX3pFrNKpMqHfk3Pq92ackPUkU+fxVFKShPYlTSQOKwuXNYD3bYqSLUXHWF5z1v0cRdAh7y/2kBu28xrnmRlw4/riImV0VMhfgBiHmHSqXjUa+Vvc87XPw9mBgqEN3v9JMV4pqVDkFY+NgiwxQqsOkpws8Hj+G11K/FQdox5vZEsT3W/xwYK9xbBTzsX1kEmA+uKyoUc2TekzLj/CqtHLxN3mbLc/IIMQPIjnibs0/q0NEWgw2OxWCTgf+hOyIS9iVSNXe69EjDGitdQekU/3nF3LXphWqgXLnTnlcs87uE2NipW/GLtJ7Oc/zjuX8OK0aqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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 (0) 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=EfiUDM1/vy9D7v2Z/solIi9QNNAH0ekD3nAFAcRaHYk=; b=Mt+K7SKAk0351KRt8ZceKCzlZHVx8oZeIK81JKDMY213hJ3QmhjsiaJLwjxh3wi01n/pisRWQNf223ACXS9vh4lrY/q68q3cQWRcgXi3hq40q3DOYMrLFsshYeVgK11TGyM/Pxdte6FYcS285qO/r5YGurtYV9+04yyYcQqQ9pRagZNzhmVU3FuO8St0IGM9Bp6d6RIsZyu+/8DKGezmqKr0OcPdmP50olqFNTJxQTiwbyrvg2capHDQPM8EIsCQg7JuR4kGp1vykz+OSkR11WOVOXhPubUsAeh0Cn9CH1R22mLFDMzdXtg9GepTCnu8thuRmb10k3tbvhRX8JOoAQ== Received: from CH3P220CA0011.NAMP220.PROD.OUTLOOK.COM (2603:10b6:610:1e8::26) by CH0PR12MB8577.namprd12.prod.outlook.com (2603:10b6:610:18b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Tue, 3 Dec 2024 20:50:29 +0000 Received: from CH1PEPF0000AD7A.namprd04.prod.outlook.com (2603:10b6:610:1e8:cafe::53) by CH3P220CA0011.outlook.office365.com (2603:10b6:610:1e8::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.18 via Frontend Transport; Tue, 3 Dec 2024 20:50:29 +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 CH1PEPF0000AD7A.mail.protection.outlook.com (10.167.244.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 20:50:28 +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.1544.4; Tue, 3 Dec 2024 12:50:10 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Tue, 3 Dec 2024 12:50:10 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Tue, 3 Dec 2024 12:50:06 -0800 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Tariq Toukan , Lama Kayal Subject: [PATCH net 5/6] net/mlx5e: SD, Use correct mdev to build channel param Date: Tue, 3 Dec 2024 22:49:19 +0200 Message-ID: <20241203204920.232744-6-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241203204920.232744-1-tariqt@nvidia.com> References: <20241203204920.232744-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD7A:EE_|CH0PR12MB8577:EE_ X-MS-Office365-Filtering-Correlation-Id: d1081bf0-caaf-4ee2-349e-08dd13dc1f02 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: bcdGCyNrJxipp522y9TdxukbTQ0wIYQSfGh17ROk9qlRtX/ifmKqJQ5gt32m9WoQ94sxQLF9tupb6srINrD1UGgw3KXrp3l2Trxf/q+ztSCsZzZlq2nMGXxgMtF346GYn4t0McJIGNjOOX+n+xsINDnkYrdsJHVVcE+Pmu9avlUUL2Pv2bKNDjRheL6dJoIjhAR/RkXJtRNCmaGJQyUQ5SRWI44LxdkVn/doQpIbA1FVOTkNfvh5gSOxnWvFdaGx97uQfqiczCdRJNbAppvhCfcEjBw4tCWiUtDEDBC2HJU31yDMSAFqzwEA6to3NwRZLky+G47gwAGIV4WQTa7rqHq9p1gMIoTsJpUzn1uPleu43V/NZQQ8ZGrx8DYXB/xMdu0iXDKY3cQP08iMSXGI87XN1KJko6VEzC6qj/QRMdz/EJ6v4XevkvZ+r/ro1X0G7jAGEb3CDJrF58U8OaM/BQXa0NzeTV7YoMP5b47l9T8CWgIK5h7AUoud8Bvh8vu2hnOU86PJQokkCpjp8hnv13vZXDsNNSh9ZJztfOn5mDLicJzGYUtDFW6Rnb3wKKHWKU+slaSoRx6QjsiViEpHqye+3pdc8l9pqUu95YdnIctXHllroQoipWB6I2YiIOSGnyvhqyxFAuzLTPxn28iNNtiO0IkRj4/k9fuBXdvjUXqcBnP8gdsWG184ngjOUoBGTCIc2gHUv0awYXNVI5QoHT3rOMCwhkQa7dAFXoKrRCzafcDjoA9Uhs1APRKu5amtcdRSsFSlCceA/ry/To8CpclBsXdaArs/ATn+OLi5L2FWKTjvWACexPJj34vfhd8CFn7XRl1zoWscV+FjGKBom/SvfRRC1pM2Eemq4Pd4VoqFPlZriDg2mL8UOFTFipSOgP2gRjMzF1nboTqEvkCfXR6mGHeDxk5N5oHXTetXYs/ND8HZR3R4yDfJEoQhGkIbfDeLZjsmXoppy6J/oV4ouXZvGSXsne62MWmuXkwmkp/XtqrB5o9GR3zRjD8ZYUBKnQFiJ6WguPInT0NqNKevd1BllK4WUbkIfxBsRTyRJiU5M5KS0DlI01/YlUilPAcO6qdMAo10UYwK1/o9GwozJCbW46D4KamK4nOh+ANH833Tb9NYM2No79UQsQff17AFBkRZJoT896AbPHYrJ1XlLUvQNU+mrfz+Q4dODUS6GQ5SPGEMBTUoAlCW4kNXy4BTjgNw6zmbpwpnCw6tsgEx3uP3A/oqiMXkrhnPqjd2RB5lVS9ETGJxClRPdllUG3HnWX0c/mjuIxONeXqNVaxyh1wNzNLSvEok/330XG8oGm+CEJo974CpdaUcAcGXIgMpEaJgBQSCvii+0LrhDtLnDI8OBVUrdeNM7Uh5C6cN/PAYY1i0YGppzOXkbzcTmHda0BewdvPiXHVrIXOUqOWBSZVyMb3C0vShe4j1XOuxuzEzuWrsSHkNKAsUP33Q5wxU 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:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 20:50:28.8262 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d1081bf0-caaf-4ee2-349e-08dd13dc1f02 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: CH1PEPF0000AD7A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8577 X-Patchwork-Delegate: kuba@kernel.org In a multi-PF netdev, each traffic channel creates its own resources against a specific PF. In the cited commit, where this support was added, the channel_param logic was mistakenly kept unchanged, so it always used the primary PF which is found at priv->mdev. In this patch we fix this by moving the logic to be per-channel, and passing the correct mdev instance. This bug happened to be usually harmless, as the resulting cparam structures would be the same for all channels, due to identical FW logic and decisions. However, in some use cases, like fwreset, this gets broken. This could lead to different symptoms. Example: Error cqe on cqn 0x428, ci 0x0, qn 0x10a9, opcode 0xe, syndrome 0x4, vendor syndrome 0x32 Fixes: e4f9686bdee7 ("net/mlx5e: Let channels be SD-aware") Signed-off-by: Tariq Toukan Reviewed-by: Lama Kayal Reviewed-by: Gal Pressman --- .../net/ethernet/mellanox/mlx5/core/en_main.c | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index d0b80b520397..dd16d73000c3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -2680,11 +2680,11 @@ void mlx5e_trigger_napi_sched(struct napi_struct *napi) static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, struct mlx5e_params *params, - struct mlx5e_channel_param *cparam, struct xsk_buff_pool *xsk_pool, struct mlx5e_channel **cp) { struct net_device *netdev = priv->netdev; + struct mlx5e_channel_param *cparam; struct mlx5_core_dev *mdev; struct mlx5e_xsk_param xsk; struct mlx5e_channel *c; @@ -2706,8 +2706,15 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, return err; c = kvzalloc_node(sizeof(*c), GFP_KERNEL, cpu_to_node(cpu)); - if (!c) - return -ENOMEM; + cparam = kvzalloc(sizeof(*cparam), GFP_KERNEL); + if (!c || !cparam) { + err = -ENOMEM; + goto err_free; + } + + err = mlx5e_build_channel_param(mdev, params, cparam); + if (err) + goto err_free; c->priv = priv; c->mdev = mdev; @@ -2741,6 +2748,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, *cp = c; + kvfree(cparam); return 0; err_close_queues: @@ -2749,6 +2757,8 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, err_napi_del: netif_napi_del(&c->napi); +err_free: + kvfree(cparam); kvfree(c); return err; @@ -2807,20 +2817,14 @@ static void mlx5e_close_channel(struct mlx5e_channel *c) int mlx5e_open_channels(struct mlx5e_priv *priv, struct mlx5e_channels *chs) { - struct mlx5e_channel_param *cparam; int err = -ENOMEM; int i; chs->num = chs->params.num_channels; chs->c = kcalloc(chs->num, sizeof(struct mlx5e_channel *), GFP_KERNEL); - cparam = kvzalloc(sizeof(struct mlx5e_channel_param), GFP_KERNEL); - if (!chs->c || !cparam) - goto err_free; - - err = mlx5e_build_channel_param(priv->mdev, &chs->params, cparam); - if (err) - goto err_free; + if (!chs->c) + goto err_out; for (i = 0; i < chs->num; i++) { struct xsk_buff_pool *xsk_pool = NULL; @@ -2828,7 +2832,7 @@ int mlx5e_open_channels(struct mlx5e_priv *priv, if (chs->params.xdp_prog) xsk_pool = mlx5e_xsk_get_pool(&chs->params, chs->params.xsk, i); - err = mlx5e_open_channel(priv, i, &chs->params, cparam, xsk_pool, &chs->c[i]); + err = mlx5e_open_channel(priv, i, &chs->params, xsk_pool, &chs->c[i]); if (err) goto err_close_channels; } @@ -2846,7 +2850,6 @@ int mlx5e_open_channels(struct mlx5e_priv *priv, } mlx5e_health_channels_update(priv); - kvfree(cparam); return 0; err_close_ptp: @@ -2857,9 +2860,8 @@ int mlx5e_open_channels(struct mlx5e_priv *priv, for (i--; i >= 0; i--) mlx5e_close_channel(chs->c[i]); -err_free: kfree(chs->c); - kvfree(cparam); +err_out: chs->num = 0; return err; } From patchwork Tue Dec 3 20:49:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tariq Toukan X-Patchwork-Id: 13892973 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2085.outbound.protection.outlook.com [40.107.94.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28C4C208990 for ; Tue, 3 Dec 2024 20:50:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.85 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259040; cv=fail; b=Kmz+ACUWnZYKWaH/ByzMLV6xQAs/ZMqOVliYWw8vi+lQv1JhbzTT2m3UCF83E9QrTZ11vUEd+tTlViGGj70Y1Yov5KFb6HCsJ+KRKEBveWKrUlSQInMlgNEVojWm5lE9ncJcAf7hR9M0S+efX0QNjGC759KPCubEHEPih96VkYU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733259040; c=relaxed/simple; bh=Y7JEzGR6bYD0aIDyEgkpAGrh+SbgH3Jn3Q+HVBEC18o=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pA9nfSuIX8vEbHs83JIR1bECo6RylOTjof12y5xS7fZyhpXV/hG//F2b2ydT9CwxRB8th7ZvhhffXsUjF7hgXeqp+rLF9t51GGwR1ZWdZtr4DFI22lxKUS5R/P8R3WsvQXFcgnWUdHPLcGoUdP5vRthxYtGClL40j9DtjtGfmJs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=Ym3yVMwt; arc=fail smtp.client-ip=40.107.94.85 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="Ym3yVMwt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d49WHBmHhUSsmUcHwOj+U2QxjbVsyxA9cAXasJzUON5T50S7uG/3rtOZaVR17DgY1f4sxECJ3WkgRKIWuPH5mRsuiaJk23kuASYQ8G9/oopFzzVIGqxyHoVqKNFWiTppWDAN5+xg0sNlBLt6VyzZhwEk8yLq7GCQhFwPeNlxhA1w8XUezFSl7VSB02bYqGvTZjs1LkIaBeuTKBhbJMeckWSUnUTeew69+qmvvkI8yvcqP2rNeSBMctvs+rbWs4gP7Yl9qo2P8NtD6oN2I5PQlrg45bld0GfBZpMnU24dVMlXRbeRPKXTzjepC22Rx/g60XGsP9jbNTfH7GTVuQZdOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=G2hYZE3XR4sWs2wUxj5+HkyYOc0Lq8aSFErOBfB6C20=; b=VwU6pRm7/K0/nPHT8ipqHoL4Qyrs4oNQkwfbssVaZDttZs525PDHgFMLHJGgmy0dZVv6i4/3o6Pi/NTcwalSm8XsuFQ39Z2nna8ddEWvSWj220OQqq6dX8wh6o7taRXKja91/2GsCpV+dkZczI9XIzxNooGOPXAdqvZ1YEOtK4iInq+to5RlnHK/swOquEAndeB/+06kKH/TRG4xN5403mCBWhgCuIOHZSdHw2Vu2gX1NMAawjLpIXflO1mYELPyGu+yV8jWGizQQdkL5PQiaP+ymz1yBdCPkB/8/9TfnZL8RA+zkhD4A+zsMldioyZOjxYPgudn0F3K4deQGkXCOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=davemloft.net 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 (0) 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=G2hYZE3XR4sWs2wUxj5+HkyYOc0Lq8aSFErOBfB6C20=; b=Ym3yVMwtLZmH9F5JNgQGioKwjxjDubftKnEuu2KumdU/R9SKo/vCdaPVbFQpNrS9iDIbDwaHljou7U81F8CrtoNelIpWdJCUlZBFbuSrpap8q4qgKyI0g/nYd1K+iTZkqU6ZmVHEKI22tieIvV2xA9347M7THp3M1bydbDa699KLswI5+FMUAriP2cu15t2xCCS23+/0c8C6W6CiBsY2SoLzcIimvkYODjauIHTupvmGEKV5bKQXdgDbOxGiPPoDajkHHFUi1ttsUU2Q7mtXyQi29qYGya50SvpAWf23yciKfEtdLDzT9ojaIEXvkqlXUmOHTpEqm/W+AFCmjetWwg== Received: from CH2PR03CA0002.namprd03.prod.outlook.com (2603:10b6:610:59::12) by SJ2PR12MB8875.namprd12.prod.outlook.com (2603:10b6:a03:543::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.17; Tue, 3 Dec 2024 20:50:34 +0000 Received: from CH1PEPF0000AD76.namprd04.prod.outlook.com (2603:10b6:610:59:cafe::a9) by CH2PR03CA0002.outlook.office365.com (2603:10b6:610:59::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.18 via Frontend Transport; Tue, 3 Dec 2024 20:50:33 +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 CH1PEPF0000AD76.mail.protection.outlook.com (10.167.244.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Tue, 3 Dec 2024 20:50:33 +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.1544.4; Tue, 3 Dec 2024 12:50:14 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Tue, 3 Dec 2024 12:50:14 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Tue, 3 Dec 2024 12:50:10 -0800 From: Tariq Toukan To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" CC: , Saeed Mahameed , Gal Pressman , Leon Romanovsky , Jianbo Liu , Frode Nordahl , Chris Mi , Ariel Levkovich , Tariq Toukan Subject: [PATCH net 6/6] net/mlx5e: Remove workaround to avoid syndrome for internal port Date: Tue, 3 Dec 2024 22:49:20 +0200 Message-ID: <20241203204920.232744-7-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20241203204920.232744-1-tariqt@nvidia.com> References: <20241203204920.232744-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD76:EE_|SJ2PR12MB8875:EE_ X-MS-Office365-Filtering-Correlation-Id: 4860085e-8109-4ebe-fc02-08dd13dc2192 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: 1Kqj9PvuvxcnF5oWwntdfC/gfv8OM7BNXSY1aEsYJZ5Nd80Eh8kfDwxLIGscD2ud+BmbNdiFa4LFxwXns8avE/nmeZd/RLYpnZVoZfE8ihWR+zHuLWlCsB2+0KyBS4wbgZwOXuCXwmr7IIXmrWZIJIMkd+zjOkLE/4p5U2dv0kBN2XPCAZMEBAz6WJ7JNnLX6JPzNzOi7w6cUzr0uDEd/LoZyVs3aTPfDAxqoGfdZQA+iMlUOq3yvhnwZoa8SQvLy1l7iVQJixAhRc0TeMsJ6nKy/LDE+Nzm9pczBodsz5lN/lvamPSvdyphN+/7bx6HvLKdmBb4PmhTHw76SKZLfmoMo5OHjRf4Y/qjvtj6eyzfcn0jTvJT9RbxeezWn9D/AUP/UVbbUA64Odx8HpdEZB58EU/vFksUY+7fpzLStnT3yN9TGxeDxYCPW5eKGBJz2DtMYtWInluB7QPuHdilBT/ObUvfokwjknbtaYSpDLdlEJH8Tg2ojuySQEjA9ACKzJfPu0NbtLWl/twiZrwqqKP6lje4QgABL++CngYPP4Dh/jjPvKTKpcuyF/OVYlkuMeOnOcFW9fW/Qf7x/m8s4upSYNZoRmHUbTQQ4pPYUCVY84XvC0GJL7pFlSReT4TZfEeoMZx/Hcn84z3lKSDgY4T4R1Cc0gYEIQgPG1dY/GlEIZ/8oIWNeaO/aUps2xB6yH6Yaq+d4qcAsnwal7yZwAsZ/f7xsVjQSAZktPVIz8FBtdTzSKxtRG+0RkWfe59lpduettJat+7+tXh/y/u7MJC6iYyS/Ssl2XFukNwLBhZUff5SwcBAn+qaRJiXEF8bkQxF6iRjLHW0gPyxmYR2iH/yEaeQKXDx9d8dTYhYVutyICghiBmTSLut8y5RV/6IgKcjMZJ+EItHAseKNL9fikxi46mixBz1EbzLyWQRx0DMs/EtS3m1XAkOUFbD+TC9qDg4fdFCCGavW1jSN9VtoP6O05n/hHw+hZhxXtvgZ3IaE2CWyTJ6M8RjSI/cM97UkFPX190+eceD4DD7HXm4s4VOXn0OUJHHflWne2usQWR16Rhs0KdkLHx2UZnj/Y1wneYX2ZMYcAKpTk2xDfyu7iyMgRtvOkk+Z2c6PVixDFgIyxqw62cvXDxcawKC/fETSKokquXlIs+49FsW0xAQNIV6BVL4dMuSJMBOQ+vroRETNcFnueiF54f8cholnf3QdmnoxnAQYVv7DZ76tMki4JLxoM/Abceim1bGo4wbQ1M+gJ9hfm3t0WU75E4G2dyZecDGNEYEXf2WkZRE0ibRGYnsZIkhRT320iusz4kfaED327LXi79cuBzKmceEU14TzKQYjyQRWX2htU0BxL0yG81bJ+h/xO1qcYeNdwAnTce/azIQ/AaSfi6BaTpEWfgw+ZcBkd6ub2zVlHWdwozCMvCTwkRQ0iTioy/rMmgel9Rogvtg4o7QRN8C504LnJxV 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:(13230040)(82310400026)(36860700013)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2024 20:50:33.1157 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4860085e-8109-4ebe-fc02-08dd13dc2192 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: CH1PEPF0000AD76.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8875 X-Patchwork-Delegate: kuba@kernel.org From: Jianbo Liu Previously a workaround was added to avoid syndrome 0xcdb051. It is triggered when offload a rule with tunnel encapsulation, and forwarding to another table, but not matching on the internal port in firmware steering mode. The original workaround skips internal tunnel port logic, which is not correct as not all cases are considered. As an example, if vlan is configured on the uplink port, traffic can't pass because vlan header is not added with this workaround. Besides, there is no such issue for software steering. So, this patch removes that, and returns error directly if trying to offload such rule for firmware steering. Fixes: 06b4eac9c4be ("net/mlx5e: Don't offload internal port if filter device is out device") Signed-off-by: Jianbo Liu Tested-by: Frode Nordahl Reviewed-by: Chris Mi Reviewed-by: Ariel Levkovich Signed-off-by: Tariq Toukan --- .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c index 878cbdbf5ec8..e7e01f3298ef 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c @@ -5,6 +5,7 @@ #include #include #include "tc_tun_encap.h" +#include "fs_core.h" #include "en_tc.h" #include "tc_tun.h" #include "rep/tc.h" @@ -24,10 +25,18 @@ static int mlx5e_set_int_port_tunnel(struct mlx5e_priv *priv, route_dev = dev_get_by_index(dev_net(e->out_dev), e->route_dev_ifindex); - if (!route_dev || !netif_is_ovs_master(route_dev) || - attr->parse_attr->filter_dev == e->out_dev) + if (!route_dev || !netif_is_ovs_master(route_dev)) goto out; + if (priv->mdev->priv.steering->mode == MLX5_FLOW_STEERING_MODE_DMFS && + mlx5e_eswitch_uplink_rep(attr->parse_attr->filter_dev) && + (attr->esw_attr->dests[out_index].flags & MLX5_ESW_DEST_ENCAP)) { + mlx5_core_warn(priv->mdev, + "Matching on external port with encap + fwd to table actions is not allowed for firmware steering\n"); + err = -EINVAL; + goto out; + } + err = mlx5e_set_fwd_to_int_port_actions(priv, attr, e->route_dev_ifindex, MLX5E_TC_INT_PORT_EGRESS, &attr->action, out_index);