From patchwork Tue Jun 5 13:29:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10448293 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 A2ABD6024A for ; Tue, 5 Jun 2018 13:33:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9543E29365 for ; Tue, 5 Jun 2018 13:33:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A04D2937B; Tue, 5 Jun 2018 13:33:05 +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 35C3A29365 for ; Tue, 5 Jun 2018 13:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751967AbeFENcv (ORCPT ); Tue, 5 Jun 2018 09:32:51 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:35316 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751968AbeFEN34 (ORCPT ); Tue, 5 Jun 2018 09:29:56 -0400 Received: by mail-qt0-f193.google.com with SMTP id s9-v6so2362401qtg.2 for ; Tue, 05 Jun 2018 06:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sWOwbpIrK9XPYUY4yEH5tX1tHsTGl4xJAX1+6iwXdZU=; b=NU58ZYV5CAD5JwY2wGIEipMl9bJGjqQkv1bCaljgM7sEejgSEK+RnMz/pZkISPUCpe Nq9wFIORqL2/9rAkUVpdotRGGQGcxZ1L7J9XIFfgIXBXrPT3YDMeiPicYT0ssePIt9Lx U3FkeFpt3TVjNZFBwUDKqntQrQG6PvGXXSwAmwpsa3pUrOyQyxoAAvZw3f2ioUM5Ffb+ DIcYcWucH/yqo3NlfMCfxXwSzQ1FGxM2hO+rGawx1GjRyQhFktgs4T8UdARkWKnwh0i+ 28/wJDv+qJVdjEvajIKWUkDnxRa867Tj9cC8z6YKEo+dLZFSG6ApVoTYgmr6xEab/A1t Csnw== 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; bh=sWOwbpIrK9XPYUY4yEH5tX1tHsTGl4xJAX1+6iwXdZU=; b=C/JjusUdp0wf9iZXADfa7oJZXH2QAbtncLP6Lp8F0CWKok9uCU341WNxk15cl3/Yvj bCguioB/ZI5PRvZNE9YjymeEH9ad+l3w0fQiWSrLncSqZrxqb+G3TV6mvmJRHkPS4tuo 4MWq16pU9bU+Oqq3DByUtlrRzpZmv7pUcueTgAhzUquzMAVCcBD5G72pRgxDHsU1u0++ Mu3ET0eM37Mz4mjVWvr2zEKZOvMCpXI0jrO/SiBq1C74KX6AKivr4xxoXqtH518lRdtM OSedRVeXspLw7QTSUZMCEwntQmZ+EAcsG/2OS0gpGl1OOx9jyOpKubWD14rD6LBoX517 /NPg== X-Gm-Message-State: APt69E3XvXYfgNqURuM85zDZbEg2HsUKawD8zTYSaN35/xCByT402QXt s8XIaSgLxyBZeojXzpKNknffQg== X-Google-Smtp-Source: ADUXVKLAOpDJOxVE0IO45i2gjBkYdpZD1mePUwSMDyU0z/qOxe6+mf+oUVKT7NJPRh/iExmI96YNxA== X-Received: by 2002:ac8:19ab:: with SMTP id u40-v6mr11532381qtj.266.1528205396235; Tue, 05 Jun 2018 06:29:56 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id x12-v6sm19265309qtp.10.2018.06.05.06.29.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 06:29:55 -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 Cc: Josef Bacik Subject: [PATCH 04/13] blk: introduce REQ_SWAP Date: Tue, 5 Jun 2018 09:29:39 -0400 Message-Id: <20180605132948.1664-5-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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Josef Bacik Just like REQ_META, it's important to know the IO coming down is swap in order to guard against potential IO priority inversion issues with cgroups. Add REQ_SWAP and use it for all swap IO, and add it to our bio_issue_as_root_blkg helper. Signed-off-by: Josef Bacik Acked-by: Tejun Heo --- include/linux/blk-cgroup.h | 2 +- include/linux/blk_types.h | 3 ++- mm/page_io.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index b41292726c0f..a8f9ba8f33a4 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -254,7 +254,7 @@ static inline struct blkcg *bio_blkcg(struct bio *bio) */ static inline bool bio_issue_as_root_blkg(struct bio *bio) { - return (bio->bi_opf & REQ_META); + return (bio->bi_opf & (REQ_META | REQ_SWAP)) != 0; } /** diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index ff181df8c195..4f7ba397d37d 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -327,7 +327,7 @@ enum req_flag_bits { /* for driver use */ __REQ_DRV, - + __REQ_SWAP, /* swapping request. */ __REQ_NR_BITS, /* stops here */ }; @@ -349,6 +349,7 @@ enum req_flag_bits { #define REQ_NOUNMAP (1ULL << __REQ_NOUNMAP) #define REQ_DRV (1ULL << __REQ_DRV) +#define REQ_SWAP (1ULL << __REQ_SWAP) #define REQ_FAILFAST_MASK \ (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER) diff --git a/mm/page_io.c b/mm/page_io.c index b41cf9644585..a552cb37e220 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -338,7 +338,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc, ret = -ENOMEM; goto out; } - bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc); + bio->bi_opf = REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc); count_swpout_vm_event(page); set_page_writeback(page); unlock_page(page);