From patchwork Thu Jul 27 14:18:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13330159 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 7DD99C04A6A for ; Thu, 27 Jul 2023 14:18:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E28076B0074; Thu, 27 Jul 2023 10:18:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD87A6B0075; Thu, 27 Jul 2023 10:18:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC8AF6B0078; Thu, 27 Jul 2023 10:18:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BC3606B0074 for ; Thu, 27 Jul 2023 10:18:56 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8A8011C8CDE for ; Thu, 27 Jul 2023 14:18:56 +0000 (UTC) X-FDA: 81057598272.18.A0A1796 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf05.hostedemail.com (Postfix) with ESMTP id AF28F10000F for ; Thu, 27 Jul 2023 14:18:54 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690467534; 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; bh=/R1i0Z79rbCdEGDmJ1wW40j2ENnF/On2EYwY3sRbF4E=; b=ZMDHNqQKwNS9525WntrNuxJvyTZCc8huBxzNm6EZze90qBUfnR09MXL1rvM4n+C80GtYyS hwGs2r3QBGI6euDMfnqaidRQBc/8y37eoH0cmMam0AnaG1O86BLZRd3y+KoABM5CPcmKPY w3NGUzo3jXqfQEj/SH45AMFA4Uq82q8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690467534; a=rsa-sha256; cv=none; b=thdqt+zxhiQi9sVQfmqNuLzq/yM7uUclpnP6FMNH7WUW0HEqN7UZdDBPiRCKzwHO4sq7s5 Q49+mw8BXocJqLpAKReeZzM26sJvpTrfI2OOyZcXFq9hImhyJehuBgtg65ao8+E1UEZCbP ZGvhRMBiSW4DtqJczqOYrumXXl16KXs= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; spf=pass (imf05.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C1A5C1474; Thu, 27 Jul 2023 07:19:36 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BD0863F6C4; Thu, 27 Jul 2023 07:18:51 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , Yin Fengwei , David Hildenbrand , Yu Zhao , Yang Shi , "Huang, Ying" , Zi Yan , Nathan Chancellor , Alexander Gordeev , Gerald Schaefer Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v4 2/3] mm: Implement folio_remove_rmap_range() Date: Thu, 27 Jul 2023 15:18:36 +0100 Message-Id: <20230727141837.3386072-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230727141837.3386072-1-ryan.roberts@arm.com> References: <20230727141837.3386072-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: AF28F10000F X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: dppzm6taqo77x8mri6jw5b1do7oypaqy X-HE-Tag: 1690467534-980143 X-HE-Meta: U2FsdGVkX1+a/FTmQjhTOeVq/MgD75gQW9ewRTVjsid3z4XuTScjtBuYz23VR0RM35PhRPCRb6Ti4okP2ypYNx3Bh6xIXRckzZL9mc8RxJ5nd8KedfjSrdXw/dFb1IUelk71js4mdfqxGfA27tfnwaSiabJFXO0AeONuxOd9DpbPWlzYG2KNH155N4nsfiReldgxjWdxq1pYJC05QV2EwT6lch5w+0LlM3Fof+gWoAhbYpwrlYGPXXeX/Ot+Ft3r9dmk8okWYdmf7mHduLWvVH+fmBqINBBj5EwejbvGMfzBPcSh8kkAijHsNpXw6ebwTrW/5Ah0nguGsbtkjNUsJDTWi7c6oS7EytumuWsq5kg4Fbh5+wTTNP3B5OH4EDiAEm+nIuW/aFFdfE3ChPj6ANUUlmoFilyx2oO/jJF87j2tyredM1dYpx1MywXgU0WMV7u4/hXHXMiY0apiSRTrfF77l/jJ/diFMhACtsSaGlOAyjw62R9KX/es5MKaVs3OweDx+GQeigCb7qwqh8zolm2zB8E0OhJyMDYMK4ab6dPrOyGc0npHLuNMEqiWOlWsCzNHzFuXiBSEHrjk/gsj8m4wSYD0BJMXE/0kvc4A5WetCH1OTwMucqfn3KkUjoqxOddXLrvsSYRepbyUw5nbo3XhOmoOEsx/KMknMu82TvadXc6JiMIWaUjASf+7QAfw70ZXBkF7MYC8AdfHFAZP9PK4BnmeSxBgywWfe/y2dvD0oSZQd5W2ABkFv2nhdxpowikRjF9zC4axifVzBf/1ncFiP+G1cOjUDHRno5PV3doee/tb/tjIMJkAdUOGNdgbbs77gE4OxfqKb9j2orLQVknQqFOyCZN7vScvuOwwdeSoOihMH5TqaE4mc06thBgzw+FQaO4MPyshFi/DAdP1zUqY6D5whYIcNA6nUQUDtt6TlaAj9KCZnSYiWMWpn3aiPz/vjUQnCM1KH8uVxzo IMR3QcTv i2J/dOtyK1xmDI5Fg/DHEulVpYfcl+g7p+q9QgIlKD1A+hjvQ9K7g9aJGxT6+7bd10YR3C9nXAu2gKybxuucZrBVS2ZHYlAAqz1UF5ArRxsamr+uNLvI0k5fzV8PURFSrQFlBHztYEmF2JTqEi7Kb55GMuvJbFjWUUaNsb+Fnm70dnzNq38RW4zwm6J2GsCbi0CkJ12F+/nW0oWo= 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: Like page_remove_rmap() but batch-removes the rmap for a range of pages belonging to a folio. This can provide a small speedup due to less manipuation of the various counters. But more crucially, if removing the rmap for all pages of a folio in a batch, there is no need to (spuriously) add it to the deferred split list, which saves significant cost when there is contention for the split queue lock. All contained pages are accounted using the order-0 folio (or base page) scheme. page_remove_rmap() is refactored so that it forwards to folio_remove_rmap_range() for !compound cases, and both functions now share a common epilogue function. The intention here is to avoid duplication of code. Signed-off-by: Ryan Roberts --- include/linux/rmap.h | 2 + mm/rmap.c | 125 ++++++++++++++++++++++++++++++++----------- 2 files changed, 97 insertions(+), 30 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index b87d01660412..f578975c12c0 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -200,6 +200,8 @@ void page_add_file_rmap(struct page *, struct vm_area_struct *, bool compound); void page_remove_rmap(struct page *, struct vm_area_struct *, bool compound); +void folio_remove_rmap_range(struct folio *folio, struct page *page, + int nr, struct vm_area_struct *vma); void hugepage_add_anon_rmap(struct page *, struct vm_area_struct *, unsigned long address, rmap_t flags); diff --git a/mm/rmap.c b/mm/rmap.c index eb0bb00dae34..c3ef56f7ec15 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1359,6 +1359,94 @@ void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, mlock_vma_folio(folio, vma, compound); } +/** + * __remove_rmap_finish - common operations when taking down a mapping. + * @folio: Folio containing all pages taken down. + * @vma: The VM area containing the range. + * @compound: True if pages were taken down from PMD or false if from PTE(s). + * @nr_unmapped: Number of pages within folio that are now unmapped. + * @nr_mapped: Number of pages within folio that are still mapped. + */ +static void __remove_rmap_finish(struct folio *folio, + struct vm_area_struct *vma, bool compound, + int nr_unmapped, int nr_mapped) +{ + enum node_stat_item idx; + + if (nr_unmapped) { + idx = folio_test_anon(folio) ? NR_ANON_MAPPED : NR_FILE_MAPPED; + __lruvec_stat_mod_folio(folio, idx, -nr_unmapped); + + /* + * Queue large anon folio for deferred split if at least one + * page of the folio is unmapped and at least one page is still + * mapped. + */ + if (folio_test_large(folio) && + folio_test_anon(folio) && nr_mapped) + deferred_split_folio(folio); + } + + /* + * It would be tidy to reset folio_test_anon mapping when fully + * unmapped, but that might overwrite a racing page_add_anon_rmap + * which increments mapcount after us but sets mapping before us: + * so leave the reset to free_pages_prepare, and remember that + * it's only reliable while mapped. + */ + + munlock_vma_folio(folio, vma, compound); +} + +/** + * folio_remove_rmap_range - Take down PTE mappings from a range of pages. + * @folio: Folio containing all pages in range. + * @page: First page in range to unmap. + * @nr: Number of pages to unmap. + * @vma: The VM area containing the range. + * + * All pages in the range must belong to the same VMA & folio. They must be + * mapped with PTEs, not a PMD. + * + * Context: Caller holds the pte lock. + */ +void folio_remove_rmap_range(struct folio *folio, struct page *page, + int nr, struct vm_area_struct *vma) +{ + atomic_t *mapped = &folio->_nr_pages_mapped; + int nr_unmapped = 0; + int nr_mapped = 0; + bool last; + + if (unlikely(folio_test_hugetlb(folio))) { + VM_WARN_ON_FOLIO(1, folio); + return; + } + + VM_WARN_ON_ONCE(page < &folio->page || + page + nr > (&folio->page + folio_nr_pages(folio))); + + if (!folio_test_large(folio)) { + /* Is this the page's last map to be removed? */ + last = atomic_add_negative(-1, &page->_mapcount); + nr_unmapped = last; + } else { + for (; nr != 0; nr--, page++) { + /* Is this the page's last map to be removed? */ + last = atomic_add_negative(-1, &page->_mapcount); + if (last) + nr_unmapped++; + } + + /* Pages still mapped if folio mapped entirely */ + nr_mapped = atomic_sub_return_relaxed(nr_unmapped, mapped); + if (nr_mapped >= COMPOUND_MAPPED) + nr_unmapped = 0; + } + + __remove_rmap_finish(folio, vma, false, nr_unmapped, nr_mapped); +} + /** * page_remove_rmap - take down pte mapping from a page * @page: page to remove mapping from @@ -1385,15 +1473,13 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, return; } - /* Is page being unmapped by PTE? Is this its last map to be removed? */ + /* Is page being unmapped by PTE? */ if (likely(!compound)) { - last = atomic_add_negative(-1, &page->_mapcount); - nr = last; - if (last && folio_test_large(folio)) { - nr = atomic_dec_return_relaxed(mapped); - nr = (nr < COMPOUND_MAPPED); - } - } else if (folio_test_pmd_mappable(folio)) { + folio_remove_rmap_range(folio, page, 1, vma); + return; + } + + if (folio_test_pmd_mappable(folio)) { /* That test is redundant: it's for safety or to optimize out */ last = atomic_add_negative(-1, &folio->_entire_mapcount); @@ -1421,29 +1507,8 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, idx = NR_FILE_PMDMAPPED; __lruvec_stat_mod_folio(folio, idx, -nr_pmdmapped); } - if (nr) { - idx = folio_test_anon(folio) ? NR_ANON_MAPPED : NR_FILE_MAPPED; - __lruvec_stat_mod_folio(folio, idx, -nr); - - /* - * Queue anon large folio for deferred split if at least one - * page of the folio is unmapped and at least one page - * is still mapped. - */ - if (folio_test_large(folio) && folio_test_anon(folio)) - if (!compound || nr < nr_pmdmapped) - deferred_split_folio(folio); - } - - /* - * It would be tidy to reset folio_test_anon mapping when fully - * unmapped, but that might overwrite a racing page_add_anon_rmap - * which increments mapcount after us but sets mapping before us: - * so leave the reset to free_pages_prepare, and remember that - * it's only reliable while mapped. - */ - munlock_vma_folio(folio, vma, compound); + __remove_rmap_finish(folio, vma, compound, nr, nr_pmdmapped - nr); } /*