From patchwork Mon Feb 24 16:55:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13988502 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 68349C021A4 for ; Mon, 24 Feb 2025 16:56:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D8086B009D; Mon, 24 Feb 2025 11:56:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 08A296B009E; Mon, 24 Feb 2025 11:56:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF70F6B009F; Mon, 24 Feb 2025 11:56:32 -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 BFEE56B009D for ; Mon, 24 Feb 2025 11:56:32 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 570F6120BDF for ; Mon, 24 Feb 2025 16:56:32 +0000 (UTC) X-FDA: 83155441824.24.B8A57EE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id C3984180010 for ; Mon, 24 Feb 2025 16:56:29 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Yq2Vnekq; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@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=1740416189; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Cb8Ah8lJoOkHJddlEV7mqidKdKB3PYdRohUjXTfR2AA=; b=fu0mauNoBn+ftIorkVip/JH7KVlxJnI0qLXRzP9FquYPFsAloG3OJ2aVZJ1CmfCCvwwj6L UbzAeO4/VVt0co8CEEUQ44Et//CfEabjmyBQ2p1AOytTgbAyPKnPiqLAbtGoaQT/yQOzpM bAIBYraIYwJcILEBLe6sDnD55EE3pPM= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Yq2Vnekq; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740416189; a=rsa-sha256; cv=none; b=TAZHe47U/rn/cfMIuCDTYQmLdtjxI0moZI+8zR2rSVpVPRwSk9eq+yJqdu4dl+g9uLnFpH /wVTdOrWdtQQnJKCcJnQ+44AOc8OZ6PJnGIP85MnOdpOp1LWhRUg1FWIqqMo54WeAISAkw zU5vaseDLyYescmoOacULqgFR3tc3ms= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740416189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cb8Ah8lJoOkHJddlEV7mqidKdKB3PYdRohUjXTfR2AA=; b=Yq2VnekqTsEPrE3qB51D3ielMktnGD9InoR6XWb0CXtiN6/tNv071DHpYQk9mwkZQJYBzx 1QsYZKM1AWpc/EgGu1mwTahindzy6gqzZceZ4T8E6qh2KiAvvRt2BZvv1wCsPHVvTDN6w2 98EXwNEHvXOfJCaHPttwxFW0AhHqvmQ= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-494-6RjJDzu_N4auYsuHO4TDyQ-1; Mon, 24 Feb 2025 11:56:25 -0500 X-MC-Unique: 6RjJDzu_N4auYsuHO4TDyQ-1 X-Mimecast-MFC-AGG-ID: 6RjJDzu_N4auYsuHO4TDyQ_1740416184 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43935e09897so32828945e9.1 for ; Mon, 24 Feb 2025 08:56:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740416184; x=1741020984; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cb8Ah8lJoOkHJddlEV7mqidKdKB3PYdRohUjXTfR2AA=; b=ibG8RphXvu1t0LvWZ86esg5JMR9uYKwzmFxH8lqw3D2prBeF7JwXLKaaMSRUiwbkeN sEFOR0wdqhlPzhwitJvoZ1wyFEWkOOpUHQmvxncLcuBwh4pB2RKWUB0TpQmB8kpxFkJA frSX2M80xFs5vEXYFTWBopHUhTj+7+6xiAb357UOd0OlQsUESqKcgpOtMPskpsEL9+Ry IbTlpXbuj2zMTxI6D/2WTahkM3BDObeZWSR91J9m+0AOWwKLDnYByl+RxsWmMfpvCqzY rTOU9oWc6YecAuHI44KEbSt3ZgtG/+LLDLR8wAQdDLsT/pnm1829sA3S59yuAlUCwOHl Qpdw== X-Forwarded-Encrypted: i=1; AJvYcCXs3MJV4Xy+qEsq2v2dQjiYwk/tFVMGZMXJtqIPPtm9rvJRDbcolYl5pXasj+XnDeInG2343Uo9IA==@kvack.org X-Gm-Message-State: AOJu0YysvymlIIq4iyHcf0lO07knppiDolgCv3hVZjnFbRj2ImiacIX1 jjIp/jqJeqECwowJ0HhdmbL3ZxYtvTkuzpoS0K2KtarpsKnS2eVXXQ5bqAVkSZ7ETkb9yhbm4do FGpOVrohigNLaVrCZ8Mq56tjTEiJel77JUI28U1xFVGI3z+7K X-Gm-Gg: ASbGncvLFRC6zxrcnVMo9At97XZiaRfhIuS/XOEM1AkjNBsCNXzsCnp15Z7bDCzjZww dtGdQxQpB/R35cXPIjs9IbYT00AUgV2CdsMb0ulU/WO7CzOCSbV2/rL/kl+O5NcHiDBeVQ+0msK 5u+YM+mS04g5IG4OAcqfp4NfcQVXhMIFuUrjKr3Odv7BC5RPyjgEFRonbWyFf68OL5hOfJrLmrw hFT+L6kmog0D/sLY0KoLxKhsd9fekoxsQCK1Y6/fYfOnKAxbQrloWS1wfXEckYO++mErSSpnapT wlPdeecf5A1TRa/AocJKXEdHW4XzAn0vYasNqK1DVA== X-Received: by 2002:a05:600c:4e8c:b0:439:6712:643d with SMTP id 5b1f17b1804b1-439ae1e6c15mr101103425e9.9.1740416184317; Mon, 24 Feb 2025 08:56:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IELVR15SfmZbX6a5/LWsD6f0rg6Y8hiw7+oMACeve7JZ9CA6HteUq/ZR57fRSUerpUCoh+bqg== X-Received: by 2002:a05:600c:4e8c:b0:439:6712:643d with SMTP id 5b1f17b1804b1-439ae1e6c15mr101103135e9.9.1740416183869; Mon, 24 Feb 2025 08:56:23 -0800 (PST) Received: from localhost (p4ff234b6.dip0.t-ipconnect.de. [79.242.52.182]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-439b031b613sm111082365e9.33.2025.02.24.08.56.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 08:56:23 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Tejun Heo , Zefan Li , Johannes Weiner , =?utf-8?q?Michal_Koutn=C3=BD?= , Jonathan Corbet , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Muchun Song , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn Subject: [PATCH v2 09/20] mm/rmap: abstract large mapcount operations for large folios (!hugetlb) Date: Mon, 24 Feb 2025 17:55:51 +0100 Message-ID: <20250224165603.1434404-10-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224165603.1434404-1-david@redhat.com> References: <20250224165603.1434404-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: EOoeUjN2GlXgciCR1eKB65Uq5TMHZDNWruANHZJUZmE_1740416184 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Stat-Signature: mguop8wm6iwaw9r7ykkdujeqgxjfiu6i X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: C3984180010 X-HE-Tag: 1740416189-578440 X-HE-Meta: U2FsdGVkX1+ZrUn0S/jtcwu9iP5azUH6NaYmzd4MzIKE/ZpZZx4+1gRiWDypiu/G157XC1az8lxiP4mp/r12/L0NvgpVwksOSR7rkmQgRLBtQuVQEiLWaUguXMZ6l/hXygkIsIxEGHYuJGyyldtvrrVvp9Bva9Dxl3hGxPiXfFBkBeLFsdWpjF2r6i/M/vpJixQ4LD6VRlGiO0Aqp/6mDnTm2YPwUypBmiunItyd/L8uJaeNE3UdjeO2QOhWSrIyeP2ertEWP4JWuLXl+dBjbaiO5I0eUHrZwI2bPQqLiGD/6dA1DqL1gEcGBbdfDseUsAgQj2Vb6Jz+xYzNl2aQ/eDUUPg7TINnNgpc2awX3xIP1YqUhbyzwyO+KQjaupr7iyiKJUGNLKheK1fcX/8m2qdwpmf5LxyqO+ICodI7UdKkLX5w0eo+sD8fS/03JmhGS/J+2R70H1bCy54cBvixx1FS2xcvyLyANd/g11Mb7GTvBcacO1ivMxV9pX6mjNWLcD8vv1l9/BpEAP/IJVUw7o/e4GMjVhgAOP/sYfqbp0IxjXRUyVSW5mDIWemLTeqIKn/JVX3+uu4t1BMG+ngk4Q76prnFYTsQ+PnZtUdilW6kgz/Bk2n6wta+iokvVdOWBx/n4aQQyrHd2VdTBPYm2/KGhDETaVe75vDJNmVtepda4Vgntgh8lMj3vAojoRs+F3BVrfoBxbg49nammwG2z/6z17+25aA0JsTEopyeWxqSnipy7xwml4d/DPMcwmebUkbNCHCtzBYDU4oMtRftFqITXB8EGbcwP7HPptsCoVzcSWcJ+iQjQ4ethlwy0xSe1tCl2gikcW3q45NCD5gAKo2z4UU96FenaNHrPCV4epwB4G22PSK11H7WJ6JQbHg5q3qFwhhTkD/+N9Zyx211ucbT9/HCwh46acMrnywsEVaUDqQ+LDGWoCDSX+8jR6Xz1cXTnQbO76Yf68WJBV+ rLWa1VuB NXyECD/wqexicXoXWZwT2cndxh04tqpjDtm/JySd6lu7VFU6WFqp21CEgvxV/qUSuesSJT5K9z0ld0Xi1U6xk/Ek7BIVYJVBdA4bYmYV9FTLYFETUKQyJshZyHM2BOuBrQ8FBnPCqe+lsbmtxUuPBi58Eg0EiUtNfU03wk8WCgYfBKp+jsw8i2IEBWXaJoNEfqe4PBPWJUZkWlwy8mXHWwUiCmRPekt7iPYOaunU0YxY/onfiBajUfwph02OKN02D0UEN2CSyKczxlvk2SBGaAJIexFJFw3Oyxa9SULY0PI/PZozwb6IdjWaTXkfBIxUKP5+xX2av59l7BsZagi3xOSoBNPy3Jm/ys+a3mUCpZ0Pg9kWZxQNDXhfSmL3kA+bC+jkebirgT27MFf2XvIVqhUdQBKDjnwik4K4Sf5kKL0ditYKIXeetV2x08ElTe7vnXL7spJzLlDb4xhfjtU+n3uqM6ojVMED5gItG5DDvjEJ5CfRwBFXf4qotcRiBRNvJNPwAjlsC82JaUyQn+Hstk/V6vzzAkc9Ndm8n 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 abstract the operations so we can extend these operations easily. Signed-off-by: David Hildenbrand --- include/linux/rmap.h | 32 ++++++++++++++++++++++++++++---- mm/rmap.c | 14 ++++++-------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index e795610bade80..d1e888cc97a58 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -173,6 +173,30 @@ static inline void anon_vma_merge(struct vm_area_struct *vma, struct anon_vma *folio_get_anon_vma(const struct folio *folio); +static inline void folio_set_large_mapcount(struct folio *folio, int mapcount, + struct vm_area_struct *vma) +{ + /* Note: mapcounts start at -1. */ + atomic_set(&folio->_large_mapcount, mapcount - 1); +} + +static inline void folio_add_large_mapcount(struct folio *folio, + int diff, struct vm_area_struct *vma) +{ + atomic_add(diff, &folio->_large_mapcount); +} + +static inline void folio_sub_large_mapcount(struct folio *folio, + int diff, struct vm_area_struct *vma) +{ + atomic_sub(diff, &folio->_large_mapcount); +} + +#define folio_inc_large_mapcount(folio, vma) \ + folio_add_large_mapcount(folio, 1, vma) +#define folio_dec_large_mapcount(folio, vma) \ + folio_sub_large_mapcount(folio, 1, vma) + /* RMAP flags, currently only relevant for some anon rmap operations. */ typedef int __bitwise rmap_t; @@ -352,12 +376,12 @@ static __always_inline void __folio_dup_file_rmap(struct folio *folio, do { atomic_inc(&page->_mapcount); } while (page++, --nr_pages > 0); - atomic_add(orig_nr_pages, &folio->_large_mapcount); + folio_add_large_mapcount(folio, orig_nr_pages, dst_vma); break; case RMAP_LEVEL_PMD: case RMAP_LEVEL_PUD: atomic_inc(&folio->_entire_mapcount); - atomic_inc(&folio->_large_mapcount); + folio_inc_large_mapcount(folio, dst_vma); break; } } @@ -451,7 +475,7 @@ static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio, ClearPageAnonExclusive(page); atomic_inc(&page->_mapcount); } while (page++, --nr_pages > 0); - atomic_add(orig_nr_pages, &folio->_large_mapcount); + folio_add_large_mapcount(folio, orig_nr_pages, dst_vma); break; case RMAP_LEVEL_PMD: case RMAP_LEVEL_PUD: @@ -461,7 +485,7 @@ static __always_inline int __folio_try_dup_anon_rmap(struct folio *folio, ClearPageAnonExclusive(page); } atomic_inc(&folio->_entire_mapcount); - atomic_inc(&folio->_large_mapcount); + folio_inc_large_mapcount(folio, dst_vma); break; } return 0; diff --git a/mm/rmap.c b/mm/rmap.c index 8a7d023b02e0c..08846b7eced60 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1266,7 +1266,7 @@ static __always_inline unsigned int __folio_add_rmap(struct folio *folio, atomic_add_return_relaxed(first, mapped) < ENTIRELY_MAPPED) nr = first; - atomic_add(orig_nr_pages, &folio->_large_mapcount); + folio_add_large_mapcount(folio, orig_nr_pages, vma); break; case RMAP_LEVEL_PMD: case RMAP_LEVEL_PUD: @@ -1290,7 +1290,7 @@ static __always_inline unsigned int __folio_add_rmap(struct folio *folio, nr = 0; } } - atomic_inc(&folio->_large_mapcount); + folio_inc_large_mapcount(folio, vma); break; } return nr; @@ -1556,14 +1556,12 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, SetPageAnonExclusive(page); } - /* increment count (starts at -1) */ - atomic_set(&folio->_large_mapcount, nr - 1); + folio_set_large_mapcount(folio, nr, vma); atomic_set(&folio->_nr_pages_mapped, nr); } else { /* increment count (starts at -1) */ atomic_set(&folio->_entire_mapcount, 0); - /* increment count (starts at -1) */ - atomic_set(&folio->_large_mapcount, 0); + folio_set_large_mapcount(folio, 1, vma); atomic_set(&folio->_nr_pages_mapped, ENTIRELY_MAPPED); if (exclusive) SetPageAnonExclusive(&folio->page); @@ -1665,7 +1663,7 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, break; } - atomic_sub(nr_pages, &folio->_large_mapcount); + folio_sub_large_mapcount(folio, nr_pages, vma); do { last += atomic_add_negative(-1, &page->_mapcount); } while (page++, --nr_pages > 0); @@ -1678,7 +1676,7 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, break; case RMAP_LEVEL_PMD: case RMAP_LEVEL_PUD: - atomic_dec(&folio->_large_mapcount); + folio_dec_large_mapcount(folio, vma); last = atomic_add_negative(-1, &folio->_entire_mapcount); if (last) { nr = atomic_sub_return_relaxed(ENTIRELY_MAPPED, mapped);