From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82F2CC43461 for ; Tue, 8 Sep 2020 19:56:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2C40220768 for ; Tue, 8 Sep 2020 19:55:57 +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 2C40220768 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) Received: by kanga.kvack.org (Postfix, from userid 40) id D7A416B0062; Tue, 8 Sep 2020 15:55:55 -0400 (EDT) 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-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-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 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: From: "Kirill A. Shutemov" File THPs may now be of arbitrary order. Signed-off-by: Kirill A. Shutemov Signed-off-by: Matthew Wilcox (Oracle) --- 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, st= ruct list_head *list, =20 int total_mapcount(struct page *page) { - int i, compound, ret; + int i, compound, nr, ret; =20 VM_BUG_ON_PAGE(PageTail(page), page); =20 @@ -2466,16 +2466,17 @@ int total_mapcount(struct page *page) return atomic_read(&page->_mapcount) + 1; =20 compound =3D compound_mapcount(page); + nr =3D compound_nr(page); if (PageHuge(page)) return compound; ret =3D compound; - for (i =3D 0; i < HPAGE_PMD_NR; i++) + for (i =3D 0; i < nr; i++) ret +=3D 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 -=3D HPAGE_PMD_NR; + ret -=3D nr; return ret; } =20 --=20 2.28.0