From patchwork Tue Feb 28 21:37:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthew Wilcox (Oracle)" X-Patchwork-Id: 13155257 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 7FEE3C7EE32 for ; Tue, 28 Feb 2023 21:38:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 598A06B0078; Tue, 28 Feb 2023 16:38:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 54AAB6B009F; Tue, 28 Feb 2023 16:38:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CCFC6B00A1; Tue, 28 Feb 2023 16:38:01 -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 2833D6B0078 for ; Tue, 28 Feb 2023 16:38:01 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E254C8025A for ; Tue, 28 Feb 2023 21:38:00 +0000 (UTC) X-FDA: 80518013520.24.9FCE171 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 0ABC4100011 for ; Tue, 28 Feb 2023 21:37:58 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LRdOtZ9Z; spf=none (imf14.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=1677620279; 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=y0P5OnBh3qG6d3noGaCIYdmYizhMJwO+EWfJPW8MG4E=; b=gLsGDJk1eBJYGCV4riYhDNIUZiGG8CjewpmG2xRXHqvRbgU96TvO3/coe0XQo7TUxF7gS2 E3duQI9OygV1Oo2BIpqHFxl8qvjccAyj2mltiE2EUoWTHqKsMVvmvgWzCsZPdPL5sYCTyR 1WkblquNmM0OC+xtUkXoLU4b7e0Gn4s= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=LRdOtZ9Z; spf=none (imf14.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=1677620279; a=rsa-sha256; cv=none; b=zeHD+bRiTxTdG93Iz3fcyjkRMg2Savh3CH0QFc9O7/vHl0bNnGgZCgbCsTlbwV5vvcvvdt 7mxtIBHe+AE2+zeXtJhbJgtxj4knvuQ2JddiLiQwosHUBaKbaE/10+12umYpqduj37qrgM 0I9ML94qfT5Y+fRAl2ngrMRl6I1pTx0= 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=y0P5OnBh3qG6d3noGaCIYdmYizhMJwO+EWfJPW8MG4E=; b=LRdOtZ9ZFkTTxLpXQzhSaFBaCO 3LY1E0Ww6W7K84LoUvYzcxA8jYCxW/TlqQ6e5ETaKmaR6l27lmJAZCHy4QLqJdsCEmO7qZVip53ZF aMwH9kSUjY9Bf+LrPeWlxlolBANWfD0tGcMm9aTgIpfam04BFwmZiBTytL1Aj4xW8plPpu1BStvS/ YAGcDVb0J/Z34yIZc3XS3bwtDdU70HZuxJiDVtxN9iyhe2H5z0vZJ/avHH5y5dPwdoz5Kv7iNHEzL No0ijIELFIwUqqoIWgpdx38Wg9d+6zY92qOCl4JKw8mVTDyZvnl4BSbK8YBk4+101LB2HCYitNH6F QnOg7n2Q==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pX7fL-0018r6-HG; Tue, 28 Feb 2023 21:37:43 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: Yin Fengwei , linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v3 32/34] rmap: add folio_add_file_rmap_range() Date: Tue, 28 Feb 2023 21:37:35 +0000 Message-Id: <20230228213738.272178-33-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230228213738.272178-1-willy@infradead.org> References: <20230228213738.272178-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0ABC4100011 X-Stat-Signature: co9j664niphck7hcsngrbe1s71s66qs4 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1677620278-326163 X-HE-Meta: U2FsdGVkX19Aa6+nh8HclHdozJTJ0JSVFSAgg1VDMbhKP7AFIOA9JF5rcclB0tx1v30+DjqvTDPFLXYwGekdA3dp6EKuu0ZaTLwuzYGmVg1/tXI8kBKKRo2zDvIHpmg3IY6ZGn07oRd0Jb3WUVun4vHawIzy5ReWnutd2ZpHHZrlEW6z2r1Z86CnYlsvvq6yRRmtc8BiYCTHDg8WFIp3UuSOz4e+9wgHzFKpjGhvV5pC3MzVQ219jrpSYhFAT3XV0pyweBMaVXtdR6obaVN55ThWucDiCq7FxGHl126w9qsXjcoISffTKkgFG1FdG/8A8XBlhK5wD1OArnXFMQWNVpsFPJvIdRNtWN6VrjdSEd11+KR1Zng+CeYigFfQ+QpG6FUsEqav80lHj9/txFk6ZITFDw+JtzdblGOJ4p4kb0OICs1aaKBZJarlVFuucsubBKy8ewt2dYZiePqPA/SHHvzxiQjri1qvYjDJa+gfz7oRgA30nW+g2FTQ2AVUXoKttIQnYJL2M31am96wciHO//wEpNl/GGksvz3con3Z+0maN2CdWPNjCtT7nfVyhZkhV4irMhiMXgnBe0ZL/yCm/b+N9FaUgXGYYPA3pmjv68MOHqPo8c4XKsAPVDZem4HpM+UoLH2J1HRsqMu7RTkPiUZVEGoWGbi0RMXb9NbRM+huQ/RCAEVP57Kv6Z705Z5U41uD5FXKzl0exPfvRBLBiKWJLTyyd9Eftcvg2ncbBfP7qppb3CIGTy+IVtDoUKG0u+hrQBBG1F5js9MP+Q3JHiu18QLtJZKBdFlyMER8felXwMgmpTB2RNaCiw7Cr1I2uAjV0sFE3L3g0hHTUzNsxh0RbrfXwpn/PwdOa8Fg8AXwUfMY2Q7/7BANdrweSN90Wj3l3+OTGoqhz2YtxE33aBGTCBOMvqnZPb7fqcwStEPr17X926vV3U6pV+u/aJ2bhlYKc1XcGbwwjC09eGz Aja3AclX QDkVgiW1AySKJFeeOhM/kyHGAmOvNH3mbqK/goizhQ8EtHAyfczBLOlCOtjU2HB3no8oLop9Dr8qVEVaTiV769zlqdxEttLPEt2w0hilNNSx95q4zBQtPoOPVB46U1kb4TL2NCtmNngSQlKqZbwdXibtLxWUBvfKILJUmf6jTC20rM+Ef965nNtlfcstLP0yRxgZ8L4fuR7AdY8RnMXGt0FZtPneaJslh97i0eTzQ/1+dV9CXVAyC/83ocburVl/ynbc/KlQ+qhwjhFQ= 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: Yin Fengwei folio_add_file_rmap_range() allows to add pte mapping to a specific range of file folio. Comparing to page_add_file_rmap(), it batched updates __lruvec_stat for large folio. Signed-off-by: Yin Fengwei Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/rmap.h | 2 ++ mm/rmap.c | 60 +++++++++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index b87d01660412..a3825ce81102 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -198,6 +198,8 @@ 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 folio_add_file_rmap_range(struct folio *, struct page *, unsigned int nr, + struct vm_area_struct *, bool compound); void page_remove_rmap(struct page *, struct vm_area_struct *, bool compound); diff --git a/mm/rmap.c b/mm/rmap.c index bacdb795d5ee..fffdb85a3b3d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1303,31 +1303,39 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, } /** - * page_add_file_rmap - add pte mapping to a file page - * @page: the page to add the mapping to + * folio_add_file_rmap_range - add pte mapping to page range of a folio + * @folio: The folio to add the mapping to + * @page: The first page to add + * @nr_pages: The number of pages which will be mapped * @vma: the vm area in which the mapping is added * @compound: charge the page as compound or small page * + * The page range of folio is defined by [first_page, first_page + nr_pages) + * * The caller needs to hold the pte lock. */ -void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, - bool compound) +void folio_add_file_rmap_range(struct folio *folio, struct page *page, + unsigned int nr_pages, struct vm_area_struct *vma, + bool compound) { - struct folio *folio = page_folio(page); atomic_t *mapped = &folio->_nr_pages_mapped; - int nr = 0, nr_pmdmapped = 0; - bool first; + unsigned int nr_pmdmapped = 0, first; + int nr = 0; - VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page); + VM_WARN_ON_FOLIO(compound && !folio_test_pmd_mappable(folio), 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 && folio_test_large(folio)) { - nr = atomic_inc_return_relaxed(mapped); - nr = (nr < COMPOUND_MAPPED); - } + do { + first = atomic_inc_and_test(&page->_mapcount); + if (first && folio_test_large(folio)) { + first = atomic_inc_return_relaxed(mapped); + first = (nr < COMPOUND_MAPPED); + } + + if (first) + nr++; + } while (page++, --nr_pages > 0); } else if (folio_test_pmd_mappable(folio)) { /* That test is redundant: it's for safety or to optimize out */ @@ -1356,6 +1364,30 @@ void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, mlock_vma_folio(folio, vma, compound); } +/** + * page_add_file_rmap - add pte mapping to a file page + * @page: the page to add the mapping to + * @vma: the vm area in which the mapping is added + * @compound: charge the page as compound or small page + * + * The caller needs to hold the pte lock. + */ +void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, + bool compound) +{ + struct folio *folio = page_folio(page); + unsigned int nr_pages; + + VM_WARN_ON_ONCE_PAGE(compound && !PageTransHuge(page), page); + + if (likely(!compound)) + nr_pages = 1; + else + nr_pages = folio_nr_pages(folio); + + folio_add_file_rmap_range(folio, page, nr_pages, vma, compound); +} + /** * page_remove_rmap - take down pte mapping from a page * @page: page to remove mapping from