From patchwork Wed Dec 20 22:45:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13500651 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 0CE4AC46CD4 for ; Wed, 20 Dec 2023 22:47:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F55E8D0028; Wed, 20 Dec 2023 17:46:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A36B8D0022; Wed, 20 Dec 2023 17:46:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 539448D0028; Wed, 20 Dec 2023 17:46:54 -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 3C9E68D0022 for ; Wed, 20 Dec 2023 17:46:54 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1AD08A1A87 for ; Wed, 20 Dec 2023 22:46:54 +0000 (UTC) X-FDA: 81588683148.15.8BE1370 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 68A5C4000A for ; Wed, 20 Dec 2023 22:46:52 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VVhx9Ni1; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1703112412; 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=97Mkj9KBAth/M3QAsUCGduTq4AF8YjGPbQx442c84RA=; b=IanMod8EMY7zhzm6fgVh/DcYWXMSmpej/QSETmDQnCv9zJ01PInGUTZ/EEzPRwQeR7OTEe SIPcXjPOkFSv8IadcYrONAFrW4n6ZrCXevl/51Wqm6lOlS3vce8JwPckR8EwZ7ox2vFD5z hhO7HEHwrcxVT2uoQmo4ob5hhe/eCzc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VVhx9Ni1; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703112412; a=rsa-sha256; cv=none; b=GrxKLbsVS5VXLeszehginZ+f2Dt02gXSv9KVJgajuEqiGb29AoGrzlgGJMzOymSvelzuK/ 7h4UwNfkKjvH832a+p5WNMPZxZryGoQFhS3GlnNAYhnn89ee1qlHarv19G15nEJWJxq2vY rZyRlz/fSIs6s5I1usswWNo+yNyqGjQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112411; 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=97Mkj9KBAth/M3QAsUCGduTq4AF8YjGPbQx442c84RA=; b=VVhx9Ni1fnpb2bw/L/boWveZejNoR+XT7uEZzWBjf0tDYFJrV106uHXFCV6YOJ2wb/6sCm F9yLMuDTiy885K0loR5dFN73MtjppWzsejYy1N3xPbGn0JonPvIwQoRS58WD/aEp6dHfLb kGyiRp400tyO7yEmRTrZKjjZhpC+gno= 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-636-w_aS-3J-PiOb71UIJo4vXQ-1; Wed, 20 Dec 2023 17:46:50 -0500 X-MC-Unique: w_aS-3J-PiOb71UIJo4vXQ-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 93C361019C89; Wed, 20 Dec 2023 22:46:49 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.192.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28EFF40C6EB9; Wed, 20 Dec 2023 22:46:47 +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 39/40] mm/rmap: rename COMPOUND_MAPPED to ENTIRELY_MAPPED Date: Wed, 20 Dec 2023 23:45:03 +0100 Message-ID: <20231220224504.646757-40-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-Server: rspam09 X-Rspamd-Queue-Id: 68A5C4000A X-Stat-Signature: t8djc8aq63wf4ob6m5p1w799d7whp4xm X-Rspam-User: X-HE-Tag: 1703112412-917971 X-HE-Meta: U2FsdGVkX19mYJd6RU1HtzhLHPmyfCUd3Mg8ukxzxfdfKYdXf2jtI0DxBba4ZK8Kq8o4oWGB/sIbf428A6yNj/ZZvsXb2gT0266s20Nz6uBcWrGC1QuzaKASt4nOYhl+nSTktHVX4Zj/oyo9qfSO2s92nvNbaovtchSpSkZPuMGmH4qUC1T2Why8Zd2TPesbFyRS19rcjhXWvb+o4dsOK717LtElJaGq16PPSEYhDLXFRbmvMVrQntxAdh8J1JR1TtWAbZJxknyQ+TED1DUg96B4pqB3sKjGUSBwr/OcIGcMV5GdF8stMHzMZXrn/1HwNGGjfzASXT9rekqzkRDfrLSD93N45NBEjoS/mD52PzRotTCPuDXX0c/ToHuhFEAPwZA7nJJNNnM1dFZacpuN5l3qQV9M7FkHMPtjMMKHCNi/0g8U8oQRqvHKB4LvXvoGxcDbX4D+tXG2UEVkVMNZlvETAFR2Vb1UNckDV5XZZeML3Ciw0ru1KuP3Z8FHWNUM3WW/zqW6xtPY4+NbRSi3D1lXcx3t4cHD1PGNpQBjzELTqlXokEWNI5QESm9th4m/57769fzwg1JJpeuoAnLac4L36BhkYJAbcLaMpzR1H+oGmYrgVE13/OJmBuc2xDm0qnOhaHCYqZ6BGiYhULG++nN4RORVZgbwFRZT8HYjuDYxurj48/DZOqDp8ddqRDEA2i2CoPDcSJiA9Iz3wLD1u1JGe3W0MXUefkNoUs1H9BvubV2ch+o9QusqDsQSbhsduWVjHsSBEoUN81Ef/6R1R3Bh2DmL7G7p0OdCYgtRb0+ev8pv3ejEel4YTmxNlwS6FUnJIfkcwBn3ZRLThoe5wyvsWAfkxfGBXHj5T0enbQO7X/qiUC59clPxLhI1h51U7//OZiU8Nvmwf1whkkod6PmGgpgA3mKiRiS2LOWbTmlhemC5WkO62AUmrAo3Pk2BcxI188a9zrbynePe2mu YMdA0+pQ FPMOeQbMXxtW05Q7Z+ni8dFPEOFCJORGCo5RK5Rx5hSa7d4ucEYlN6s9GMUzC8/SImy+M8evAbjG5UBc5vngui4vXdQ8z2nU078JMzpFy6tLD0XKCgTBiU2y5OBsaHGNYGCX/zfGFWNbiBl7WFIlc7vPKF7KlfppPeyQY1V9z9A0M8FeiZTCp94dyLNvKpShYne83waQsg0m91CzyuW1MsgdmM5GgTiZVNfIX 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 cf81272a6b8b6..93c9239b9ebe2 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 29589bc3f046d..188807d2aebc5 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 6209e65985a26..f5d43edad529a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1172,7 +1172,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) @@ -1182,15 +1182,15 @@ static __always_inline unsigned int __folio_add_rmap(struct folio *folio, case RMAP_LEVEL_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; } } @@ -1433,7 +1433,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); } @@ -1514,7 +1514,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) @@ -1524,15 +1524,15 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, case RMAP_LEVEL_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; } }