Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH v4 4/8] nvme-fc: Wait with a timeout for queue to freeze
To:     Daniel Wagner <dwagner@suse.de>, linux-nvme@lists.infradead.org
Cc:     linux-kernel@vger.kernel.org,
        James Smart <james.smart@broadcom.com>,
        Keith Busch <kbusch@kernel.org>,
        Ming Lei <ming.lei@redhat.com>,
        Sagi Grimberg <sagi@grimberg.me>,
        Hannes Reinecke <hare@suse.de>,
        Wen Xiong <wenxiong@us.ibm.com>,
        James Smart <jsmart2021@gmail.com>
References: <20210802112658.75875-1-dwagner@suse.de>
 <20210802112658.75875-5-dwagner@suse.de>
From:   Himanshu Madhani <himanshu.madhani@oracle.com>
Organization: Oracle
Message-ID: <13814cd7-eb04-8c14-0732-e0f70005835f@oracle.com>
Date:   Mon, 2 Aug 2021 14:36:09 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
In-Reply-To: <20210802112658.75875-5-dwagner@suse.de>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from [IPv6:2606:b400:2001:93:8000::b52] (2606:b400:8004:44::1e) by SN4PR0701CA0030.namprd07.prod.outlook.com (2603:10b6:803:2d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Mon, 2 Aug 2021 19:36:11 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: f085732c-20b3-4104-efbe-08d955ecc8a6
X-MS-TrafficTypeDiagnostic: SN6PR10MB2990:
X-Microsoft-Antispam-PRVS: <SN6PR10MB2990840A82B0D642DD1D89FCE6EF9@SN6PR10MB2990.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:81;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: KreTuZPr6AoZF26J4ZbI7CIO4EquUpqBckZHkpLC/HVzIesLyYQ7o/CJ40/a8jS6q9m/tw3flvYIoVIh2HA1dl9EMqB3zqATL5YBy5OiFe1TV6JWK5IYuL+IJ5nxurFoBiyvB+q4U+NPXoYDevOfbJ8L0o02AOczPfsV+ZvQE6rZroWkHsCqS6Qul/K+cFyDWk/S3pG73l1M+x04SxNXDA2d8vgZF6WSghsMw2sg/GpzOxrGMDqcfQYY+7ipIBu9VJ97pC1154+ptntsFTdPLxxL73CiSRRkSDW8Lvy1Oy60H9Easfbvu0AQtSaRkv4r0f16Z8sSsuyYLDHe6GKVOQ24aU9+0yNYilP3Y2+YBswrdO3Ak631h1psH0GpSaYuT1arro/GJ4/6UKomGxH5ix5jdWfCXL6x2y+a07tXbvrHuA1aNyL4WsRptT1Anfv53KUu79QVlzmAI0E6FN85fbkS+vX/gIJ0sEWxBgWoM/eNxEgKkl3ERtbfRplDXKMwnlRPwCjiuR0BdECSGQ3CinL8Ji2LcFya8nCEJuZhTM+STwu6oIvqL47JEJeqYOcA5eXkbil3HlwN4vl59QXipFBaCEd7Q6pkvWPTYldy+Ux/++rETj7qvhB7/x17xlc69ttJE9q1/Ubhe+bcjp9x2sOsX9K4H6cMAwRLU+G1oYSvyIJuJnJtSX8PDwz6eRVTEqw0we6/f0CdhBS7rN/eSjxvV5PzYeM+gHoHzu3RBpw=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB2943.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(39860400002)(396003)(366004)(346002)(136003)(36916002)(7416002)(44832011)(66946007)(38100700002)(83380400001)(31696002)(66476007)(66556008)(186003)(316002)(5660300002)(36756003)(2616005)(478600001)(86362001)(2906002)(4326008)(6486002)(8676002)(31686004)(8936002)(53546011)(54906003)(45980500001)(43740500002);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y3RnSVRtMTBTejFmN1pkekN6ZEhZZEg5U3FDNGxDQVhvSkx3bGE1NXJQdElD?=
 =?utf-8?B?MnZySGdNR1VGbGUwcUNXOU9YaGVVS1NHWXQrUVcwZTdPNUQ1N2w3a0pHMjhU?=
 =?utf-8?B?MUpzTVJqTHdna2I5RmNWNEFMZTFnNXZ2NFVKU0NXV2liK1B1LzlrMkdtY1VL?=
 =?utf-8?B?eGpON1VCME1MZ3REQ3R0K2Q3RFl1MFhXNktIYmMrNmZrZm0rbjBHNVkxSlBT?=
 =?utf-8?B?NFpDdmx4VkNVV3U5ZnVRb2hUY2JHanRqTG5ZSTB2bUUxdGhDaHU4WkQrWUs3?=
 =?utf-8?B?a0xobEY1QlZ2MGdUamg2bTlwYnpudmdMOEM2Q0ZDS0NHQnh4SlRlUzhuejdG?=
 =?utf-8?B?USs3Q1Bqc2x6MmxPbTlQam1HU04zUVUrd3dTV3hoRDQzRWRqQTZ5Rm1SMjl5?=
 =?utf-8?B?RjNLUVViZFJYSy9ZYTJONStQRUQ5R3B3aWkwR3FnOHBJemNheHhPMHZ5aWt5?=
 =?utf-8?B?dDE5Y0pFZ1ZKZW1zQndIemMxSHBOOXB1Z25kVFRZVExwMXpMVTFtVEYxNkcr?=
 =?utf-8?B?MWNKSEZEQXZVYUtQQVZOKzV6V2txQ1VhRGZnZ0lUOFdJUy9lZy9ybERCRk1O?=
 =?utf-8?B?cXF6YWw5NHQ0UHJQTnpIWk82NG50N01RSDBjVHRuMUtaMERoT1NmYmRySmlz?=
 =?utf-8?B?RjBXSXh5QU1VRWFENVNtemlxTUN6ejJDbXV2ODdHZ0lZaHl6S3dSU1FwNGh5?=
 =?utf-8?B?N0pJdlhiVFF4cllqUjQwanpQQkVyUDJKMGpibjQxV1RwYThtTUxpVVZqTnVs?=
 =?utf-8?B?Y3J4RDRlWmZFTmhZSTlpQUtjSHpVQS9JRXJmQyt2UXkyaW10UjNEUHBjK3J5?=
 =?utf-8?B?dGRvRHlnQmNwdXhNZWFSY1J1VXVSZU13QWVac2Vubk1WMFAvWkhCRmZaZ1Rp?=
 =?utf-8?B?OFNsUStIZlFOUHlhNi80RnFlNFJXUHZEQkZKbkpWZDFjVWFzQVZmSHRwQ3V2?=
 =?utf-8?B?UjZtU1JBczFTbVVVRU0yU2RLN0tZUGU5Y1NQZkR6MUI0NnhrTld3YXpINUR2?=
 =?utf-8?B?QVRFZlFCK1VNbk80VUozR2xoUVlEdThBUUxTTzUzN2QrWkRyWlUyM0pXYWwr?=
 =?utf-8?B?TXZ4OXAyZDBtbC9lQmtXb0Z3OXpueHVSYlJBaGV0eVY4SkxoamVrRGhMWFBR?=
 =?utf-8?B?bnRXMkFPNjYvQ0ZTZ2NUSzliK3YzM2k4VFQraHlzcUt4SzJxTUxQV3BCRUQy?=
 =?utf-8?B?UGNCYlB6b0I1SEZtSGdFWFJNYi9Sbk1mSTE4dXhMbzhyWkEvcVZDM3c0OGRJ?=
 =?utf-8?B?TDFUT2R6SXQ1UXIyRFp5QXU1WFE1QnRnYXpYb0JINjNNUkt6NzhTVmxGd0dN?=
 =?utf-8?B?bUVOdHd4ZmhOOUYvbnFRc1U2aDJkMHJ3dmF5Y2ZFQkk0amN4NGJtQ0hRdE1U?=
 =?utf-8?B?dFFWN2RnZFd4S2p4UkZ3U2l6RVNTT1B1VXBraWtqbmRGbGlXWmNEOThqY3lx?=
 =?utf-8?B?MUVhRitCd2JHZmExOUtMUm9nWXE4NDU3bkpOcTRYZ3JJaVE2TmZJS3lpSDBB?=
 =?utf-8?B?SWlXSndIeTBrOGJSbzd5Y3V0VEo1MmloQ3k2Sjd3YnpKWG5UbnRFNDBwUjZi?=
 =?utf-8?B?aGRBOWluMnFWQWNSY3JBY2VBSjN6ZFY0Wnk1SDV2TW81V3Uzay9mQ3lacWhl?=
 =?utf-8?B?cXRZaTdrejF5Z2NDeVpXUUdqQmtkKzM5Szg0MFhEdjRWM1EvU0FmS1A4L1lW?=
 =?utf-8?B?WlNXMVdIMlZIM2ZHOExRbzZrcTE5eVdWOW1FRENiSG83aGdEMlhpREJyUlJW?=
 =?utf-8?B?aTNuMG9qTjFhUzF3Qnk0Y0oxaUZDK3JlWVlTRG5nZjdGdTBBZzE0TU9MQS91?=
 =?utf-8?B?SU1DdjlOWVRWeU5BcTZwdz09?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f085732c-20b3-4104-efbe-08d955ecc8a6
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB2943.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 19:36:11.7351
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tOoGvCx8binNxdDFvCrkTS83f4wmul7twyZuQZtF3WbpnpKbnVpGaY9VM0OpYejxsByLpk8Zu4Xescr0JdP7OdJUcpZWQ00oANUI91ikDKE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2990
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10064 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 malwarescore=0
 suspectscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000
 definitions=main-2108020125
X-Proofpoint-GUID: 771LSlRrYohmDeBxIsCu7gOux0cr-XW4
X-Proofpoint-ORIG-GUID: 771LSlRrYohmDeBxIsCu7gOux0cr-XW4
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 8/2/21 6:26 AM, Daniel Wagner wrote:
> Do not wait indifinitly for all queues to freeze. Instead use a
> timeout and abort the operation if we get stuck.
> 
> Reviewed-by: James Smart <jsmart2021@gmail.com>
> Reviewed-by: Hannes Reinecke <hare@suse.de>
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
>   drivers/nvme/host/fc.c | 9 ++++++++-
>   1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 8a903769364f..dbb8ad816df8 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2955,7 +2955,14 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)
>   		dev_info(ctrl->ctrl.device,
>   			"reconnect: revising io queue count from %d to %d\n",
>   			prior_ioq_cnt, nr_io_queues);
> -		nvme_wait_freeze(&ctrl->ctrl);
> +		if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) {
> +			/*
> +			 * If we timed out waiting for freeze we are likely to
> +			 * be stuck.  Fail the controller initialization just
> +			 * to be safe.
> +			 */
> +			return -ENODEV;
> +		}
>   		blk_mq_update_nr_hw_queues(&ctrl->tag_set, nr_io_queues);
>   		nvme_unfreeze(&ctrl->ctrl);
>   	}
> 

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

-- 
Himanshu Madhani                                Oracle Linux Engineering