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 4E655C433F5 for ; Fri, 28 Jan 2022 13:00:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237744AbiA1NAv (ORCPT ); Fri, 28 Jan 2022 08:00:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240067AbiA1NAt (ORCPT ); Fri, 28 Jan 2022 08:00:49 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B02FC061753 for ; Fri, 28 Jan 2022 05:00:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=ywTlvegLDQZrbp8ZRH50h3BbpWVpevO4rwk6sQWYJN8=; b=NxFSt6oWJiVRBYf8MCOxTHagA9 Frvz0HUyDuncGqwu4AyaYuRuy0dCLGbqceFaZTbwlUb3sToyAHzyeQkPIdpib0R4TCaB87pMvxLrg 1Omjtm4y2XZqKp4swnbSPEBYLAxUMxM3dT3baMnl+tcODTT2gWWVErliCRmBm2uR/RjyQuSUOozra LLEtoUoHy6Ro8SS/mVLLnoQ36YqvRMSu3632tQPHEC/C6S8XuKWzq4iRimOP0geOVHuw9ojPJ6ZbC lQuKXSYwiX/a3Vo9qNjlrc8wOztREHDg4d4QE/uovjgDEv0uF61ldTNCzthibnGGixC35tR1AStfm eNrFCbCg==; Received: from [2001:4bb8:180:4c4c:73e:e8c7:4199:32d7] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDQrs-00290H-Bg; Fri, 28 Jan 2022 13:00:44 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tetsuo Handa , Jan Kara , linux-block@vger.kernel.org, Ming Lei , "Darrick J . Wong" Subject: [PATCH 7/8] loop: only freeze the queue in __loop_clr_fd when needed Date: Fri, 28 Jan 2022 14:00:21 +0100 Message-Id: <20220128130022.1750906-8-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220128130022.1750906-1-hch@lst.de> References: <20220128130022.1750906-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org ->release is only called after all outstanding I/O has completed, so only freeze the queue when clearing the backing file of a live loop device. Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Tested-by: Darrick J. Wong --- drivers/block/loop.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 1ca70f735b5bc..0cdbc60037642 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1110,7 +1110,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, return error; } -static void __loop_clr_fd(struct loop_device *lo) +static void __loop_clr_fd(struct loop_device *lo, bool release) { struct file *filp; gfp_t gfp = lo->old_gfp_mask; @@ -1139,8 +1139,13 @@ static void __loop_clr_fd(struct loop_device *lo) if (test_bit(QUEUE_FLAG_WC, &lo->lo_queue->queue_flags)) blk_queue_write_cache(lo->lo_queue, false, false); - /* freeze request queue during the transition */ - blk_mq_freeze_queue(lo->lo_queue); + /* + * Freeze the request queue when unbinding on a live file descriptor and + * thus an open device. When called from ->release we are guaranteed + * that there is no I/O in progress already. + */ + if (!release) + blk_mq_freeze_queue(lo->lo_queue); destroy_workqueue(lo->workqueue); loop_free_idle_workers(lo, true); @@ -1163,7 +1168,8 @@ static void __loop_clr_fd(struct loop_device *lo) /* let user-space know about this change */ kobject_uevent(&disk_to_dev(lo->lo_disk)->kobj, KOBJ_CHANGE); mapping_set_gfp_mask(filp->f_mapping, gfp); - blk_mq_unfreeze_queue(lo->lo_queue); + if (!release) + blk_mq_unfreeze_queue(lo->lo_queue); disk_force_media_change(lo->lo_disk, DISK_EVENT_MEDIA_CHANGE); @@ -1201,7 +1207,7 @@ static void loop_rundown_workfn(struct work_struct *work) struct block_device *bdev = lo->lo_device; struct gendisk *disk = lo->lo_disk; - __loop_clr_fd(lo); + __loop_clr_fd(lo, true); kobject_put(&bdev->bd_device.kobj); module_put(disk->fops->owner); loop_rundown_completed(lo); @@ -1247,7 +1253,7 @@ static int loop_clr_fd(struct loop_device *lo) lo->lo_state = Lo_rundown; mutex_unlock(&lo->lo_mutex); - __loop_clr_fd(lo); + __loop_clr_fd(lo, false); loop_rundown_completed(lo); return 0; } -- 2.30.2