From patchwork Fri Jun 29 19:25:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10497399 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 8ED6360230 for ; Fri, 29 Jun 2018 19:28:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8128729754 for ; Fri, 29 Jun 2018 19:28:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74EC629912; Fri, 29 Jun 2018 19:28:36 +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 2225A29819 for ; Fri, 29 Jun 2018 19:28:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932822AbeF2T2b (ORCPT ); Fri, 29 Jun 2018 15:28:31 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:34284 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935053AbeF2TZw (ORCPT ); Fri, 29 Jun 2018 15:25:52 -0400 Received: by mail-qt0-f196.google.com with SMTP id m13-v6so2005767qth.1 for ; Fri, 29 Jun 2018 12:25:52 -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=bxA6cMGXvEe6N+gMDPkoHZMx5A3XRvMVyzrtT6Xehm8=; b=osPCwBJFdNZ44qSNyc87CIACn0BK8abMTzPVHxQaQVwTZpAdG9xNtnk4fFBysNshXN WkGWFR2+QsyK61IevlqQiVhXovrYf1GQkfuTPIhnz/+qBNXY4lE1jJC7y8LOe3VfNlWC MYYkf0xrFItsXhsB8cwNO/h600KWLcE43zOmZZ+U0lXGiEPBFSGujSPuauVACHAB6aOL FmzL9OW8f+CrKvGPsc0whleRj3klwO9BhOfuq7ydVKGwQZ/GdhIpq4T3hMK7emH+SKwZ Pf3MBJO4jSbCBDYOHx0lArBBMPDwlfJcJktEHf3dnsze4pKRnrutHg96djNQ0He87TWH yabw== 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=bxA6cMGXvEe6N+gMDPkoHZMx5A3XRvMVyzrtT6Xehm8=; b=FvmfEgyoXEDixFmOSKI+b7tzCmBaRLP86jbX4wnEcer/26AxBTsCkMltmonT9NiMKo XVgbZiKYASwb4q7E9I+JE1GA5/xQEtBeOGQbW7fKX8PsSpvRHXm7DVEMIb8vOMWxg67Q JvCz3XQvoEP8vUod6SSIV7xXYIUJ2DVK/TpGGZ8YOupSvzMicpZc9GVE0X17DqMALROx Cs43t+htvYksqXIPf0aV+JkFQuAZnFAWQKWenSWEFKKADpp9hvZK7kVsPaMCRI66/k/w vpprIgziFui5vK4ryEnMQGF2Z46tHo8qINs1eyIP/ZC4x8WdJwJgYkosLN6ZJfYZvZsn Wxxg== X-Gm-Message-State: APt69E1F/NSuSk5QkT+AEax1S1hqI0nrjSMFRSHBxNWVMNmi3Wsds5pQ cpoY0FiqmiYwj2RlfhzkPgv8kA== X-Google-Smtp-Source: AAOMgpfcm8+ccIp4MLlldfNwIupoxvAn4CLkzxLd35XfWa5AlCYoDKbz5HRSo1AI8zx483boaw3LLA== X-Received: by 2002:a0c:da90:: with SMTP id z16-v6mr6532386qvj.55.1530300352090; Fri, 29 Jun 2018 12:25:52 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id x8-v6sm4122675qth.73.2018.06.29.12.25.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 12:25:51 -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, tj@kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 05/14] swap, blkcg: issue swap io with the appropriate context Date: Fri, 29 Jun 2018 15:25:33 -0400 Message-Id: <20180629192542.26649-6-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180629192542.26649-1-josef@toxicpanda.com> References: <20180629192542.26649-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. We don't worry about things that do ->rw_page (zram etc) at the moment, we're only worried about pages that actually go to a block device. Signed-off-by: Tejun Heo Signed-off-by: Josef Bacik 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);