From patchwork Tue Sep 8 19:55:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 11764215 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 B980C59D for ; Tue, 8 Sep 2020 19:55:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7E9AB2080C for ; Tue, 8 Sep 2020 19:55:58 +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="hXpYjLsh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E9AB2080C 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 DC6546B005D; Tue, 8 Sep 2020 15:55:55 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D7A416B0062; Tue, 8 Sep 2020 15:55:55 -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 C3F426B0068; Tue, 8 Sep 2020 15:55:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id AC51F6B005D for ; Tue, 8 Sep 2020 15:55:55 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 761B1348D for ; Tue, 8 Sep 2020 19:55:55 +0000 (UTC) X-FDA: 77240949870.18.lace71_150d412270d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 4BF93100ED0F5 for ; Tue, 8 Sep 2020 19:55:55 +0000 (UTC) X-Spam-Summary: 1,0,0,e1920fb204c1b882,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:2553:2559:2562:2731:3138:3139:3140:3141:3142:3352:3866:3870:4321:5007:6117:6261:6653:7576:7875:8957:9010:10004:11026:11473:11658:11914:12043:12296:12297:12555:12895:12986:13069:13184:13229:13311:13357:13894:14181:14384:14394:14721:21080:21451:21627:21990:30054:30090,0,RBL:90.155.50.34:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.15.100;04yrfwnzt53gpsczbfc9xtbh39h5kop4pmp6tuic5x73utpjsq1uwoem9dj3ypz.ap36smrjepgjz3qtuwdyym89mpdf9itcx53533zph86994f4g67hzadsejjmso4.y-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: lace71_150d412270d7 X-Filterd-Recvd-Size: 2964 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Sep 2020 19:55:54 +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=5HK7gdVdE06xHS4ek1IW5f4Q4mUxJGwGtHLr9PWHU1M=; b=hXpYjLshV4IRI68PNBZ6K5wER8 MYziQDgRAPtmu/GXd26x0jUiYYiSinqJvgxu3nSrondTI5j7LzAh2sDCl5zx06Q0+y13rH85KaZg7 9lVBoyuS9pPVB+3T/+23oKG62aofM/mbSiqYmwXrJJByMNpGo8aeRgvtzbCbfG4vAF426+jrs4Gs/ HnLWj2rBp/iK7aYdOH88WQQ8UCf7eWDBee2LY3OqyJBtRrmiS7sxk+nQOx406j1jJrqqQ3ZyBjiQC lEkcM6NmtO1ia2xKmgJCUtIx/3AlY/oVSbm5qVCJpTNoo9cHpPdHRqIvLF3GOgJRDYxeyvMIRxtTH 9TWPRU+g==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFjiT-0006lg-KZ; Tue, 08 Sep 2020 19:55:46 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, Andrew Morton Cc: "Kirill A. Shutemov" , Huang Ying , Matthew Wilcox Subject: [PATCH 04/11] mm/huge_memory: Fix total_mapcount assumption of page size Date: Tue, 8 Sep 2020 20:55:31 +0100 Message-Id: <20200908195539.25896-5-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: 4BF93100ED0F5 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: From: "Kirill A. Shutemov" File THPs may now be of arbitrary order. Signed-off-by: Kirill A. Shutemov Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: SeongJae Park --- mm/huge_memory.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index adc5a91d8fd4..a882d770a812 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2458,7 +2458,7 @@ static void __split_huge_page(struct page *page, struct list_head *list, int total_mapcount(struct page *page) { - int i, compound, ret; + int i, compound, nr, ret; VM_BUG_ON_PAGE(PageTail(page), page); @@ -2466,16 +2466,17 @@ int total_mapcount(struct page *page) return atomic_read(&page->_mapcount) + 1; compound = compound_mapcount(page); + nr = compound_nr(page); if (PageHuge(page)) return compound; ret = compound; - for (i = 0; i < HPAGE_PMD_NR; i++) + for (i = 0; i < nr; i++) ret += atomic_read(&page[i]._mapcount) + 1; /* File pages has compound_mapcount included in _mapcount */ if (!PageAnon(page)) - return ret - compound * HPAGE_PMD_NR; + return ret - compound * nr; if (PageDoubleMap(page)) - ret -= HPAGE_PMD_NR; + ret -= nr; return ret; }