From patchwork Wed Dec 20 22:44:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500635 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 13B42C3DA6E for ; Wed, 20 Dec 2023 22:46:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22A038D0018; Wed, 20 Dec 2023 17:46:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B35D8D000D; Wed, 20 Dec 2023 17:46:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 02B8E8D0018; Wed, 20 Dec 2023 17:46:13 -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 DDC608D000D for ; Wed, 20 Dec 2023 17:46:13 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B6427C015A for ; Wed, 20 Dec 2023 22:46:13 +0000 (UTC) X-FDA: 81588681426.01.4DC1DB0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 10A1F14001A for ; Wed, 20 Dec 2023 22:46:11 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="D7/ssT31"; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703112372; 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=/d9mpve/qdOWVGsQDSuYBEYTclHzlkzYvVo312FD3s0=; b=49xSqMeUBrI+8ycK7FJV355ZgzkpfnB+fgBtymuzRxNyYGSuV7OXCrRK98e2Rv9gVzRgL+ g/aogfU3rvoS/7+dt1acrTAZKwZ1HFKN1aT/2JqDlcDwHd/WzeUVCxUVDQWl5b0TbmoKpn TA4HOmXLa3mlJRFMmdhEJew02h3mad8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703112372; a=rsa-sha256; cv=none; b=N90aFYowt+SbyDkC7NTm1e4foYw4PY0DVNHocKNawiobsr96GTSTFp1RNx4KY4oCgNY3bw 6w6MhM2dcm9hUJ8CjOZ93DvnTcvcqJ867R2Qo6AqWtU/Cv4Dd7m54vHm/WReHzZ3PxpRUe xd9k2lvH5hsiLd6f3LQPPTJs802NW6I= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="D7/ssT31"; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112371; 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=/d9mpve/qdOWVGsQDSuYBEYTclHzlkzYvVo312FD3s0=; b=D7/ssT315aHkEftYfRXpjmo5fAGGtKuPyVTQNzjv9tN6iRHTEt8Zldk2CxjXUe0awd4zIP nT6sSRQ09krktda2Y10JbaQ+k3v0haRa1zRSyQ4GHokFwzPzl+VlY/BdXwHcqZyz7sZP/p aKmxzDIRZOXZ9aXM0Ie2Het8/XC9Th0= 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-640-h8r1ias0P2CwC8ml7LleWA-1; Wed, 20 Dec 2023 17:46:08 -0500 X-MC-Unique: h8r1ias0P2CwC8ml7LleWA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 923D42803609; Wed, 20 Dec 2023 22:46:07 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44B9640C6EB9; Wed, 20 Dec 2023 22:46:05 +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 v2 23/40] mm/rmap: introduce folio_remove_rmap_[pte|ptes|pmd]() Date: Wed, 20 Dec 2023 23:44:47 +0100 Message-ID: <20231220224504.646757-24-david@redhat.com> In-Reply-To: <20231220224504.646757-1-david@redhat.com> References: <20231220224504.646757-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Rspamd-Queue-Id: 10A1F14001A X-Rspam-User: X-Stat-Signature: fib7cygt5yexwngycijpe9xg9cn1kd3x X-Rspamd-Server: rspam03 X-HE-Tag: 1703112371-751776 X-HE-Meta: U2FsdGVkX1+aw3jKF5tGLGoMgCggod07u1qomNHUADfC0c9Tb+CKwr44S6ELCWJZFEOJpzrRvKdE19wN5lSoBEoWrQGfAw2AR1qeaymDjaSbMCRTXqv6cSUXzherSF7S+ZBLKA4fKNQQLhWiTisT78JAFKVjUKylnlYOQtEPN6afrAFK3J86MeCD2IPZKwpem66Kd83BlCFY9rTQ8Anz0tcW9rOn2jgI/xdBJvdiZb1w/xtiO3F1a/zmTxuwLJZvU+Bt+Rt1Mw9z3AvhH+xAygSuoCeJ8H+GvCNlXQljfZgVysu7eD9TUeesvbwc8Pzh7RTm0Y0EuVeVUMJIsiqDZ91M5y0RQXlfo1UPGXOeG6jSozmSNiyh8GDAn83lfmAe69CNw2TUHXD81zVoebXHujavAjK06QxBNO5o9wD8IWVxae2NMXuC7A8UepH90iPUtIMPPUgur1zRHTqHEzdQ1CxOyqhQC+mxXUueuNi4LGdxa2kt4SGPzSNIzd92Sar5M5QL0SbnnQ7EHnCgMx3JQkEvuSKkm+zPu8m59H9enPtRTmSDhKl1Aknb8aXpgRTrxAYhaPfghQTbaQfyMlLq2Rz5gWQtN+Z7qskNIg2iuxOpJfJzJgG2HGmS4Uz0cPdG+SpBogXbcr7mmIsVOtzwxbi5NRE7BW7GEiHsHCY12Z0nQLFFKN7EZBvABscjme4+4BAyyttZTPaWuxrDC2NlqMz7UCoU8jYJW2418A0Ce3bXN1HVXTtxFMec0As8lB27OHdOFLsR0ZWaeg8tPZGqrbmB4XjXsLAzkxZIpO0D4Tco/DCqNZc/ewu54B7mnsAL2yvxZACpHgqBFgVbV6HVuGCemKXmE5tZZFS9qIXfzYdIKRGbQ0NT3Xf8JTcr0M4UXg31S0w80UdNdCcljDypQbbFLxkTh5dLzyIZmf2ITUTMimCKMkHmDgAfselEtU3Gs3PXTdW+JlmQuuA0Zgr QLv56x6c 3GPWZQxHsnkeUGCEbGPkpmLUoyi+7tee+L9GP6HjdXtId0pEKKJou2GCz10E4Tkat6OUXzRGdMx2BuhhDZ+28yZtzhVZ0KMuzaSPrR71ROtVDlbv3ewAJf02HhZfLytl2OHNu0ZHn56B0oXjQ2KqBnKdN3Z0TmOgvVfVZcOWSxQ6tEplN/ZXI4+9NUIcvexRPz9Fc+GTpiBpwHLFYkx7ZbP0HR98uxY0/YFtm 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 | 82 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 72 insertions(+), 16 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index bf6cb79aa7a0a..57e045093f047 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -243,6 +243,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 2b386b9f6791c..1273180753953 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1510,25 +1510,37 @@ 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_level level) +{ 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); - - /* 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 */ + __folio_rmap_sanity_checks(folio, page, nr_pages, level); + + switch (level) { + case RMAP_LEVEL_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_LEVEL_PMD: last = atomic_add_negative(-1, &folio->_entire_mapcount); if (last) { nr = atomic_sub_return_relaxed(COMPOUND_MAPPED, mapped); @@ -1543,6 +1555,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, nr = 0; } } + break; } if (nr_pmdmapped) { @@ -1564,7 +1577,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 (level == RMAP_LEVEL_PTE || nr < nr_pmdmapped) deferred_split_folio(folio); } @@ -1579,6 +1592,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_LEVEL_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_LEVEL_PMD); +#else + WARN_ON_ONCE(true); +#endif +} + /* * @arg: enum ttu_flags will be passed to this argument */