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 7CDA2C4332F for ; Sat, 31 Dec 2022 21:46:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EEBDC8E0019; Sat, 31 Dec 2022 16:46:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E4EA48E0016; Sat, 31 Dec 2022 16:46:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B730D8E001A; Sat, 31 Dec 2022 16:46:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 820898E0016 for ; Sat, 31 Dec 2022 16:46:39 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 5340A1C5B68 for ; Sat, 31 Dec 2022 21:46:38 +0000 (UTC) X-FDA: 80303936076.09.FD7F6F4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id C842940002 for ; Sat, 31 Dec 2022 21:46:36 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=oWYqj1gj; dmarc=none; spf=none (imf11.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=1672523197; 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=z6Ypz1vkEVt9rd+JsNwK6A71aPLdMdkfvoLtv8oxYlI=; b=U+4zlJxu9J7O0ZfPpXk0BVLgwn1p3x6Uce/4kVjFnzny0VY/KRgWT84uD6Su9GufAGywWC SsIoTfqAxcu5FSJytNjAprcoVkHL6Tab99Xu7TpXO1/LcN+SFGHoKDBUgtE/ZQKXhTCrUQ YlWT6A8eH4akymBXYrjYeOWp3b9S5wo= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=oWYqj1gj; dmarc=none; spf=none (imf11.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=1672523197; a=rsa-sha256; cv=none; b=TlTX+6MwpRKPrUDQGoIHRXNX/XKlXvWbEu1PVwpsTJkE1Di+R7mJKYdMFLCba220TyHpOw GM96QC7LIwSg6+raeJj4gzqxylOiKHpDv3oT8DBEhF/9hwZ+i+wmPvMJTR1VcXMo9yg+wT K8180VLNAjOMGJd5nsbC45sOX2jbfeQ= 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=z6Ypz1vkEVt9rd+JsNwK6A71aPLdMdkfvoLtv8oxYlI=; b=oWYqj1gjRJys+ex1xvHcftLWGX kvibiLxl7Uu0LR5KdIvFN9PljZon4YHCvW4uCsfB7f0nk/mV8taiIChP8T7W3zCEwanGtUVTu82JQ 447bfWkrDtotX3kds8ICoco3GCPegmm2SSdS5LkV2hfSzl21SbchUUFCJfC6gCOC/JVuewBSaTldh 5qkS3Ay7u0RAu20AlZ4czDSMymjK960uyQw3eBwMN/sEM2F3l4JVSWFUK4k1yumI04RYd7W51ov4O VOnSJMrIC/JFGggIJIchSk/ohrnowIaaGJDI0iwVN5YKt+0RYnfTZqQTASIsTFr57gJDOAKo7LjhN NAN76tgw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBjgD-00Bkaf-8G; 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 07/22] mm: Convert page_add_file_rmap() to use a folio internally Date: Sat, 31 Dec 2022 21:45:55 +0000 Message-Id: <20221231214610.2800682-8-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: C842940002 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: ipbp8ico7nohhkn387b64ykmf4w6y7r5 X-HE-Tag: 1672523196-261166 X-HE-Meta: U2FsdGVkX18jr4VCSrQ0d+UPA46zYP7mV692a7mUvTkuqRC8qlNYmIsyn9SriNT0ZvUsil1dmaTrMHgCvtHYGo0RmoB8Lr19Z29VsApACGcdGEw7cAc3uuUNVhjKcpe1Y6KS4LooK38ZneNnfLBeR94eUKp5TrpK3RF+b82hoU3U4EXS8kLwN86D4+snS37i1ObEKcLwcXUr6FAFz8mQsohLBB4HYTNm5KoR7bFakzbPe74TNirfdtdkhL3SNcN45rb35wsTbVujUFtKF1wApA8MHp3XuHd7gsNTgzA6iohui9rknF+MtNijV4f733O18iAkppCy9QqUxc0XESxmLWcPWob7GST8no2rk3n1Yov71IrdbouN8pNa+aZEkk5sCGsDIVLkeSgI5UU5EpDqWHIPZRVlzGoL/De/RLqgwKAecebyDEV/OdnAK3BbhCiBRSpQhzRIBdTDotTeSIQnXj21VSxJcX9PWj8DjLNn/0YKEaBQTHueso5X6rhbBU+uH8x5Fc+TKAZbmsbJqkt0EawGMUbL3+aCc43OP+sVrAdnVpdCKtAdur/rFRcskdo0YzHhgBfgJf99HsMzs7vfZDwyk/I4bkp8BosduEupqg0e4b3XRQ7a/0ASMqyWpxaCEhjC6to79uI6rxiGgMX4FOE7sIlzOICoHrCGjJXVNfNTTOizrJK+JVLWQixQLvKyiJliW96HtVRjlCmsIOuS06NrLwxNC0k50eqSYVEY/Q18gEBJ8fDizkGowQOZcZ0mPkuIHceSQC5rb/lK28jvMOpeH5ycCKZkLa6Ss/gzRPdSWD2fHpcgL84/REohLaveOEnjrBQYoi8wop2gakK1ZbheiwTAA2dk8Gl3KDG3y8v6oUcZfFInenmxAjtEBo0BKb4VCMcD1JaZKQoXssHFIs/D6bo5cy0fq0Vo/SyqDCvL3PFPfg9TCQ== 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_file_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 | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index a3046a0adfc9..71fbe4a65b93 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1320,34 +1320,33 @@ void page_add_new_anon_rmap(struct page *page, * * The caller needs to hold the pte lock. */ -void page_add_file_rmap(struct page *page, - struct vm_area_struct *vma, bool compound) +void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, + bool compound) { - atomic_t *mapped; + struct folio *folio = page_folio(page); + atomic_t *mapped = &folio->_nr_pages_mapped; int nr = 0, nr_pmdmapped = 0; bool first; VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page); - lock_page_memcg(page); + 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)) @@ -1360,11 +1359,11 @@ void page_add_file_rmap(struct page *page, } if (nr_pmdmapped) - __mod_lruvec_page_state(page, PageSwapBacked(page) ? + __lruvec_stat_mod_folio(folio, folio_test_swapbacked(folio) ? NR_SHMEM_PMDMAPPED : NR_FILE_PMDMAPPED, nr_pmdmapped); if (nr) - __mod_lruvec_page_state(page, NR_FILE_MAPPED, nr); - unlock_page_memcg(page); + __lruvec_stat_mod_folio(folio, NR_FILE_MAPPED, nr); + folio_memcg_unlock(folio); mlock_vma_page(page, vma, compound); } -- 2.35.1