Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp3292670rwb; Mon, 19 Sep 2022 19:04:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7rM9y3Mo5UMp58RpZUYtFVDgJbUUp3xR18n0o4iUXj/GZOSGsdpnbU0dWN0KBsS0tW1HUB X-Received: by 2002:a17:907:2d14:b0:779:fa1d:1aac with SMTP id gs20-20020a1709072d1400b00779fa1d1aacmr14885818ejc.585.1663639454335; Mon, 19 Sep 2022 19:04:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663639454; cv=none; d=google.com; s=arc-20160816; b=Gz93AVbBlbAMY6dgUrOnY6hwdzJssBBaHtpEkwX1Y4PX1d9VrW/bBZHbV0jM8z/FMb ezbjxS1QdKNiO/P7wn00gcek1uclADgV6cu0DM6PSd8wKBHvDWMJjweeN2grPpS0BLPN Xxx8ApeoJ4WVRQWZWshB75tUDwOGSEn2swyvg1Hq0gwGM20zTYu8vJu6zQVZXXizGbsj 9ALs54XKUbIguRcvSMiVCaHpf4YAaHbvAtwXO+mlmcE0M8hv6Lgd3qVD75EJVRO46h5f 7bQzlKLHuiRpbPDuaZyJ0VIoJqag2RCnWAl45ZmT4Y+GKzqAeDZrQ0oJ05zwTC962Tle IoHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id; bh=PQauAZLZAuE41a8SGxQ/oj4cgvYAYoIJIdwz22QzU/8=; b=y5W1VhGwQZGXVoxca+eefgKVA4mSE0c/DMd0JgA1XGQeIQniGD1OY5hiDX4ZJkXCvs wKOGxhEwrEl8U+hLGjU9ECJicyUZnxn4UutHh/HMT7HBJWm1E64LcsIO6Rb6wJCcAp7a 4Vas0jPZRMeQtBfzTyJ08CsOPIuy8b81WMAZir8x4LDfaLXUw2Dc28SGEliDfLNKeUix VYm8ixZ+nsUfPyFvRjRVHOfdgc6Hcsr+UFmDcS3+dJKRMGsk0rbTVOZeET7tfbLTZGUS cKChsv2R8/BTvnjpiNLL6aHWbFwGdsGu3dQ4Pb3f5EhCsEg0D/F9rl276hWEE07w5oAQ ZtRA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a0564020e0600b00450f56cd37bsi285116edh.175.2022.09.19.19.03.48; Mon, 19 Sep 2022 19:04:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229471AbiITBcG (ORCPT + 99 others); Mon, 19 Sep 2022 21:32:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbiITBcC (ORCPT ); Mon, 19 Sep 2022 21:32:02 -0400 Received: from out30-42.freemail.mail.aliyun.com (out30-42.freemail.mail.aliyun.com [115.124.30.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B18C05141E; Mon, 19 Sep 2022 18:31:59 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=ziyangzhang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VQGUuEI_1663637516; Received: from 30.97.56.91(mailfrom:ZiyangZhang@linux.alibaba.com fp:SMTPD_---0VQGUuEI_1663637516) by smtp.aliyun-inc.com; Tue, 20 Sep 2022 09:31:57 +0800 Message-ID: <84b99294-6859-f49f-d529-c6e3899f2aa2@linux.alibaba.com> Date: Tue, 20 Sep 2022 09:31:54 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Subject: Re: [PATCH V3 4/7] ublk_drv: requeue rqs with recovery feature enabled Content-Language: en-US To: Ming Lei Cc: axboe@kernel.dk, xiaoguang.wang@linux.alibaba.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, joseph.qi@linux.alibaba.com References: <20220913041707.197334-1-ZiyangZhang@linux.alibaba.com> <20220913041707.197334-5-ZiyangZhang@linux.alibaba.com> From: Ziyang Zhang In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,NICE_REPLY_A,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022/9/19 20:39, Ming Lei wrote: > On Mon, Sep 19, 2022 at 05:12:21PM +0800, Ziyang Zhang wrote: >> On 2022/9/19 11:55, Ming Lei wrote: >>> On Tue, Sep 13, 2022 at 12:17:04PM +0800, ZiyangZhang wrote: >>>> With recovery feature enabled, in ublk_queue_rq or task work >>>> (in exit_task_work or fallback wq), we requeue rqs instead of >>>> ending(aborting) them. Besides, No matter recovery feature is enabled >>>> or disabled, we schedule monitor_work immediately. >>>> >>>> Signed-off-by: ZiyangZhang >>>> --- >>>> drivers/block/ublk_drv.c | 34 ++++++++++++++++++++++++++++++++-- >>>> 1 file changed, 32 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c >>>> index 23337bd7c105..b067f33a1913 100644 >>>> --- a/drivers/block/ublk_drv.c >>>> +++ b/drivers/block/ublk_drv.c >>>> @@ -682,6 +682,21 @@ static void ubq_complete_io_cmd(struct ublk_io *io, int res) >>>> >>>> #define UBLK_REQUEUE_DELAY_MS 3 >>>> >>>> +static inline void __ublk_abort_rq_in_task_work(struct ublk_queue *ubq, >>>> + struct request *rq) >>>> +{ >>>> + pr_devel("%s: %s q_id %d tag %d io_flags %x.\n", __func__, >>>> + (ublk_queue_can_use_recovery(ubq)) ? "requeue" : "abort", >>>> + ubq->q_id, rq->tag, ubq->ios[rq->tag].flags); >>>> + /* We cannot process this rq so just requeue it. */ >>>> + if (ublk_queue_can_use_recovery(ubq)) { >>>> + blk_mq_requeue_request(rq, false); >>>> + blk_mq_delay_kick_requeue_list(rq->q, UBLK_REQUEUE_DELAY_MS); >>> >>> Here you needn't to kick requeue list since we know it can't make >>> progress. And you can do that once before deleting gendisk >>> or the queue is recovered. >> >> No, kicking rq here is necessary. >> >> Consider USER_RECOVERY is enabled and everything goes well. >> User sends STOP_DEV, and we have kicked requeue list in >> ublk_stop_dev() and are going to call del_gendisk(). >> However, a crash happens now. Then rqs may be still requeued >> by ublk_queue_rq() because ublk_queue_rq() sees a dying >> ubq_daemon. So del_gendisk() will hang because there are >> rqs leaving in requeue list and no one kicks them. > > Why can't you kick requeue list before calling del_gendisk(). Yes, we can kick requeue list once before calling del_gendisk(). But a crash may happen just after kicking but before del_gendisk(). So some rqs may be requeued at this moment. But we have already kicked the requeue list! Then del_gendisk() will hang, right? > >> >> BTW, kicking requeue list after requeue rqs is really harmless >> since we schedule quiesce_work immediately after finding a >> dying ubq_daemon. So few rqs have chance to be re-dispatched. > > Do you think it makes sense to kick requeue list when the queue > can't handle any request? I know it does not make sense while ubq_daemon is dying, but it is good for handling the situation I discribed before. Regards, Zhang.