From patchwork Thu Jul 27 14:18:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13330160 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 9B274C001E0 for ; Thu, 27 Jul 2023 14:18:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 417756B0075; Thu, 27 Jul 2023 10:18:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C6846B0078; Thu, 27 Jul 2023 10:18:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2673F6B007B; Thu, 27 Jul 2023 10:18:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 187DB6B0075 for ; Thu, 27 Jul 2023 10:18:57 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C0D4FB13D8 for ; Thu, 27 Jul 2023 14:18:56 +0000 (UTC) X-FDA: 81057598272.18.88C97BD Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf26.hostedemail.com (Postfix) with ESMTP id A05D0140015 for ; Thu, 27 Jul 2023 14:18:52 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.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=1690467532; 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=hNL1y3SfunmfxSUTvIEH48/V1tE9GSr47MXZQeskAHk=; b=capOYwEB2oIMsD8BpcCk2JMPnmw1nZ62vS8bi+/zfvos059GD2NqRlM/yI5T5TmwyIy1dn slOu1HCQmTArIDglgnxmCHuL3OimjUcpaRPJoe4IseIQ4LKcapJmhiipAvThQFwLpXGRXI Rhw3lEsy6d8rJTj+aFBZmqxt9l/lIes= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690467532; a=rsa-sha256; cv=none; b=Cx3mY/rkvPla+IJsbFJoyjP3yfrk03MSfA2Bdz1N8H9UW1XLXqfpF/X+nxR+S6NumDRKld QO9V7JYN19jlYcvxPDUzKuNIZnwjpzfhuiVnHLwxFXHTCglKNHRAP/ITGfiXTGkCl3nrfo hlcH/sO4/085GG76euHmCfmvqT48XKg= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.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 92B98FEC; Thu, 27 Jul 2023 07:19:34 -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 8D9823F6C4; Thu, 27 Jul 2023 07:18:49 -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 1/3] mm: Allow deferred splitting of arbitrary large anon folios Date: Thu, 27 Jul 2023 15:18:35 +0100 Message-Id: <20230727141837.3386072-2-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-Stat-Signature: kdys8dgcxk388uwf1pc165w1ubu6nq3z X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A05D0140015 X-Rspam-User: X-HE-Tag: 1690467532-119398 X-HE-Meta: U2FsdGVkX18IsIJcWQ3u0/aBjl/dRQSaS9vCJ64KTJG2kkaorGaKrlgcuh+mg6aRFVZqhkrDZPFCmljdrjXullK93RMx0IAmm4cCI05wBRNDvt414o3Hcn2Wy8khveqOEWosYc/8OYfvCyWDjjXfP9wjzeHHB4vp0LcQAWbsCBmbuBJBV4ssITuQ1jTOCkgO9KVSmAc1XP7uORQr+tAo6Bxwb5EGXfYIXWrQQ1eB8ron+0QFdzUMn10tud6STq6ya1t54pVXaXPpGLBhjb0J2LkMo7gc/FncL7jQvuUf74RQNHic+uNfO1NMXiGQyzkrNa3FPOgly3DSTHVk0RyZzAZcQJLacmO1GpXcd4xEH4e/o0HxmX7Iyd+rBYwlBHBfzrPp9+/sKSMMOm69J2irlWOUJ1lMNwMIrLxBY7UF97yiziJmXFiUnldnCWcuLehJq/G3u2GboXVp737Wa8vcjgF6CcX2BMCvHwbUKyeOlmO57oAikd7082yd/PmO9cGHPTQv/vSHk2Ti3WmL+UzvtM32iL5XAHOKePUjKZZrG1YxqpWHpK5MSJA5oB7GUBDagqw3ZEhVgv1EjfOzhFNcX7vxUmZRkCgP/vULt7mydxifJuL6Flnt0kPGZ8R7mevtpg06cmLaOW8cef54OeO3a9+6oh7i+bwLKaPZVFfaYjjaGT0qAKFD+6XfgqHVHJEiX0gMTIJwOzpOP2sqfL7AFikIH1EIpOSqVwfMfkUYpWbxNgCbek5uV/sr2ayrTXBS4Aoh2U/tqtiTTe6v2SqhPhpvjT9Da10Uh+qWGhgN63SCQtPN0aOOlKWNnlYBJFQzH7Mgnb7ixGnmRbYAiNimc9Ohhvy3RjZ1uxdknmyluwgiSUg4oFPrGNsKffF7874Gr/wAFhpayNWES4zGuhMShli736o4GLjyYq4zfG+BQQUtW93f/p+V414Fm+/GOYX0ICg8QC8fmFteyZF6JkA RmJN93LZ WjOHQQsJSd7segqm2EGiWBVW+yhVc/s3E3EJq+7VsImdEdcUpE02CdzSZQoU2+f67AfhdnZYTapIR8FFBQ8o+9Plt38L0Wj4TGSjM5TrqEE+vIyXMgViUT13SZzktUtdF2gJaMLJZFh88JDBSMHY1o1UQ9MxPP0MBCk3ejkqgATDTE3hp4SJh0DZtpJ4/b2hiRpl+hXIVAgDrtvSjxoJwSYIxLmgrgwkQZDYQew065jRGCrWMlX46EoJna+ZHjXltxKe1XqUq2zxYmieKNrIceTfGVu4yku21tAPy 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 preparation for the introduction of large folios for anonymous memory, we would like to be able to split them when they have unmapped subpages, in order to free those unused pages under memory pressure. So remove the artificial requirement that the large folio needed to be at least PMD-sized. Reviewed-by: Yu Zhao Reviewed-by: Yin Fengwei Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: David Hildenbrand Signed-off-by: Ryan Roberts --- mm/rmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 0c0d8857dfce..eb0bb00dae34 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1426,11 +1426,11 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, __lruvec_stat_mod_folio(folio, idx, -nr); /* - * Queue anon THP for deferred split if at least one + * 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_pmd_mappable(folio) && folio_test_anon(folio)) + if (folio_test_large(folio) && folio_test_anon(folio)) if (!compound || nr < nr_pmdmapped) deferred_split_folio(folio); } 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); } /* From patchwork Thu Jul 27 14:18:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13330161 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 40E71C04A6A for ; Thu, 27 Jul 2023 14:19:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E2026B0078; Thu, 27 Jul 2023 10:18:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2674A6B007B; Thu, 27 Jul 2023 10:18:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 094606B007D; Thu, 27 Jul 2023 10:18:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EDB736B0078 for ; Thu, 27 Jul 2023 10:18:58 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BB4931605F2 for ; Thu, 27 Jul 2023 14:18:58 +0000 (UTC) X-FDA: 81057598356.25.DAE4B4A Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf26.hostedemail.com (Postfix) with ESMTP id D1D4014000D for ; Thu, 27 Jul 2023 14:18:56 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf26.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690467537; 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=4xvN9LRbQRZ8hP2GhriJAu0dRh41Z7ObX23pb31SOJA=; b=wgIFWu+lYl/T/m2WPFPHwBEYOZ3JTxMr+IILmw0RRMGYWPOhWemvJqy/Pj83ZvI8gE66Gq xQJGIBLFYOMMsDiSbPVlKMLTkP7mdWcUDEmEJh3l6HyrHV33UkLpBo0C0w0G26WusI3d4i r7px6kaRLHT6jrJKFIP29mY5KtEN2Hw= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf26.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690467537; a=rsa-sha256; cv=none; b=5AslpkWsz8pfTjb+1Ep2Y2cAmY36ucsUAlMDp9VllP9Y2btIEUrBUnE9vNARPTEL04oOE9 YK+Pacgu4PLHUwyTG1jF5dOI99ggMdQW/Rdh7g280jI+6etPggyEdB/XL/Nytn1c+yPhJ1 QoX5rGUVjbEwZAiwNBDQlj41hALokXs= 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 F0D851477; Thu, 27 Jul 2023 07:19:38 -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 EC1323F6C4; Thu, 27 Jul 2023 07:18:53 -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 3/3] mm: Batch-zap large anonymous folio PTE mappings Date: Thu, 27 Jul 2023 15:18:37 +0100 Message-Id: <20230727141837.3386072-4-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: D1D4014000D X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 4wuktwd463srfjxe4a77eqqgjfufumg7 X-HE-Tag: 1690467536-556317 X-HE-Meta: U2FsdGVkX1+qQkmJJoq9ZecgqiNAz9uwtpTOYL6VE6Y/teeyS3pP/VWeSHOqKTc+J2mUqPoqQ+Ppf2tTrLKtBtk/u08Pa2Lh4rhp/ekCLI2s8gi00CHIqO9UVQZczByyXn+fHzTRp6jvNFSxUEshedkfz+Om2dV3xhVNNNnRNBNK8wjtgF93VtIhePmvYuYiQaroLdo0eu4lLRl0OI3sosaBedsvc/er9qGfOHK5e7gm/uIr01VIAmjcJEwVqKRUz53D17RgHpb1dQKbJhLnfwvDr+WU37ebzj02LwvuT2UiheJtrrbHv59lqIArubU7lxYBfiqAB1laK9zyIQQs8HSx0KckCLrlRkDEcTQxFy8vea5jZDvslFoh7NgV1+2P21ue5syQy5QA9/klz9MEBl6jS66+EI3WyskBMEVu0FuQp+NhBnrRr3CX+Oj3iu2QbrjvKRVnWP6pimSZHI7owefXPvks3FXhTiFdDWkRHH2B3OpBoQoBdSEaBzbIi9+OJFPKMQNv26i/XlIUWU5FgqZuIVs/qrvtbJ5DSSOsRxjsj3HTaZ9WkUFFRY2Ok+2dP1hqZk3IAcV3UaXTdViTQAAliXI2rb57/SWrC7FWPS4d4dv5pr+o73Q/9/Eu9dZMhRphHK9LeB80uY9hwtTPZarrUq5smP77EXtttdzXHCXBRNr/+XPtZuzYNXUIGG8SOKWQlXHQi/KNnwvxXWmoG6OQFeripTH+HC/Qy2ZGTu8w8a6M3dVbK4GKjP+yHSA56qi4x7QaVJiIAcijJu/yQaDtpOgc4KETW+xeOTUdOEhhifjZ6Q68wangkBGxTH7o1GvjBU/MgWod+i9dq1IvRayqRd0cvcPQsS3tOKL435k2G8qeA3hLnLFYfnGGE5d6s8g6kihDr+bn5M3ELnkxF/d67MVXMY62aCfi0EOei3i0mDTC2IcwdGd5f70Off+ofZ+kGMnuwU7erD4LsqC kS1UWyPJ B3LQJtghWeNoOc0IPK3+H98xQYM4SrdmKkY3B+gPP6qkJEPwbFxEPSxOZtGCDFJd45g37qePv/sozlWcgbSo6JLICoMQdEtsTyL6DkOxR0Ad5gQZZVXt7Mma1zDTmMdjAKF7WcczxwpQ39AsrquZMsgC/t2xFiImH2vSU 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: This allows batching the rmap removal with folio_remove_rmap_range(), which means we avoid spuriously adding a partially unmapped folio to the deferred split queue in the common case, which reduces split queue lock contention. Previously each page was removed from the rmap individually with page_remove_rmap(). If the first page belonged to a large folio, this would cause page_remove_rmap() to conclude that the folio was now partially mapped and add the folio to the deferred split queue. But subsequent calls would cause the folio to become fully unmapped, meaning there is no value to adding it to the split queue. A complicating factor is that for platforms where MMU_GATHER_NO_GATHER is enabled (e.g. s390), __tlb_remove_page() drops a reference to the page. This means that the folio reference count could drop to zero while still in use (i.e. before folio_remove_rmap_range() is called). This does not happen on other platforms because the actual page freeing is deferred. Solve this by appropriately getting/putting the folio to guarrantee it does not get freed early. Given the need to get/put the folio in the batch path, we stick to the non-batched path if the folio is not large. While the batched path is functionally correct for a folio with 1 page, it is unlikely to be as efficient as the existing non-batched path in this case. Signed-off-by: Ryan Roberts --- mm/memory.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 01f39e8144ef..d35bd8d2b855 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1391,6 +1391,99 @@ zap_install_uffd_wp_if_needed(struct vm_area_struct *vma, pte_install_uffd_wp_if_needed(vma, addr, pte, pteval); } +static inline unsigned long page_cont_mapped_vaddr(struct page *page, + struct page *anchor, unsigned long anchor_vaddr) +{ + unsigned long offset; + unsigned long vaddr; + + offset = (page_to_pfn(page) - page_to_pfn(anchor)) << PAGE_SHIFT; + vaddr = anchor_vaddr + offset; + + if (anchor > page) { + if (vaddr > anchor_vaddr) + return 0; + } else { + if (vaddr < anchor_vaddr) + return ULONG_MAX; + } + + return vaddr; +} + +static int folio_nr_pages_cont_mapped(struct folio *folio, + struct page *page, pte_t *pte, + unsigned long addr, unsigned long end) +{ + pte_t ptent; + int floops; + int i; + unsigned long pfn; + struct page *folio_end; + + if (!folio_test_large(folio)) + return 1; + + folio_end = &folio->page + folio_nr_pages(folio); + end = min(page_cont_mapped_vaddr(folio_end, page, addr), end); + floops = (end - addr) >> PAGE_SHIFT; + pfn = page_to_pfn(page); + pfn++; + pte++; + + for (i = 1; i < floops; i++) { + ptent = ptep_get(pte); + + if (!pte_present(ptent) || pte_pfn(ptent) != pfn) + break; + + pfn++; + pte++; + } + + return i; +} + +static unsigned long try_zap_anon_pte_range(struct mmu_gather *tlb, + struct vm_area_struct *vma, + struct folio *folio, + struct page *page, pte_t *pte, + unsigned long addr, int nr_pages, + struct zap_details *details) +{ + struct mm_struct *mm = tlb->mm; + pte_t ptent; + bool full; + int i; + + /* __tlb_remove_page may drop a ref; prevent going to 0 while in use. */ + folio_get(folio); + + for (i = 0; i < nr_pages;) { + ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); + tlb_remove_tlb_entry(tlb, pte, addr); + zap_install_uffd_wp_if_needed(vma, addr, pte, details, ptent); + full = __tlb_remove_page(tlb, page, 0); + + if (unlikely(page_mapcount(page) < 1)) + print_bad_pte(vma, addr, ptent, page); + + i++; + page++; + pte++; + addr += PAGE_SIZE; + + if (unlikely(full)) + break; + } + + folio_remove_rmap_range(folio, page - i, i, vma); + + folio_put(folio); + + return i; +} + static unsigned long zap_pte_range(struct mmu_gather *tlb, struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, unsigned long end, @@ -1428,6 +1521,45 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb, page = vm_normal_page(vma, addr, ptent); if (unlikely(!should_zap_page(details, page))) continue; + + /* + * Batch zap large anonymous folio mappings. This allows + * batching the rmap removal, which means we avoid + * spuriously adding a partially unmapped folio to the + * deferrred split queue in the common case, which + * reduces split queue lock contention. + */ + if (page && PageAnon(page)) { + struct folio *folio = page_folio(page); + + if (folio_test_large(folio)) { + int nr_pages_req, nr_pages; + int counter = mm_counter(page); + + nr_pages_req = folio_nr_pages_cont_mapped( + folio, page, pte, addr, + end); + + /* folio may be freed on return. */ + nr_pages = try_zap_anon_pte_range( + tlb, vma, folio, page, + pte, addr, nr_pages_req, + details); + + rss[counter] -= nr_pages; + nr_pages--; + pte += nr_pages; + addr += nr_pages << PAGE_SHIFT; + + if (unlikely(nr_pages < nr_pages_req)) { + force_flush = 1; + addr += PAGE_SIZE; + break; + } + continue; + } + } + ptent = ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm); tlb_remove_tlb_entry(tlb, pte, addr);