From patchwork Tue Jun 5 13:29:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10448273 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2FAC26024A for ; Tue, 5 Jun 2018 13:32:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 211EE294A4 for ; Tue, 5 Jun 2018 13:32:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E8E6294A6; Tue, 5 Jun 2018 13:32:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0679F294C8 for ; Tue, 5 Jun 2018 13:32:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752052AbeFENaB (ORCPT ); Tue, 5 Jun 2018 09:30:01 -0400 Received: from mail-qt0-f169.google.com ([209.85.216.169]:39156 "EHLO mail-qt0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751940AbeFEN36 (ORCPT ); Tue, 5 Jun 2018 09:29:58 -0400 Received: by mail-qt0-f169.google.com with SMTP id p23-v6so2347578qtn.6 for ; Tue, 05 Jun 2018 06:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=piVmLLeAFYpSy10fFCjk+Kapvp5SqDLwpzxi6jEe5Ho=; b=gfxdgwJL/iAfF+9U89YVvAMW7lSuOIevBuUsypUCqkkY1cJ2p8hLC7tkNPqQFfxXbV frD+aqP0IBY32oFUri/3mehsWNxxPsSUKiGidiP+56HQXkXq5P/uuCQKnQO7Y2eNXG4Z ap3CVZOdau0s3t0HrBEdU6kDaygC2cfO6ostkmMQWta0z/joKg+Gzmb+pjKhWabS17vB j2P0NQIbLaq6HnGTPNjcmmCnNlUme8G179EImVrym/hkF6q1XS/skBUC34dQQMgCOrds CEM4IXxO4jIR74ZSyYXE0nhMRYRAsoTat42ejBq+rJ17RtYdDJSnP1h4lfQFCS/x05Dc oDGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=piVmLLeAFYpSy10fFCjk+Kapvp5SqDLwpzxi6jEe5Ho=; b=PmlIJKbL2/Eimnr8TNiK/tpUxMJXY0tbM1Spw+aIUgjNcY5e0hfOJaSQoPTtNR/j7n M11pOsYUIzQMkbBmCaUoFsN1NByii5vjMGw+I+FY63yYwEfApC9/mTMRxm3tywR3y3Ue bJFa1fywWOCA7pn1C5j/HShw6ZGCwP5fnrZZrwDFjquR96s0MJfuMGkm44TcNBaVtSnX I78k1lf/GbdBe16jOveyNjrFltbSCBE1C26W8glgQVj4kA/ThDLte+AxhlZQgjb9aEuH 21wThpMCbYzkTjtIkkfQpq9lWc8zNS/JT1vrc8EKEooSksw5/4E0pgHVCpsL0kxA3b/X yzyg== X-Gm-Message-State: APt69E1Y99ooQ732C24jYIMjLQtBd8LKUwyU7AJ/Yjy6ipM0KXGS2AhK 4kIOVdhMDlZHVyTIY84MyiG9UQ== X-Google-Smtp-Source: ADUXVKKacsC2CTZurrbQkuSU2tudcpeo0l5FG4FmGApmwKUxqgdOuhQE3cWBFZid4mS1hbecT8lq+w== X-Received: by 2002:ac8:2e1c:: with SMTP id r28-v6mr23964840qta.156.1528205397615; Tue, 05 Jun 2018 06:29:57 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id u74-v6sm7699886qku.55.2018.06.05.06.29.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 06:29:57 -0700 (PDT) From: Josef Bacik To: axboe@kernel.dk, kernel-team@fb.com, linux-block@vger.kernel.org, akpm@linux-foundation.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, tj@kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 05/13] swap, blkcg: issue swap io with the appropriate context Date: Tue, 5 Jun 2018 09:29:40 -0400 Message-Id: <20180605132948.1664-6-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180605132948.1664-1-josef@toxicpanda.com> References: <20180605132948.1664-1-josef@toxicpanda.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tejun Heo For backcharging we need to know who the page belongs to when swapping it out. Signed-off-by: Tejun Heo Signed-off-by: Josef Bacik Acked-by: Tejun Heo Acked-by: Johannes Weiner --- block/bio.c | 24 ++++++++++++++++++++++++ include/linux/bio.h | 7 +++++++ mm/page_io.c | 1 + 3 files changed, 32 insertions(+) diff --git a/block/bio.c b/block/bio.c index 57c4b1986e76..c77fe1b4caa8 100644 --- a/block/bio.c +++ b/block/bio.c @@ -2005,6 +2005,30 @@ EXPORT_SYMBOL(bioset_create); #ifdef CONFIG_BLK_CGROUP +#ifdef CONFIG_MEMCG +/** + * bio_associate_blkcg_from_page - associate a bio with the page's blkcg + * @bio: target bio + * @page: the page to lookup the blkcg from + * + * Associate @bio with the blkcg from @page's owning memcg. This works like + * every other associate function wrt references. + */ +int bio_associate_blkcg_from_page(struct bio *bio, struct page *page) +{ + struct cgroup_subsys_state *blkcg_css; + + if (unlikely(bio->bi_css)) + return -EBUSY; + if (!page->mem_cgroup) + return 0; + blkcg_css = cgroup_get_e_css(page->mem_cgroup->css.cgroup, + &io_cgrp_subsys); + bio->bi_css = blkcg_css; + return 0; +} +#endif /* CONFIG_MEMCG */ + /** * bio_associate_blkcg - associate a bio with the specified blkcg * @bio: target bio diff --git a/include/linux/bio.h b/include/linux/bio.h index f2f3f1428e81..eef1e8877048 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -545,6 +545,13 @@ do { \ #define bio_dev(bio) \ disk_devt((bio)->bi_disk) +#if defined(CONFIG_MEMCG) && defined(CONFIG_BLK_CGROUP) +int bio_associate_blkcg_from_page(struct bio *bio, struct page *page); +#else +static inline int bio_associate_blkcg_from_page(struct bio *bio, + struct page *page) { return 0; } +#endif + #ifdef CONFIG_BLK_CGROUP int bio_associate_blkcg(struct bio *bio, struct cgroup_subsys_state *blkcg_css); int bio_associate_blkg(struct bio *bio, struct blkcg_gq *blkg); diff --git a/mm/page_io.c b/mm/page_io.c index a552cb37e220..aafd19ec1db4 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -339,6 +339,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc, goto out; } bio->bi_opf = REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc); + bio_associate_blkcg_from_page(bio, page); count_swpout_vm_event(page); set_page_writeback(page); unlock_page(page);