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 X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75A79C432BE for ; Wed, 28 Jul 2021 08:17:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5C55560F41 for ; Wed, 28 Jul 2021 08:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235132AbhG1IRO (ORCPT ); Wed, 28 Jul 2021 04:17:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29697 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235124AbhG1IRL (ORCPT ); Wed, 28 Jul 2021 04:17:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627460229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0eyxC/bNWH641s65CYnIgwaGlNbe4zNB9/q2qn/yi1E=; b=cQ7cbUut4xlpxSI2NQ4IvskEDod7RjDI7T/FUxZe147g4sL3q4rn1nE5usv3eAKYZkkqTQ fSIbo0os5EEJb2c8egNSsAD5y0N9698q6lJAPKxBq5vO0+ZQ1xxLYB++loiYJlkUrFIH+I guRyDzlDjTockg+ZUbmhY1Hry2JHbZM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-85-sWNBtTYGO2STOg-GarBBjA-1; Wed, 28 Jul 2021 04:17:08 -0400 X-MC-Unique: sWNBtTYGO2STOg-GarBBjA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D28018C8C02; Wed, 28 Jul 2021 08:17:07 +0000 (UTC) Received: from localhost (ovpn-13-99.pek2.redhat.com [10.72.13.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BAA55D6B1; Wed, 28 Jul 2021 08:17:02 +0000 (UTC) From: Ming Lei To: Jens Axboe Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Christoph Hellwig , Dan Schatzberg , Ming Lei Subject: [PATCH V2 3/7] loop: conver timer for monitoring idle worker into dwork Date: Wed, 28 Jul 2021 16:16:34 +0800 Message-Id: <20210728081638.1500953-4-ming.lei@redhat.com> In-Reply-To: <20210728081638.1500953-1-ming.lei@redhat.com> References: <20210728081638.1500953-1-ming.lei@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Not necessary to use a timer to do that, and dwork is just fine, then we don't need to always disable interrupt when acquiring ->loop_work_lock. Acked-by: Dan Schatzberg Signed-off-by: Ming Lei --- drivers/block/loop.c | 75 ++++++++++++++++++++++---------------------- drivers/block/loop.h | 2 +- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 1756c17d3936..f63bd75e80ba 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -929,7 +929,6 @@ struct loop_worker { static void loop_workfn(struct work_struct *work); static void loop_rootcg_workfn(struct work_struct *work); -static void loop_free_idle_workers(struct timer_list *timer); #ifdef CONFIG_BLK_CGROUP static inline int queue_on_root_worker(struct cgroup_subsys_state *css) @@ -973,7 +972,7 @@ static void loop_queue_work(struct loop_device *lo, struct loop_cmd *cmd) struct list_head *cmd_list; struct cgroup_subsys_state *blkcg_css = loop_rq_blkcg_css(cmd); - spin_lock_irq(&lo->lo_work_lock); + spin_lock(&lo->lo_work_lock); if (queue_on_root_worker(blkcg_css)) goto queue_work; @@ -1028,7 +1027,7 @@ static void loop_queue_work(struct loop_device *lo, struct loop_cmd *cmd) } list_add_tail(&cmd->list_entry, cmd_list); queue_work(lo->workqueue, work); - spin_unlock_irq(&lo->lo_work_lock); + spin_unlock(&lo->lo_work_lock); } static void loop_update_rotational(struct loop_device *lo) @@ -1150,6 +1149,33 @@ loop_set_status_from_info(struct loop_device *lo, return 0; } +static void loop_set_timer(struct loop_device *lo) +{ + schedule_delayed_work(&lo->idle_work, LOOP_IDLE_WORKER_TIMEOUT); +} + +static void loop_free_idle_workers(struct work_struct *work) +{ + struct loop_device *lo = container_of(work, struct loop_device, + idle_work.work); + struct loop_worker *pos, *worker; + + spin_lock(&lo->lo_work_lock); + list_for_each_entry_safe(worker, pos, &lo->idle_worker_list, + idle_list) { + if (time_is_after_jiffies(worker->last_ran_at + + LOOP_IDLE_WORKER_TIMEOUT)) + break; + list_del(&worker->idle_list); + rb_erase(&worker->rb_node, &lo->worker_tree); + css_put(worker->blkcg_css); + kfree(worker); + } + if (!list_empty(&lo->idle_worker_list)) + loop_set_timer(lo); + spin_unlock(&lo->lo_work_lock); +} + static int loop_configure(struct loop_device *lo, fmode_t mode, struct block_device *bdev, const struct loop_config *config) @@ -1229,8 +1255,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, INIT_LIST_HEAD(&lo->rootcg_cmd_list); INIT_LIST_HEAD(&lo->idle_worker_list); lo->worker_tree = RB_ROOT; - timer_setup(&lo->timer, loop_free_idle_workers, - TIMER_DEFERRABLE); + INIT_DELAYED_WORK(&lo->idle_work, loop_free_idle_workers); lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO; lo->lo_device = bdev; lo->lo_backing_file = file; @@ -1320,7 +1345,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) blk_mq_freeze_queue(lo->lo_queue); destroy_workqueue(lo->workqueue); - spin_lock_irq(&lo->lo_work_lock); + spin_lock(&lo->lo_work_lock); list_for_each_entry_safe(worker, pos, &lo->idle_worker_list, idle_list) { list_del(&worker->idle_list); @@ -1328,8 +1353,8 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) css_put(worker->blkcg_css); kfree(worker); } - spin_unlock_irq(&lo->lo_work_lock); - del_timer_sync(&lo->timer); + spin_unlock(&lo->lo_work_lock); + cancel_delayed_work_sync(&lo->idle_work); spin_lock_irq(&lo->lo_lock); lo->lo_backing_file = NULL; @@ -2147,11 +2172,6 @@ static void loop_handle_cmd(struct loop_cmd *cmd) } } -static void loop_set_timer(struct loop_device *lo) -{ - timer_reduce(&lo->timer, jiffies + LOOP_IDLE_WORKER_TIMEOUT); -} - static void loop_process_work(struct loop_worker *worker, struct list_head *cmd_list, struct loop_device *lo) { @@ -2159,17 +2179,17 @@ static void loop_process_work(struct loop_worker *worker, struct loop_cmd *cmd; current->flags |= PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO; - spin_lock_irq(&lo->lo_work_lock); + spin_lock(&lo->lo_work_lock); while (!list_empty(cmd_list)) { cmd = container_of( cmd_list->next, struct loop_cmd, list_entry); list_del(cmd_list->next); - spin_unlock_irq(&lo->lo_work_lock); + spin_unlock(&lo->lo_work_lock); loop_handle_cmd(cmd); cond_resched(); - spin_lock_irq(&lo->lo_work_lock); + spin_lock(&lo->lo_work_lock); } /* @@ -2182,7 +2202,7 @@ static void loop_process_work(struct loop_worker *worker, list_add_tail(&worker->idle_list, &lo->idle_worker_list); loop_set_timer(lo); } - spin_unlock_irq(&lo->lo_work_lock); + spin_unlock(&lo->lo_work_lock); current->flags = orig_flags; } @@ -2214,27 +2234,6 @@ static void loop_rootcg_workfn(struct work_struct *work) loop_process_work(NULL, &lo->rootcg_cmd_list, lo); } -static void loop_free_idle_workers(struct timer_list *timer) -{ - struct loop_device *lo = container_of(timer, struct loop_device, timer); - struct loop_worker *pos, *worker; - - spin_lock_irq(&lo->lo_work_lock); - list_for_each_entry_safe(worker, pos, &lo->idle_worker_list, - idle_list) { - if (time_is_after_jiffies(worker->last_ran_at + - LOOP_IDLE_WORKER_TIMEOUT)) - break; - list_del(&worker->idle_list); - rb_erase(&worker->rb_node, &lo->worker_tree); - css_put(worker->blkcg_css); - kfree(worker); - } - if (!list_empty(&lo->idle_worker_list)) - loop_set_timer(lo); - spin_unlock_irq(&lo->lo_work_lock); -} - static const struct blk_mq_ops loop_mq_ops = { .queue_rq = loop_queue_rq, .complete = lo_complete_rq, diff --git a/drivers/block/loop.h b/drivers/block/loop.h index a52a3fd89457..9df889af1bcf 100644 --- a/drivers/block/loop.h +++ b/drivers/block/loop.h @@ -60,7 +60,7 @@ struct loop_device { struct list_head rootcg_cmd_list; struct list_head idle_worker_list; struct rb_root worker_tree; - struct timer_list timer; + struct delayed_work idle_work; bool use_dio; bool sysfs_inited; -- 2.31.1