From patchwork Tue Aug 4 16:17:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11700669 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D9E914B7 for ; Tue, 4 Aug 2020 16:35:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3B47222B42 for ; Tue, 4 Aug 2020 16:35:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="rFRGehJj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B47222B42 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1EC738D0178; Tue, 4 Aug 2020 12:35:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1C3C28D0081; Tue, 4 Aug 2020 12:35:26 -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 0B2A48D0178; Tue, 4 Aug 2020 12:35:26 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id E94A58D0081 for ; Tue, 4 Aug 2020 12:35:25 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 3BCC7180AD817 for ; Tue, 4 Aug 2020 16:35:25 +0000 (UTC) X-FDA: 77113436610.12.mind03_1715e0c26fa7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 090E1180548F1 for ; Tue, 4 Aug 2020 16:35:25 +0000 (UTC) X-Spam-Summary: 1,0,0,a815c194e0d28f06,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2731:3138:3139:3140:3141:3142:3352:3865:3866:3870:4250:5007:6119:6261:6653:7903:9592:10004:11026:11473:11658:11914:12043:12296:12297:12438:12555:12679:12895:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21450:21451:21627:21660:21990:30001:30054,0,RBL:90.155.50.34:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.15.100;04y8modw9his5kqjwus9jnqnhcj54ocgygywzzys94hgk8ftcit8tm4xzwhwsjo.1nihrrq3u6y5apghu9x8gppcx3y87xuerjodawibjxyqsr755tj9opd56khkp4h.g-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: mind03_1715e0c26fa7 X-Filterd-Recvd-Size: 3284 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Tue, 4 Aug 2020 16:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=FP1uJLv/iUGGxCHzPq47tYJZ9XtyvZoBsMXwg0wUi4E=; b=rFRGehJj3pybPeMWt2c7DpXfhS 2c5gWioEVFC4vbqL+nHIjlXm++/jLTEwG+QaU+LZkEFGYZQqtEYIJsj5heg36HAHMrz3cj9ptK4hg Sw23NSOAx/KZVZ00WlLnHIcmNjQrMO3I8v5UjCfjR3F5Vh7Q2gQlyymA7oEOKP9xfUExqHKx/zoMJ KEZYcyqjrz6e7WZ/VQahcr89YjCpeQNriZr79zFrnF5WkhtaR77Hag4XO7OgL+rJjhZn6LB2/qK/C VCWjJGFrZP1dvR46ID4ngyx8Za1CcPmIt4PBJJJXUny2/41rSeAC2/gIGbVNUuncI7oPWE5gk7kRT /LAAOQOA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2zdW-0002eF-3b; Tue, 04 Aug 2020 16:17:58 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-nvdimm@lists.01.org Subject: [PATCH 3/4] dax: Account DAX entries as nrpages Date: Tue, 4 Aug 2020 17:17:54 +0100 Message-Id: <20200804161755.10100-4-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200804161755.10100-1-willy@infradead.org> References: <20200804161755.10100-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 090E1180548F1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: Simplify mapping_needs_writeback() by accounting DAX entries as pages instead of exceptional entries. Signed-off-by: Matthew Wilcox (Oracle) --- fs/dax.c | 6 +++--- mm/filemap.c | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 2f75ee2cd41f..71ddab04d91d 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -525,7 +525,7 @@ static void *grab_mapping_entry(struct xa_state *xas, dax_disassociate_entry(entry, mapping, false); xas_store(xas, NULL); /* undo the PMD join */ dax_wake_entry(xas, entry, true); - mapping->nrexceptional--; + mapping->nrpages -= PG_PMD_NR; entry = NULL; xas_set(xas, index); } @@ -541,7 +541,7 @@ static void *grab_mapping_entry(struct xa_state *xas, dax_lock_entry(xas, entry); if (xas_error(xas)) goto out_unlock; - mapping->nrexceptional++; + mapping->nrpages += 1UL << order; } out_unlock: @@ -644,7 +644,7 @@ static int __dax_invalidate_entry(struct address_space *mapping, goto out; dax_disassociate_entry(entry, mapping, trunc); xas_store(&xas, NULL); - mapping->nrexceptional--; + mapping->nrpages -= dax_entry_order(entry); ret = 1; out: put_unlocked_entry(&xas, entry); diff --git a/mm/filemap.c b/mm/filemap.c index 7c3f97bd6dcd..ef8ecfba7f9b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -615,9 +615,6 @@ EXPORT_SYMBOL(filemap_fdatawait_keep_errors); /* Returns true if writeback might be needed or already in progress. */ static bool mapping_needs_writeback(struct address_space *mapping) { - if (dax_mapping(mapping)) - return mapping->nrexceptional; - return mapping->nrpages; }