From mboxrd@z Thu Jan 1 00:00:00 1970 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 C2CE9C761A6 for ; Sat, 1 Apr 2023 01:44:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233714AbjDABn6 (ORCPT ); Fri, 31 Mar 2023 21:43:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233677AbjDABnd (ORCPT ); Fri, 31 Mar 2023 21:43:33 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DB1F20D94; Fri, 31 Mar 2023 18:43:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C106CB83313; Sat, 1 Apr 2023 01:43:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA835C4339E; Sat, 1 Apr 2023 01:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680313380; bh=tPP5Uymkg5+cO2zQqihgwwc+sGOlG0PfkqjeCtfYDb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hltvDFu/zpTdWOizyNIc6+n6SJ1ivvzX2LTljlBttJv8YIizNEqg/+fnrGDKrgg6k Vh8Yw03A40ldSTsY9zyG65f9D9t+J5ZaVSDRdB2roX+n7xPS5cYPC7GqaQmBC2I8Q/ m9clMof7JJ0P82V/rnGdn55baOe8LsWlkSlKDGiv/IUmTGD99WlYbpknNSaB9V7dJD UVc3kDOhEh3wF9mfZJbnTDYsQjmPb2qKj80BGwm2/mOmyxe+ceuWmATPgU6pSxMcC0 0F7rvPa9KpJCwHu/AvoGliAnw0lOIDeU596U4+nTZq9LKSl7dvfKyf/f6DxhrT4oD6 sFngORNF8Y1jQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ming Lei , Ziyang Zhang , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 11/24] block: ublk_drv: mark device as LIVE before adding disk Date: Fri, 31 Mar 2023 21:42:27 -0400 Message-Id: <20230401014242.3356780-11-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230401014242.3356780-1-sashal@kernel.org> References: <20230401014242.3356780-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ming Lei [ Upstream commit 4985e7b2c002eb4c5c794a1d3acd91b82c89a0fd ] IO can be started before add_disk() returns, such as reading parititon table, then the monitor work should work for making forward progress. So mark device as LIVE before adding disk, meantime change to DEAD if add_disk() fails. Fixed: 71f28f3136af ("ublk_drv: add io_uring based userspace block driver") Reviewed-by: Ziyang Zhang Signed-off-by: Ming Lei Link: https://lore.kernel.org/r/20230318141231.55562-1-ming.lei@redhat.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/ublk_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 4aec9be0ab77e..5a5bf0e2738b2 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1548,17 +1548,18 @@ static int ublk_ctrl_start_dev(struct io_uring_cmd *cmd) set_bit(GD_SUPPRESS_PART_SCAN, &disk->state); get_device(&ub->cdev_dev); + ub->dev_info.state = UBLK_S_DEV_LIVE; ret = add_disk(disk); if (ret) { /* * Has to drop the reference since ->free_disk won't be * called in case of add_disk failure. */ + ub->dev_info.state = UBLK_S_DEV_DEAD; ublk_put_device(ub); goto out_put_disk; } set_bit(UB_STATE_USED, &ub->state); - ub->dev_info.state = UBLK_S_DEV_LIVE; out_put_disk: if (ret) put_disk(disk); -- 2.39.2