From patchwork Mon Dec 11 15:56:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487479 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 A8FD5C4167B for ; Mon, 11 Dec 2023 15:58:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 62E3C6B0144; Mon, 11 Dec 2023 10:58:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5B60E6B0146; Mon, 11 Dec 2023 10:58:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 430C96B0147; Mon, 11 Dec 2023 10:58:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 309396B0144 for ; Mon, 11 Dec 2023 10:58:42 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 02EA040762 for ; Mon, 11 Dec 2023 15:58:41 +0000 (UTC) X-FDA: 81554995284.04.F51EFB7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 338A580022 for ; Mon, 11 Dec 2023 15:58:39 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=g2OabzK2; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1702310320; 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=8kCOKQnn/YILhh4/y6F4VVgOwWNItKHStdMCkjwZ7+g=; b=ASxIn/KSBt7BDQlzYDjVh10FwbMVgwZnItGuo3+8cTiZX1tir3Y2u8QAQ4hvE/tqL/NRB5 hQ/v/ZXDyMrRt07eMKU1UtSkzrpr/5NTicJfaxCJyYVI63XjZhnMbJgVBYFisM/5KQEF7H BrlqCLJBByTPCctW3InLekDue2L/ki4= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=g2OabzK2; spf=pass (imf30.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702310320; a=rsa-sha256; cv=none; b=cGGXBbKxxrft+jWomrxX1Yat4QdBPvEbek9bYNa7Zn9ZTx8biS+qWq44wcqYmOxCh0ti82 ohh98p1ncpeWxuVzly6ibIryvMJsXYRFkjsFRWnZZknoEefCoUqKhZrWMW9GpqxWAvP1eG v17CzKriSI7Bp/LUirqydFRp61ZtHE4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310319; 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=8kCOKQnn/YILhh4/y6F4VVgOwWNItKHStdMCkjwZ7+g=; b=g2OabzK2ErmylqZsX4QjOHnqqRqbcp61bt+5PhpX7WKdKRXhR62vrv/L7iEY8W6nrIFM4/ AWY0XjhWTMHXcqb6ZtT9n1wK3Y9wbb6Cg4s64ziYmPSaPD5HRRdoiQy9smVBAYeD0Cotly XEpylHuvathX5l0lnigfdQeUGyysFa4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-461-PqgcZlcINPWhAdvqUvsCRQ-1; Mon, 11 Dec 2023 10:58:35 -0500 X-MC-Unique: PqgcZlcINPWhAdvqUvsCRQ-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 E3F70848A68; Mon, 11 Dec 2023 15:58:34 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id F28F81121306; Mon, 11 Dec 2023 15:58:32 +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 39/39] mm/rmap: rename COMPOUND_MAPPED to ENTIRELY_MAPPED Date: Mon, 11 Dec 2023 16:56:52 +0100 Message-ID: <20231211155652.131054-40-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: 338A580022 X-Rspam-User: X-Stat-Signature: iorhmyfhsgr39dokgtthh91z3r5nuso1 X-Rspamd-Server: rspam01 X-HE-Tag: 1702310319-326540 X-HE-Meta: U2FsdGVkX18h9IdFzOB8HHPhR38lF8g2rBb9gpD8HYHXd6s3svc6qHLzLsFanPX+47IYfkxZHEeKKM72L/98gPlJrI8k27hxXJlX1AjmgsvZCtKmuwV0E3fLzvBBxasjyqB8Mj6FfyxkotLlhewYpGTBgdzB9MxB5M9brWYMBVrjBOvnx6V6LmkYmBmxjb6eNvOZB+ydMeCy7fdZRyCdRek0gtV5Jc9yF89P7q9ZSFetlU0OocDfz4LNfyf+Yp3MeqbAj43ySvRFRNeDZ/sacr1RLMSNTlf1zoik4CLu5gKkvxhwkf1K7ThRpf2BLT7ELZ0ONuuW53l6QA2PIN9FE681nsz4AV0eVNN+Cwn0M1M9JiXxii0REzpKNd756olnDfTuuZ/nqyrmZFh0M/UaVFn5Dap9gAwLLbr4BcKzxiEe8FjZ9dZQ6t3ywFr7HHUj4iX/CflNcj3xgFs/55rld3o/soQLPktWHomZHGat25FVaDAtH9/1y2GylLJQuWd7ezbB4vB1HbyTU7Jj4hQXC1v/+m3taDqcD6l1LYUA+MGk0JcyGqRwy055m8P2fydP+Cab/4OP5gsHGPoLioFZ3O1c99S6a1eHu5HhndWwJrzIYCxXblK+Bq7QufuxOjwNk8Y/OAm/1/O4xzXemmo33MZWG8aZBmo4cIkI4hId2rhv0EaMSNCMrdeZx04XtgMMhCZ2MRbCzngQg03aqfEMc4EcBlrqLf2Ozh3fA0iERsYZ2eahm2CBuQRXhiYtGR+doTofgXskS2CJOB/QeGS62Vj97Kcw2PzqAsus9CTHikN1O5lU51Q9xTnSxvK/YOlFuQ2oA7KLNM6AKK9rRcAACdv3sqAyut+AriOYYfr0TPpiIVpnGmJ6VMyew1tMcjnil72+ungaP/HFlmVxSoxpQ+3YrVnjje5sheJrUbWlQCsLGSP6CxtvwbEPs1vKg7clfq2qCZcpK73rX7cA6it /nQBUK2R avVm2ND7Y/HWqOcMiiSmaiX337JahbT67Ywtm8LdZ5FcmXRFF1NBveX+MBszLgiPiw8xOy9T+NQY4FPHQTz28cukewgtUUNWoy0owp1ngtYIsEWLRxfyxYovzGRibgnAAvlOmO9GrSlwKgFlN1pe0FMeGquv+mGIrn1XqTJoipYKOsisQ6//p364LZ8Vke+MLFi9t7CaD3uaRYDATYsRxq4DgS50zh+Rg4n5v 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: We removed all "bool compound" and RMAP_COMPOUND parameters. Let's remove the remaining "compound" terminology by making COMPOUND_MAPPED match the "folio->_entire_mapcount" terminology, renaming it to ENTIRELY_MAPPED. ENTIRELY_MAPPED is only used when the whole folio is mapped using a single page table entry (e.g., a single PMD mapping a PMD-sized THP). For now, we don't support mapping any THP bigger than that, so ENTIRELY_MAPPED only applies to PMD-mapped PMD-sized THP only. Signed-off-by: David Hildenbrand --- Documentation/mm/transhuge.rst | 2 +- mm/internal.h | 6 +++--- mm/rmap.c | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/mm/transhuge.rst b/Documentation/mm/transhuge.rst index cf81272a6b8b..93c9239b9ebe 100644 --- a/Documentation/mm/transhuge.rst +++ b/Documentation/mm/transhuge.rst @@ -117,7 +117,7 @@ pages: - map/unmap of a PMD entry for the whole THP increment/decrement folio->_entire_mapcount and also increment/decrement - folio->_nr_pages_mapped by COMPOUND_MAPPED when _entire_mapcount + folio->_nr_pages_mapped by ENTIRELY_MAPPED when _entire_mapcount goes from -1 to 0 or 0 to -1. - map/unmap of individual pages with PTE entry increment/decrement diff --git a/mm/internal.h b/mm/internal.h index 29589bc3f046..188807d2aebc 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -54,12 +54,12 @@ void page_writeback_init(void); /* * If a 16GB hugetlb folio were mapped by PTEs of all of its 4kB pages, - * its nr_pages_mapped would be 0x400000: choose the COMPOUND_MAPPED bit + * its nr_pages_mapped would be 0x400000: choose the ENTIRELY_MAPPED bit * above that range, instead of 2*(PMD_SIZE/PAGE_SIZE). Hugetlb currently * leaves nr_pages_mapped at 0, but avoid surprise if it participates later. */ -#define COMPOUND_MAPPED 0x800000 -#define FOLIO_PAGES_MAPPED (COMPOUND_MAPPED - 1) +#define ENTIRELY_MAPPED 0x800000 +#define FOLIO_PAGES_MAPPED (ENTIRELY_MAPPED - 1) /* * Flags passed to __show_mem() and show_free_areas() to suppress output in diff --git a/mm/rmap.c b/mm/rmap.c index 45296739236f..53753834a10d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1173,7 +1173,7 @@ static __always_inline unsigned int __folio_add_rmap(struct folio *folio, first = atomic_inc_and_test(&page->_mapcount); if (first && folio_test_large(folio)) { first = atomic_inc_return_relaxed(mapped); - first = (first < COMPOUND_MAPPED); + first = (first < ENTIRELY_MAPPED); } if (first) @@ -1183,15 +1183,15 @@ static __always_inline unsigned int __folio_add_rmap(struct folio *folio, case RMAP_MODE_PMD: first = atomic_inc_and_test(&folio->_entire_mapcount); if (first) { - nr = atomic_add_return_relaxed(COMPOUND_MAPPED, mapped); - if (likely(nr < COMPOUND_MAPPED + COMPOUND_MAPPED)) { + nr = atomic_add_return_relaxed(ENTIRELY_MAPPED, mapped); + if (likely(nr < ENTIRELY_MAPPED + ENTIRELY_MAPPED)) { *nr_pmdmapped = folio_nr_pages(folio); nr = *nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of a remove and another add? */ if (unlikely(nr < 0)) nr = 0; } else { - /* Raced ahead of a remove of COMPOUND_MAPPED */ + /* Raced ahead of a remove of ENTIRELY_MAPPED */ nr = 0; } } @@ -1434,7 +1434,7 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, } else { /* increment count (starts at -1) */ atomic_set(&folio->_entire_mapcount, 0); - atomic_set(&folio->_nr_pages_mapped, COMPOUND_MAPPED); + atomic_set(&folio->_nr_pages_mapped, ENTIRELY_MAPPED); SetPageAnonExclusive(&folio->page); __lruvec_stat_mod_folio(folio, NR_ANON_THPS, nr); } @@ -1516,7 +1516,7 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, last = atomic_add_negative(-1, &page->_mapcount); if (last && folio_test_large(folio)) { last = atomic_dec_return_relaxed(mapped); - last = (last < COMPOUND_MAPPED); + last = (last < ENTIRELY_MAPPED); } if (last) @@ -1526,15 +1526,15 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, case RMAP_MODE_PMD: last = atomic_add_negative(-1, &folio->_entire_mapcount); if (last) { - nr = atomic_sub_return_relaxed(COMPOUND_MAPPED, mapped); - if (likely(nr < COMPOUND_MAPPED)) { + nr = atomic_sub_return_relaxed(ENTIRELY_MAPPED, mapped); + if (likely(nr < ENTIRELY_MAPPED)) { nr_pmdmapped = folio_nr_pages(folio); nr = nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of another remove and an add? */ if (unlikely(nr < 0)) nr = 0; } else { - /* An add of COMPOUND_MAPPED raced ahead */ + /* An add of ENTIRELY_MAPPED raced ahead */ nr = 0; } }