From patchwork Thu Feb 23 08:32:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yin Fengwei X-Patchwork-Id: 13149975 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 C04A4C6379F for ; Thu, 23 Feb 2023 08:30:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 905DC6B007E; Thu, 23 Feb 2023 03:30:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B4C36B0080; Thu, 23 Feb 2023 03:30:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 693206B0081; Thu, 23 Feb 2023 03:30:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 54DB36B007E for ; Thu, 23 Feb 2023 03:30:37 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1E0CF4126E for ; Thu, 23 Feb 2023 08:30:37 +0000 (UTC) X-FDA: 80497885314.13.62222B3 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by imf10.hostedemail.com (Postfix) with ESMTP id F41D9C0014 for ; Thu, 23 Feb 2023 08:30:34 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="bcQKyqK/"; spf=pass (imf10.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677141035; 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=LG+G4CbRfXLWfpKc9YkszcxpegepZUGtOrXoX6VfTSc=; b=nNl4S4ZuP5oMqwPUnfznZPNsmBR89VukxOqrjhXtsiOYt+cEYY42Z9h00EVF7mmsBVsTju og/AuTGvB5wTU+n3kCLCLIZbxdVEJ7jV90etkHr/hWVD8slEqsOGfa4++8IwW7bhcTPXby jOC8EBorjISYHxvFBpuSjEE30IvRGy8= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="bcQKyqK/"; spf=pass (imf10.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677141035; a=rsa-sha256; cv=none; b=m0FSZ2t7m1o2Oie/24oVUduGqosebnfIAvtYq2aZa6ULkeWWYOOOynpcy7p7WbpfvhMP8i E7f5WPguC72wQlSyc29mHWD+zav7myrubXNnhB0Kcl7MiZoqWOrq/ahst1QN8T9weOfLN6 Qa9g5b5KKm8CWbwW0wNxpzQYj6pGuss= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677141035; x=1708677035; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5qNh46j3kGtQTgTbcNWUvGm74xowS1nozv/si/SE9M0=; b=bcQKyqK/OS7u/QcIWvUSujC39KMHvQ1j0JKFQiUyWyQO1a/0s/nkRdeG tJGabOgy740xrzRO3emsIk+omctYgvxia0bE+k5b16BBsSFI8nywH6NUz b0VkXYdFKU0V3K+pCrZcSmSdYVTxbEX/nqER9IEC5+QibdIrwz7RF3Wp7 sxt6mv1Y2lLCi9A6q00V22d7Q4tjB6Tm3FhJMc7wZC98eu/CqPgMuLC3g CCFon/9xy391VczF0CN9o7Q9zxpGgqZ9L/JkzGdLb4TtTxr1vSveblMDQ OFcxShoME7JNN8qklB25eHeg/i/N4V0kvry6v9P37x14D07iB1h3YFNPa A==; X-IronPort-AV: E=McAfee;i="6500,9779,10629"; a="321298509" X-IronPort-AV: E=Sophos;i="5.97,320,1669104000"; d="scan'208";a="321298509" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 00:30:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10629"; a="674437916" X-IronPort-AV: E=Sophos;i="5.97,320,1669104000"; d="scan'208";a="674437916" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by fmsmga007.fm.intel.com with ESMTP; 23 Feb 2023 00:30:33 -0800 From: Yin Fengwei To: linux-mm@kvack.org, akpm@linux-foundation.org, willy@infradead.org Cc: fengwei.yin@intel.com Subject: [PATCH 5/5] try_to_unmap_one: batched remove rmap, update folio refcount Date: Thu, 23 Feb 2023 16:32:00 +0800 Message-Id: <20230223083200.3149015-6-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230223083200.3149015-1-fengwei.yin@intel.com> References: <20230223083200.3149015-1-fengwei.yin@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: F41D9C0014 X-Stat-Signature: shu4uo4zcu1yytuia488zfxrwu34u9s8 X-HE-Tag: 1677141034-561662 X-HE-Meta: U2FsdGVkX18600iwIcgiulo/leZOx26n8CYyG0JMpRbcGoMyzKbnWcU+b1xvLaZg2KLVcoVt8HpmqhU1+on4zF70q1OU7vpsow26Z/eUbB7Exua5AQ+wInxaMKpbXm/1sgwBnSXKx5fvweLMVxNkDt5GnS6i34sePF1Mew60iZ/jkAWBdiaxxzVg2LW+tKPopHir1M3y+9/6AZdA1OnLIhzep0pc7Ahzamtkb3jrZbWcG3PGBWQLiJv0+Ycnh/VzKZBR4jkypGqrgPbp3IjUu0+8RzuJbPT4hX4CdXRo1y4cKaL3XoIlda38uyPM55Q66vqr7D9vM0NmarHWfa/l6+5/1EtIQrXLdDeJk+EiMowQAUbMT9WapnQbZwztjbqLhU3BST3kre37sFSKtcGkQqqceW1RAgqF0Hc99i4awFuglwmpR/1ctWUQyfghKNV34SC4y4kqX3ybuEHTqRMwDXWht8mksCCiw46LcDgdAciDQY60Dt9CuUw5T6zKYkYN8vaoUAKq75b4dRIRqQ/hOZbPF866j9sBF+wJY1NiyaETbq+v3j2d0Z18UbstKqljbDvj6X/RovkRN6vWbRwfSxhL4zxM/aLS0axUvK0NBXjz+UZ0/KIWwmfESir2/Qv23g2wW5a9QDOes8rvYd6iMrfrB1OA6X6G0rLYUMtxydNyI2qPfo3iSvJoPUrOJTv7dCcwTEJMO1ZEE4q4N1Gufzvsz3oxw+ehDgcrg7wA8bjY4OPn6lRVHqzoy4hq/P795ZWYmbKHeMgWza83W8pAunzLwBwVaVerBGgEPoBDE/yn5NlRmSUp2ZssVa3Wu1HQYEqk8sZEEogVU31BDyoLQ2NOm3z04skJNUfIdKRabc3BBiJsuSyeumBmrcvUkjZzCCGz+5oFSNW5PUINXZcpMnXeKC2vVoX+1dN2hAFUavZKIu1rTR/HBVwraglaa6EA1XlnrnGSsab7u41G4+v piYpoKpD z587bVghnPiPhOw2fT2psOUcsqZZzDFXybCfbJGm8InoF6S15aH7L7QFzYYGm0Dw9e96ciE5fJWQJatyxRiEjal+uhoNoKeibmQUJroBVdXOONAR+OOpc74SvzLyGGifJfjMphgy/VnABmNQO6ZsGznc3vV145W8YpofbOxEZD8ipG6Z/DqaL0BmkvhG4qbCUVp/2Q0oIjCOnZouaBCswau9XHgBWtZT2btgS 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: If unmap one page fails, or the vma walk will skip next pte, or the vma walk will end on next pte, batched remove map, update folio refcount. Signed-off-by: Yin Fengwei --- include/linux/rmap.h | 1 + mm/page_vma_mapped.c | 30 +++++++++++++++++++++++++++ mm/rmap.c | 48 ++++++++++++++++++++++++++++++++++---------- 3 files changed, 68 insertions(+), 11 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index d7a51b96f379..568801ee8d6a 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -424,6 +424,7 @@ static inline void page_vma_mapped_walk_done(struct page_vma_mapped_walk *pvmw) } bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw); +bool pvmw_walk_skip_or_end_on_next(struct page_vma_mapped_walk *pvmw); /* * Used by swapoff to help locate where page is expected in vma. diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index 4e448cfbc6ef..19e997dfb5c6 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -291,6 +291,36 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) return false; } +/** + * pvmw_walk_skip_or_end_on_next - check if next pte will be skipped or + * end the walk + * @pvmw: pointer to struct page_vma_mapped_walk. + * + * This function can only be called with correct pte lock hold + */ +bool pvmw_walk_skip_or_end_on_next(struct page_vma_mapped_walk *pvmw) +{ + unsigned long address = pvmw->address + PAGE_SIZE; + + if (address >= vma_address_end(pvmw)) + return true; + + if ((address & (PMD_SIZE - PAGE_SIZE)) == 0) + return true; + + if (pte_none(*pvmw->pte)) + return true; + + pvmw->pte++; + if (!check_pte(pvmw)) { + pvmw->pte--; + return true; + } + pvmw->pte--; + + return false; +} + /** * page_mapped_in_vma - check whether a page is really mapped in a VMA * @page: the page to test diff --git a/mm/rmap.c b/mm/rmap.c index 3680765b7ec8..7156b804d424 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1748,6 +1748,26 @@ static bool try_to_unmap_one_page(struct folio *folio, return false; } +static void folio_remove_rmap_and_update_count(struct folio *folio, + struct page *start, struct vm_area_struct *vma, int count) +{ + if (count == 0) + return; + + /* + * No need to call mmu_notifier_invalidate_range() it has be + * done above for all cases requiring it to happen under page + * table lock before mmu_notifier_invalidate_range_end() + * + * See Documentation/mm/mmu_notifier.rst + */ + folio_remove_rmap_range(folio, start, count, vma, + folio_test_hugetlb(folio)); + if (vma->vm_flags & VM_LOCKED) + mlock_drain_local(); + folio_ref_sub(folio, count); +} + /* * @arg: enum ttu_flags will be passed to this argument */ @@ -1755,10 +1775,11 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, unsigned long address, void *arg) { DEFINE_FOLIO_VMA_WALK(pvmw, folio, vma, address, 0); - struct page *subpage; + struct page *start = NULL; bool ret = true; struct mmu_notifier_range range; enum ttu_flags flags = (enum ttu_flags)(long)arg; + int count = 0; /* * When racing against e.g. zap_pte_range() on another cpu, @@ -1819,26 +1840,31 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, break; } - subpage = folio_page(folio, + if (!start) + start = folio_page(folio, pte_pfn(*pvmw.pte) - folio_pfn(folio)); ret = try_to_unmap_one_page(folio, vma, range, pvmw, address, flags); if (!ret) { + folio_remove_rmap_and_update_count(folio, + start, vma, count); page_vma_mapped_walk_done(&pvmw); break; } + count++; /* - * No need to call mmu_notifier_invalidate_range() it has be - * done above for all cases requiring it to happen under page - * table lock before mmu_notifier_invalidate_range_end() - * - * See Documentation/mm/mmu_notifier.rst + * If next pte will be skipped in page_vma_mapped_walk() or + * the walk will end at it, batched remove rmap and update + * page refcount. We can't do it after page_vma_mapped_walk() + * return false because the pte lock will not be hold. */ - page_remove_rmap(subpage, vma, false); - if (vma->vm_flags & VM_LOCKED) - mlock_drain_local(); - folio_put(folio); + if (pvmw_walk_skip_or_end_on_next(&pvmw)) { + folio_remove_rmap_and_update_count(folio, + start, vma, count); + count = 0; + start = NULL; + } } mmu_notifier_invalidate_range_end(&range);