From patchwork Wed Feb 8 03:48:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 54162 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3231080wrn; Tue, 7 Feb 2023 19:40:47 -0800 (PST) X-Google-Smtp-Source: AK7set/U3+GQ1oAVfLZqOOc81vqWdoBVTEVS/x0uFfm+cGU70BvDgDOEvivEwNgZhHdFqBhotni6 X-Received: by 2002:a05:6a20:1444:b0:bc:ec65:a73f with SMTP id a4-20020a056a20144400b000bcec65a73fmr7465667pzi.58.1675827647208; Tue, 07 Feb 2023 19:40:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675827647; cv=none; d=google.com; s=arc-20160816; b=znAcKyzVDBng0XYkPjZh09fWvMZ6wi/mNQlXfICtcXDci2S9Z3Bb09MkG+EfpXRue+ pXWh2zr19He/KqnObUxX57jzos2FF4/qi6Lanjm7vUp7uyFwZ4JW8nEjzXL+w/RgsGM4 qvbHXDCongWgZobZTHEw7crNMJqN1yVetl5ZJAVvCvQqehA0lyS3Z8QlvdhMWB4rdQOq YVYxboNtvjhLZRU4+BytlWXkR8MgFcKFlLnysm+iBIvy+e54RbayOGPXBBmlCxsIxH5K WAYdd4lQ1gJj2UDt9vsaHcE+Fp7aS4l/npxcH754HOJLxThODaCwYW2JS7nAJl3/0gPT VzFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=NwhKapKPIKPI90XDE9I0QtzP2CXBTrLYYJNuuHrDudI=; b=QMut+nqPY7ZJwP8iX7GQYu1wQFL52XJUTrGBzzvA0/bjIP5NhzlgFH8kvaxgWxrZJk GBStUIY36FhWO0Rftyigso6w7qvzn/+hLXV/unF/TqDQSliwEY+OegNzP0EvExSb85Nv TnPgVx4qI1u08tblGqdTUzbmtW6BjYhUMW3rWs0V9DSMPzxiOwkMSduORaeGwbnP9TFd GQJWQRIWvOEENBDQrnYWcFHaVHrLI6XbfwUkQDPYsjXXUaI0HtDhfQbwl5aIhzCYDtUg KW3WFP4vF7zSHS0Ooby0rzOdISxtpIloHz3EbR2y6Q2eczrNSt4pVh0zDIKxbOMjJoVN Ioeg== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e1-20020a636901000000b004dfaea494e3si1109135pgc.839.2023.02.07.19.40.33; Tue, 07 Feb 2023 19:40:47 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230331AbjBHDYY (ORCPT + 99 others); Tue, 7 Feb 2023 22:24:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229573AbjBHDYW (ORCPT ); Tue, 7 Feb 2023 22:24:22 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F29E43587; Tue, 7 Feb 2023 19:24:20 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PBQMh1fySz4f3tpX; Wed, 8 Feb 2023 11:24:16 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgDX0R_dFeNj8Tu4Cw--.19123S4; Wed, 08 Feb 2023 11:24:14 +0800 (CST) From: Yu Kuai To: tj@kernel.org, josef@toxicpanda.com, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next] blk-iocost: fix sleeping in atomic warning for wbt_enable_default() Date: Wed, 8 Feb 2023 11:48:03 +0800 Message-Id: <20230208034803.2818155-1-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgDX0R_dFeNj8Tu4Cw--.19123S4 X-Coremail-Antispam: 1UD129KBjvJXoW7Zw1fXr1xuw43ZFy5tFyDAwb_yoW8Cry5pF W3GrnFya4IqFZ7Zr47JanFqw15GaykGryxCw1fG34aqw1ak3s2qa1vkry09F1kZFZ3AF45 XF48KF4UZa1vv3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvF14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2 Y2ka0xkIwI1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4 xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43 MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I 0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWrJr0_WFyUJwCI42IY6I8E87Iv67AK xVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvj fUoOJ5UUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757232651270835468?= X-GMAIL-MSGID: =?utf-8?q?1757232651270835468?= From: Yu Kuai There are following smatch warning: block/blk-wbt.c:843 wbt_init() warn: sleeping in atomic context ioc_qos_write() <- disables preempt -> wbt_enable_default() -> wbt_init() wbt_init() will be called from wbt_enable_default() if wbt is not initialized, currently wbt is initialized in blk_register_queue(), hence wbt_init() will never be called from iocost and this warning is false positive. However, we might support rq_qos destruction dynamically in the future, and it's better to prevent that, hence move wbt_enable_default() outside 'ioc->lock'. This is safe because queue is still freezed. Reported-by: Dan Carpenter Link: https://lore.kernel.org/lkml/Y+Ja5SRs886CEz7a@kadam/ Signed-off-by: Yu Kuai --- block/blk-iocost.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 7a2dc9dc8e3b..03bfe1dda07c 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -3279,11 +3279,9 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input, blk_stat_enable_accounting(disk->queue); blk_queue_flag_set(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue); ioc->enabled = true; - wbt_disable_default(disk); } else { blk_queue_flag_clear(QUEUE_FLAG_RQ_ALLOC_TIME, disk->queue); ioc->enabled = false; - wbt_enable_default(disk); } if (user) { @@ -3296,6 +3294,10 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input, ioc_refresh_params(ioc, true); spin_unlock_irq(&ioc->lock); + if (enable) + wbt_disable_default(disk); + else + wbt_enable_default(disk); blk_mq_unquiesce_queue(disk->queue); blk_mq_unfreeze_queue(disk->queue);