From patchwork Thu Jul 20 11:29:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13320352 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 14EB7EB64DC for ; Thu, 20 Jul 2023 11:30:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CF842800F1; Thu, 20 Jul 2023 07:30:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 730D528004C; Thu, 20 Jul 2023 07:30:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F9692800F1; Thu, 20 Jul 2023 07:30:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4D0D328004C for ; Thu, 20 Jul 2023 07:30:17 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 197B0C031F for ; Thu, 20 Jul 2023 11:30:16 +0000 (UTC) X-FDA: 81031771674.10.C3C01E5 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id F1FAA100015 for ; Thu, 20 Jul 2023 11:30:14 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.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=1689852615; 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=G2GF+BZHvW+OuduMU+juyHwMecPdL/HtveJeza/m3Jw=; b=RGBmfYRoX6X06X3aHScjl9H4meH3ZuQmn62sjor2UrF4HGANUdywGIFS0eOuHcCIoQTaFW wdOEVeo/SoIHEhdKtgXKlfERn5QFxTxe495z1Ok4TxsbemHGtoEp9gChV1KUbc8gL0lO4C WNO1KErJiQIaz37noLHNWwRvDIOxNj4= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.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=1689852615; a=rsa-sha256; cv=none; b=pg+5ET+HzGNvmGTuYH+P8lp/UVcuR7wCyxNUT+MSgn0I8oCUOsWu3PKQ4UcZkcx9EW2HNk QJbvYfYPK40Peeedyz+kXfwrqfx78lQXMUl8BawmYAHJzcz83DJ5/eo27FfO9I5EzTPNRA jQgMbe9OXPJ0Enndin2attd7f8+/H4A= 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 3C758139F; Thu, 20 Jul 2023 04:30:57 -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 5A2CA3F6C4; Thu, 20 Jul 2023 04:30:12 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Matthew Wilcox , Yin Fengwei , David Hildenbrand , Yu Zhao , Yang Shi , "Huang, Ying" , Zi Yan Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v3 3/3] mm: Batch-zap large anonymous folio PTE mappings Date: Thu, 20 Jul 2023 12:29:55 +0100 Message-Id: <20230720112955.643283-4-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230720112955.643283-1-ryan.roberts@arm.com> References: <20230720112955.643283-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: F1FAA100015 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: hszj6mx7rhz86gokp48e6n4cr94pc861 X-HE-Tag: 1689852614-269363 X-HE-Meta: U2FsdGVkX1/QtVdm6wk5DBCphWcpRd4aGW4qkQ/foN15YMmODUimAuX9LGUA+sDTa1GkIFAXE4BT2aGUexlBw816xJGj/TR18LZ6xcv/rsOVfbmg17ckLzFopZDnkn0oM9vccfySjlj3yDCRRJEDrstv8vW8jPM7IUVvYioXzMJFa8zE5zADPQaPlFHjdDdwUl3jzFGmGxtbNDISnuy1/823rzMNl+PkL0+bi7deMPi3vGUY+2nCtvWIz+mG2FfpPfj56A8Fg3Ce36x/KeCaWxWi91p58bRUtuFMserqhUQy7Ydr/pArlA1idudQrj2isKSZS+uiZ2/NJRZDxo3GzIUAHEzOW5f/Rm0QIKC3pq+mQmUUHylyCW1H4iq6Py/MhxJ8IHbwkq0WQJcEBPwMec4yn6uQsA80S78IEbCjrh9RqH7VTjibKgbt8mdlJaOksKyVqN2PDozY72/ejSvcboaWH+LDAvLUJk+0dZI4kqbdamNdGQEOUGT7kZ8oK5dAEDDpz0Ln0gH3X865BNLQ3LKXs8jZ+AlUUP9QoZd/WyVXZbvenKPx1z0tzXG4vItpGvQYG0TW1VMhydQystfhpgrx2nf99pplx7d2S5Q15tJ+0zOtkCNQbykwV/pX2RJiijDCJceJkzoUzZ02FQ0f9LVcChnm2XwKbsmHJUgTxTopgm4qlSxPWYgvp6PiD57IgpsphiB7p1rkXgDGfOZJvR9W/XBEne0Lu/puiEDWl2vpioSPuPBKT+NnPNs3iX6aA7lJmpijtxrcBGCZy54Z6D+u6b+X8WdZKw2qSBSkzEisE56T2kNcQfSb1FZE1N7bhX2ICPNUCLt61r7KHHhk0AiAMMecZBvkrq4T+16hCZirgAtx+eSvR+Ehhhq/LJaXU+UZBc+ORMZtfcy3tlbuaHlUb+Tsed5HPNFPNQbxpAR9ksgoQrpItBv9VqDSKtyhohJWxn8N+j5tM4xfOTI 86sSTr/u cVjf2ZFmRgke8x6biSKPQJWAMqp24C7gNzx5nerx0I79nb9W7Bt6rriNU9tZAFurHyqIlRR36C7z66rHHpPs6b6OKtfGG+QzRN/5Dpf5qg8Y9ERYJPlGPz4s4CnixL3bkg/3Si6xIqUNS92tO5Zm6i5QF9GPsjLi2pkhc 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. Signed-off-by: Ryan Roberts --- mm/memory.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 01f39e8144ef..189b1cfd823d 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1391,6 +1391,94 @@ 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; + + 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); + + 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 +1516,38 @@ 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); + int nr_pages_req, nr_pages; + + nr_pages_req = folio_nr_pages_cont_mapped( + folio, page, pte, addr, end); + + nr_pages = try_zap_anon_pte_range(tlb, vma, + folio, page, pte, addr, + nr_pages_req, details); + + rss[mm_counter(page)] -= 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);