From patchwork Wed Jun 27 19:09:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10492501 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 9201060325 for ; Wed, 27 Jun 2018 19:14:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A26EC29BC9 for ; Wed, 27 Jun 2018 19:14:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95F4429D96; Wed, 27 Jun 2018 19:14:07 +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 4119F29BC9 for ; Wed, 27 Jun 2018 19:14:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966425AbeF0TNw (ORCPT ); Wed, 27 Jun 2018 15:13:52 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:35318 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934991AbeF0TJu (ORCPT ); Wed, 27 Jun 2018 15:09:50 -0400 Received: by mail-qk0-f195.google.com with SMTP id u21-v6so1662457qku.2 for ; Wed, 27 Jun 2018 12:09:50 -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=nbRJyDLumgeP/1WsbHEh1Olz6qoLNAqJsKESPZX7Dc7oqLGQmg5jF9CqnTpc+t4GoO +d2MtcOO49CbOHcnp1rbyfIpTO3xMmNxFjLBzPsSb6eiqO4b3UeG7AfrI8ngkm40UaKc 9ZOSm7DQgPnzDlmG3l8OFshFjYOnolDIccPxBof0HAENcWyaXeRlXgk+TX9NK78rsedp yTuXAe4ioR+8VLoWIIa19h3rDwimr99K/jYVUjSaCSfGxhBk7aoQseIVVX0V631fcBvE pjHz0IySqXDoT77PMGE8B7Pw5+xky7YHR4u6Q9SHC/8HFYRpSby+HtZCefkI4ZIj0RfH BVOQ== 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=o2lVz9Ns54vtrx0M7wymccXh+VS5PmEd2xyJ38P1i0JuVgkTTO2ReGc1086JSX26nK 5J84bl/q6kIoWHySJ2LLXE3S18aglHe82BbHoHQog1YmP2WchJ63u3woHwmSjnk26GQc oPtXRpX1Gw3Yv/neWE8zi87n4mHv+0IEAAM+e9oIwJILJV/euVqaRLkxsLHLdSGCLIGq YzAGzOpsj8jdJFh4Wzmzx7e/k+lRmLicxofo3MNIZ+qMqF6CP7WdhVM+wI0SzO+/w0w9 q9mccUtoogicEBZLQMVfjr+fJRdqCyYFa6f9JQfezXffwJ+NCOt/UXCX8ur27fRJxVLF Yjmw== X-Gm-Message-State: APt69E3DR5a6wx+pqDRE4c3CbqJ6e9t9a2zCCYK56w8iV+pNXc9FOuZ/ i6rD08LTS7xzRxEchETLczkZ0g== X-Google-Smtp-Source: AAOMgpeBm93UBrlKhz1eNvInyIkOU9jyPMXGPnrljXvIVEnUqDlKuf/tK/lUXGaE5ffQeU3tJ8arDA== X-Received: by 2002:a37:4f10:: with SMTP id d16-v6mr6347909qkb.323.1530126589706; Wed, 27 Jun 2018 12:09:49 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id b14-v6sm3026210qtp.26.2018.06.27.12.09.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Jun 2018 12:09:49 -0700 (PDT) From: Josef Bacik To: axboe@kernel.dk, linux-block@vger.kernel.org, kernel-team@fb.com, akpm@linux-foundation.org, hannes@cmpxchg.org, tj@kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Josef Bacik Subject: [PATCH 04/14] blk: introduce REQ_SWAP Date: Wed, 27 Jun 2018 15:09:30 -0400 Message-Id: <20180627190940.4696-5-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180627190940.4696-1-josef@toxicpanda.com> References: <20180627190940.4696-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: 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);