From patchwork Mon Dec 11 15:56:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487462 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 9DC2EC4167B for ; Mon, 11 Dec 2023 15:58:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F9236B0122; Mon, 11 Dec 2023 10:58:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 284E56B0124; Mon, 11 Dec 2023 10:58:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0ACC36B0126; Mon, 11 Dec 2023 10:58:02 -0500 (EST) 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 E78F46B0122 for ; Mon, 11 Dec 2023 10:58:01 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C98811C107A for ; Mon, 11 Dec 2023 15:58:01 +0000 (UTC) X-FDA: 81554993562.10.ACB42AA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 0A9DB140004 for ; Mon, 11 Dec 2023 15:57:59 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cNvtRwPL; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702310280; 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=OcVx4x0aUtY07dVPvydbU+uc8icopPtFroqSSpn7QWM=; b=cTwcAFoGAsY6pHA9sSq+YOSJLDpsaTglFP/5vI+sWahMBw6jhwf+sN5YGId7UZQgKwyzn4 kmkkC/CnFrZFL0mpEP5m9TjTtqUo1M8CjDiuASjGUX5zXXMEA9ketH6CZQ5ErkgV0U6k7s lh5SK+rnk7FS08cupZsnAwv9m6HFCIE= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cNvtRwPL; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702310280; a=rsa-sha256; cv=none; b=U9u4nXQLHXJeieLGi0JJBzmDSXWcgr1s56Jcla+t6IjpoSAJkERMyht6Egdlvjxai3XS+r cCLncQSNPgquXUJ242I06BHaqNrDboMEJZYVCqAucjlaZThAXKeePG3ek4pi0wJ1/urKLU LscBo17ABBP4IlglxfUYEt/gk04AZFg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OcVx4x0aUtY07dVPvydbU+uc8icopPtFroqSSpn7QWM=; b=cNvtRwPL3eFiW9oT7XnqoauygX8Wp/nkgWCFayufGsupZJlWy+PWrqNt8WWjAbuFWlWiQj Uvar4uVNKuSJn1s0R+dmBV8X38cVEvbZ8mgQoPxH6uB3pFkY+88RPKgD26QJr6NBvsLVeh bIgjFw05c0IQb4Dv6CyMaklC/aU+hZo= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-177-0UIjTO6mNmu_u3e5pNi68Q-1; Mon, 11 Dec 2023 10:57:54 -0500 X-MC-Unique: 0UIjTO6mNmu_u3e5pNi68Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3BFCA1C08B9E; Mon, 11 Dec 2023 15:57:54 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E8C71121306; Mon, 11 Dec 2023 15:57:52 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu Subject: [PATCH v1 23/39] mm/rmap: introduce folio_remove_rmap_[pte|ptes|pmd]() Date: Mon, 11 Dec 2023 16:56:36 +0100 Message-ID: <20231211155652.131054-24-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Queue-Id: 0A9DB140004 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ny9qganiojg1t88o3i9wmo41a97kddzk X-HE-Tag: 1702310279-791488 X-HE-Meta: U2FsdGVkX18BkF8Jy6zRLZzZT0CurTMFvliD89GhUbKLQitpkXxG4IZRKkzvuXrGZVtqzpjKjTu+Dp+ARV05cQ8pxQ3H9cAwYljOYD6a/VW8XEfNkEmX7D5eEkiLLX7KnA2lYGSunJxORWhtboU5ecTTBQ6iM96CenAzlOzqEJap4ZtkGUyLxTbKvmHcBFNyiRgXxNPMbSzim1I4EMsbftglgVqzOO67NkUxRPJZT8nHI2BwHZvH/hy+dee+Ja+Fc1yhhZiyEv+IbBCPTYJA6PURb2n8gyPqIn1E8Ydaw1m0z8H4zVyzASY15tIufx1GZO7wUSSF2RcJlIgU78RX3/YaIr+Eyrxl5aFmQ5pQawMirRXZ9BfdSQMGOXx8He/zevDNJ2cADvfv3g3sLtHfZyeYUs/GtSeBMdkacujzDpFHz65dpZ6Dk3dmaQMlYBn4ghMQnp6dCv4o+JD3ZvI9QnkzZOJ1Ievs1mVhItOLHjfN9nlGECpLCovCNycfOpy5nI6tq7514tNE7RmMRroKywjbQaX6ZMjOuuoSUr/g9n2hPyMsFOUvpx4LHwMKIFx4As3xPXB2qn21i8CfgWFygE57fxQ3RyzFYzYHPs00GMjzdCw/Twlc6rWZbARiRHLGyGONFHNrzuYH5cjtdjh0ZNfBuwtWSFIhv3FffZm0MANWUArPbS4MaiHeZNGqmm0DeY/nhyzRrawfFW/GrVqTH7GoAkWjIcLjMQko4fgCFM4CCXEuPTsGD0YbLUnsGgNttMCzZqsWV2uiJShHeAH33bFjLEsB9NmHmasYCKafHFD+33zHP+bonxEbSlNzmueYsAIUiC4/28mGZmxDPn9MK7qS/hdLsHRHW76K8FQT2SludrfkCgYsBbo4Q1Pr9cL4qZDlgDVJGfwKitHkNLh0QgXjQqlQXU0hWNmVU3OMnClpMC/2+pL0g1XfSu5MQ983TnKVMIIZ8ufEgzdq9i4 bbKza0OQ 4sPMusy/fotEaVE2QgfBicIIJrVjBasNRKyMHfZzbiDRMv/xKiJczDM99yj9qbAzW6je8D2idGUdgUMnUiJs065pAh5v7CF9P9MR+cj9r/KJ0xmp6nKyyylJ+8/5hTSH1zs5JVzT5T2LyFFLLBdRRqLfH1sQao7SS5GumuOhKcpE8OQBXzGR+2nEDJBrgW6m2cys+B0dl2S98CBhX2LnM6KIzx52BK/IbUrjN 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: List-Subscribe: List-Unsubscribe: Let's mimic what we did with folio_add_file_rmap_*() and folio_add_anon_rmap_*() so we can similarly replace page_remove_rmap() next. Make the compiler always special-case on the granularity by using __always_inline. We're adding folio_remove_rmap_ptes() handling right away, as we want to use that soon for batching rmap operations when unmapping PTE-mapped large folios. Signed-off-by: David Hildenbrand --- include/linux/rmap.h | 6 ++++ mm/rmap.c | 79 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 71 insertions(+), 14 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 0acebe41ab8e..a266dc0ef99e 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -246,6 +246,12 @@ void folio_add_file_rmap_pmd(struct folio *, struct page *, struct vm_area_struct *); void page_remove_rmap(struct page *, struct vm_area_struct *, bool compound); +void folio_remove_rmap_ptes(struct folio *, struct page *, int nr_pages, + struct vm_area_struct *); +#define folio_remove_rmap_pte(folio, page, vma) \ + folio_remove_rmap_ptes(folio, page, 1, vma) +void folio_remove_rmap_pmd(struct folio *, struct page *, + struct vm_area_struct *); void hugetlb_add_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address, rmap_t flags); diff --git a/mm/rmap.c b/mm/rmap.c index 9212726268ba..dc3be5807cee 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1511,25 +1511,38 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, bool compound) { struct folio *folio = page_folio(page); + + if (likely(!compound)) + folio_remove_rmap_pte(folio, page, vma); + else + folio_remove_rmap_pmd(folio, page, vma); +} + +static __always_inline void __folio_remove_rmap(struct folio *folio, + struct page *page, int nr_pages, struct vm_area_struct *vma, + enum rmap_mode mode) +{ atomic_t *mapped = &folio->_nr_pages_mapped; - int nr = 0, nr_pmdmapped = 0; - bool last; + int last, nr = 0, nr_pmdmapped = 0; enum node_stat_item idx; - VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); - VM_BUG_ON_PAGE(compound && !PageHead(page), page); + __folio_rmap_sanity_checks(folio, page, nr_pages, mode); /* 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); - } - } else if (folio_test_pmd_mappable(folio)) { - /* That test is redundant: it's for safety or to optimize out */ + switch (mode) { + case RMAP_MODE_PTE: + 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); + break; + case RMAP_MODE_PMD: last = atomic_add_negative(-1, &folio->_entire_mapcount); if (last) { nr = atomic_sub_return_relaxed(COMPOUND_MAPPED, mapped); @@ -1544,6 +1557,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, nr = 0; } } + break; } if (nr_pmdmapped) { @@ -1565,7 +1579,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, * is still mapped. */ if (folio_test_large(folio) && folio_test_anon(folio)) - if (!compound || nr < nr_pmdmapped) + if (mode == RMAP_MODE_PTE || nr < nr_pmdmapped) deferred_split_folio(folio); } @@ -1580,6 +1594,43 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, munlock_vma_folio(folio, vma); } +/** + * folio_remove_rmap_ptes - remove PTE mappings from a page range of a folio + * @folio: The folio to remove the mappings from + * @page: The first page to remove + * @nr_pages: The number of pages that will be removed from the mapping + * @vma: The vm area from which the mappings are removed + * + * The page range of the folio is defined by [page, page + nr_pages) + * + * The caller needs to hold the page table lock. + */ +void folio_remove_rmap_ptes(struct folio *folio, struct page *page, + int nr_pages, struct vm_area_struct *vma) +{ + __folio_remove_rmap(folio, page, nr_pages, vma, RMAP_MODE_PTE); +} + +/** + * folio_remove_rmap_pmd - remove a PMD mapping from a page range of a folio + * @folio: The folio to remove the mapping from + * @page: The first page to remove + * @vma: The vm area from which the mapping is removed + * + * The page range of the folio is defined by [page, page + HPAGE_PMD_NR) + * + * The caller needs to hold the page table lock. + */ +void folio_remove_rmap_pmd(struct folio *folio, struct page *page, + struct vm_area_struct *vma) +{ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + __folio_remove_rmap(folio, page, HPAGE_PMD_NR, vma, RMAP_MODE_PMD); +#else + WARN_ON_ONCE(true); +#endif +} + /* * @arg: enum ttu_flags will be passed to this argument */