From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012061.outbound.protection.outlook.com [52.101.43.61]) (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 B2F9148C40F; Wed, 3 Jun 2026 19:34:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.61 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780515277; cv=fail; b=i9rrzdPCQS10706I12YDQuwRh6g8yC+3N0r/KJq7iZpYZxhlnt8OhMsYCKZH0vlnnTCE2wRFxub1T13zckVHwe+dS4a65SMrHl5xHrC3+Pwl3bGDGnVC+2Jj64FvfY1iDDUVIN6EXLHfZ20380bDhKVkytqQDMGzi7FVsyv+6Rw= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780515277; c=relaxed/simple; bh=jSch0ciHaAM1sWMZMwjvlyCb+JrlevS5niw4TmhB6+0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p/RZpdAk+mQsvyTJUHewIvpBT+PAjXFXX2Zv4Kp3PVxKkPYLZgCyX3qH2B0I5xGdGcUMVwOCHE/SBSRG+XjHLyZ/fbiMMbzBjCVywbiyz4dIiIZs/7Wr+Vwkr8oKTeLfEvptzx1WD8H5XHcYtghrz3TW+5mf6unvT3K/dpkCVqM= 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=Fgtfv08w; arc=fail smtp.client-ip=52.101.43.61 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="Fgtfv08w" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r2xXGEmINOpyS8aMsj/zZRK5TTpEJy+qYByyFhD5f1+/gtGGNb8MmlwL4hN56V9Ku2ca+2Mb9uAagD8tttEiaLcecZDJwz5Vjwz54JGlezavzayEwP1AKCZbfaaW/PsixfgEYAp3VXECMRq7cATZ7zHt31pc/bzeOQ18TI8AMdjYFJi96QFWgdLxihWmbpBcj9oY8FI6FMP8xur4Ey2yxDcrFvWwlav8p7L/eMjerqxb8oSqIBNRVAyLccEODSAi/+qEhlQElgl1Mka7jH2Vtv8Xf1fG9i1bCd5XR4AVRI3Mk4EMoww68pMZfbbV4bs0PyDEYHlXE/7AQavF+xLjvQ== 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=9Fjh6Va9is1UKXphs4R/KE5/TgQpuAEqDeLTgySmbZw=; b=nNZguOT0BMiPHjUKwFmLHS20Nq3U59gAF+Uwy+jtYym6kpEdK9gYaRLyD6bC4NhV0SxR2y23U9jP2WQTEkwH5hi4PXmaTsdLDh8oL8KtB42d+oOYMKcZO1BxcOPIOpQ1/tm3JqxMEfBQmzzmt7HeLP0+P9C1Pr4c3Qh9tWq/CLhkIVr1RDc2vbkvfTaPDv/5q0BngnyufUdnT6ZQCqHgVLlwD+7qJAcCWnH1+xGeYaF2v3Fs0chOsjN2rnIm6V8KWVae4fISSEhmlpFqf6eIPu7m4ULDnXoMHiW4R2SU2WCm/KcICQ+6ZFYBIIXVqPO6Tt5gTHk2H7zeGAtEVl4S9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=google.com 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=9Fjh6Va9is1UKXphs4R/KE5/TgQpuAEqDeLTgySmbZw=; b=Fgtfv08w1OMLXdonW+6HhtK+YmUVi2lSS4VLNGSHmALfE55OYgvxudlo1Q4f7jySItgL6vXqvATpX3wvNhH+bA73roP8Ui+xg5eBRvUzuKu5FtyeInKKVflg2gMq+Y6VEqgy+KY4Rjqi95nxCUea+676mSRT9DrWr4CEEG8MLSziAma3drMxNQdsnhwKXsK4t3C30uSXU4j2ET6d3+IP2npt2w/LZXHrQWPcqygZ2hgs8hRzsy+FdqORKCs/GFOfSRLkMkUVOTCvCDqcpy/EUBF/ikpVvXoF8VcMnkEgj2h3VRxOx97dkEWwPdzGLcFyMH+koLLvp2/ECUsn8+QuFg== Received: from SJ0PR13CA0144.namprd13.prod.outlook.com (2603:10b6:a03:2c6::29) by MW4PR12MB7015.namprd12.prod.outlook.com (2603:10b6:303:218::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.7; Wed, 3 Jun 2026 19:34:28 +0000 Received: from CO1PEPF000066E6.namprd05.prod.outlook.com (2603:10b6:a03:2c6:cafe::e5) by SJ0PR13CA0144.outlook.office365.com (2603:10b6:a03:2c6::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.92.7 via Frontend Transport; Wed, 3 Jun 2026 19:34:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1PEPF000066E6.mail.protection.outlook.com (10.167.249.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.5 via Frontend Transport; Wed, 3 Jun 2026 19:34:24 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 3 Jun 2026 12:34:07 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 3 Jun 2026 12:34:07 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Wed, 3 Jun 2026 12:33:58 -0700 From: Mark Bloch To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Jonathan Corbet , Shuah Khan , Jiri Pirko , Simon Horman , Sunil Goutham , Linu Cherian , Geetha sowjanya , hariprasad , Subbaraya Sundeep , Bharat Bhushan , Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , "Borislav Petkov (AMD)" , Andrew Morton , Randy Dunlap , "Peter Zijlstra (Intel)" , Thomas Gleixner , Petr Mladek , Tejun Heo , Vlastimil Babka , Feng Tang , Dave Hansen , Christian Brauner , Dapeng Mi , Kees Cook , Marco Elver , Eric Biggers , Li RongQing , "Paul E. McKenney" , "Ethan Nelson-Moore" , , , , Subject: [PATCH net-next V2 6/7] octeontx2-pf: Register devlink after SR-IOV state init Date: Wed, 3 Jun 2026 22:32:58 +0300 Message-ID: <20260603193259.3412464-7-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260603193259.3412464-1-mbloch@nvidia.com> References: <20260603193259.3412464-1-mbloch@nvidia.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066E6:EE_|MW4PR12MB7015:EE_ X-MS-Office365-Filtering-Correlation-Id: aec7e565-1771-41d6-312b-08dec1a71e5f 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;ARA:13230040|7416014|376014|1800799024|82310400026|36860700016|18002099003|22082099003|6133799003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: aj5MfJdt7S7ffWEPi+2bAyFKJJ+JKCDKT3lmNTaudJZjdP+2XuhUSP8dWnaPB/+GODtfGEkmjun2Ykwx5Ika04Nk76A948BFRfkOSg+3WdcqVlz/sbFzcYIqMpk6B0f0+gYPZNbK08f1JxcnVf6zQzy6RinkbmWvuLdkAyQMCi/d5nUY3mzHeFietax3qCgQACNfLZykk6nQkpjRYHbYV9f6VMQRva/b4Jg77N9qbMUy1kYvTjz1gKTGjwJOg7oEkDIetZVWOfPIl7BoLQKGLu1DuOnbMR1HBng03AXZ6lDT3w40cd0aSNCja5zUVHiyG2aGWJfGQ8oThyIJmR+VcxWTLZQzIjm1mdD78J6tOIIVKq8WbMUoGk0y12ZPV/2twQZjfQdaQrLmBjApCR6dZy43uJLr0ZQm66RM8P3g+vvu0LlmfUvaFB+qELN95duYuwlDqKVhoN6Vpb0MugIsHRT+nRIbmOSIo42MDW7TVoMxzw6jseoo7kPFAuC18RQ5zZfMUU+ZhniRBIK04iKE4YYJCe2e9pIQDtGRKpxJ2DC+s3orWMtzjjDMOZSFbX+Ig2dpWtyaqTWWn8YigTOWmd6kk8XWgCmgcuH+BlDTg+4pZMHyGj+1jX2Xxypgybu0acjxA3rKNx5Opjkja1tpa6VUTEXfhg2Rn5TJNjPDgnXIQEQKc4uqLMpyH6AsINaNTieD3M0hJIFLKmLpqwaeoGJJ4TlLSsdRMLpQupwOv5E= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(82310400026)(36860700016)(18002099003)(22082099003)(6133799003)(11063799006)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pYvcMNaVP/MUO06CJGhrMlHikBRZfeMjxaOLvi3d7MoX2PYGsMqLahWar0SDDH81grOmCN73c2o5L3Jn+DezI82yy4Hv70athUPxyWiT3GJB3gFcJFr4xxyqX2tQmyKMEe/9GuUf1j99bNaRZljiY1m8BeU5Uk1QuK023oyt2I4NWyiFK/8wX/Mva9mdGVuPjqIAeNYe+AemnU3yLNkkmTfRoC5LJfm0B7YXSnRx66ZMjcevijzxTIVsb2Q/hpVKJ0c5u9M3l5FeoRSNWw/oHeLCADVFHmiWBi4arrhbHghuSXPiNtVU5HnAsdmX2j8dPpU6Y2c9u4L+PuBEgk8TpZwUF6EH/YN8iBfVS0+fWRe8X76ghC5uKCoPutRR7u84T1mGlMpGSh0c4EcFvp6XBDIsv7yiSNEsguyeoQTKw2+YII0eS6rjK5fGlGzyV/jD X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2026 19:34:24.5714 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aec7e565-1771-41d6-312b-08dec1a71e5f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000066E6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7015 A later patch makes devlink registration the point where devlink core may call eswitch_mode_set() to apply a boot-time default eswitch mode. Move octeontx2 PF devlink registration after PF SR-IOV configuration state is initialized, so representor creation has the state it needs. Add a separate unwind label so failures after devlink registration unregister devlink before cleaning up SR-IOV state. Signed-off-by: Mark Bloch --- .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c index ee623476e5ff..9afe6cf0ea01 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c @@ -3278,14 +3278,14 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (err) goto err_mcam_flow_del; - err = otx2_register_dl(pf); - if (err) - goto err_mcam_flow_del; - /* Initialize SR-IOV resources */ err = otx2_sriov_vfcfg_init(pf); if (err) - goto err_pf_sriov_init; + goto err_shutdown_tc; + + err = otx2_register_dl(pf); + if (err) + goto err_sriov_cleannup; /* Enable link notifications */ otx2_cgx_config_linkevents(pf, true); @@ -3293,7 +3293,7 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) pf->af_xdp_zc_qidx = bitmap_zalloc(qcount, GFP_KERNEL); if (!pf->af_xdp_zc_qidx) { err = -ENOMEM; - goto err_sriov_cleannup; + goto err_dl_unregister; } #ifdef CONFIG_DCB @@ -3310,10 +3310,11 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) err_free_zc_bmap: bitmap_free(pf->af_xdp_zc_qidx); #endif +err_dl_unregister: + otx2_unregister_dl(pf); err_sriov_cleannup: otx2_sriov_vfcfg_cleanup(pf); -err_pf_sriov_init: - otx2_unregister_dl(pf); +err_shutdown_tc: otx2_shutdown_tc(pf); err_mcam_flow_del: otx2_mcam_flow_del(pf); -- 2.34.1