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 C1525C43461 for ; Tue, 8 Sep 2020 19:55:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 713F72080C for ; Tue, 8 Sep 2020 19:55:59 +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="nRpLywFj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 713F72080C 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 B7E5C6B0062; Tue, 8 Sep 2020 15:55:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB82D6B0068; Tue, 8 Sep 2020 15:55:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 958596B006C; Tue, 8 Sep 2020 15:55:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0096.hostedemail.com [216.40.44.96]) by kanga.kvack.org (Postfix) with ESMTP id 753286B0062 for ; Tue, 8 Sep 2020 15:55:57 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 38A94181AEF1A for ; Tue, 8 Sep 2020 19:55:57 +0000 (UTC) X-FDA: 77240949954.12.chalk09_37067e2270d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 055B0180054FD for ; Tue, 8 Sep 2020 19:55:56 +0000 (UTC) X-HE-Tag: chalk09_37067e2270d7 X-Filterd-Recvd-Size: 2593 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Sep 2020 19:55:56 +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=paZjsA7KOGNnFTd2XUuVeoPxs0FJxkHM0Lg0ZSZ92aY=; b=nRpLywFjvP6Gxkydjah+VOoeb3 3rzdZlMmck7OfizZrMAUio2YWE+BK2STNHKxZSwMtTpviz/21yCdyFAvW7ssQNRor2IXV54bzIbsI Ftz0CztxAyqMFFnyvsqkJ8KgZqMAu7PSoCtuGzi5lH5m34Bl3f6DeYKd/eq4Yf0qhOOkpO5DS3HFj gb3bEvzP/T5qHRJftwH2YwQzBFTmioP4I30F76jcqh2r/aO24YzOzhzm2m/JC9LmztdsPW/nHM3XM Va1DBDmdKFHO4BElMYwYYnKJ/zkNK30Fc2z5GYb14x6ZA0SQYYYoTykfktoSP0jwTI4VoGDF5+e6W GFc3NtmA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFjiV-0006mX-RL; Tue, 08 Sep 2020 19:55:48 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, Andrew Morton Cc: "Matthew Wilcox (Oracle)" , "Kirill A . Shutemov" , Huang Ying Subject: [PATCH 06/11] mm/huge_memory: Fix page_trans_huge_mapcount assumption of THP size Date: Tue, 8 Sep 2020 20:55:33 +0100 Message-Id: <20200908195539.25896-7-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: 055B0180054FD 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: Ask the page what size it is instead of assuming it's PMD size. Signed-off-by: Matthew Wilcox (Oracle) --- mm/huge_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 7bf837c32e3f..e9503b10df8f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2522,14 +2522,14 @@ int page_trans_huge_mapcount(struct page *page, i= nt *total_mapcount) page =3D compound_head(page); =20 _total_mapcount =3D ret =3D 0; - for (i =3D 0; i < HPAGE_PMD_NR; i++) { + for (i =3D 0; i < thp_nr_pages(page); i++) { mapcount =3D atomic_read(&page[i]._mapcount) + 1; ret =3D max(ret, mapcount); _total_mapcount +=3D mapcount; } if (PageDoubleMap(page)) { ret -=3D 1; - _total_mapcount -=3D HPAGE_PMD_NR; + _total_mapcount -=3D thp_nr_pages(page); } mapcount =3D compound_mapcount(page); ret +=3D mapcount; --=20 2.28.0