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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC52AC6FD19 for ; Mon, 6 Mar 2023 09:22:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48A756B007B; Mon, 6 Mar 2023 04:22:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 461A96B007D; Mon, 6 Mar 2023 04:22:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3298F6B007E; Mon, 6 Mar 2023 04:22:39 -0500 (EST) 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 226AF6B007B for ; Mon, 6 Mar 2023 04:22:39 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id F3F2540B38 for ; Mon, 6 Mar 2023 09:22:38 +0000 (UTC) X-FDA: 80537933196.04.C2955C6 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by imf13.hostedemail.com (Postfix) with ESMTP id D497E20002 for ; Mon, 6 Mar 2023 09:22:36 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hNoWPfX2; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf13.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678094557; 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=udgZbP1JVBpOFWZLs5hDZuekTW7pDVYq1cY/Jwp6jQ4=; b=aUt6/tRa8JjFj88PRp3N+6RdyEfDqVuPqrJCUUmiIxrNi1tM1Kf14gjWmnPMQicsYw6tHN 4ja1ikyzsolcFM05wGZCD3qroJ4J/dIS3xYejpwrrrS3G4D8F2FH6zZrnUEeFz8KA+L5Mx E3sLxRMl5tKgUjr6NzGgkEbVvtUyXKQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hNoWPfX2; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf13.hostedemail.com: domain of fengwei.yin@intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=fengwei.yin@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678094557; a=rsa-sha256; cv=none; b=g/CXch6PrK7BbFUl5Fv8mLjx7ZzotrVsRvFufRhnazvoXMp3D4TnDqG+ykpTJh9hrby4n5 7GXeCoPoGVfSmqKFKbSFXUpNrDD1rIm1VW2hoT7azvf5drEAL5h6h0YWX6z8ARzVO2iiue uMABDZLm7tByv9UG79qX8cdYKFKrbMs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678094555; x=1709630555; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=g5aabX8vz/M8Ls+LQWJ4EOQUiHzF9r4YTa/VaArWwhI=; b=hNoWPfX2IOyCv1LQWtXlMCjIOiKVkKmilMK8Y+vjXEt4M1AvuAU/Ruea h/DIFImJwgoSJX6r+G0SI5QjjAEkcc1p6K5Q42qaUNBcgnjaXdDO/Amtb APhMwg3dF7l/gcOYnfNmI3q9HdtO6wuvV+OT1qOSYKdV5CY8Hts+clF6W YvCfEkHzwIvR9eyx+cLQFrFFLP9vczK/bqgTnAg98EIm3sKWKARdIoZOB 5n0c9GR8YbDJaQi2sssRxRlqwR6xHxRkDV9KlTxuTK4GC0JRniUbUBpTR aPlLSih2RXpQCHaENomVcdvjQRGkAoObGo4WPvtqcTFprLneR4BWJhLTq w==; X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="398091720" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="398091720" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2023 01:22:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="740261322" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="740261322" Received: from fyin-dev.sh.intel.com ([10.239.159.32]) by fmsmga008.fm.intel.com with ESMTP; 06 Mar 2023 01:22:32 -0800 From: Yin Fengwei To: linux-mm@kvack.org, akpm@linux-foundation.org, willy@infradead.org, mike.kravetz@oracle.com, sidhartha.kumar@oracle.com, naoya.horiguchi@nec.com, jane.chu@oracle.com, david@redhat.com Cc: fengwei.yin@intel.com Subject: [PATCH v3 4/5] rmap:addd folio_remove_rmap_range() Date: Mon, 6 Mar 2023 17:22:58 +0800 Message-Id: <20230306092259.3507807-5-fengwei.yin@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230306092259.3507807-1-fengwei.yin@intel.com> References: <20230306092259.3507807-1-fengwei.yin@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D497E20002 X-Stat-Signature: kadxut1shoctnzid45ff8y8xgksj5cti X-HE-Tag: 1678094556-30538 X-HE-Meta: U2FsdGVkX1+hs2GNbS3JaU4k+NN84x2txyazZjIFHt9tSqmzmXDroJ5jV0Dhp8y+JTeQh9tb4fDSl2FnE1xWo5NlWNj1a+xlaxgIZ5pK4u+ha/uMkVtO0Nk5fcU6ZOtuyE5i2rCCchYeN48KZ0Nqf9+dxdq6HNXDRxKY/BZcKl12usotHtJ97QlxO6Y+X5hy5yHNnH5/pc4bQkZ0PLSH2bKn+6M9Oym89d6H00t43rO4OP6dR/QLSbTinAWFc0+six+8TDBEnUj3I03V2OhalQADFtNF2DHbiktm8tPnM1G5EAZ+g8eWHnrwvLokXrOIBBNphOfPOHkHBnimFFjnJh80c1WKlreqgTPPZLnutwd5nv7G/D69ipclEq9ruLtF4s8/3CTxoHehHfPaFnpSAP+305nA+x/cKbRDKeGj3gu6W+CVkjkPEm70V3hfsbi3tZnYXU6qsk0bgi2UuazpwRL9yBmoiXZBJyl7uT6aOWuDdA1WXMxbPHdqXqtG82/bl6A13fMKptfibCQg3DGgO+2+4OpHzN1nX5KMcCAConZ2wgYniMey6ENOPJIvzlssvK3LkN7vV5kutMAG1SFbd4L0g+WPU4CWFRxbvVmNYsk7yrpwkF/aFi4gDpo6vBGBh/K9c/E+FRCog/hPdhgBomZnnbUpiUfiqYqlBSzMdwkhq3PyEfiBrNBIJLtL9tst6ocpiTsDLclp9sK772G9b9osHakfBmIqmpqQ5GJlWQoWS8nHVBYI92R1j2Zg/BssdVK1+xiCKqVCO0uxoHEJ36FZh65ljrTm/YankQYnk7Md70B5by56VbtIKTPJxEYBstTUlunYUksOdZjFv7Jh1Gj0CrCbhIyyUeQMEuxj/B4vRkBo7PoIQQbcMzF5PPqUyg39zhYeVMnk4X75C+MVJzClXmqkxbTMCLHdW+nlSIxgNvbhkvCd8gSa28KqG4fd0Z1bU46xcVBAoYMdZuE oiew5TpY GkFG3mfYOdsZpcHz0c2JgQa7sub3cyrflEo2plQm2F51wHTPHOBccKcr6Hkw+QQ2vgYD7MYWQhD8L1mvR5geEz16GHyeDVKXg7DP4L7C544cO+eV1INe6NSMUZ3PWs4RaL03H3gqaaMKTujrq8LlyUbyTcLfVh5QR57pbyCeadVFurfFlVeAgawbrb3G97t0dpdqMKx3B6oPVmBf8Ds5xRGizKkpvNWxGACwpMgahBZW0bwk8QmPHSGd5dvsclOsJISBx 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: folio_remove_rmap_range() allows to take down the pte mapping to a specific range of folio. Comparing to page_remove_rmap(), it batched updates __lruvec_stat for large folio. Signed-off-by: Yin Fengwei --- include/linux/rmap.h | 4 +++ mm/rmap.c | 58 +++++++++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index b87d01660412..d2569b42e21a 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -200,6 +200,10 @@ 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 *, struct page *, + unsigned int nr_pages, struct vm_area_struct *, + bool compound); + 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 836cfc13cf9d..bb3fcb8df579 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1355,23 +1355,25 @@ void page_add_file_rmap(struct page *page, struct vm_area_struct *vma, } /** - * page_remove_rmap - take down pte mapping from a page - * @page: page to remove mapping from + * folio_remove_rmap_range - take down pte mapping from a range of pages + * @folio: folio to remove mapping from + * @page: The first page to take down pte mapping + * @nr_pages: The number of pages which will be take down pte mapping * @vma: the vm area from which the mapping is removed * @compound: uncharge the page as compound or small page * * The caller needs to hold the pte lock. */ -void page_remove_rmap(struct page *page, struct vm_area_struct *vma, - bool compound) +void folio_remove_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 last; + int nr = 0, nr_pmdmapped = 0, last; enum node_stat_item idx; - VM_BUG_ON_PAGE(compound && !PageHead(page), page); + VM_BUG_ON_FOLIO(compound && (nr_pages != folio_nr_pages(folio)), folio); + VM_BUG_ON_FOLIO(compound && (page != &folio->page), folio); /* Hugetlb pages are not counted in NR_*MAPPED */ if (unlikely(folio_test_hugetlb(folio))) { @@ -1382,12 +1384,16 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, /* Is page being unmapped by PTE? Is this its last map to be removed? */ 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); - } + do { + last = atomic_add_negative(-1, &page->_mapcount); + if (last && folio_test_large(folio)) { + last = atomic_dec_return_relaxed(mapped); + last = (last < COMPOUND_MAPPED); + } + + if (last) + 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 */ @@ -1441,6 +1447,30 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, munlock_vma_folio(folio, 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 + * @compound: uncharge the page as compound or small page + * + * The caller needs to hold the pte lock. + */ +void page_remove_rmap(struct page *page, struct vm_area_struct *vma, + bool compound) +{ + struct folio *folio = page_folio(page); + unsigned int nr_pages; + + VM_BUG_ON_FOLIO(compound && (page != &folio->page), folio); + + if (likely(!compound)) + nr_pages = 1; + else + nr_pages = folio_nr_pages(folio); + + folio_remove_rmap_range(folio, page, nr_pages, vma, compound); +} + static bool try_to_unmap_one_hugetlb(struct folio *folio, struct vm_area_struct *vma, struct mmu_notifier_range range, struct page_vma_mapped_walk pvmw, unsigned long address, -- 2.30.2