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=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 68C8EC433E3 for ; Mon, 24 Aug 2020 15:37:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 157ED20838 for ; Mon, 24 Aug 2020 15:37:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NUKm3bqw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 157ED20838 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B85686B0033; Mon, 24 Aug 2020 11:37:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B0F9E6B0036; Mon, 24 Aug 2020 11:37:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9AF9E8D0003; Mon, 24 Aug 2020 11:37:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0159.hostedemail.com [216.40.44.159]) by kanga.kvack.org (Postfix) with ESMTP id 7D25D6B0033 for ; Mon, 24 Aug 2020 11:37:58 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 2F132348D for ; Mon, 24 Aug 2020 15:37:58 +0000 (UTC) X-FDA: 77185867836.18.story20_300ef9727054 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 74D79100EC666 for ; Mon, 24 Aug 2020 15:37:48 +0000 (UTC) X-HE-Tag: story20_300ef9727054 X-Filterd-Recvd-Size: 15503 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Mon, 24 Aug 2020 15:37:47 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id x12so6464904qtp.1 for ; Mon, 24 Aug 2020 08:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A5DdXelQcbR5GxywzEYVYok/69RDCGB0HAV+H4TqDt0=; b=NUKm3bqwNgUyjxV7tREGYU3MwpJmbYqCqlf5SjeHQ8sVavYtwePEn5kH5I1hrq6Hx2 Vcn91Xn7c4G1M0BuHEEz4R72pSdLlnQujZPZFRLoMg6tNQ2aSA5on6J+PR6/fxvF1amF tSwXaVb0CLFiLlXr8mzh8sgFOebvOlWujNsNnQxU67SoFqo2bpPgMKXh0qbVib4FTilx pJDGe1X2WeU70O92i1oJCuKNQyvHCzEy4etoZu0pi4anHXcRA3uxOC6WzymUYRqkFG4M NwONHtoexMTi9EDWQSe+Vo1Ulu+atlYLS0O/eXWodirT7MkRfDJqnmpNFt3Y1Hbmuvqm 4P1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A5DdXelQcbR5GxywzEYVYok/69RDCGB0HAV+H4TqDt0=; b=chTEqtGebN4aUFEby8uXfCTfDHxx+QkRP8j6wg0gdEtKv7RkyXztHMqHbBwddQFTsA C7rzAYVkpis3h+AkCHZvR857/UQ4Jzgc4GPQL3G0F7mH01ACEm9O34pSyal2uQRVM4jG NQOvrlKYm8p7+q5JuhDNBpDQ7GYjMF3J4UPHGK1dmEUXHzxWjwue9h4FJTokCJbt6k/n 1OYbI/2wEr79DMKkQIAK/oJqW84CgmwRyNk4K9L3sgodN0aiFi90c2/sq09N05jepw4o cuqOeBhJn7l8BUzLCMSeL2og7I4ylbh+zgNMBZVrAuwNJRn8EZ1SB9mi5MMHv+w/dAnU eWvQ== X-Gm-Message-State: AOAM531jaw3E4fh4JkZuMIpTjHfK5bO59TPGJQpyydTfRC2/Yzzx9jgL e3k45U34qMcZP7dpt0dwHbw= X-Google-Smtp-Source: ABdhPJwVRnikLF8AoNCHctXwS/c4fPQYX+cmDWALS+z0n7zUJeT9FE9hCfLxPrrOxlu5Brd9gl8A/g== X-Received: by 2002:ac8:4c8e:: with SMTP id j14mr5436529qtv.381.1598283465804; Mon, 24 Aug 2020 08:37:45 -0700 (PDT) Received: from dschatzberg-fedora-PC0Y6AEN.thefacebook.com ([2620:10d:c091:480::1:dd21]) by smtp.gmail.com with ESMTPSA id m17sm10942758qkn.45.2020.08.24.08.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 08:37:45 -0700 (PDT) From: Dan Schatzberg To: Cc: Dan Schatzberg , Jens Axboe , Alexander Viro , Jan Kara , Amir Goldstein , Tejun Heo , Li Zefan , Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Hugh Dickins , Shakeel Butt , Roman Gushchin , Chris Down , Yafang Shao , Jakub Kicinski , Yang Shi , Peter Zijlstra , Ingo Molnar , Mathieu Desnoyers , Michael Ellerman , Thomas Gleixner , Michel Lespinasse , linux-block@vger.kernel.org (open list:BLOCK LAYER), linux-kernel@vger.kernel.org (open list), linux-fsdevel@vger.kernel.org (open list:FILESYSTEMS (VFS and infrastructure)), cgroups@vger.kernel.org (open list:CONTROL GROUP (CGROUP)), linux-mm@kvack.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)) Subject: [PATCH 1/4] loop: Use worker per cgroup instead of kworker Date: Mon, 24 Aug 2020 11:35:59 -0400 Message-Id: <20200824153607.6595-2-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200824153607.6595-1-schatzberg.dan@gmail.com> References: <20200824153607.6595-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 74D79100EC666 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Existing uses of loop device may have multiple cgroups reading/writing to the same device. Simply charging resources for I/O to the backing file could result in priority inversion where one cgroup gets synchronously blocked, holding up all other I/O to the loop device. In order to avoid this priority inversion, we use a single workqueue where each work item is a "struct loop_worker" which contains a queue of struct loop_cmds to issue. The loop device maintains a tree mapping blk css_id -> loop_worker. This allows each cgroup to independently make forward progress issuing I/O to the backing file. There is also a single queue for I/O associated with the rootcg which can be used in cases of extreme memory shortage where we cannot allocate a loop_worker. The locking for the tree and queues is fairly heavy handed - we acquire a per-loop-device spinlock any time either is accessed. The existing implementation serializes all I/O through a single thread anyways, so I don't believe this is any worse. Signed-off-by: Dan Schatzberg --- drivers/block/loop.c | 207 ++++++++++++++++++++++++++++++++++++------- drivers/block/loop.h | 12 ++- 2 files changed, 182 insertions(+), 37 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 2f137d6ce169..c8dae53f3914 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -70,7 +70,6 @@ #include #include #include -#include #include #include #include @@ -83,6 +82,8 @@ =20 #include =20 +#define LOOP_IDLE_WORKER_TIMEOUT (60 * HZ) + static DEFINE_IDR(loop_index_idr); static DEFINE_MUTEX(loop_ctl_mutex); =20 @@ -922,27 +923,83 @@ static void loop_config_discard(struct loop_device = *lo) blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); } =20 -static void loop_unprepare_queue(struct loop_device *lo) -{ - kthread_flush_worker(&lo->worker); - kthread_stop(lo->worker_task); -} +struct loop_worker { + struct rb_node rb_node; + struct work_struct work; + struct list_head cmd_list; + struct list_head idle_list; + struct loop_device *lo; + struct cgroup_subsys_state *css; + unsigned long last_ran_at; +}; =20 -static int loop_kthread_worker_fn(void *worker_ptr) -{ - current->flags |=3D PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO; - return kthread_worker_fn(worker_ptr); -} +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); =20 -static int loop_prepare_queue(struct loop_device *lo) +static void loop_queue_work(struct loop_device *lo, struct loop_cmd *cmd= ) { - kthread_init_worker(&lo->worker); - lo->worker_task =3D kthread_run(loop_kthread_worker_fn, - &lo->worker, "loop%d", lo->lo_number); - if (IS_ERR(lo->worker_task)) - return -ENOMEM; - set_user_nice(lo->worker_task, MIN_NICE); - return 0; + struct rb_node **node =3D &(lo->worker_tree.rb_node), *parent =3D NULL; + struct loop_worker *cur_worker, *worker =3D NULL; + struct work_struct *work; + struct list_head *cmd_list; + + spin_lock_irq(&lo->lo_work_lock); + + if (!cmd->css) + goto queue_work; + + node =3D &lo->worker_tree.rb_node; + + while (*node) { + parent =3D *node; + cur_worker =3D container_of(*node, struct loop_worker, rb_node); + if (cur_worker->css =3D=3D cmd->css) { + worker =3D cur_worker; + break; + } else if ((long)cur_worker->css < (long)cmd->css) { + node =3D &(*node)->rb_left; + } else { + node =3D &(*node)->rb_right; + } + } + if (worker) + goto queue_work; + + worker =3D kzalloc(sizeof(struct loop_worker), GFP_NOWAIT | __GFP_NOWAR= N); + /* + * In the event we cannot allocate a worker, just queue on the + * rootcg worker + */ + if (!worker) + goto queue_work; + + worker->css =3D cmd->css; + css_get(worker->css); + INIT_WORK(&worker->work, loop_workfn); + INIT_LIST_HEAD(&worker->cmd_list); + INIT_LIST_HEAD(&worker->idle_list); + worker->lo =3D lo; + rb_link_node(&worker->rb_node, parent, node); + rb_insert_color(&worker->rb_node, &lo->worker_tree); +queue_work: + if (worker) { + /* + * We need to remove from the idle list here while + * holding the lock so that the idle timer doesn't + * free the worker + */ + if (!list_empty(&worker->idle_list)) + list_del_init(&worker->idle_list); + work =3D &worker->work; + cmd_list =3D &worker->cmd_list; + } else { + work =3D &lo->rootcg_work; + cmd_list =3D &lo->rootcg_cmd_list; + } + list_add_tail(&cmd->list_entry, cmd_list); + queue_work(lo->workqueue, work); + spin_unlock_irq(&lo->lo_work_lock); } =20 static void loop_update_rotational(struct loop_device *lo) @@ -1132,12 +1189,27 @@ static int loop_configure(struct loop_device *lo,= fmode_t mode, !file->f_op->write_iter) lo->lo_flags |=3D LO_FLAGS_READ_ONLY; =20 - error =3D loop_prepare_queue(lo); - if (error) + error =3D -EFBIG; + size =3D get_loop_size(lo, file); + if ((loff_t)(sector_t)size !=3D size) goto out_unlock; + lo->workqueue =3D alloc_workqueue("loop%d", + WQ_UNBOUND | WQ_FREEZABLE | + WQ_MEM_RECLAIM, + lo->lo_number); + if (!lo->workqueue) { + error =3D -ENOMEM; + goto out_unlock; + } =20 set_device_ro(bdev, (lo->lo_flags & LO_FLAGS_READ_ONLY) !=3D 0); =20 + INIT_WORK(&lo->rootcg_work, loop_rootcg_workfn); + INIT_LIST_HEAD(&lo->rootcg_cmd_list); + INIT_LIST_HEAD(&lo->idle_worker_list); + lo->worker_tree =3D RB_ROOT; + timer_setup(&lo->timer, loop_free_idle_workers, + TIMER_DEFERRABLE); lo->use_dio =3D lo->lo_flags & LO_FLAGS_DIRECT_IO; lo->lo_device =3D bdev; lo->lo_backing_file =3D file; @@ -1206,6 +1278,7 @@ static int __loop_clr_fd(struct loop_device *lo, bo= ol release) int err =3D 0; bool partscan =3D false; int lo_number; + struct loop_worker *pos, *worker; =20 mutex_lock(&loop_ctl_mutex); if (WARN_ON_ONCE(lo->lo_state !=3D Lo_rundown)) { @@ -1222,6 +1295,18 @@ static int __loop_clr_fd(struct loop_device *lo, b= ool release) /* freeze request queue during the transition */ blk_mq_freeze_queue(lo->lo_queue); =20 + destroy_workqueue(lo->workqueue); + spin_lock_irq(&lo->lo_work_lock); + list_for_each_entry_safe(worker, pos, &lo->idle_worker_list, + idle_list) { + list_del(&worker->idle_list); + rb_erase(&worker->rb_node, &lo->worker_tree); + css_put(worker->css); + kfree(worker); + } + spin_unlock_irq(&lo->lo_work_lock); + del_timer_sync(&lo->timer); + spin_lock_irq(&lo->lo_lock); lo->lo_backing_file =3D NULL; spin_unlock_irq(&lo->lo_lock); @@ -1259,7 +1344,6 @@ static int __loop_clr_fd(struct loop_device *lo, bo= ol release) =20 partscan =3D lo->lo_flags & LO_FLAGS_PARTSCAN && bdev; lo_number =3D lo->lo_number; - loop_unprepare_queue(lo); out_unlock: mutex_unlock(&loop_ctl_mutex); if (partscan) { @@ -2025,7 +2109,7 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_= ctx *hctx, } else #endif cmd->css =3D NULL; - kthread_queue_work(&lo->worker, &cmd->work); + loop_queue_work(lo, cmd); =20 return BLK_STS_OK; } @@ -2055,26 +2139,82 @@ static void loop_handle_cmd(struct loop_cmd *cmd) } } =20 -static void loop_queue_work(struct kthread_work *work) +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) { - struct loop_cmd *cmd =3D - container_of(work, struct loop_cmd, work); + int orig_flags =3D current->flags; + struct loop_cmd *cmd; =20 - loop_handle_cmd(cmd); + current->flags |=3D PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO; + spin_lock_irq(&lo->lo_work_lock); + while (!list_empty(cmd_list)) { + cmd =3D container_of( + cmd_list->next, struct loop_cmd, list_entry); + list_del(cmd_list->next); + spin_unlock_irq(&lo->lo_work_lock); + + loop_handle_cmd(cmd); + cond_resched(); + + spin_lock_irq(&lo->lo_work_lock); + } + + /* + * We only add to the idle list if there are no pending cmds + * *and* the worker will not run again which ensures that it + * is safe to free any worker on the idle list + */ + if (worker && !work_pending(&worker->work)) { + worker->last_ran_at =3D jiffies; + list_add_tail(&worker->idle_list, &lo->idle_worker_list); + loop_set_timer(lo); + } + spin_unlock_irq(&lo->lo_work_lock); + current->flags =3D orig_flags; } =20 -static int loop_init_request(struct blk_mq_tag_set *set, struct request = *rq, - unsigned int hctx_idx, unsigned int numa_node) +static void loop_workfn(struct work_struct *work) { - struct loop_cmd *cmd =3D blk_mq_rq_to_pdu(rq); + struct loop_worker *worker =3D + container_of(work, struct loop_worker, work); + loop_process_work(worker, &worker->cmd_list, worker->lo); +} =20 - kthread_init_work(&cmd->work, loop_queue_work); - return 0; +static void loop_rootcg_workfn(struct work_struct *work) +{ + struct loop_device *lo =3D + container_of(work, struct loop_device, rootcg_work); + loop_process_work(NULL, &lo->rootcg_cmd_list, lo); +} + +static void loop_free_idle_workers(struct timer_list *timer) +{ + struct loop_device *lo =3D container_of(timer, struct loop_device, time= r); + 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->css); + kfree(worker); + } + if (!list_empty(&lo->idle_worker_list)) + loop_set_timer(lo); + spin_unlock_irq(&lo->lo_work_lock); } =20 static const struct blk_mq_ops loop_mq_ops =3D { .queue_rq =3D loop_queue_rq, - .init_request =3D loop_init_request, .complete =3D lo_complete_rq, }; =20 @@ -2162,6 +2302,7 @@ static int loop_add(struct loop_device **l, int i) atomic_set(&lo->lo_refcnt, 0); lo->lo_number =3D i; spin_lock_init(&lo->lo_lock); + spin_lock_init(&lo->lo_work_lock); disk->major =3D LOOP_MAJOR; disk->first_minor =3D i << part_shift; disk->fops =3D &lo_fops; diff --git a/drivers/block/loop.h b/drivers/block/loop.h index af75a5ee4094..0162b55a68e1 100644 --- a/drivers/block/loop.h +++ b/drivers/block/loop.h @@ -14,7 +14,6 @@ #include #include #include -#include #include =20 /* Possible states of device */ @@ -54,8 +53,13 @@ struct loop_device { =20 spinlock_t lo_lock; int lo_state; - struct kthread_worker worker; - struct task_struct *worker_task; + spinlock_t lo_work_lock; + struct workqueue_struct *workqueue; + struct work_struct rootcg_work; + struct list_head rootcg_cmd_list; + struct list_head idle_worker_list; + struct rb_root worker_tree; + struct timer_list timer; bool use_dio; bool sysfs_inited; =20 @@ -65,7 +69,7 @@ struct loop_device { }; =20 struct loop_cmd { - struct kthread_work work; + struct list_head list_entry; bool use_aio; /* use AIO interface to handle I/O */ atomic_t ref; /* only for aio */ long ret; --=20 2.24.1