From patchwork Tue Jul 3 15:14:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10504437 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 3E3FF60325 for ; Tue, 3 Jul 2018 15:19:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CE8227E5A for ; Tue, 3 Jul 2018 15:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21050285FE; Tue, 3 Jul 2018 15:19:22 +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=ham 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 B231F27E5A for ; Tue, 3 Jul 2018 15:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933986AbeGCPTT (ORCPT ); Tue, 3 Jul 2018 11:19:19 -0400 Received: from mail-qt0-f195.google.com ([209.85.216.195]:41899 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933661AbeGCPPM (ORCPT ); Tue, 3 Jul 2018 11:15:12 -0400 Received: by mail-qt0-f195.google.com with SMTP id y20-v6so1863795qto.8 for ; Tue, 03 Jul 2018 08:15:12 -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=lvnAokgK4iqwm/rj6v3ejnikhDRvUCn1RQ4MZFK+fOU=; b=UneJiFCSgllHfNoq3SBSWbxqlsCTGD7Vq1q/HnoyhX1Rj8Rw3h4kcfnnVJVa3x+OUG h3O5AMRTc8mA4GMtig3ViBH7TUbmug9fAX8wFJEbBTGmYB93Wzerd6O9lAYVGSA9kxSj C1irkQOWVI5gywjo6XBkyhvZMQa9i/NI2OPgTK8r50d97W2PlXoMgQYfg9SdlHB0js9E ykvd3TKAQOUDlNxHxfMnjEM7Jo18Z+eY+Kfh66E+SrNL4xQOPoYJ1otSRBf7Xhl9vcEi sRvz0+21IaQl6HruhZ93VScGriGepDoqPCo0DNqyxGKoYb94DKo+ju18JwH8c/73c2gu vo1Q== 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=lvnAokgK4iqwm/rj6v3ejnikhDRvUCn1RQ4MZFK+fOU=; b=g82CTsMGsIF8dAVUltutjVLE0E3HYvn5//TBiS2/y0N2PrqcdK60WZ+Td+gX3nOFUY 0aM5cQIFmEhvgA/yLOqdoCMACy+prQjthCqIs1sjwE/uOgWPvGB40XgIoj9YUUi7F4/f tWILowERYd6ABYYZCze/2y7iTh1rAAb/4v+emdzMRiCqSP5uY/Jdjv7Wz6eGwmFTwv5v ZkQucLKMA/ghv/wtIXCtKUUL1Co9KgSSnuh3dVRcA/otM8x/iJsaGGMGdbUOJ9SjMDk1 c4xuL1HnKH3x5ocPz0vmElU6rT6vGSr7W6zVPFkD3hWM+SqIQl+UrkecfDxkZNHAm34z EFSQ== X-Gm-Message-State: APt69E2Q4wZyHofZ1Fsp6zKBu9zx8sAIJcb4LpcfJDELJi76ufkj4e4i QeWr9aEnGBxaY7u8u9TRVYUl5ll/Chc= X-Google-Smtp-Source: AAOMgpdViDv2aD+Zcf0Q7Y4Gpw8vcBZXufmeYIXNw2r27ZfT0T1n18INllGIqDb0UehlIgfsyl+h7A== X-Received: by 2002:a0c:98a7:: with SMTP id f36-v6mr26671142qvd.81.1530630912181; Tue, 03 Jul 2018 08:15:12 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id t17-v6sm1043619qth.10.2018.07.03.08.15.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jul 2018 08:15:11 -0700 (PDT) From: Josef Bacik To: axboe@kernel.dk, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, hannes@cmpxchg.org, tj@kernel.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, kernel-team@fb.com Cc: Josef Bacik Subject: [PATCH 04/14] blk: introduce REQ_SWAP Date: Tue, 3 Jul 2018 11:14:53 -0400 Message-Id: <20180703151503.2549-5-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180703151503.2549-1-josef@toxicpanda.com> References: <20180703151503.2549-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 3364d42ebe08..0ffc34c5cc83 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -329,7 +329,7 @@ enum req_flag_bits { /* for driver use */ __REQ_DRV, - + __REQ_SWAP, /* swapping request. */ __REQ_NR_BITS, /* stops here */ }; @@ -351,6 +351,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);