From patchwork Mon Aug 31 15:36:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Schatzberg X-Patchwork-Id: 11746529 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 6359D13B6 for ; Mon, 31 Aug 2020 15:37:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 117CC2168B for ; Mon, 31 Aug 2020 15:37:29 +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="ChO/LRnu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 117CC2168B 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 2B3336B0055; Mon, 31 Aug 2020 11:37:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 263806B005C; Mon, 31 Aug 2020 11:37:28 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1534B8E0001; Mon, 31 Aug 2020 11:37:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0143.hostedemail.com [216.40.44.143]) by kanga.kvack.org (Postfix) with ESMTP id E63DA6B0055 for ; Mon, 31 Aug 2020 11:37:27 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B2F501E1B for ; Mon, 31 Aug 2020 15:37:27 +0000 (UTC) X-FDA: 77211268134.11.nose18_07160b727090 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 75997180F8B86 for ; Mon, 31 Aug 2020 15:37:27 +0000 (UTC) X-Spam-Summary: 1,0,0,8e47a9e1527364c1,d41d8cd98f00b204,schatzberg.dan@gmail.com,,RULES_HIT:4:41:355:379:387:541:800:960:966:968:973:988:989:1260:1311:1314:1345:1359:1437:1515:1605:1730:1747:1777:1792:2194:2196:2198:2199:2200:2201:2393:2553:2559:2562:2637:2691:2693:2731:2918:3138:3139:3140:3141:3142:3865:3866:3867:3868:3870:3871:3872:3874:4250:4321:4384:4385:4395:4605:5007:6117:6119:6121:6261:6653:6742:7514:8603:9010:9121:9413:9707:10004:11026:11473:11658:11914:12043:12291:12294:12296:12297:12438:12517:12519:12555:12683:12895:12986:13161:13184:13229:13868:13894:14096:14394:14687:14877:21433:21444:21451:21627:21666:21740:21983:21987:21990:30045:30054:30090,0,RBL:209.85.222.195:@gmail.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04y8c34ygxjdzqnte4aa435eh39c1ypmmuedp7o5h3gt15uicskw88ehw6xkcgd.dz9r6qt7weenxy7118ir1877jnr1wojrzoziy9ukwe6ee6u8migy6snyfaff81p.o-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp, MSBL:0,D X-HE-Tag: nose18_07160b727090 X-Filterd-Recvd-Size: 15014 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Mon, 31 Aug 2020 15:37:26 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id w186so6527627qkd.1 for ; Mon, 31 Aug 2020 08:37:26 -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=jJN4UPrdfQwv0ztMCA233uhuF+9lN7rNHbCyoNaDXVk=; b=ChO/LRnuoPxGKo81ayT/ISkhJprKPNq9yNhzz4p+wqwDqvQ/J6ABFAODrq20WtO6h4 CWNlcipBWO1hzhTo54A3KgH3o1OYXkHYINgYOOAwStE91QFlSz7ZnUnpA3vCZk3QJubZ Rk9BU2q3uusjEDxrWgQFZZyOD1sOlw2fBFMVJA7VtZrg40PJgBv3sMjyo7E+5SD7mmfI 0DZDKBQE1Ic+QH6DWsCMKMUEJnrFfQXgQGBKYmM2E27if5T6YOkDE451XmzzUgmr7PP1 RhHkmmUrX6PyClrrA4u2wK/QLYMF0Vf3dCwc32xcoLcjqNpL1GGaX2LtpCUMgqjfy2wY 5CzA== 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=jJN4UPrdfQwv0ztMCA233uhuF+9lN7rNHbCyoNaDXVk=; b=lWQ75aNC+BHeVrzUvY3xpZJQeBOCpBpTbWzY+r3SrEyadHQReoZgQu2bc7ozXEYkfw hpegb6PCWwfNb9rE6XrnoFbYKReYWXQLkUUlVF/J5cxDcObAv+ZbRF0UNaG4BKPanBbp NROTzHiR2ko9ewb7hk3Ikdpy+oCuHzdk7butrkHh0zRmRd5HnuWH1d7o8uoY0QNtFX3b RAy/I+QU1cECgKrdGPioiOH1aoJOWsczUfTEcv67ycmfLN9HIg84fNfoteeOhEqJQO18 ML2V4AhIpowKLVJ+ejhHlMw+k3/AeGXA19Reh0u0qurkF7l/gEFHYGTFeLF+wTcWZVMh Fdcw== X-Gm-Message-State: AOAM5331t8CDBtUB/faA1/ACWhusYqzFgk9Q1fZSw3fbV4L0iUCW61IL DG39hSl4kEODE+Ut9Sa1N74= X-Google-Smtp-Source: ABdhPJzkFZFrfG4k3npNaRU0YZrCZlsyzC1J97h90jrkIXM4vrJJ6oR5gtZyWbor4meYq13rF+yIJw== X-Received: by 2002:a05:620a:6c3:: with SMTP id 3mr1909216qky.426.1598888246282; Mon, 31 Aug 2020 08:37:26 -0700 (PDT) Received: from dschatzberg-fedora-PC0Y6AEN.thefacebook.com ([2620:10d:c091:480::1:2edc]) by smtp.gmail.com with ESMTPSA id s5sm9908872qke.120.2020.08.31.08.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 08:37:25 -0700 (PDT) From: Dan Schatzberg To: Cc: Dan Schatzberg , Jens Axboe , Tejun Heo , Li Zefan , Johannes Weiner , Michal Hocko , Vladimir Davydov , Andrew Morton , Hugh Dickins , Shakeel Butt , Roman Gushchin , Chris Down , Yang Shi , Jakub Kicinski , linux-block@vger.kernel.org (open list:BLOCK LAYER), linux-kernel@vger.kernel.org (open list), cgroups@vger.kernel.org (open list:CONTROL GROUP (CGROUP)), linux-mm@kvack.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)) Subject: [PATCH 1/3] loop: Use worker per cgroup instead of kworker Date: Mon, 31 Aug 2020 11:36:58 -0400 Message-Id: <20200831153704.16848-2-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200831153704.16848-1-schatzberg.dan@gmail.com> References: <20200831153704.16848-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 75997180F8B86 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 d3394191e168..771685a6c259 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 @@ #include +#define LOOP_IDLE_WORKER_TIMEOUT (60 * HZ) + static DEFINE_IDR(loop_index_idr); static DEFINE_MUTEX(loop_ctl_mutex); @@ -925,27 +926,83 @@ static void loop_config_discard(struct loop_device *lo) q->limits.discard_alignment = 0; } -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; +}; -static int loop_kthread_worker_fn(void *worker_ptr) -{ - current->flags |= 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); -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 = 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 = &(lo->worker_tree.rb_node), *parent = NULL; + struct loop_worker *cur_worker, *worker = NULL; + struct work_struct *work; + struct list_head *cmd_list; + + spin_lock_irq(&lo->lo_work_lock); + + if (!cmd->css) + goto queue_work; + + node = &lo->worker_tree.rb_node; + + while (*node) { + parent = *node; + cur_worker = container_of(*node, struct loop_worker, rb_node); + if (cur_worker->css == cmd->css) { + worker = cur_worker; + break; + } else if ((long)cur_worker->css < (long)cmd->css) { + node = &(*node)->rb_left; + } else { + node = &(*node)->rb_right; + } + } + if (worker) + goto queue_work; + + worker = kzalloc(sizeof(struct loop_worker), GFP_NOWAIT | __GFP_NOWARN); + /* + * In the event we cannot allocate a worker, just queue on the + * rootcg worker + */ + if (!worker) + goto queue_work; + + worker->css = 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 = 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 = &worker->work; + cmd_list = &worker->cmd_list; + } else { + work = &lo->rootcg_work; + cmd_list = &lo->rootcg_cmd_list; + } + list_add_tail(&cmd->list_entry, cmd_list); + queue_work(lo->workqueue, work); + spin_unlock_irq(&lo->lo_work_lock); } static void loop_update_rotational(struct loop_device *lo) @@ -1133,12 +1190,27 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, !file->f_op->write_iter) lo->lo_flags |= LO_FLAGS_READ_ONLY; - error = loop_prepare_queue(lo); - if (error) + error = -EFBIG; + size = get_loop_size(lo, file); + if ((loff_t)(sector_t)size != size) goto out_unlock; + lo->workqueue = alloc_workqueue("loop%d", + WQ_UNBOUND | WQ_FREEZABLE | + WQ_MEM_RECLAIM, + lo->lo_number); + if (!lo->workqueue) { + error = -ENOMEM; + goto out_unlock; + } set_device_ro(bdev, (lo->lo_flags & LO_FLAGS_READ_ONLY) != 0); + 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 = RB_ROOT; + timer_setup(&lo->timer, loop_free_idle_workers, + TIMER_DEFERRABLE); lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO; lo->lo_device = bdev; lo->lo_backing_file = file; @@ -1209,6 +1281,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) int err = 0; bool partscan = false; int lo_number; + struct loop_worker *pos, *worker; mutex_lock(&loop_ctl_mutex); if (WARN_ON_ONCE(lo->lo_state != Lo_rundown)) { @@ -1225,6 +1298,18 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) /* freeze request queue during the transition */ blk_mq_freeze_queue(lo->lo_queue); + 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 = NULL; spin_unlock_irq(&lo->lo_lock); @@ -1262,7 +1347,6 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) partscan = lo->lo_flags & LO_FLAGS_PARTSCAN && bdev; lo_number = lo->lo_number; - loop_unprepare_queue(lo); out_unlock: mutex_unlock(&loop_ctl_mutex); if (partscan) { @@ -2028,7 +2112,7 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_ctx *hctx, } else #endif cmd->css = NULL; - kthread_queue_work(&lo->worker, &cmd->work); + loop_queue_work(lo, cmd); return BLK_STS_OK; } @@ -2058,26 +2142,82 @@ static void loop_handle_cmd(struct loop_cmd *cmd) } } -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 = - container_of(work, struct loop_cmd, work); + int orig_flags = current->flags; + struct loop_cmd *cmd; - loop_handle_cmd(cmd); + current->flags |= PF_LOCAL_THROTTLE | PF_MEMALLOC_NOIO; + spin_lock_irq(&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); + + 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 = jiffies; + list_add_tail(&worker->idle_list, &lo->idle_worker_list); + loop_set_timer(lo); + } + spin_unlock_irq(&lo->lo_work_lock); + current->flags = orig_flags; } -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 = blk_mq_rq_to_pdu(rq); + struct loop_worker *worker = + container_of(work, struct loop_worker, work); + loop_process_work(worker, &worker->cmd_list, worker->lo); +} - kthread_init_work(&cmd->work, loop_queue_work); - return 0; +static void loop_rootcg_workfn(struct work_struct *work) +{ + struct loop_device *lo = + 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 = 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->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, - .init_request = loop_init_request, .complete = lo_complete_rq, }; @@ -2165,6 +2305,7 @@ static int loop_add(struct loop_device **l, int i) atomic_set(&lo->lo_refcnt, 0); lo->lo_number = i; spin_lock_init(&lo->lo_lock); + spin_lock_init(&lo->lo_work_lock); disk->major = LOOP_MAJOR; disk->first_minor = i << part_shift; disk->fops = &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 /* Possible states of device */ @@ -54,8 +53,13 @@ struct loop_device { 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; @@ -65,7 +69,7 @@ struct loop_device { }; 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; From patchwork Mon Aug 31 15:36:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Schatzberg X-Patchwork-Id: 11746531 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 0FB58109B for ; Mon, 31 Aug 2020 15:37:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D127E214D8 for ; Mon, 31 Aug 2020 15:37:32 +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="SjePWpDm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D127E214D8 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 D13E76B005D; Mon, 31 Aug 2020 11:37:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CC4A38E0001; Mon, 31 Aug 2020 11:37:31 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDA0B6B0068; Mon, 31 Aug 2020 11:37:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0182.hostedemail.com [216.40.44.182]) by kanga.kvack.org (Postfix) with ESMTP id 799CB6B005D for ; Mon, 31 Aug 2020 11:37:31 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 36E09247F for ; Mon, 31 Aug 2020 15:37:31 +0000 (UTC) X-FDA: 77211268302.20.cloth12_1213d6b27090 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 019FE180C07AB for ; Mon, 31 Aug 2020 15:37:30 +0000 (UTC) X-Spam-Summary: 1,0,0,ef21435ee130c61d,d41d8cd98f00b204,schatzberg.dan@gmail.com,,RULES_HIT:41:355:379:387:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1535:1542:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2731:3138:3139:3140:3141:3142:3354:3865:3867:3870:3871:3872:3874:4117:4250:4605:5007:6119:6261:6653:6742:7514:7901:7903:9413:10004:11026:11658:11914:12043:12296:12297:12438:12517:12519:12555:12895:13053:13894:14096:14181:14394:14687:14721:21324:21433:21444:21451:21627:21666:21740:21795:21990:30012:30051:30054:30075,0,RBL:209.85.219.65:@gmail.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfncgjkwkye6tou51nawwzozhhsoc6jtpbt9dx6k38fc9h1gk9x6ztgozyhwm.ph87x36kynabgk953ouekyczo6azs3uuniu1bgo9furqc4btncm7iua4hxhkac5.g-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: cloth12_1213d6b27090 X-Filterd-Recvd-Size: 6466 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Mon, 31 Aug 2020 15:37:30 +0000 (UTC) Received: by mail-qv1-f65.google.com with SMTP id di5so2554825qvb.13 for ; Mon, 31 Aug 2020 08:37:30 -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=hFNO1srh3AW4C+hy+7CfuD56Hs7de0B4v+mt5P6Q+8c=; b=SjePWpDm/dcOfaWyG090sIQ82qRogNC8U9o/SXOsilJibfKn37U7NrP6cYs9z13ajn 3ahnbXMI1dfgdzV1jsX4P8YPuyM1wY2QGXQiesxpHGGEg3Z23HYwzkk62guOns9HMJyO mv5bVZQTbHPtdEJ+eNlOenVGaVNmy48r50T0qx1KJrkByftLK+OzvzENGehdjQZ0EdVJ SbKPXAl9lN5Bz1sTMxYIYgFWi6dPAG2dwLhw1nXA9usckN3AXJXudsT9uUJdRuIs/Ntq 5nv1yGY0UIXNQDK7x6fl3OY/BjqkvDLJzoM8kbzBSnvSW8Q8tEl7Yp4cPcUq9xxnCReP 1UgQ== 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=hFNO1srh3AW4C+hy+7CfuD56Hs7de0B4v+mt5P6Q+8c=; b=j4PkIhTXng+KmWQLF65yuQHI7qYPZsbooL0vZR6/nDUCpvzIeDy8sYNeZ1tM9FjKS4 lE4NDXJv10sZOTMYi0Wd6QaXE79ZUQ6r7nz/nXcbcvG7dvH22jWCpXyf0SYwb/4LQtg7 pzFyvowZ7Wn9Bpf0JiybHl8Ya2p1lW+BEQhuuIQBIj5kSWTYtuYpSSjiQ4M9ipNQty+J 9Sro6ZZG+Bql1l3tpRzyRBwhwb2P/Sg59WqR45RqmDpRnDkM+HlM8iwon0RjLQil04ZJ ch2esF8bJqdCsiIestElWLVDQpBqFevH+wAJ8+1gqthW3O37DYP6K+SPO6JKdc2BLf4a eSkQ== X-Gm-Message-State: AOAM533rzHYlrbji7/V0I0Wuiltfh25bXwig+EiBTmW6DNiRSghSYjCr nf3hEfvssurPTefWFY5VcAA= X-Google-Smtp-Source: ABdhPJxZrAVMLKA6PaN3RQHI9DyNFWZHOVofg01sLYGajv8EisNnh3wB37+tmq28zRDNQhabk9LCkg== X-Received: by 2002:ad4:430d:: with SMTP id c13mr1642259qvs.49.1598888249829; Mon, 31 Aug 2020 08:37:29 -0700 (PDT) Received: from dschatzberg-fedora-PC0Y6AEN.thefacebook.com ([2620:10d:c091:480::1:2edc]) by smtp.gmail.com with ESMTPSA id s5sm9908872qke.120.2020.08.31.08.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 08:37:29 -0700 (PDT) From: Dan Schatzberg To: Cc: Dan Schatzberg , Johannes Weiner , Tejun Heo , Chris Down , Shakeel Butt , Jens Axboe , Li Zefan , Michal Hocko , Vladimir Davydov , Andrew Morton , Hugh Dickins , Roman Gushchin , Yang Shi , Jakub Kicinski , linux-block@vger.kernel.org (open list:BLOCK LAYER), linux-kernel@vger.kernel.org (open list), cgroups@vger.kernel.org (open list:CONTROL GROUP (CGROUP)), linux-mm@kvack.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)) Subject: [PATCH 2/3] mm: Charge active memcg when no mm is set Date: Mon, 31 Aug 2020 11:36:59 -0400 Message-Id: <20200831153704.16848-3-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200831153704.16848-1-schatzberg.dan@gmail.com> References: <20200831153704.16848-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 019FE180C07AB X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: memalloc_use_memcg() worked for kernel allocations but was silently ignored for user pages. This patch establishes a precedence order for who gets charged: 1. If there is a memcg associated with the page already, that memcg is charged. This happens during swapin. 2. If an explicit mm is passed, mm->memcg is charged. This happens during page faults, which can be triggered in remote VMs (eg gup). 3. Otherwise consult the current process context. If it has configured a current->active_memcg, use that. Otherwise, current->mm->memcg. Previously, if a NULL mm was passed to mem_cgroup_try_charge (case 3) it would always charge the root cgroup. Now it looks up the current active_memcg first (falling back to charging the root cgroup if not set). Signed-off-by: Dan Schatzberg Acked-by: Johannes Weiner Acked-by: Tejun Heo Acked-by: Chris Down Reviewed-by: Shakeel Butt --- mm/memcontrol.c | 11 ++++++++--- mm/shmem.c | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e27ac6d79a32..877778b792da 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6676,7 +6676,8 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root, * @gfp_mask: reclaim mode * * Try to charge @page to the memcg that @mm belongs to, reclaiming - * pages according to @gfp_mask if necessary. + * pages according to @gfp_mask if necessary. if @mm is NULL, try to + * charge to the active memcg. * * Returns 0 on success. Otherwise, an error code is returned. */ @@ -6712,8 +6713,12 @@ int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask) rcu_read_unlock(); } - if (!memcg) - memcg = get_mem_cgroup_from_mm(mm); + if (!memcg) { + if (!mm) + memcg = get_mem_cgroup_from_current(); + else + memcg = get_mem_cgroup_from_mm(mm); + } ret = try_charge(memcg, gfp_mask, nr_pages); if (ret) diff --git a/mm/shmem.c b/mm/shmem.c index 271548ca20f3..1139f52ac4ee 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1695,7 +1695,7 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, { struct address_space *mapping = inode->i_mapping; struct shmem_inode_info *info = SHMEM_I(inode); - struct mm_struct *charge_mm = vma ? vma->vm_mm : current->mm; + struct mm_struct *charge_mm = vma ? vma->vm_mm : NULL; struct page *page; swp_entry_t swap; int error; @@ -1809,7 +1809,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, } sbinfo = SHMEM_SB(inode->i_sb); - charge_mm = vma ? vma->vm_mm : current->mm; + charge_mm = vma ? vma->vm_mm : NULL; page = find_lock_entry(mapping, index); if (xa_is_value(page)) { From patchwork Mon Aug 31 15:37:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Schatzberg X-Patchwork-Id: 11746533 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 0A47613B6 for ; Mon, 31 Aug 2020 15:37:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BB21B20EDD for ; Mon, 31 Aug 2020 15:37:36 +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="Wm313dtO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB21B20EDD 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 8F5006B0068; Mon, 31 Aug 2020 11:37:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8CC1C6B006C; Mon, 31 Aug 2020 11:37:35 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 794506B006E; Mon, 31 Aug 2020 11:37:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0250.hostedemail.com [216.40.44.250]) by kanga.kvack.org (Postfix) with ESMTP id 47C036B0068 for ; Mon, 31 Aug 2020 11:37:35 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 11AD0181AEF1D for ; Mon, 31 Aug 2020 15:37:35 +0000 (UTC) X-FDA: 77211268470.21.kiss15_4a1231627090 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id DD8E3180442C2 for ; Mon, 31 Aug 2020 15:37:34 +0000 (UTC) X-Spam-Summary: 1,0,0,cfe2d4e1458ea83e,d41d8cd98f00b204,schatzberg.dan@gmail.com,,RULES_HIT:1:2:41:69:355:379:387:541:800:960:966:973:988:989:1260:1311:1314:1345:1359:1437:1515:1605:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:2901:3138:3139:3140:3141:3142:3865:3866:3867:3868:3870:3871:3872:4050:4321:4385:4605:5007:6119:6120:6121:6261:6653:6742:7514:7901:7903:9413:10004:11026:11473:11658:11914:12043:12291:12296:12297:12438:12517:12519:12555:12683:12895:12986:13161:13229:13894:14096:14394:14687:21092:21433:21444:21451:21524:21627:21666:21740:21987:21990:30012:30054,0,RBL:209.85.160.196:@gmail.com:.lbl8.mailshell.net-62.50.0.100 66.100.201.100;04y8kkwf18aycqam3fo78fe81iazeyc1qdejxey735uiuo8h1fk7x8s6nkkd9gz.wiayg3gbswgheh1ticarhu9eobgfhtstrxxcbhb74p8gm9knk3xsecpui5bnccb.1-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:27,LUA_SUMMARY:none X-HE-Tag: kiss15_4a1231627090 X-Filterd-Recvd-Size: 10658 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Mon, 31 Aug 2020 15:37:34 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id b3so4981347qtg.13 for ; Mon, 31 Aug 2020 08:37:34 -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=QsMkC5oXq5WobzdILIB2ScjD9TgMB1liEL21vqR/JC4=; b=Wm313dtOmsFOK8Cnr4/6OmwNiezmSvcB1alZmu82FUIhUMw4n9ArHBcrs42yI+jFhO ojGwxKqq228m4vtsBIC8i1hjYkolf3eU7QyISKNRjRse1u8l0/P92mFL2dUImjKABzMx vOK5UKOfKflYGSjazdqNTY71NxFTd/QwNYkhkuddif0x3yQGh7060uAb2rrZ2VcSQWhL 4n8Al5ewZkeUA/Md2dds+tqkZrVfY3S/OLA8ynJFo21LW2dgIVOkGfjcigTeAeJ/yLW1 zYqvPcw+UFtdWk4c2DR/OP4bZi2Ct02HTaUZV0WZxWGi7RV4B9COQOTYTW3cMs8p6JHS iEmg== 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=QsMkC5oXq5WobzdILIB2ScjD9TgMB1liEL21vqR/JC4=; b=e7YYFg5t6d0bX8bSUAcaxv9q1UUHX9VYTXqFZ3/6D3wrXB4pNOT1jsa40Q6dsknRcZ ONZAxXJb/OGHv+RkxJqg09GZdmqQmu0Nn7Q4eR25HR97B2KMCcFJ/0e6pZNRV+qTYozD 9STZbnI8CrV2UOXJV/QYbVNDL4oUrgg8YB1BGH5E08vFkyFTxkUZiFXO4TfUCRbUYVZ+ Q8oFFiSKsxte9YF+PFBB2TntJOUAWI3NpUtjPiWmFaYLvJ2+fgobyPdBmyoB1YB6Q5yf /8wg6dRszxBzIAkQUOMDtvI3nw5vnyC6pE7sOT7urw8+U6vc89wOeK49oDXBjSOfU4yR mXwg== X-Gm-Message-State: AOAM531PbomeHdjfzf4YIqYIbAomSbEsIjri2JZaZP3hV1s7NKgHrfcO tPAvjm9trE7GLYKbiq/08Mc= X-Google-Smtp-Source: ABdhPJwNgQwkTvcxQopBySVGrO5u9TYtUYf8WYp5vpq6hvCEiBOZFeiTD9G7XIoFcDAaDwEQhLaH8Q== X-Received: by 2002:ac8:1c3:: with SMTP id b3mr1357180qtg.240.1598888253678; Mon, 31 Aug 2020 08:37:33 -0700 (PDT) Received: from dschatzberg-fedora-PC0Y6AEN.thefacebook.com ([2620:10d:c091:480::1:2edc]) by smtp.gmail.com with ESMTPSA id s5sm9908872qke.120.2020.08.31.08.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 08:37:32 -0700 (PDT) From: Dan Schatzberg To: Cc: Dan Schatzberg , Johannes Weiner , Jens Axboe , Tejun Heo , Li Zefan , Michal Hocko , Vladimir Davydov , Andrew Morton , Hugh Dickins , Shakeel Butt , Roman Gushchin , Joonsoo Kim , Chris Down , Yafang Shao , Yang Shi , linux-block@vger.kernel.org (open list:BLOCK LAYER), linux-kernel@vger.kernel.org (open list), cgroups@vger.kernel.org (open list:CONTROL GROUP (CGROUP)), linux-mm@kvack.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)) Subject: [PATCH 3/3] loop: Charge i/o to mem and blk cg Date: Mon, 31 Aug 2020 11:37:00 -0400 Message-Id: <20200831153704.16848-4-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200831153704.16848-1-schatzberg.dan@gmail.com> References: <20200831153704.16848-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: DD8E3180442C2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: The current code only associates with the existing blkcg when aio is used to access the backing file. This patch covers all types of i/o to the backing file and also associates the memcg so if the backing file is on tmpfs, memory is charged appropriately. This patch also exports cgroup_get_e_css so it can be used by the loop module. Signed-off-by: Dan Schatzberg Acked-by: Johannes Weiner --- drivers/block/loop.c | 61 +++++++++++++++++++++++++------------- drivers/block/loop.h | 3 +- include/linux/memcontrol.h | 6 ++++ kernel/cgroup/cgroup.c | 1 + 4 files changed, 50 insertions(+), 21 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 771685a6c259..3da34d454287 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -77,6 +77,7 @@ #include #include #include +#include #include "loop.h" @@ -518,8 +519,6 @@ static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2) { struct loop_cmd *cmd = container_of(iocb, struct loop_cmd, iocb); - if (cmd->css) - css_put(cmd->css); cmd->ret = ret; lo_rw_aio_do_completion(cmd); } @@ -580,8 +579,6 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, cmd->iocb.ki_complete = lo_rw_aio_complete; cmd->iocb.ki_flags = IOCB_DIRECT; cmd->iocb.ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0); - if (cmd->css) - kthread_associate_blkcg(cmd->css); if (rw == WRITE) ret = call_write_iter(file, &cmd->iocb, &iter); @@ -589,7 +586,6 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, ret = call_read_iter(file, &cmd->iocb, &iter); lo_rw_aio_do_completion(cmd); - kthread_associate_blkcg(NULL); if (ret != -EIOCBQUEUED) cmd->iocb.ki_complete(&cmd->iocb, ret, 0); @@ -932,7 +928,7 @@ struct loop_worker { struct list_head cmd_list; struct list_head idle_list; struct loop_device *lo; - struct cgroup_subsys_state *css; + struct cgroup_subsys_state *blkcg_css; unsigned long last_ran_at; }; @@ -949,7 +945,7 @@ static void loop_queue_work(struct loop_device *lo, struct loop_cmd *cmd) spin_lock_irq(&lo->lo_work_lock); - if (!cmd->css) + if (!cmd->blkcg_css) goto queue_work; node = &lo->worker_tree.rb_node; @@ -957,10 +953,10 @@ static void loop_queue_work(struct loop_device *lo, struct loop_cmd *cmd) while (*node) { parent = *node; cur_worker = container_of(*node, struct loop_worker, rb_node); - if (cur_worker->css == cmd->css) { + if (cur_worker->blkcg_css == cmd->blkcg_css) { worker = cur_worker; break; - } else if ((long)cur_worker->css < (long)cmd->css) { + } else if ((long)cur_worker->blkcg_css < (long)cmd->blkcg_css) { node = &(*node)->rb_left; } else { node = &(*node)->rb_right; @@ -972,13 +968,18 @@ static void loop_queue_work(struct loop_device *lo, struct loop_cmd *cmd) worker = kzalloc(sizeof(struct loop_worker), GFP_NOWAIT | __GFP_NOWARN); /* * In the event we cannot allocate a worker, just queue on the - * rootcg worker + * rootcg worker and issue the I/O as the rootcg */ - if (!worker) + if (!worker) { + cmd->blkcg_css = NULL; + if (cmd->memcg_css) + css_put(cmd->memcg_css); + cmd->memcg_css = NULL; goto queue_work; + } - worker->css = cmd->css; - css_get(worker->css); + worker->blkcg_css = cmd->blkcg_css; + css_get(worker->blkcg_css); INIT_WORK(&worker->work, loop_workfn); INIT_LIST_HEAD(&worker->cmd_list); INIT_LIST_HEAD(&worker->idle_list); @@ -1304,7 +1305,7 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) idle_list) { list_del(&worker->idle_list); rb_erase(&worker->rb_node, &lo->worker_tree); - css_put(worker->css); + css_put(worker->blkcg_css); kfree(worker); } spin_unlock_irq(&lo->lo_work_lock); @@ -2105,13 +2106,18 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_ctx *hctx, } /* always use the first bio's css */ + cmd->blkcg_css = NULL; + cmd->memcg_css = NULL; #ifdef CONFIG_BLK_CGROUP - if (cmd->use_aio && rq->bio && rq->bio->bi_blkg) { - cmd->css = &bio_blkcg(rq->bio)->css; - css_get(cmd->css); - } else + if (rq->bio && rq->bio->bi_blkg) { + cmd->blkcg_css = &bio_blkcg(rq->bio)->css; +#ifdef CONFIG_MEMCG + cmd->memcg_css = + cgroup_get_e_css(cmd->blkcg_css->cgroup, + &memory_cgrp_subsys); +#endif + } #endif - cmd->css = NULL; loop_queue_work(lo, cmd); return BLK_STS_OK; @@ -2123,13 +2129,28 @@ static void loop_handle_cmd(struct loop_cmd *cmd) const bool write = op_is_write(req_op(rq)); struct loop_device *lo = rq->q->queuedata; int ret = 0; + struct mem_cgroup *old_memcg = NULL; if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY)) { ret = -EIO; goto failed; } + if (cmd->blkcg_css) + kthread_associate_blkcg(cmd->blkcg_css); + if (cmd->memcg_css) + old_memcg = set_active_memcg( + mem_cgroup_from_css(cmd->memcg_css)); + ret = do_req_filebacked(lo, rq); + + if (cmd->blkcg_css) + kthread_associate_blkcg(NULL); + + if (cmd->memcg_css) { + set_active_memcg(old_memcg); + css_put(cmd->memcg_css); + } failed: /* complete non-aio request */ if (!cmd->use_aio || ret) { @@ -2208,7 +2229,7 @@ static void loop_free_idle_workers(struct timer_list *timer) break; list_del(&worker->idle_list); rb_erase(&worker->rb_node, &lo->worker_tree); - css_put(worker->css); + css_put(worker->blkcg_css); kfree(worker); } if (!list_empty(&lo->idle_worker_list)) diff --git a/drivers/block/loop.h b/drivers/block/loop.h index 0162b55a68e1..4d6886d9855a 100644 --- a/drivers/block/loop.h +++ b/drivers/block/loop.h @@ -75,7 +75,8 @@ struct loop_cmd { long ret; struct kiocb iocb; struct bio_vec *bvec; - struct cgroup_subsys_state *css; + struct cgroup_subsys_state *blkcg_css; + struct cgroup_subsys_state *memcg_css; }; /* Support for loadable transfer modules */ diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d0b036123c6a..fceac9f66d96 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1031,6 +1031,12 @@ static inline struct mem_cgroup *get_mem_cgroup_from_page(struct page *page) return NULL; } +static inline +struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css) +{ + return NULL; +} + static inline void mem_cgroup_put(struct mem_cgroup *memcg) { } diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index dd247747ec14..16d059a89a68 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -580,6 +580,7 @@ struct cgroup_subsys_state *cgroup_get_e_css(struct cgroup *cgrp, rcu_read_unlock(); return css; } +EXPORT_SYMBOL_GPL(cgroup_get_e_css); static void cgroup_get_live(struct cgroup *cgrp) {