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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1FF1C727B6 for ; Thu, 24 Aug 2023 23:22:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244082AbjHXXW1 (ORCPT ); Thu, 24 Aug 2023 19:22:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244081AbjHXXV5 (ORCPT ); Thu, 24 Aug 2023 19:21:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8DAA1FC7 for ; Thu, 24 Aug 2023 16:21:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6251B64FED for ; Thu, 24 Aug 2023 23:21:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC23AC433C8; Thu, 24 Aug 2023 23:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1692919312; bh=3ZsoBfFfGef9rzC2XnfNAJvnRpXMpAIj739fhs8/meg=; h=Date:To:From:Subject:From; b=BVYvRG0qDx1ykguGo5/f5UH1L7doNpOqL9m1zxNr7KB9iA3ZuS7AU+/zxPmVKyBcN GeDVJTVhEgZNEAL2myWx3moeO7AZT44NzCvoxIN/PxPIDAwgJ61COxueCmAMADa0GG iQ0C8P2JjcDDhBYNsmgH9Xb0QGecgtiGOVbxwWfo= Date: Thu, 24 Aug 2023 16:21:52 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, fengwei.yin@intel.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] rmap-add-folio_add_file_rmap_range.patch removed from -mm tree Message-Id: <20230824232152.BC23AC433C8@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: rmap: add folio_add_file_rmap_range() has been removed from the -mm tree. Its filename was rmap-add-folio_add_file_rmap_range.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Yin Fengwei Subject: rmap: add folio_add_file_rmap_range() Date: Wed, 2 Aug 2023 16:14:03 +0100 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. Link: https://lkml.kernel.org/r/20230802151406.3735276-36-willy@infradead.org Signed-off-by: Yin Fengwei Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Andrew Morton --- include/linux/rmap.h | 2 + mm/rmap.c | 60 +++++++++++++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 14 deletions(-) --- a/include/linux/rmap.h~rmap-add-folio_add_file_rmap_range +++ a/include/linux/rmap.h @@ -198,6 +198,8 @@ void folio_add_new_anon_rmap(struct foli 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); --- a/mm/rmap.c~rmap-add-folio_add_file_rmap_range +++ a/mm/rmap.c @@ -1294,31 +1294,39 @@ void folio_add_new_anon_rmap(struct foli } /** - * 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 = (first < 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 */ @@ -1348,6 +1356,30 @@ void page_add_file_rmap(struct page *pag } /** + * 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 * @vma: the vm area from which the mapping is removed _ Patches currently in -mm which might be from fengwei.yin@intel.com are