From patchwork Fri Sep 18 01:47:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yufen Yu X-Patchwork-Id: 11783821 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 51CA7112E for ; Fri, 18 Sep 2020 01:47:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 332632087D for ; Fri, 18 Sep 2020 01:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726170AbgIRBrd (ORCPT ); Thu, 17 Sep 2020 21:47:33 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:13279 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725886AbgIRBrd (ORCPT ); Thu, 17 Sep 2020 21:47:33 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 5B53B7317F8675FB75D7; Fri, 18 Sep 2020 09:47:31 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Fri, 18 Sep 2020 09:47:22 +0800 From: Yufen Yu To: CC: , , , Subject: [PATCH 1/4] block: invoke blk_mq_exit_sched no matter whether have .exit_sched Date: Thu, 17 Sep 2020 21:47:03 -0400 Message-ID: <20200918014706.1962485-2-yuyufen@huawei.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200918014706.1962485-1-yuyufen@huawei.com> References: <20200918014706.1962485-1-yuyufen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org We will register debugfs for scheduler no matter whether it have defined callback funciton .exit_sched. So, blk_mq_exit_sched() is always needed to unregister debugfs. Also, q->elevator should be set as NULL after exiting scheduler. For now, since all register scheduler have defined .exit_sched, it will not cause any actual problem. But It will be more reasonable to do this change. Signed-off-by: Yufen Yu --- block/blk-sysfs.c | 1 - block/elevator.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 7dda709f3ccb..ee2cd4d1054c 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -883,7 +883,6 @@ static void blk_exit_queue(struct request_queue *q) if (q->elevator) { ioc_clear_queue(q); __elevator_exit(q, q->elevator); - q->elevator = NULL; } /* diff --git a/block/elevator.c b/block/elevator.c index 6e775bd4af66..b506895b34c7 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -191,8 +191,7 @@ static void elevator_release(struct kobject *kobj) void __elevator_exit(struct request_queue *q, struct elevator_queue *e) { mutex_lock(&e->sysfs_lock); - if (e->type->ops.exit_sched) - blk_mq_exit_sched(q, e); + blk_mq_exit_sched(q, e); mutex_unlock(&e->sysfs_lock); kobject_put(&e->kobj); From patchwork Fri Sep 18 01:47:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yufen Yu X-Patchwork-Id: 11783825 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D3C792C for ; Fri, 18 Sep 2020 01:47:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F3857208C3 for ; Fri, 18 Sep 2020 01:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726093AbgIRBre (ORCPT ); Thu, 17 Sep 2020 21:47:34 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:13280 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726151AbgIRBrd (ORCPT ); Thu, 17 Sep 2020 21:47:33 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 60180F3F6DBA07D70061; Fri, 18 Sep 2020 09:47:31 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Fri, 18 Sep 2020 09:47:23 +0800 From: Yufen Yu To: CC: , , , Subject: [PATCH 2/4] block: use common interface blk_queue_registered() Date: Thu, 17 Sep 2020 21:47:04 -0400 Message-ID: <20200918014706.1962485-3-yuyufen@huawei.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200918014706.1962485-1-yuyufen@huawei.com> References: <20200918014706.1962485-1-yuyufen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org We have defined common interface blk_queue_registered() to test QUEUE_FLAG_REGISTERED. Just use it. Signed-off-by: Yufen Yu --- block/blk-iocost.c | 2 +- block/elevator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index d37b55db2409..073624f54bc9 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -618,7 +618,7 @@ static struct ioc *q_to_ioc(struct request_queue *q) static const char *q_name(struct request_queue *q) { - if (test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags)) + if (test_bit(blk_queue_registered(q))) return kobject_name(q->kobj.parent); else return ""; diff --git a/block/elevator.c b/block/elevator.c index b506895b34c7..431a2a1c896e 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -672,7 +672,7 @@ void elevator_init_mq(struct request_queue *q) if (!elv_support_iosched(q)) return; - WARN_ON_ONCE(test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags)); + WARN_ON_ONCE(blk_queue_registered(q)); if (unlikely(q->elevator)) return; From patchwork Fri Sep 18 01:47:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yufen Yu X-Patchwork-Id: 11783827 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34951112E for ; Fri, 18 Sep 2020 01:47:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1CF282137B for ; Fri, 18 Sep 2020 01:47:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726151AbgIRBre (ORCPT ); Thu, 17 Sep 2020 21:47:34 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:13249 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726187AbgIRBre (ORCPT ); Thu, 17 Sep 2020 21:47:34 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 905CC8BBC7C06C9190FE; Fri, 18 Sep 2020 09:47:31 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Fri, 18 Sep 2020 09:47:23 +0800 From: Yufen Yu To: CC: , , , Subject: [PATCH 3/4] block: fix comment and add lockdep assert Date: Thu, 17 Sep 2020 21:47:05 -0400 Message-ID: <20200918014706.1962485-4-yuyufen@huawei.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200918014706.1962485-1-yuyufen@huawei.com> References: <20200918014706.1962485-1-yuyufen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org After commit b89f625e28d4 ("block: don't release queue's sysfs lock during switching elevator"), whole elevator register and unregister function are covered by sysfs_lock. So, remove wrong comment and add lockdep assert. Signed-off-by: Yufen Yu --- block/elevator.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/block/elevator.c b/block/elevator.c index 431a2a1c896e..293c5c81397a 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -479,16 +479,13 @@ static struct kobj_type elv_ktype = { .release = elevator_release, }; -/* - * elv_register_queue is called from either blk_register_queue or - * elevator_switch, elevator switch is prevented from being happen - * in the two paths, so it is safe to not hold q->sysfs_lock. - */ int elv_register_queue(struct request_queue *q, bool uevent) { struct elevator_queue *e = q->elevator; int error; + lockdep_assert_held(&q->sysfs_lock); + error = kobject_add(&e->kobj, &q->kobj, "%s", "iosched"); if (!error) { struct elv_fs_entry *attr = e->type->elevator_attrs; @@ -507,13 +504,10 @@ int elv_register_queue(struct request_queue *q, bool uevent) return error; } -/* - * elv_unregister_queue is called from either blk_unregister_queue or - * elevator_switch, elevator switch is prevented from being happen - * in the two paths, so it is safe to not hold q->sysfs_lock. - */ void elv_unregister_queue(struct request_queue *q) { + lockdep_assert_held(&q->sysfs_lock); + if (q) { struct elevator_queue *e = q->elevator; From patchwork Fri Sep 18 01:47:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yufen Yu X-Patchwork-Id: 11783823 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 729B414F6 for ; Fri, 18 Sep 2020 01:47:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5EE9D214D8 for ; Fri, 18 Sep 2020 01:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725886AbgIRBrd (ORCPT ); Thu, 17 Sep 2020 21:47:33 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:13281 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726134AbgIRBrd (ORCPT ); Thu, 17 Sep 2020 21:47:33 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 648019D9BDF5865273B3; Fri, 18 Sep 2020 09:47:31 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Fri, 18 Sep 2020 09:47:24 +0800 From: Yufen Yu To: CC: , , , Subject: [PATCH 4/4] block: get rid of unnecessary local variable Date: Thu, 17 Sep 2020 21:47:06 -0400 Message-ID: <20200918014706.1962485-5-yuyufen@huawei.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200918014706.1962485-1-yuyufen@huawei.com> References: <20200918014706.1962485-1-yuyufen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Since whole elevator register is protectd by sysfs_lock, we don't need extras 'has_elevator'. Just use q->elevator directly. Signed-off-by: Yufen Yu --- block/blk-sysfs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index ee2cd4d1054c..d13a70ed39bf 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -976,7 +976,6 @@ int blk_register_queue(struct gendisk *disk) int ret; struct device *dev = disk_to_dev(disk); struct request_queue *q = disk->queue; - bool has_elevator = false; if (WARN_ON(!q)) return -ENXIO; @@ -1040,7 +1039,6 @@ int blk_register_queue(struct gendisk *disk) kobject_put(&dev->kobj); return ret; } - has_elevator = true; } blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q); @@ -1049,7 +1047,7 @@ int blk_register_queue(struct gendisk *disk) /* Now everything is ready and send out KOBJ_ADD uevent */ kobject_uevent(&q->kobj, KOBJ_ADD); - if (has_elevator) + if (q->elevator) kobject_uevent(&q->elevator->kobj, KOBJ_ADD); mutex_unlock(&q->sysfs_lock);