From patchwork Tue Sep 25 15:30:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10614263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 37F9E15E8 for ; Tue, 25 Sep 2018 15:30:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B4952A857 for ; Tue, 25 Sep 2018 15:30:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28F742A866; Tue, 25 Sep 2018 15:30:43 +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=unavailable 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 245612A89A for ; Tue, 25 Sep 2018 15:30:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 03D818E00A3; Tue, 25 Sep 2018 11:30:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F05068E009E; Tue, 25 Sep 2018 11:30:28 -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 D553D8E00A2; Tue, 25 Sep 2018 11:30:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by kanga.kvack.org (Postfix) with ESMTP id A18488E009E for ; Tue, 25 Sep 2018 11:30:28 -0400 (EDT) Received: by mail-qk1-f199.google.com with SMTP id v14-v6so6675508qkg.8 for ; Tue, 25 Sep 2018 08:30:28 -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:subject:date:message-id :in-reply-to:references; bh=ku7/MRL/ppjtTHGZe2O1XF901LokT9maZEyU9FpjnHE=; b=hAXLsDvFPhRzBxNiFzWsYICife82POOsr70sa38xxvWg+9zN/yjKWqX/lbCIi12aPH eY8uZB/6jDFGLmB1aaMvcBkmeNR2LZMUdNsehDgMMYKDqjTxu4jIeBrEnRivT6V/SkbV z5gbLwvfYIgLVDkweyJ3iu+3qnXkHTgl9/kxAMY5X9bX5F3mbc1NcVcE3u/tLydOT9gS 3IyzVQuushaL2KHP2FIGsaB88+BBe4NXIQ+A4NtQA5zB6Xpk2wEe3uWzROuBCLWYpXKY TLy/9gGdl1/tjRzV94jPPb0mVriOA8Uj2SMaoBCtjQb8IaUwj6ufsf3pD8nW7VE7gDEG hbpA== X-Gm-Message-State: ABuFfogAS7kLcsQNLVGB9011t2wI7YLE7oDNlL/jZozZ4TDSH9XVxep2 GozX7Y+t/KM2MVvdtsh4dFQlKmMi2BJ9z+2ynzHgNYJpoL4S36gJ0RIvZz54DYZ6cDx/txlC3rZ 7Tr15rUA2r8ibTSEP6b9WYZfE1FURQtvTkMbDSjpoYuG1ba3zGGhFOkP0+DV6KDrdhkk/Ep//wW aZfKu1cXfq3Yb7hp0pCcS6Q0g9ba1cIC3u21+Ah2V5tRqUiEmUzHTOk6LjuM38Sj5OT0/iF5NFr lPtFS7/y+hf9fs6/TzBsRB9WHhl0+YRGE/O44yrO+zUmfeBruhMI9j+Nwn6UqRP4m0Ikedj/Fje ZW8JZ29yVWtWlr6REKZmaiUezygCyvLXyHkB6+ip54kF+vTZrnrTJlEZMsAWrRY0s6dqt2xiRv2 9 X-Received: by 2002:aed:2462:: with SMTP id s31-v6mr1278813qtc.160.1537889428435; Tue, 25 Sep 2018 08:30:28 -0700 (PDT) X-Received: by 2002:aed:2462:: with SMTP id s31-v6mr1278778qtc.160.1537889427824; Tue, 25 Sep 2018 08:30:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537889427; cv=none; d=google.com; s=arc-20160816; b=lI5cT8+K1m8cIpgDDKCWvvUT0zg/Pp5o5VtX+0hArJewL5NlqbIpLyXkFLfYuLOYoH g7nPgAStBNnTdjOahk51ZCT6WnVhSbf7qdOq3188ItgBXohR98TYH/TRCbFzkE/NO7fF sYgjT1GbKJEXnem6iPVH8zGaiujw0XKqnoZ//PNFvbsDPyjseGdbOyLNvsSnpTevNcKj UsFGkrusrhQ5o85c2k/Rna0ilaV7FxG4O0Zv77xSZbq+WIA4HzCZQazw9D69CNFe5Glc RLz0XeofBx2Fwov2qmJjUHCeR0kHg5Ewps3ZQEDa9qtWEiKqhwhMKcOtfaJ7o0pCh/lc 6NPA== 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:to:from :dkim-signature; bh=ku7/MRL/ppjtTHGZe2O1XF901LokT9maZEyU9FpjnHE=; b=yNwlOYF2K9FqVjFzgeSVAfvVbL47y1VrkoNj7qGD6NbL2E/eftWw4yV/lJI9QSoQZd NkTTo1oPR4eDJxlBjVS3OtdmF1QWbx09lGXG2yVT5dcXw5br5hMJwkgCeQCMHBpMhDMx 4HAx6f3YRnmkWMeXeIEGH/Amh8nhX2/vn5DhkMStD7iA4xP8KAkmCqMhfq0I1iO40k/Q g8wpWTnIkETHcTQfS7LjFllZlxSnSmZU4fqeh145XXyD3mc4hM42W2x5qDG/OnDMpJkz 34UYsTX9zSj/IEXqRLV0192ptlhzENwxN85NPnpGxMvA6KmGAW2y/fAouCwCS3RgOgHZ TnWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@toxicpanda-com.20150623.gappssmtp.com header.s=20150623 header.b=QENpwOrr; 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 c17-v6sor883445qvn.136.2018.09.25.08.30.27 for (Google Transport Security); Tue, 25 Sep 2018 08:30:27 -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=QENpwOrr; 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:subject:date:message-id:in-reply-to:references; bh=ku7/MRL/ppjtTHGZe2O1XF901LokT9maZEyU9FpjnHE=; b=QENpwOrr/7ZhS366ZP7w913/Hs2ElSqyKva/3kYfiaWk0+nhF6n+0Oa0FNzB+IV9Ye w8PDsT3mG1ZBqJSQto0v1fNNqZiiuYsf8CdazEuwY8dEGoeye7fn2Mkgzrzd1pmXKusw ihZdiUq10sVQ4cocO/MxEM+S/6DBh0Z4tjeMK4z44d/zCWr8qs0/nJDyXikVoXRDdTDk mtZ+7pr6nbyNre5aGEML/ZNBB8ndkk8vZSu7Mhd0VOqKcMyDsa5hBcEYJLYdoh4dLmog MdEJGU9LhxBcsHxVKFbrTgk52uT33H2FKS0kYhrbYjBC841r9NXAD4ZgSSGqzActbwAG 2dfw== X-Google-Smtp-Source: ACcGV62u48xuG+u6HnDqHjgjSdJBvYRkbiUdmT4B3A/rajjCC8tIPdq/rTHhk6YGPZQGn6+Y1hSAMw== X-Received: by 2002:a0c:93c1:: with SMTP id g1-v6mr1226748qvg.136.1537889427517; Tue, 25 Sep 2018 08:30:27 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id l16-v6sm1642913qtk.30.2018.09.25.08.30.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Sep 2018 08:30:26 -0700 (PDT) From: Josef Bacik To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, linux-btrfs@vger.kernel.org, riel@redhat.com, hannes@cmpxchg.org, tj@kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 7/8] mm: add a flag to indicate we used a cached page Date: Tue, 25 Sep 2018 11:30:10 -0400 Message-Id: <20180925153011.15311-8-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180925153011.15311-1-josef@toxicpanda.com> References: <20180925153011.15311-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 This is preparation for dropping the mmap_sem in page_mkwrite. We need to know if we used our cached page so we can be sure it is the page we already did the page_mkwrite stuff on so we don't have to redo all of that work. Signed-off-by: Josef Bacik --- include/linux/mm.h | 6 +++++- mm/filemap.c | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 724514be03b2..10a0118f5485 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -318,6 +318,9 @@ extern pgprot_t protection_map[16]; #define FAULT_FLAG_USER 0x40 /* The fault originated in userspace */ #define FAULT_FLAG_REMOTE 0x80 /* faulting for non current tsk/mm */ #define FAULT_FLAG_INSTRUCTION 0x100 /* The fault was during an instruction fetch */ +#define FAULT_FLAG_USED_CACHED 0x200 /* Our vmf->page was from a previous + * loop through the fault handler. + */ #define FAULT_FLAG_TRACE \ { FAULT_FLAG_WRITE, "WRITE" }, \ @@ -328,7 +331,8 @@ extern pgprot_t protection_map[16]; { FAULT_FLAG_TRIED, "TRIED" }, \ { FAULT_FLAG_USER, "USER" }, \ { FAULT_FLAG_REMOTE, "REMOTE" }, \ - { FAULT_FLAG_INSTRUCTION, "INSTRUCTION" } + { FAULT_FLAG_INSTRUCTION, "INSTRUCTION" }, \ + { FAULT_FLAG_USED_CACHED, "USED_CACHED" } /* * vm_fault is filled by the the pagefault handler and passed to the vma's diff --git a/mm/filemap.c b/mm/filemap.c index 49b35293fa95..75a8b252814a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2556,6 +2556,7 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) if (cached_page->mapping == mapping && cached_page->index == offset) { page = cached_page; + vmf->flags |= FAULT_FLAG_USED_CACHED; goto have_cached_page; } unlock_page(cached_page); @@ -2618,8 +2619,10 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) * We have a locked page in the page cache, now we need to check * that it's up-to-date. If not, it is going to be due to an error. */ - if (unlikely(!PageUptodate(page))) + if (unlikely(!PageUptodate(page))) { + vmf->flags &= ~(FAULT_FLAG_USED_CACHED); goto page_not_uptodate; + } /* * Found the page and have a reference on it.