From patchwork Wed Aug 2 03:26:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 710578 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50E43C001DF for ; Wed, 2 Aug 2023 03:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229800AbjHBD1F (ORCPT ); Tue, 1 Aug 2023 23:27:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231258AbjHBD1E (ORCPT ); Tue, 1 Aug 2023 23:27:04 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2042.outbound.protection.outlook.com [40.107.244.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD53F1990 for ; Tue, 1 Aug 2023 20:27:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gg5c+8jk3u+KtciqDCkzQaeWF4HFBQxu98p6+mYp0jA7A6ycg7vFNXqXLCyWKz4GJaiyM13DzsxhjyvWkds/hbX8Kabt/wwDmKVPPp7lV7Ii6BOXA6vtXgfxSRgdmE3U0S0rd5T8WtOIEbyM/2mamzad2HFftaw5WBO3UO9voCbcWR4p8lbcRyx2G1aBS5h1+FXlDv7Xbcyyl+/jKlB01mtzIt5WNxsHEQ8oHvxHX7I6mfB1BeDG4vByeZCid77PE3RgcyJBnBPbJ5TLWjPMF4ei13lxp6suglkKGo0nYGo+X1MhzdcbE96HWTtrrL6v6vJEa0Nt8/fszZ5bTJ8dxw== 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=ZXWE0D79dU6sChd2MozY6tprLj+NzHL+YdDPGzMCMzs=; b=WUiSQ9obasHIKtlzRS1fCUO6JJOU7BL2d7bjbjPz+2TomGNrUraQLAmKFC29eIOS1WHAkQnylmzPMPoqoBHdkytX1/QVLRk+Lnzkdp2QQRzeU41/VPfcsrKhG9mp7ZcA2UVFy5rXaySd5i5gqoXIDMAf4Sxo1HgnpxZIYw3QXIFGYRHM01fJ54NgkY578pY0OF2sJn/UB4c8IPde3YgQva4a9/tk/4QPNaMV4b19GRji0ot9JYgPdeLpo3A5Ju5+bFkn3HK/Cn9NvO2ALm9C4bCJ4A3F/fnQFzz+SA4x7+m8zG4eUVzHAEUn4+avJqmIqbggEzBuQJL8lhA40qEGhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=lists.infradead.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=ZXWE0D79dU6sChd2MozY6tprLj+NzHL+YdDPGzMCMzs=; b=g7nR+XtE8xoP1Clin/3LQxZ/B4hiHBzBQRXH3pPhkUeUrYS2+z1Ja3KjU8NBsZOTVBVUIzMdnW6Ju/caFJjiLohq7O/k6V52ytEij9ZmHk4C6etU+cfqXDNb3nnlKNnZORS6bx/aWwMZ80AgqnVQ/aiEMzfKrl0UcK/9jQUkLitDIz07alQ4VCXDZsNOg/TB/YeXUm51k4U/3iZYnuRHFT9zKivPyc2egcgNeHQCB5f8HTCXlDNM3gJ4cMqS4iS7pxY2+++B5tpp1WQP9Y3tv58PHoO7Fpf1pr1UCKc2CxwH+HUXvml+qYCtkNeU3ncwKMiuU8+k4gPg+Jer0YLXIg== Received: from CYXPR02CA0075.namprd02.prod.outlook.com (2603:10b6:930:ce::28) by DM4PR12MB6182.namprd12.prod.outlook.com (2603:10b6:8:a8::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Wed, 2 Aug 2023 03:27:01 +0000 Received: from CY4PEPF0000EDD7.namprd03.prod.outlook.com (2603:10b6:930:ce:cafe::ec) by CYXPR02CA0075.outlook.office365.com (2603:10b6:930:ce::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44 via Frontend Transport; Wed, 2 Aug 2023 03:27:01 +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 CY4PEPF0000EDD7.mail.protection.outlook.com (10.167.241.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 2 Aug 2023 03:27:01 +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.986.5; Tue, 1 Aug 2023 20:26:49 -0700 Received: from dev.nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 1 Aug 2023 20:26:48 -0700 From: Chaitanya Kulkarni To: , CC: , , , , , , , Chaitanya Kulkarni Subject: [PATCH 1/3] nvme-core: init auth ctrl early Date: Tue, 1 Aug 2023 20:26:27 -0700 Message-ID: <20230802032629.24309-2-kch@nvidia.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230802032629.24309-1-kch@nvidia.com> References: <20230802032629.24309-1-kch@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD7:EE_|DM4PR12MB6182:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b9cb279-d17a-460c-0aa1-08db93085608 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Esv4CjVp6zkCLYoOHEPl16SRt84QQiuZtZztweM6Y9AlTPDe4QsUNpOxWp/Ny2OWUzrIk0a7phtY7wg8n/2tq5e6nstydYbZGlGNocTH6ZLdeVN6Rne7Ss5U8x7Aw+PDLvNvyAmfnDYP5+Np37X2qYqtxdEkdwAO/ypor74aE6U1Eq2mI5JjkSUvyFYM+tLTNF6kCXvUsDHxfCxsAdE3z1vAPmpk1HA+1IqQpYh7Uztm2iWjHT9UdqVkdukfU1bme4sj1eluGydo78U44J6ip8octgv6tHK6PPEF6R8SM8dvVdvtK3rkoOAR3xsxeeWgaY0+77jLMGnhOJbkuTcdxdsQ7N1bDcazXFamN5AnwJNndcrWrHyQCNz5ojr+FPbsZYbzLF5itG6uj1ynoV8N9TYp/51G8WcUGwOL7sGphm2vyWC3qs277pmdmVLBVBO/zP6IfPTTJ+uiojKE1k4H50WW/Aqp4AM1jIWM3aL8GY5Rsq6u6sWj06GXBa5rUAWFWIlTyeplY9xcjnWg7SOWOSbvjhcOb4rt5s+I+cfUEMBnOV0BgWBOM2kLrOaWzFmgyrJCKzh+QBMb2Ioy2IziNXf/Mz4+nxYuEuXIsnTJzlFaklVSayLEPbUbornW3H79tN2fv4ciHSMLx8Vc7u547LWB3fWi084ukLhOFe9X/hQQshSpCgjDjURzunDv991eaWtpvPooQoFfWDiNyTtFrr/XysRHXsfIZwfC5tSCKXrKaYJNEQYgFmZEOJaBkOgBdDhgOlYXvt7D2eZzJnzuUw== 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:(13230028)(4636009)(346002)(136003)(376002)(39860400002)(396003)(451199021)(82310400008)(36840700001)(40470700004)(46966006)(4326008)(70586007)(40480700001)(40460700003)(356005)(7636003)(36860700001)(70206006)(107886003)(2616005)(66899021)(47076005)(426003)(83380400001)(2906002)(36756003)(54906003)(8676002)(110136005)(8936002)(7696005)(478600001)(316002)(336012)(16526019)(41300700001)(1076003)(5660300002)(26005)(186003)(6666004)(82740400003)(2101003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 03:27:01.4039 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b9cb279-d17a-460c-0aa1-08db93085608 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: CY4PEPF0000EDD7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6182 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently, nvme_auth_init_ctrl() is called at the end of the nvme_init_ctrl(). Prior to that call, we allocate the discard page, allocate ida get the controller reference, and add cdev(). None of these steps are required for the successful initialization of nvme_auth_init_ctrl(). The only non-nvme-auth properties accessed by nvme_auth_init_ctrl() in ctrl_max_dhchaps() are ctrl->opts->nr_io_queues, ctrl->opts->nr_write_queues, and ctrl->opts->nr_poll_queues that are set by transports. Ideally, we should avoid adding anything after device's addition to the the system that could result in failure, since current position of the nvme_auth_init_ctrl() adds more code in the error unwind path that can lead to potential bugs which can be avoided. Move nvme_auth_init_ctrl() call to the top of the function in the nvme_init_ctrl() since it allows us to make the error unwind path smaller that requires less debugging and maintenance. Note that the addition of the whiteline after return 0 is intentional. Signed-off-by: Chaitanya Kulkarni --- drivers/nvme/host/core.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 37b6fa746662..a732a862d6bf 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -4410,6 +4410,10 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, { int ret; + ret = nvme_auth_init_ctrl(ctrl); + if (ret) + return ret; + ctrl->state = NVME_CTRL_NEW; clear_bit(NVME_CTRL_FAILFAST_EXPIRED, &ctrl->flags); spin_lock_init(&ctrl->lock); @@ -4478,15 +4482,8 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, nvme_fault_inject_init(&ctrl->fault_inject, dev_name(ctrl->device)); nvme_mpath_init_ctrl(ctrl); - ret = nvme_auth_init_ctrl(ctrl); - if (ret) - goto out_free_cdev; - return 0; -out_free_cdev: - nvme_fault_inject_fini(&ctrl->fault_inject); - dev_pm_qos_hide_latency_tolerance(ctrl->device); - cdev_device_del(&ctrl->cdev, ctrl->device); + out_free_name: nvme_put_ctrl(ctrl); kfree_const(ctrl->device->kobj.name); From patchwork Wed Aug 2 03:26:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 709480 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65F3BC04A6A for ; Wed, 2 Aug 2023 03:27:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230325AbjHBD1S (ORCPT ); Tue, 1 Aug 2023 23:27:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231282AbjHBD1P (ORCPT ); Tue, 1 Aug 2023 23:27:15 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2076.outbound.protection.outlook.com [40.107.220.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AA431705 for ; Tue, 1 Aug 2023 20:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mWrHp60Qf9FiJAFkpcktOnSGUNamkh6o5PeN0/qEwA8OMm5rZ63nu9fCY9O6G8+ywueGVA0vqAgWmWDfcGugispaaKiXHE4HpoCfCY7A0rA9+BadjiIDJbITP+1WVD2aQf2Yzkf7bNXQ/n53WRoQD3ox+1juXGycdU1WhxhVwjarMBaSscHwRnfcPLKiN4e2CgfLy70rhc9UJl2UtrKU4nQEAWeT9BLdS78G8UQ5aZCImWKGd7LmMSuN4wqdTiJ9yNuwr9wnXpNwYjUoZVKELfs3urWxw2OxXryOBsqx2/sMSvRNtRRzCtf4R5UbZvcfpHMRlQv/FGF4w4M6Il7nlg== 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=pSfkO2KCMN6IV1AwLlYtHdNWGwi226lxQ3+y7plGrBs=; b=OLm5CqHCcs/rjerl+mRdWKrMF4Btnr4ONxusRKA2ssH7QU4ozSmGc7WxuQvU/sqMia02uh1stFlmBbzRRk9/UszWz1K8/ydXRincUdMmEZOF/v9Qu1QVvX/lR52g4RsY4OLZ1G/CX07rRZ7pwhXYGjsEqnN79E587b6UcCoP5vCO8MOSBNL6F+Jse1g33gap7zTTQa288JRVVylpPGufoVhrqeuFraPoTOg2oE8RrotUNJWR39+FUiKezGRDHIwX/7MEqcgY8CF2nSTZUyf6KQNnerjgayEZK3Zlb7hypIHODhGoJYdi//ar0KiaW2aOtOz/cRYLmhuM4xThf5Ck0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=lists.infradead.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=pSfkO2KCMN6IV1AwLlYtHdNWGwi226lxQ3+y7plGrBs=; b=oPEgA2E5nPdWyWGs4lqah11PcG60BaWITy55VbTS8yCdn5r4HOepKOBVTh2U7MusLiXJY6shNrwVVzykxaJWYDlzEe8gSs55LTPMhnJtqmcUz6FcF9qrP9glw5TiAMscu7enucwvAShoaPxTVbXVL0w+ToncHyNfs/httrg2tY6bSjGNqDRC3SldCxq2fXFwlImLAgQRixzSnnMgc7qsfQBmbF7uOrO6A5jCDtFqqYfv8lp7zD1kNm4iRskR1s8uROG/6Ep+lKCjq++DnqU7ceQzyNGTgpcSZgC6THxrbkV2F0HaAud1K85C9fvndSbRWKUFaa9WH8PWmAl/k82t/A== Received: from MW4P221CA0002.NAMP221.PROD.OUTLOOK.COM (2603:10b6:303:8b::7) by PH7PR12MB6587.namprd12.prod.outlook.com (2603:10b6:510:211::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 03:27:11 +0000 Received: from CO1PEPF000044EE.namprd05.prod.outlook.com (2603:10b6:303:8b:cafe::b8) by MW4P221CA0002.outlook.office365.com (2603:10b6:303:8b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44 via Frontend Transport; Wed, 2 Aug 2023 03:27:10 +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 CO1PEPF000044EE.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.22 via Frontend Transport; Wed, 2 Aug 2023 03:27:10 +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; Tue, 1 Aug 2023 20:27:01 -0700 Received: from dev.nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 1 Aug 2023 20:27:00 -0700 From: Chaitanya Kulkarni To: , CC: , , , , , , , Chaitanya Kulkarni Subject: [PATCH 2/3] nvme-core: init fault injection & mpath ctrl early Date: Tue, 1 Aug 2023 20:26:28 -0700 Message-ID: <20230802032629.24309-3-kch@nvidia.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230802032629.24309-1-kch@nvidia.com> References: <20230802032629.24309-1-kch@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EE:EE_|PH7PR12MB6587:EE_ X-MS-Office365-Filtering-Correlation-Id: 17ffba84-497e-4828-4906-08db93085b8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KADcGE7ndm9uh9cFZAGGghvkTN6sDDTX/V0GZmFJhhytHV8NVLXGvARJQH4CvLlq1KdZlKviy3wQw2cM7idIiSb66JYMiAmGLxVYPfMeyDelEwO/8CSxo0XtbYfo7PceoU9YJEmHGVEo1HkRl1H9d8Wsue32aLOAF9rGxjvT7DCXMjCrkGCWrgbJPnkwF0SxuwF10QTmB6OrHWyyZkE/n7uzO/tsm/wOcDlpnp7M2ykCbdnM4P2wkNmLpC0daG69TWYrcM4FfM7/hI1sa+/4FCiyjb2C8SEKwLNabeUDgf9BFvDkNhlOHGzYpzbPCSwaQM41ZY2GBAs5oDxtdCg7K+uLho29Hsx4AiwDJFHJD91joKUjHxN1s3req+a4sUVulgIqx/iF/zfRYTJpYXah7TvazrkJXJ9bLN2q3DQB2kRkpf0x+1i4CeqnLikZEGw1PzON78zRGd21p2Qckn/2Gc6BuLo0Ampl614ibdpg+QGdOMQbRU0vOVJWxjPUrX7WJs5mXhhZKu6YEOS2SBm0/EjNEt7j9n3Ep5D13XdIjWNo7g/h/J7cFgVt+6OoYltTxAmHRGKsF8+YhmPINaljrKd8y0T4ISVZvRmUBqYyxFyyf1wTCtV72AArpCt4mm7Zmo6Ls+rDrZeA7NL/MLnyb8U9BBZyshHU3J+aDwfDvH3Oo6i1+0q5dYG2rM3kNXI902+c84rbT6hLmXDCXUNI7EMePuCOnv+hv9dHiDRWFJfiuSJgbzlALikotYNnRads 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)(136003)(39860400002)(346002)(396003)(376002)(451199021)(82310400008)(36840700001)(46966006)(40470700004)(2616005)(5660300002)(426003)(8936002)(186003)(336012)(16526019)(36860700001)(8676002)(47076005)(83380400001)(478600001)(26005)(70586007)(70206006)(110136005)(4326008)(54906003)(316002)(107886003)(7696005)(6666004)(41300700001)(1076003)(40480700001)(36756003)(40460700003)(2906002)(356005)(7636003)(82740400003)(2101003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 03:27:10.6461 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17ffba84-497e-4828-4906-08db93085b8a 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: CO1PEPF000044EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6587 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org In order to avoid any initialization after cdev_device_add() move fault injection and multipath ctrl initialization before cdev_device_add(). Signed-off-by: Chaitanya Kulkarni --- drivers/nvme/host/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index a732a862d6bf..555ec4af5b80 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -4465,6 +4465,8 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, if (ret) goto out_release_instance; + nvme_fault_inject_init(&ctrl->fault_inject, dev_name(ctrl->device)); + nvme_mpath_init_ctrl(ctrl); nvme_get_ctrl(ctrl); cdev_init(&ctrl->cdev, &nvme_dev_fops); ctrl->cdev.owner = ops->module; @@ -4480,8 +4482,6 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, dev_pm_qos_update_user_latency_tolerance(ctrl->device, min(default_ps_max_latency_us, (unsigned long)S32_MAX)); - nvme_fault_inject_init(&ctrl->fault_inject, dev_name(ctrl->device)); - nvme_mpath_init_ctrl(ctrl); return 0; out_free_name: From patchwork Wed Aug 2 03:26:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 710577 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B881C001E0 for ; Wed, 2 Aug 2023 03:27:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231258AbjHBD1g (ORCPT ); Tue, 1 Aug 2023 23:27:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231282AbjHBD1e (ORCPT ); Tue, 1 Aug 2023 23:27:34 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2040.outbound.protection.outlook.com [40.107.93.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD08E1990 for ; Tue, 1 Aug 2023 20:27:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QZRw+V55jweBlUwa6vqKZrp+IcvOEY0HGfgkwOVROuY/BeXkMCbP98d15CuatXd5SlyXJuRg2OrNFqy9/mT+YmKD6eT5mzg8MniRFESdMXJEQG9OVGhxOh6lmO8xlRYMBhw7AnwPfva6vJAUThOT5nHlrUUU+uFoE9+I76LoFOhRPGPULkNDurc1t6udjjyUBd0GT6LLvUgG0AxiufUwfQLmHAENbE/3GNTsbI1+I17yWzCKYmvHZ41D3iBLiNWU3JUG6BZul+A4ovA4yfYt51N7Dr6dE/7RMMZCFFr6vddS0OFEMOziMpHz76TOMJNWxDYI1S9PAB/vyQS+XFyZeg== 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=rkEHW3v5+R1s2/bfUAr6/yLWUEU72Ino6/E7xbTibHM=; b=PCR4ng5L4OlNMr9p4I/KHiM2laFp66BrpuRvdWHYUmGqNf9BCOi3LfCkWb5gWgylSKRKGPKWDBCUNAbHeSZYI88r5CaF+3sHvYeKkVo8r9ml8q23FENHSDPbO7FLuLOkStfNqe1Iw/g9HMV0p7t31JZTxp0g0j6YJYyEnDijmhAhE5HiIZRCw/OxqDHx8ITMIzGTFhDtva1y8KOteawxeHlsl+UnoIETomZcfJOX575xzfAQHP0sCKDlQPZ6wtQJdV5JJsjBgHdITD7a9ms6/yjp6JyfUXe57bDmUxkHE8u0uaN4KtLNMxQV4ysqLv+BEtyqa1yxmNC5NIHVnG2j5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=lists.infradead.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=rkEHW3v5+R1s2/bfUAr6/yLWUEU72Ino6/E7xbTibHM=; b=KH3Mk5JY85OirppToJizrE1HVPlPD09Iv43EshFEWo+WSXrGzl2osCJDqAN02oyPzBjYpjT/s7snGVvi+Z4KknLrs4bQ4M3CTqLYHkaYmMvVphC2JksJAIxEY292Gwv4eAMNx9clLcsH7ODO5nwEn5Z8nNaI4aPMx+qm4VcQoyxVlXxZBNKosjqOrV8y9JlLSBOOH9pIeXwJWfWGAdtEjdDR/N/exsRg6R7kKWXHOSmLqIWHU/NXM9BifYt93J2YtrbZTd9vaIpcmcCvyDD2KtvZKW4MHO55YI9FSmU3cA0P2v3f3sQTEPigvjWCNFOh54bS+O1xQLZoi1Vt1z1fBQ== Received: from MW4PR04CA0051.namprd04.prod.outlook.com (2603:10b6:303:6a::26) by CH3PR12MB7497.namprd12.prod.outlook.com (2603:10b6:610:153::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44; Wed, 2 Aug 2023 03:27:29 +0000 Received: from CO1PEPF000044F2.namprd05.prod.outlook.com (2603:10b6:303:6a:cafe::ff) by MW4PR04CA0051.outlook.office365.com (2603:10b6:303:6a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45 via Frontend Transport; Wed, 2 Aug 2023 03:27: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 CO1PEPF000044F2.mail.protection.outlook.com (10.167.241.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 2 Aug 2023 03:27: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.986.5; Tue, 1 Aug 2023 20:27:12 -0700 Received: from dev.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.37; Tue, 1 Aug 2023 20:27:11 -0700 From: Chaitanya Kulkarni To: , CC: , , , , , , , Chaitanya Kulkarni Subject: [PATCH 3/3] nvme-core: init power qoe ops early Date: Tue, 1 Aug 2023 20:26:29 -0700 Message-ID: <20230802032629.24309-4-kch@nvidia.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230802032629.24309-1-kch@nvidia.com> References: <20230802032629.24309-1-kch@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F2:EE_|CH3PR12MB7497:EE_ X-MS-Office365-Filtering-Correlation-Id: 34d834b8-6091-48d4-568b-08db93086652 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RtE0QDu+d6d9Zj5GptPCArnYqxEkPAgu3YY3HoaG2jvsgkdCznEll+L0uz4hQBp8LY5H1AB/obvcGpSnMjN8kU5Dqo71pVrJ0hwV0zpbB7Kcc225ZtP9AszFENkZ2hsts7QEeYHz7cP+nnjPBWSbSH775y/CfIqixi+WUxplojFh0Vp/3XCbdVymq8rJDgTi7kqofJNXZ2EdqqPe4RlgimI6hCTPZnDQn3tVsK8+GYMu7xRMD71+080BQr6fR4Riu+CxDGEsCFb+4ggGCeBaQFAB0X2iBZwDTlg6jHJQtqE+QwDyCOGM2vmUrWDpcyg3DR+vjetuUitYyDuxfqXk+xXAHuhUlrbUptSw5yxunLBNOzBQ19uaoVRtYPQEhDY9QNmX1ERiCqczpmVM/QrPRBBpm7eVWRYiv55NUqMOQ8w59uvdh1HiIk7iq/hPDvXDhiptWKS+RuwW1J4kTQTe0KoEMv69g0wNrRVB9haYJIuRttIovMj9qpgK4kCVuZreLS66d1+WTdj3awFfQsUvoJH7UNcmoRHFI2yEjlnP7wzJV/s8vUGGjiteJVE8P7tn/SNOuOl2GuSapEmChQDllW3fko/udfT+Wsf4G3w5OHM63LbLNJ/nO1jSJDQdx41uEe9VLRXHIP8nN7d5kBLr+/suSanOn3OpmqPWJOXfGMo8Zq6m+nhy1i1V8laAQ3Rm6sy2CkhVlq95H1OH4oigwVoDzqhaRyoLJLzKJr/cAw3ghqEWKy15hL0f8q2XU/qC92xEcgdXbSyaApxeOk6R3w== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(396003)(376002)(136003)(39860400002)(82310400008)(451199021)(46966006)(40470700004)(36840700001)(1076003)(7636003)(356005)(26005)(186003)(82740400003)(16526019)(107886003)(426003)(336012)(2616005)(2906002)(36860700001)(47076005)(83380400001)(36756003)(8676002)(110136005)(8936002)(40460700003)(478600001)(54906003)(6666004)(41300700001)(7696005)(316002)(40480700001)(5660300002)(70206006)(70586007)(4326008)(2101003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 03:27:28.7188 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 34d834b8-6091-48d4-568b-08db93086652 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: CO1PEPF000044F2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7497 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org In order to avoid any initialization after cdev_device_add() move dev pm qos latency tolerance before cdev_device_add(). Signed-off-by: Chaitanya Kulkarni --- drivers/nvme/host/core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 555ec4af5b80..cd27df7a5751 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -4465,6 +4465,14 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, if (ret) goto out_release_instance; + /* + * Initialize latency tolerance controls. The sysfs files won't + * be visible to userspace unless the device actually supports APST. + */ + ctrl->device->power.set_latency_tolerance = nvme_set_latency_tolerance; + dev_pm_qos_update_user_latency_tolerance(ctrl->device, + min(default_ps_max_latency_us, (unsigned long)S32_MAX)); + nvme_fault_inject_init(&ctrl->fault_inject, dev_name(ctrl->device)); nvme_mpath_init_ctrl(ctrl); nvme_get_ctrl(ctrl); @@ -4474,14 +4482,6 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, if (ret) goto out_free_name; - /* - * Initialize latency tolerance controls. The sysfs files won't - * be visible to userspace unless the device actually supports APST. - */ - ctrl->device->power.set_latency_tolerance = nvme_set_latency_tolerance; - dev_pm_qos_update_user_latency_tolerance(ctrl->device, - min(default_ps_max_latency_us, (unsigned long)S32_MAX)); - return 0; out_free_name: