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=-9.5 required=3.0 tests=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 B0228C433DF for ; Fri, 29 May 2020 02:58:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 69E732075F for ; Fri, 29 May 2020 02:58:48 +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="GHVHWUzj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69E732075F 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 92487800B8; Thu, 28 May 2020 22:58:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CA986800BD; Thu, 28 May 2020 22:58:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80C62800C1; Thu, 28 May 2020 22:58:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0253.hostedemail.com [216.40.44.253]) by kanga.kvack.org (Postfix) with ESMTP id 18ECF800B7 for ; Thu, 28 May 2020 22:58:29 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C97368245571 for ; Fri, 29 May 2020 02:58:28 +0000 (UTC) X-FDA: 76868248296.01.sky38_fcb2ba1dab10 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id ADAE5180206F1 for ; Fri, 29 May 2020 02:58:28 +0000 (UTC) X-HE-Tag: sky38_fcb2ba1dab10 X-Filterd-Recvd-Size: 5969 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Fri, 29 May 2020 02:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=3hjPUrs+sThnhjJWoFR0hPXPZx64xJlitsYvYMC+qXI=; b=GHVHWUzjU0uUofHjhDU1jgwhre Y4pGON3FePJIeKdymTFCQjWQu05F1wpXVCSh9d5GEdItHl6Aj9sOVKJHi9NcN0DfPbpj1JZMNGOxC gC5RqqREX3sKOLt2Cy4Th3dJh1Anyh7k9PNQn/ZxLzR6Whluwd+7+1cNkHHtY05J4ks3U5am4qELL P4rfGMtntcH5XfcFChpxdy/GGBUIa5x5PoasSGYR4N+Y4TcFMEkL7Rz1r03Pyq8dUdIDzV2RHIBkI liXGGpbMdwMsuWsegSV3bHZDGMXQN0CDP/9B6AeUkEUQNqcCm1aFepIEVCYga8yNLM0uZjXpRTb8A yKc1E6AQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeVE3-0008Sl-Jl; Fri, 29 May 2020 02:58:27 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 27/39] mm: Remove assumptions of THP size Date: Thu, 28 May 2020 19:58:12 -0700 Message-Id: <20200529025824.32296-28-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200529025824.32296-1-willy@infradead.org> References: <20200529025824.32296-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: ADAE5180206F1 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: "Matthew Wilcox (Oracle)" Remove direct uses of HPAGE_PMD_NR in paths that aren't necessarily PMD sized. Signed-off-by: Matthew Wilcox (Oracle) --- mm/huge_memory.c | 15 ++++++++------- mm/rmap.c | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 15a86b06befc..4c4f92349829 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2518,7 +2518,7 @@ static void remap_page(struct page *page) if (PageTransHuge(page)) { remove_migration_ptes(page, page, true); } else { - for (i =3D 0; i < HPAGE_PMD_NR; i++) + for (i =3D 0; i < hpage_nr_pages(page); i++) remove_migration_ptes(page + i, page + i, true); } } @@ -2593,6 +2593,7 @@ static void __split_huge_page(struct page *page, st= ruct list_head *list, struct lruvec *lruvec; struct address_space *swap_cache =3D NULL; unsigned long offset =3D 0; + unsigned int nr =3D hpage_nr_pages(head); int i; =20 lruvec =3D mem_cgroup_page_lruvec(head, pgdat); @@ -2608,7 +2609,7 @@ static void __split_huge_page(struct page *page, st= ruct list_head *list, xa_lock(&swap_cache->i_pages); } =20 - for (i =3D HPAGE_PMD_NR - 1; i >=3D 1; i--) { + for (i =3D nr - 1; i >=3D 1; i--) { __split_huge_page_tail(head, i, lruvec, list); /* Some pages can be beyond i_size: drop them from page cache */ if (head[i].index >=3D end) { @@ -2649,7 +2650,7 @@ static void __split_huge_page(struct page *page, st= ruct list_head *list, =20 remap_page(head); =20 - for (i =3D 0; i < HPAGE_PMD_NR; i++) { + for (i =3D 0; i < nr; i++) { struct page *subpage =3D head + i; if (subpage =3D=3D page) continue; @@ -2731,14 +2732,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 < hpage_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 hpage_nr_pages(page); } mapcount =3D compound_mapcount(page); ret +=3D mapcount; @@ -2755,9 +2756,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) ? hpage_nr_pages(page) : 0; else - extra_pins =3D HPAGE_PMD_NR; + extra_pins =3D hpage_nr_pages(page); if (pextra_pins) *pextra_pins =3D extra_pins; return total_mapcount(page) =3D=3D page_count(page) - extra_pins - 1; diff --git a/mm/rmap.c b/mm/rmap.c index f79a206b271a..9da4b5121baa 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1199,7 +1199,7 @@ void page_add_file_rmap(struct page *page, bool com= pound) VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page); lock_page_memcg(page); if (compound && PageTransHuge(page)) { - for (i =3D 0, nr =3D 0; i < HPAGE_PMD_NR; i++) { + for (i =3D 0, nr =3D 0; i < hpage_nr_pages(page); i++) { if (atomic_inc_and_test(&page[i]._mapcount)) nr++; } @@ -1241,7 +1241,7 @@ static void page_remove_file_rmap(struct page *page= , bool compound) =20 /* page still mapped by someone else? */ if (compound && PageTransHuge(page)) { - for (i =3D 0, nr =3D 0; i < HPAGE_PMD_NR; i++) { + for (i =3D 0, nr =3D 0; i < hpage_nr_pages(page); i++) { if (atomic_add_negative(-1, &page[i]._mapcount)) nr++; } @@ -1290,7 +1290,7 @@ static void page_remove_anon_compound_rmap(struct p= age *page) * Subpages can be mapped with PTEs too. Check how many of * them are still mapped. */ - for (i =3D 0, nr =3D 0; i < HPAGE_PMD_NR; i++) { + for (i =3D 0, nr =3D 0; i < hpage_nr_pages(page); i++) { if (atomic_add_negative(-1, &page[i]._mapcount)) nr++; } @@ -1300,10 +1300,10 @@ static void page_remove_anon_compound_rmap(struct= page *page) * page of the compound page is unmapped, but at least one * small page is still mapped. */ - if (nr && nr < HPAGE_PMD_NR) + if (nr && nr < hpage_nr_pages(page)) deferred_split_huge_page(page); } else { - nr =3D HPAGE_PMD_NR; + nr =3D hpage_nr_pages(page); } =20 if (unlikely(PageMlocked(page))) --=20 2.26.2