From patchwork Tue May 29 21:17:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10437143 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 08531602BF for ; Tue, 29 May 2018 21:20:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA29628994 for ; Tue, 29 May 2018 21:20:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7BF5289C4; Tue, 29 May 2018 21:20:41 +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 B950928994 for ; Tue, 29 May 2018 21:20:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967178AbeE2VUb (ORCPT ); Tue, 29 May 2018 17:20:31 -0400 Received: from mail-yw0-f195.google.com ([209.85.161.195]:40897 "EHLO mail-yw0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967134AbeE2VRe (ORCPT ); Tue, 29 May 2018 17:17:34 -0400 Received: by mail-yw0-f195.google.com with SMTP id p144-v6so5315844ywg.7 for ; Tue, 29 May 2018 14:17:34 -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=YoBw5GF3e0Sa6FZi+R+K2rLhH6olkJq2QtsBvAhm3vI=; b=omOPJFyncr+yraSp5IK8E85gMlN2/0pJq40wP7gsHcZ7nUhiNPYl4qBLHMd2yM2LSU tA4Go6UvW5oUHzs5DqsABphBmSYrFYtzVU+IIysiTBEe/jbPoyaCUPesEvqPQWYBFVYz CBJ5SSfKppeYOEcyoCNcGFOiaoCRTRgJfXZ0t3y4FGe2rDS5uQUmjh35Dwk4iIHn6dDF 5t3o6WFlUwCt2L3GS3JJOt8NvoQ+GaZvOXjWzUCFsOifmSmBOT07IGCLgAajP5VCIslr vKT41SXzc28+8AkI9jn/BHbqfHxJYegPLWKH1eSigZZqJlhQz9Zyo5v9blnwkjRRraGI JMDQ== 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=YoBw5GF3e0Sa6FZi+R+K2rLhH6olkJq2QtsBvAhm3vI=; b=nQBWA3APf3xmwOtWNNv/tTUuZ61Vx3ZgMBD5GMX63fosFo5GjbYE20LXJhgy/dydOX KP8Et5FDSFTaX9oayefgtzIDV7F/n5ZYBEeYKL9sWviIfVfY99gie4jFvWEO35Iqc+YA NzcPZ9DeFJ9obNFQGFfSBNvg8bgwKleA6aw7EGKjrHXuusLNgCNc2tqwUvyLLoaA0wqh Wn/bG6L4kWqMWeAhZ/l9GYsjzcfZMh1xFS2KN+ToLeyv3w1oK9heQBP2cvvBEWhWUnlX S4vFpdTx7gB0w2FCXpVZF61JUMXWTgB2q1HjogIrwX1di2d4TC9tfTdL7+TQgKXhTJoS FmSg== X-Gm-Message-State: ALKqPwe6nBCNuydr5tm/qNPFLIlOYN9ikX5+lxpLJUaoXrFGeU3Pd0JZ Ls+oHaH2e849otGXXATati+q9A== X-Google-Smtp-Source: ADUXVKIzZtMMap8dpfHtEIQTVbqk+wdBmxYUW3sg4z6PPmqcoPDiRBhwFNfmDXpIjRphvjBohU+2AA== X-Received: by 2002:a81:2a57:: with SMTP id q84-v6mr36562ywq.149.1527628653548; Tue, 29 May 2018 14:17:33 -0700 (PDT) Received: from localhost (cpe-2606-A000-4381-1201-225-22FF-FEB3-E51A.dyn6.twc.com. [2606:a000:4381:1201:225:22ff:feb3:e51a]) by smtp.gmail.com with ESMTPSA id p123-v6sm14846647ywg.31.2018.05.29.14.17.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 14:17:32 -0700 (PDT) From: Josef Bacik To: axboe@kernel.dk, kernel-team@fb.com, linux-block@vger.kernel.org, akpm@linux-foundation.org, linux-mm@kvack.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, 29 May 2018 17:17:15 -0400 Message-Id: <20180529211724.4531-5-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180529211724.4531-1-josef@toxicpanda.com> References: <20180529211724.4531-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);