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 3FBE5C4332F for ; Sat, 31 Dec 2022 21:46:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B75E38E0015; Sat, 31 Dec 2022 16:46:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AF7288E0018; Sat, 31 Dec 2022 16:46:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65A748E0015; Sat, 31 Dec 2022 16:46:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 029848E0001 for ; Sat, 31 Dec 2022 16:46:37 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C667D1205B1 for ; Sat, 31 Dec 2022 21:46:36 +0000 (UTC) X-FDA: 80303935992.25.E7DAAC6 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id 4AA73A0009 for ; Sat, 31 Dec 2022 21:46:35 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XxMGaDgY; spf=none (imf15.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672523195; 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=mJzPOwF8dfxyuzqOH4Fd4JOPb4UyLGCk9R35O7JKrIs=; b=VzbeDpjIuCHk0witE2IUJa2cm/AL3qhfXOkpAgaZbWT8DwCZeoAcdEqqINCctEngs7/ynH wENxellPIlm0L43ZEoI1wT+0Qfm6JelTi3ecNKGuBa/BCBYwxNCcTCLVc4NUJZ3mjv8zmV KYWHqzsN8O/cPzroZOwJCkgkErRMfz0= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XxMGaDgY; spf=none (imf15.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672523195; a=rsa-sha256; cv=none; b=S/pF00j6o6y9a6amRQfaUe2DnTBDFVswMG4zS8pyQaxzIQspQJVAyFLZsHWSMiZZQWbRMr bM4m/OlBiQUN1mDziDtzl6/ASWCCTk7X07ACL6IKyoam9t/Dz+uKz9w5jozNgKOi9MlCIz qdKyB9DzhTzGbUTQpYN4AKRKh5btUU0= 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=mJzPOwF8dfxyuzqOH4Fd4JOPb4UyLGCk9R35O7JKrIs=; b=XxMGaDgYDAu/alup8QIF2z4auT ZVUTg5qCD8421AEWXMNvRdArwXcNSOmqQ+DiDakJyZdIRHMtCKH3wDnCPSFuzHWDwSQ7/gAY3elp6 819IlSRl+97lrIC5L01Fokzb25Y55rdPQT5YivpibWmLXSu3lDYwY0RZIT5vVV29NpiJW5Up8cyZ6 SF4hR3nIObGMdtftGEdJbIlsNCenRV/NjFoXAZ/U/N+30HfWHgvwXWNYVR9fL3/IkYvLhJVGyxs4Y 5thUC9uqk4wtpY230blEmWty3/JMOUET75AFdr8isKP/ISSZ77BFw6eniMgdRaj302ag3nv0s8+KU oe0XYJZA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBjgD-00Bkah-AS; 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 08/22] mm: Add folio_add_new_anon_rmap() Date: Sat, 31 Dec 2022 21:45:56 +0000 Message-Id: <20221231214610.2800682-9-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-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 4AA73A0009 X-Stat-Signature: fi5dinwxr8zz7t145rknp8ojiqdrphdz X-HE-Tag: 1672523195-901013 X-HE-Meta: U2FsdGVkX1+b2MmlWQvUcXgC2GYBJojHF4B3s9ZEnREm/KEF8FDmhFgAsy56KT8k0HJxQRclGH6Ai7VwJmInEU4C7cUm7/sWrRdwBJCZQZ7zLS1chgO124eWInqHHbrfh+B25F8I6o5glaw1GE+B44eHwHAGxehfcjO0612CnMzCm2hP230QC0iR3/UudwfnKidFXWn1vE/tcOCJRIvK+1OlUI9xyB3CwnQWMUCNeyxA8xvz/kUQPoySM7sDIAuYQIqUqlLMbf2mSqK1zqt30foYCI0Dzn4q+2YJmqtDMZiO8LhLxy8PfzgBJItx0R45VODVylJCAZEDqVUTGMSBWR2+Qp1WoKgOiDjidQ+NN4TKLzifvaoDOFIL9wbYkjRqNz5EyGpE64UpjUiDsFHSCZZs9bsQdlwRt9hPZne572YfN1oVs9DwP+nXzhtjcNnPyxKGdHTAn5gM9kG4WfJFeucfxW7tHY5vREZeh5DHIY8f60Om+fgAcK7zgUjhYCPSZKxENCevzQ7ODA6DQ6b9sTodHCn1XYLhWMvdqZIueJaReH+gbJdwz3RfuO7RrqSTFeCks8E72aJjJzyaL4oHTIWob80PEXr3G13DDXtNQUIUIQAx/ZbqGcxu492uHMbzbsIhulSt1iYOOVEAsRYl0pfgpIadLQ74kl6Rh/3Vbw4875ae1b3r9pnkCZ337EG3raZgx2rBs2R8UydeOx4y4i4anpgo20Jo6imfoXeAgUkVms+YYs9hs0OlCufyQe+7p3F820sTSFdKA7zyDmb5WV4EV/5UflPBQ6nyPMJBkIecPpsgfbKXX4SsOuliX/HpWde1L5Gf9wS3b9OpZcFcxMsA4BLaCOLNyOiV5IHNbXGS/9jP4Lko2+86+/Jn1n3f0uFcrMEJr3/ENxnY90Le6MwvXiyeC+DvDsfL7IjLWE6nYQImU20WIw== 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: In contrast to other rmap functions, page_add_new_anon_rmap() is always called with a freshly allocated page. That means it can't be called with a tail page. Turn page_add_new_anon_rmap() into folio_add_new_anon_rmap() and add a page_add_new_anon_rmap() wrapper. Callers can be converted individually. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/rmap.h | 2 ++ mm/folio-compat.c | 8 ++++++++ mm/rmap.c | 23 +++++++++++------------ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index bd3504d11b15..aa682a2a93ce 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -194,6 +194,8 @@ void page_add_anon_rmap(struct page *, struct vm_area_struct *, unsigned long address, rmap_t flags); void page_add_new_anon_rmap(struct page *, struct vm_area_struct *, unsigned long address); +void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *, + unsigned long address); void page_add_file_rmap(struct page *, struct vm_area_struct *, bool compound); void page_remove_rmap(struct page *, struct vm_area_struct *, diff --git a/mm/folio-compat.c b/mm/folio-compat.c index 69ed25790c68..92f53adc0dd9 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -123,3 +123,11 @@ void putback_lru_page(struct page *page) { folio_putback_lru(page_folio(page)); } + +void page_add_new_anon_rmap(struct page *page, struct vm_area_struct *vma, + unsigned long address) +{ + VM_BUG_ON_PAGE(PageTail(page), page); + + return folio_add_new_anon_rmap((struct folio *)page, vma, address); +} diff --git a/mm/rmap.c b/mm/rmap.c index 71fbe4a65b93..3297b88b5698 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1287,29 +1287,28 @@ void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, * This means the inc-and-test can be bypassed. * Page does not have to be locked. */ -void page_add_new_anon_rmap(struct page *page, - struct vm_area_struct *vma, unsigned long address) +void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, + unsigned long address) { int nr; VM_BUG_ON_VMA(address < vma->vm_start || address >= vma->vm_end, vma); - __SetPageSwapBacked(page); + __folio_set_swapbacked(folio); - if (likely(!PageCompound(page))) { + if (likely(!folio_test_large(folio))) { /* increment count (starts at -1) */ - atomic_set(&page->_mapcount, 0); + atomic_set(&folio->_mapcount, 0); nr = 1; } else { - VM_BUG_ON_PAGE(!PageTransHuge(page), page); /* increment count (starts at -1) */ - atomic_set(compound_mapcount_ptr(page), 0); - atomic_set(subpages_mapcount_ptr(page), COMPOUND_MAPPED); - nr = thp_nr_pages(page); - __mod_lruvec_page_state(page, NR_ANON_THPS, nr); + atomic_set(&folio->_entire_mapcount, 0); + atomic_set(&folio->_nr_pages_mapped, COMPOUND_MAPPED); + nr = folio_nr_pages(folio); + __lruvec_stat_mod_folio(folio, NR_ANON_THPS, nr); } - __mod_lruvec_page_state(page, NR_ANON_MAPPED, nr); - __page_set_anon_rmap(page, vma, address, 1); + __lruvec_stat_mod_folio(folio, NR_ANON_MAPPED, nr); + __page_set_anon_rmap(&folio->page, vma, address, 1); } /** -- 2.35.1