Message ID | 20200610201345.13273-42-willy@infradead.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=G8WG=7X=kvack.org=owner-linux-mm@kernel.org> 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 EE46C90 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 10 Jun 2020 20:39:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BA4E1206A4 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 10 Jun 2020 20:39:47 +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="Q5FK+pK0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA4E1206A4 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 8F5358D0031; Wed, 10 Jun 2020 16:39:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 856558D0030; Wed, 10 Jun 2020 16:39:31 -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 631FF8D002F; Wed, 10 Jun 2020 16:39:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id 414A78D002D for <linux-mm@kvack.org>; Wed, 10 Jun 2020 16:39:31 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0D9711801A818 for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:39:31 +0000 (UTC) X-FDA: 76914467742.26.hook85_0b0cbd326dce Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id D87561807ECF4 for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:39:30 +0000 (UTC) X-Spam-Summary: 2,0,0,5ff585434e741206,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:541:800:960:968:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2198:2199:2393:2553:2559:2562:2693:3138:3139:3140:3141:3142:3353:3865:3867:3868:3871:3872:3874:4250:4321:4419:5007:6261:6653:7576:7903:8957:10004:11026:11473:11658:11914:12296:12297:12438:12555:12895:12986:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21324:21451:21627:21795:30051:30054:30090,0,RBL:198.137.202.133:@infradead.org:.lbl8.mailshell.net-62.8.0.100 64.201.201.201,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: hook85_0b0cbd326dce X-Filterd-Recvd-Size: 3165 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf47.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Wed, 10 Jun 2020 20:39:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=mmPoGnRfA4TUBSdV1ap2zn7Ew2a8qCnx8Rp9BKBKl4s=; b=Q5FK+pK0rlhrqdQfcRpYaQNhyr 9ERE6UdAQr92hPMbjQZaSR5ylWRW5PjUBvl0S98MdVV1cmRWTQBfI6DjgaHA5QgTMk9o+4YZefDFQ ujIFF9I4t50ykVeBiDedoUZ98B96D3Op4PnbePR9YyBhA4+9IK9LlhSQPjg9/RQRUIEfRGuxaQJAX g2GrClrm5J9SRCH2mm1DlmaO59hh4JEpYl4kFUkvT2KKIJRMU53JdILUluaWtzQVQDk4CoWxhkup/ oXlPFQLp6+orAWifK/R6CoiLOnDCCYy0IPybyQA2HShydsk9CInMgFQpxox701IJEFOl0z1LTamw8 9FJaHaaw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj76a-0003XP-UF; Wed, 10 Jun 2020 20:13:48 +0000 From: Matthew Wilcox <willy@infradead.org> To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 41/51] mm: Fix truncation for pages of arbitrary size Date: Wed, 10 Jun 2020 13:13:35 -0700 Message-Id: <20200610201345.13273-42-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200610201345.13273-1-willy@infradead.org> References: <20200610201345.13273-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: D87561807ECF4 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable 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: <linux-mm.kvack.org> |
Series |
Large pages in the page cache
|
expand
|
diff --git a/mm/truncate.c b/mm/truncate.c index 152974888124..a9fde773179b 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -168,7 +168,7 @@ void do_invalidatepage(struct page *page, unsigned int offset, * becomes orphaned. It will be left on the LRU and may even be mapped into * user pagetables if we're racing with filemap_fault(). * - * We need to bale out if page->mapping is no longer equal to the original + * We need to bail out if page->mapping is no longer equal to the original * mapping. This happens a) when the VM reclaimed the page while we waited on * its lock, b) when a concurrent invalidate_mapping_pages got there first and * c) when tmpfs swizzles a page between a tmpfs inode and swapper_space. @@ -177,12 +177,12 @@ static void truncate_cleanup_page(struct address_space *mapping, struct page *page) { if (page_mapped(page)) { - pgoff_t nr = PageTransHuge(page) ? HPAGE_PMD_NR : 1; + unsigned int nr = thp_nr_pages(page); unmap_mapping_pages(mapping, page->index, nr, false); } if (page_has_private(page)) - do_invalidatepage(page, 0, PAGE_SIZE); + do_invalidatepage(page, 0, thp_size(page)); /* * Some filesystems seem to re-dirty the page even after