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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E268EC3DA7A for ; Sat, 31 Dec 2022 21:46:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD8918E000D; Sat, 31 Dec 2022 16:46:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C54288E0001; Sat, 31 Dec 2022 16:46:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9BA1D8E000D; Sat, 31 Dec 2022 16:46:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 840558E0001 for ; Sat, 31 Dec 2022 16:46:19 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5CF37140109 for ; Sat, 31 Dec 2022 21:46:19 +0000 (UTC) X-FDA: 80303935278.08.6B2A427 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id E1CFA180003 for ; Sat, 31 Dec 2022 21:46:17 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mBvtosz7; dmarc=none; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672523178; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wqGEwQQM1+6jn6Zs1tgXOIJhIPrluemv7TOqKQs1G5k=; b=mQv/Pa/KJAirZrKqYC6dLH4mkgN7QylKGEEaofovwjyiD+thcEEl0lQizskfzursVxicoL R61lNEkkrffpqbVJsuggdJPNVws2D7fCr1SWQcfInlkY807vwfx4M+3G59FxJOSyqOXLsC 7TRi6AYs57vBE/ipoJQ0D75n6/qiRTo= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mBvtosz7; dmarc=none; spf=none (imf06.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672523178; a=rsa-sha256; cv=none; b=mI4PKZzfeNoCLvLoNUBWCGCl+3PiR/IHue6JY+cD59Dz4dV32ExnZdvro7iUluB721ZvzH eOJbcQ1PnT0tUYGCRfdgyNgHX7CHlFiC4DOTs0JoCZICF7MQHJpCbM6CcB8OwW87Rh0HgB wrs437GV3kGfOL4f42BvH5lQH+l+ZoE= 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=wqGEwQQM1+6jn6Zs1tgXOIJhIPrluemv7TOqKQs1G5k=; b=mBvtosz76lFUc9IqSdU2oeQwx7 amuRgReTce38WgCFcMnG+Wb4Klt/l5N1xzC+gbor4fkHRwc1n3+ve1od0ywIqnHUv5iSMiwxfJ8ud AaNLYYXA2pAgVa/82QfUVp7UTJ2d96SDfxtP8ytE6jzxJ1zFyUFgQ8zjh1VtSjLLdDoG6QNv2Rmaq SBleIFA9DVgo7SMO5bQtnSsfxwOty9+VDwNjX6h9vM35hOI96decTMfmdtGJOz9FQSjk8QSzlEPWW VkHxGLJnc8/QU6wiX3CCsV3T2iHdNUi45SDaBHfoowp38q5H6C44ZaqIh+u9AXAAsfHsCeVrT4ybl gnpnHFjw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBjgD-00Bkad-5q; Sat, 31 Dec 2022 21:46:13 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 06/22] mm: Convert page_add_anon_rmap() to use a folio internally Date: Sat, 31 Dec 2022 21:45:54 +0000 Message-Id: <20221231214610.2800682-7-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221231214610.2800682-1-willy@infradead.org> References: <20221231214610.2800682-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E1CFA180003 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: j9rnj8hjza3omtrjd5aywekuxo9gf4g4 X-HE-Tag: 1672523177-152428 X-HE-Meta: U2FsdGVkX18p2rNO08ohS0MtXioK2ogTXSmJQ63mh6nQc3vo8KUh2e4uYydVWpDA5Rt1Rr0Io6o2l7CZi3vnBoJCEf5XUN7/RMpSd8cZ4/D54AfABERycAm6lGwFNrpm2fXPYMyez8vG0sxTVmqAhO9DpW5/JMjTZbDNUj1g9cej0JvvtBIMWv5Xvuy5BgULRfOQSbDB2Reo3L1DTn+HkKRQIyMClNmko/3zMH0OCp6KYWqMIYYJYAB2WATD329u6jWMW89nhgjjoZZ3KZdcypv5GHf4trk0+dTLxT1X9BJQrXQy0HoixYjEYUJhQo0VNBRqISKVM/w28Hj/iT9Cl/V/E/V7eQ/9CZwUokxgetvc2bejc9yg0WY52sxRn7is/odLYpvZp3gJ7aUw8bpiP90OV36OGyb8NWyjws/+iW1FQUGi45KJdW5VeFbw9ac9riBfjySp0kZacnBXJ4iueRc15U1JM+fE76vOAhJP0mihvUTHxGEVlVFicLooOaKfJMvbShJ/6PVNWjMvdOdPk9bPo0iwGShNlZ6wUe9FFCehCinDB+Br0PmukufEvsy7DEbz2O+LPvyzhBW7puhikd2RLi/nUy+ZioFN3bBSPvk0H364+MsZnpSuwk6q3FVLimY+I3Jd+xJGk2JZmIxSI7MyjlAzlqq65BAv+ofEdM1noNALBqvicht+VpLfn6LXB84F5PahtFM0zOWstsneQlBjTixFyIQ7TWgTtEcj1PUn6AiRemeo0+YlkoLewlv/MR8EpDTDZCcpcEOqBLP2JHstsMhjCtNh1ltR4BY/5RYgA5K6Vpfg3EHTU5K7OkfpL+6+WQ5xAZCfXDW2yRtAi9qo7Htvtnhj5prsvVrqvO8DgWP93Bg0o/0VYO+UAjneM+tlExKS3MrTTwKqY/vW1d4rnfg6aLfoNZ+JG9KXCT2OKxYN3SNcVQ== 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: The API for page_add_anon_rmap() needs to be page-based, because we can add mappings of individual pages. But inside the function, we want to only call compound_head() once and then use the folio APIs instead of the page APIs that each call compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/rmap.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 7d51ed49ee9f..a3046a0adfc9 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1214,35 +1214,34 @@ static void __page_check_anon_rmap(struct page *page, * and to ensure that PageAnon is not being upgraded racily to PageKsm * (but PageKsm is never downgraded to PageAnon). */ -void page_add_anon_rmap(struct page *page, - struct vm_area_struct *vma, unsigned long address, rmap_t flags) +void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, + unsigned long address, rmap_t flags) { - atomic_t *mapped; + struct folio *folio = page_folio(page); + atomic_t *mapped = &folio->_nr_pages_mapped; int nr = 0, nr_pmdmapped = 0; bool compound = flags & RMAP_COMPOUND; bool first = true; - if (unlikely(PageKsm(page))) - lock_page_memcg(page); + if (unlikely(folio_test_ksm(folio))) + folio_memcg_lock(folio); /* Is page being mapped by PTE? Is this its first map to be added? */ if (likely(!compound)) { first = atomic_inc_and_test(&page->_mapcount); nr = first; - if (first && PageCompound(page)) { - mapped = subpages_mapcount_ptr(compound_head(page)); + if (first && folio_test_large(folio)) { nr = atomic_inc_return_relaxed(mapped); nr = (nr < COMPOUND_MAPPED); } - } else if (PageTransHuge(page)) { + } else if (folio_test_large(folio)) { /* That test is redundant: it's for safety or to optimize out */ - first = atomic_inc_and_test(compound_mapcount_ptr(page)); + first = atomic_inc_and_test(&folio->_entire_mapcount); if (first) { - mapped = subpages_mapcount_ptr(page); nr = atomic_add_return_relaxed(COMPOUND_MAPPED, mapped); if (likely(nr < COMPOUND_MAPPED + COMPOUND_MAPPED)) { - nr_pmdmapped = thp_nr_pages(page); + nr_pmdmapped = folio_nr_pages(folio); nr = nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of a remove and another add? */ if (unlikely(nr < 0)) @@ -1258,12 +1257,12 @@ void page_add_anon_rmap(struct page *page, VM_BUG_ON_PAGE(!first && PageAnonExclusive(page), page); if (nr_pmdmapped) - __mod_lruvec_page_state(page, NR_ANON_THPS, nr_pmdmapped); + __lruvec_stat_mod_folio(folio, NR_ANON_THPS, nr_pmdmapped); if (nr) - __mod_lruvec_page_state(page, NR_ANON_MAPPED, nr); + __lruvec_stat_mod_folio(folio, NR_ANON_MAPPED, nr); - if (unlikely(PageKsm(page))) - unlock_page_memcg(page); + if (unlikely(folio_test_ksm(folio))) + folio_memcg_unlock(folio); /* address might be in next vma when migration races vma_adjust */ else if (first) -- 2.35.1