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.5 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 4F2A0C433E2 for ; Mon, 31 Aug 2020 15:37:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 05116207EA for ; Mon, 31 Aug 2020 15:37:35 +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 05116207EA 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) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CC1C6B006C; Mon, 31 Aug 2020 11:37:35 -0400 (EDT) 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-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-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 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: 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 =20 #include "loop.h" =20 @@ -518,8 +519,6 @@ static void lo_rw_aio_complete(struct kiocb *iocb, lo= ng ret, long ret2) { struct loop_cmd *cmd =3D container_of(iocb, struct loop_cmd, iocb); =20 - if (cmd->css) - css_put(cmd->css); cmd->ret =3D ret; lo_rw_aio_do_completion(cmd); } @@ -580,8 +579,6 @@ static int lo_rw_aio(struct loop_device *lo, struct l= oop_cmd *cmd, cmd->iocb.ki_complete =3D lo_rw_aio_complete; cmd->iocb.ki_flags =3D IOCB_DIRECT; cmd->iocb.ki_ioprio =3D IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0); - if (cmd->css) - kthread_associate_blkcg(cmd->css); =20 if (rw =3D=3D WRITE) ret =3D call_write_iter(file, &cmd->iocb, &iter); @@ -589,7 +586,6 @@ static int lo_rw_aio(struct loop_device *lo, struct l= oop_cmd *cmd, ret =3D call_read_iter(file, &cmd->iocb, &iter); =20 lo_rw_aio_do_completion(cmd); - kthread_associate_blkcg(NULL); =20 if (ret !=3D -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; }; =20 @@ -949,7 +945,7 @@ static void loop_queue_work(struct loop_device *lo, s= truct loop_cmd *cmd) =20 spin_lock_irq(&lo->lo_work_lock); =20 - if (!cmd->css) + if (!cmd->blkcg_css) goto queue_work; =20 node =3D &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 =3D *node; cur_worker =3D container_of(*node, struct loop_worker, rb_node); - if (cur_worker->css =3D=3D cmd->css) { + if (cur_worker->blkcg_css =3D=3D cmd->blkcg_css) { worker =3D cur_worker; break; - } else if ((long)cur_worker->css < (long)cmd->css) { + } else if ((long)cur_worker->blkcg_css < (long)cmd->blkcg_css) { node =3D &(*node)->rb_left; } else { node =3D &(*node)->rb_right; @@ -972,13 +968,18 @@ static void loop_queue_work(struct loop_device *lo,= struct loop_cmd *cmd) 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 + * rootcg worker and issue the I/O as the rootcg */ - if (!worker) + if (!worker) { + cmd->blkcg_css =3D NULL; + if (cmd->memcg_css) + css_put(cmd->memcg_css); + cmd->memcg_css =3D NULL; goto queue_work; + } =20 - worker->css =3D cmd->css; - css_get(worker->css); + worker->blkcg_css =3D 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, bo= ol 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_h= w_ctx *hctx, } =20 /* always use the first bio's css */ + cmd->blkcg_css =3D NULL; + cmd->memcg_css =3D NULL; #ifdef CONFIG_BLK_CGROUP - if (cmd->use_aio && rq->bio && rq->bio->bi_blkg) { - cmd->css =3D &bio_blkcg(rq->bio)->css; - css_get(cmd->css); - } else + if (rq->bio && rq->bio->bi_blkg) { + cmd->blkcg_css =3D &bio_blkcg(rq->bio)->css; +#ifdef CONFIG_MEMCG + cmd->memcg_css =3D + cgroup_get_e_css(cmd->blkcg_css->cgroup, + &memory_cgrp_subsys); +#endif + } #endif - cmd->css =3D NULL; loop_queue_work(lo, cmd); =20 return BLK_STS_OK; @@ -2123,13 +2129,28 @@ static void loop_handle_cmd(struct loop_cmd *cmd) const bool write =3D op_is_write(req_op(rq)); struct loop_device *lo =3D rq->q->queuedata; int ret =3D 0; + struct mem_cgroup *old_memcg =3D NULL; =20 if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY)) { ret =3D -EIO; goto failed; } =20 + if (cmd->blkcg_css) + kthread_associate_blkcg(cmd->blkcg_css); + if (cmd->memcg_css) + old_memcg =3D set_active_memcg( + mem_cgroup_from_css(cmd->memcg_css)); + ret =3D 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_lis= t *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; }; =20 /* 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_fr= om_page(struct page *page) return NULL; } =20 +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 c= group *cgrp, rcu_read_unlock(); return css; } +EXPORT_SYMBOL_GPL(cgroup_get_e_css); =20 static void cgroup_get_live(struct cgroup *cgrp) { --=20 2.24.1