From patchwork Tue Sep 8 19:55:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11764483 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 7885359D for ; Tue, 8 Sep 2020 20:20:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3D99D2166E for ; Tue, 8 Sep 2020 20:20:08 +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="LCqkdg4s" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D99D2166E 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 437AB6B007B; Tue, 8 Sep 2020 16:20:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 40EB36B007D; Tue, 8 Sep 2020 16:20:07 -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 34B516B007E; Tue, 8 Sep 2020 16:20:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0066.hostedemail.com [216.40.44.66]) by kanga.kvack.org (Postfix) with ESMTP id 1CA106B007B for ; Tue, 8 Sep 2020 16:20:07 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id DE428180AD806 for ; Tue, 8 Sep 2020 20:20:06 +0000 (UTC) X-FDA: 77241010812.02.wine54_260ba4b270d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id B81FA100B79CC for ; Tue, 8 Sep 2020 20:20:06 +0000 (UTC) X-Spam-Summary: 1,0,0,8001292561ecbee0,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:541:800:960:966:968:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1540:1711:1714:1730:1747:1777:1792:2196:2199:2393:2559:2562:3138:3139:3140:3141:3142:3351:3865:3868:3874:4385:4419:5007:6261:6653:7875:8957:10004:11026:11232:11473:11658:11914:12297:12438:12555:12895:13069:13161:13229:13311:13357:13894:14096:14181:14384:14394:14721:21080:21451:21627:21990:30054:30064,0,RBL:90.155.50.34:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.15.100;04yrp9mzoma1d8h8hhnfyiqo78kthopupprdyy7ecunu6g1cixhmm1zp8q6k6dm.kmort9iuurtxicgnqqmxufwehoct9rsx6o6gr1rqy7paq4cd59pf6oyqgcabbwp.w-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:24,LUA_SUMMARY:none X-HE-Tag: wine54_260ba4b270d7 X-Filterd-Recvd-Size: 2467 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Sep 2020 20:20:06 +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=jlFGZxPiT84T3IC+JBo5UGv5Y++vp0Xd2e7vofu/WGg=; b=LCqkdg4s9l8BjbSrG1ZU4ZaZPp 6T4I4/8bXRmEBPvVvIQoBg4VZIr5lz6CJeeINyP4tWKGoEyOJ+5LSXR5Uhn27QMml9hLAf5rRyttO cu8A6PtUxWrcHgCPm5JfsRt3Ydy9a4q+bAZ2sZdrxaf08u0+8z/ZrlNMpMfpdbK52zy9vyXlssNRY fIn6IEAGjRWzEZkMs3R/09gEbmrRMH4tYmFB+RWKYDCFVDwjJ5yDhe0Of10qdRbBJAdQOBYIQCcrM uqGUHtUbUiK7YuQ4OYJJUbXm07rwr6vNzA8SNDjs46h49txSdGo24GjJO/+00cuF+I4cnRdElZMTg uVBk8vrQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFjid-0006o4-Ds; Tue, 08 Sep 2020 19:55:55 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, Andrew Morton Cc: "Matthew Wilcox (Oracle)" , "Kirill A . Shutemov" , Huang Ying Subject: [PATCH 11/11] mm/vmscan: Allow arbitrary sized pages to be paged out Date: Tue, 8 Sep 2020 20:55:38 +0100 Message-Id: <20200908195539.25896-12-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200908195539.25896-1-willy@infradead.org> References: <20200908195539.25896-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: B81FA100B79CC 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: Remove the assumption that a compound page has HPAGE_PMD_NR pins from the page cache. Signed-off-by: Matthew Wilcox (Oracle) Cc: Huang Ying Acked-by: Kirill A. Shutemov Acked-by: "Huang, Ying" Reviewed-by: SeongJae Park --- mm/vmscan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 99e1796eb833..91b787fff71a 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -722,8 +722,7 @@ static inline int is_page_cache_freeable(struct page *page) * that isolated the page, the page cache and optional buffer * heads at page->private. */ - int page_cache_pins = PageTransHuge(page) && PageSwapCache(page) ? - HPAGE_PMD_NR : 1; + int page_cache_pins = thp_nr_pages(page); return page_count(page) - page_has_private(page) == 1 + page_cache_pins; }