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: 10437071 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 CC03F602BF for ; Tue, 29 May 2018 21:17:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD44D28991 for ; Tue, 29 May 2018 21:17:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B25152899C; Tue, 29 May 2018 21:17:42 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F1FC28991 for ; Tue, 29 May 2018 21:17:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BE3C6B000D; Tue, 29 May 2018 17:17:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 247D86B0010; Tue, 29 May 2018 17:17:35 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AAA06B000D; Tue, 29 May 2018 17:17:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb0-f197.google.com (mail-yb0-f197.google.com [209.85.213.197]) by kanga.kvack.org (Postfix) with ESMTP id CB22D6B000D for ; Tue, 29 May 2018 17:17:34 -0400 (EDT) Received: by mail-yb0-f197.google.com with SMTP id 188-v6so6392291ybe.23 for ; Tue, 29 May 2018 14:17:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=YoBw5GF3e0Sa6FZi+R+K2rLhH6olkJq2QtsBvAhm3vI=; b=T8qTRzaHZ6rvMNnuE6ogZzJeHLkTyrFAPKEXuWoX5b5/KLEthT20KXNIPIU1uJRROx OH0cgXO7mpXbThaxj8GXIBjsR7Nra5ivqHYcwQVDyXIMXOCAudfelmIczO3zQbwXlsWD Hyg9i8glnsfWoc+zgtHvZlapFS5umG2B68yu3qkH36/u/gu2SvB9HIOhJwf6PGCFW4Rc c37wqUhM93B5SQl6vb7nmCwdiBm1kZoWvO6wGBwhtuOlcQhzgtWGYe3vsoMtZk4SIFMr KmVDqNCt9GrxvMlZDTihajCkCUxVE7ay55Lthfqzxdqo9zE0/Pn3PpPIJvH1w/pgLyjM aF1g== X-Gm-Message-State: ALKqPwfb6aO+vJCxbFdXNxRQ+a4vubKOyxhA+DdpKgyuUUP97777VQMy mpWJtKyuje4c3LQQ7B29tN9Vt4UprNg9duYjpUUCrRwoofdLo0pHq+dq49n9+M/SYIWFTgY8uHb PDD+alscVkjjkvpk28f0d/jEheIsNMmfCNKZl8AN2m41qIn0vaagC0aGnQcNt8O0IA8mFlwSmFC bNc28hZcjoVn/r9IZcwKJQ/JSJbIcr98n2mqJq6AmMMNpPzxxgcVvN8488T1e3skc9ifFAToqn/ fzRlSKQmgWvebdg1aYWXx4pdHiJz9erbqSLrcv7Bf9Mhz4gIbrZHceHjL9rGbJ2WfQHL35AYQ1F xbi5+9tpIvpos0Spwt00/MP6XybxKufH7Z0u/QkZGJDzkkqPGL6mo6BepM4y2ln8caJnRJhnzeT s X-Received: by 2002:a81:3a0c:: with SMTP id h12-v6mr24496ywa.401.1527628654502; Tue, 29 May 2018 14:17:34 -0700 (PDT) X-Received: by 2002:a81:3a0c:: with SMTP id h12-v6mr24485ywa.401.1527628653875; Tue, 29 May 2018 14:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527628653; cv=none; d=google.com; s=arc-20160816; b=qgUkHkyOWjaEw7T/ihY7VTMRyXkZYODQ8BOv+Z2+MZRAreFlxxS9TSGEOwtNf99Kc+ 2W2gpVIQCiUFxCi87JMLdBlQjD5SmZOWfc26dVcwadJ+F9iP2jQ/0onlryIs93xljdDh eNNfWwAyyyklswIXU2qY5gLAjHfHI4f+6H51rzihm8EuTrmyVe6rKeB0WtT86l42hX36 LZRONLuI/culd+lJhDHF1BCCnFlXYt0Sdzyr4IVcsbsln8c+iYAEWcrEUlDWK6pAZ2KP ojcLEWew9ENxCAmbKnU9/nmSUv+fPgOOY4BygtlFigFjwq7FAboR13/n40y9sIk/0Yiu 15Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=YoBw5GF3e0Sa6FZi+R+K2rLhH6olkJq2QtsBvAhm3vI=; b=Li4miZzWsgQjLRYJTcGxA1tLG5UISO4ZuzpzsMuGaPgfgKKEEW/logKfpUbwAnMn2m ZKO7V7JjN/DGCjoESlw/o60UYbqajSChh2KSnz1XLqLbf/8ebpPEeTU+6Rr2vUPDk8lg hMM7mK0SKjH174g4Kdk8wkxGrDTYq53m5RPXw77LEk0FLNQ9Nek++AmUlkyQexTU5R0H JWKKAirTsipl4ZsjUj7NCkW2KyYi+qflWFqvT+8Vmjs0OUFHA3kIfDymxeJLH07c4S9R EZUM35DDdh7bqyEYVQ+/oMIOhjp7AhadYWcuIt37eihbfk5uJinewdFQjVv7ilxKvUNC IvNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@toxicpanda-com.20150623.gappssmtp.com header.s=20150623 header.b=omOPJFyn; spf=neutral (google.com: 209.85.220.65 is neither permitted nor denied by best guess record for domain of josef@toxicpanda.com) smtp.mailfrom=josef@toxicpanda.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j207-v6sor1804832ywj.58.2018.05.29.14.17.33 for (Google Transport Security); Tue, 29 May 2018 14:17:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.65 is neither permitted nor denied by best guess record for domain of josef@toxicpanda.com) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@toxicpanda-com.20150623.gappssmtp.com header.s=20150623 header.b=omOPJFyn; spf=neutral (google.com: 209.85.220.65 is neither permitted nor denied by best guess record for domain of josef@toxicpanda.com) smtp.mailfrom=josef@toxicpanda.com 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-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> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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);