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 58FDDC433E2 for ; Tue, 8 Sep 2020 20:20:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0C46920936 for ; Tue, 8 Sep 2020 20:20:12 +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="gt+ByL88" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C46920936 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 A03E86B007D; Tue, 8 Sep 2020 16:20:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9DAAD6B007E; Tue, 8 Sep 2020 16:20:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CB086B0080; Tue, 8 Sep 2020 16:20:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0246.hostedemail.com [216.40.44.246]) by kanga.kvack.org (Postfix) with ESMTP id 777B96B007D for ; Tue, 8 Sep 2020 16:20:11 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 3F7373624 for ; Tue, 8 Sep 2020 20:20:11 +0000 (UTC) X-FDA: 77241011022.04.seed56_070d031270d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 14724800CDFD for ; Tue, 8 Sep 2020 20:20:11 +0000 (UTC) X-HE-Tag: seed56_070d031270d7 X-Filterd-Recvd-Size: 2513 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Tue, 8 Sep 2020 20:20:10 +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=jnoUhZZxf1Q4s5u+onqwnY2yiW65TOjoFeLylcVZCEo=; b=gt+ByL88wko6cnLMJzJQV9H7V+ MKhcOFf1L3bsYhu91fWvengrDr7/1S904Ow41LR65iOSCjzrBgD8oi+clVU6M4XJnrlrmSC1l4s0P vEepWq5WQ9gLTc+MpUlztJ2pgHWi1xB4TV1jg8NfCPnPl/Pk8vgy6QhzOd1o3SSxMNrntTQrqN7K+ vnLFCJws9KwMnfVUS0Tf/bNY3p59UGGQt39pRTHd0IuTt3SOmI14R4FUpfJQPovUbNX+Uoyqvzxra F0jPnIVAUg2oDh9Z1+kr11wSrhe3T8O7/jVTie424MJ73j5bcnSxYRk0PH5/KB6tCGmq5PUiYlc45 fJczRyUQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFjiW-0006mr-Vj; Tue, 08 Sep 2020 19:55:49 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, Andrew Morton Cc: "Matthew Wilcox (Oracle)" , "Kirill A . Shutemov" , Huang Ying Subject: [PATCH 07/11] mm/huge_memory: Fix can_split_huge_page assumption of THP size Date: Tue, 8 Sep 2020 20:55:34 +0100 Message-Id: <20200908195539.25896-8-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: 14724800CDFD 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 how many subpages it has 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 e9503b10df8f..8bf8caf66923 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2546,9 +2546,9 @@ bool can_split_huge_page(struct page *page, int *pe= xtra_pins) =20 /* Additional pins from page cache */ if (PageAnon(page)) - extra_pins =3D PageSwapCache(page) ? HPAGE_PMD_NR : 0; + extra_pins =3D PageSwapCache(page) ? thp_nr_pages(page) : 0; else - extra_pins =3D HPAGE_PMD_NR; + extra_pins =3D thp_nr_pages(page); if (pextra_pins) *pextra_pins =3D extra_pins; return total_mapcount(page) =3D=3D page_count(page) - extra_pins - 1; --=20 2.28.0