From patchwork Mon Mar 3 16:30:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13999205 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 743B1C282CD for ; Mon, 3 Mar 2025 16:31:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5A14280012; Mon, 3 Mar 2025 11:31:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AE56D28000C; Mon, 3 Mar 2025 11:31:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93361280012; Mon, 3 Mar 2025 11:31:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1BDD928000C for ; Mon, 3 Mar 2025 11:31:04 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4970D140C81 for ; Mon, 3 Mar 2025 16:31:04 +0000 (UTC) X-FDA: 83180779248.19.ED5C0CD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id C79E040024 for ; Mon, 3 Mar 2025 16:30:56 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gnrzZ0oI; spf=pass (imf04.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.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=1741019456; 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=LJ0ixxz+hHf7n0FREmiLplNLVMfeh7W+ZMzBoW05AxmwoLEGbhNgUh1jAbliQerc+lEkQS x7PwjMaE6GHebdGYnw8mMEKfY84U2vVJSXv1hpMwzps3OeynLrqu5abQgGE68+YRqLzpGA xOjN7gyscJGY83bKSBBoARzXZ5U9JVo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741019456; a=rsa-sha256; cv=none; b=vWKxu1SYhtjG3siG2TPz/Uo8v2Pq+fW8CiGxeeYCdVVSi8EYKe6q8vetk6A1PbTBfH9hux mywV5Devt5vqADULV0eQ3TqlQpHZQqOjQafQ4ZF6f5kvAg15uvp5melNTBGhB7FQtUZKGG 1gJxYF/QAoBGnyshs58b6xA1sJV09Mc= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gnrzZ0oI; spf=pass (imf04.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@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=1741019455; 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=gnrzZ0oIN+OGKFm6I/4/6bEbFWNgiOpIwwO4+BWi7m3AClYeVkHyzBYUkNV3FOlfDrrtUT 5lJawTtEP1fb22m0XgDlU8d25Q1uqYsTYKLalfe9hOURu4bTjlqkV1d8vVpdFwMlcExw0n LnVtBwfXp094zffeEBH683UQ+BvunVE= 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-511-i86xujf7Nk-aPcT3bNyBNw-1; Mon, 03 Mar 2025 11:30:39 -0500 X-MC-Unique: i86xujf7Nk-aPcT3bNyBNw-1 X-Mimecast-MFC-AGG-ID: i86xujf7Nk-aPcT3bNyBNw_1741019438 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-438e180821aso24935245e9.1 for ; Mon, 03 Mar 2025 08:30:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741019438; x=1741624238; 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=JWsFHcnpIsQpPOpPCFiKo3BZUleVIsnGC5uenqV/EWWXR9mOFjkbWlKiPrRWxGquFo Zpy47Dyrv8osBKgTp7WDNJZlC5w5Xn3JObi9fde6DRlkkIIcBYBctS1pQu3wQXW2WvPZ 4J7DFPze6dAXub9rM/R8qwurA/G8ynS+vR+r/IqUfwzIY4wQNXqeJjUqVub1PI/8w5vy ONYOin1Vl+eW8ao+xBCxVDoO4K8G0rIuCCFFASoTim+PUuQK8CZ1Z8Hhz09Obncwx3Id X2ZudnvNeNXWrdFr5gJSBxhsnkPW1muyCLZ4srxHNDB1vs1dXt/I5Sdpibeer9FV1z0k i+2A== X-Forwarded-Encrypted: i=1; AJvYcCWZiuZfNBSRG1NGo/wprcSU9n10LqCAyMsSzKxMqkVfoaSoIJn45nx6PYY6N/4p1cjJVnap/L9eGA==@kvack.org X-Gm-Message-State: AOJu0YzcmEtzyuwW0qHBidBCEBgUWbFyZJwmIsjZRn9jRe+6OJUiN/gP gpZzXNtFbdJ/rcmoNnwLvl2+D9MDdvytE4rJhQZ1hl3yqohEoCYlIyy6NFfj3Y7XUo3FUPujVKR jv6hZ3l2mFC4fjU+eDs3DnJP6cvgMGZfcUpfvtN1pMa86Nysm X-Gm-Gg: ASbGncvlVID5eZtDzNM3/FQUHUPGK/70Rph0bbhhTwoYEZo03oziyJ7Cae9gATrlxH6 +6SUF5A+9bdejkItkM2aEOdKEzpx2RKoAnF0lcAo9btdoOyHBB/KWz6istQ7/hc0Jgl3e9Vx5qH JJiEa0pUMCR+nxGRZg/YyohjygTT9lzod2FxikbiAOOarZWtHh0D7/9rZ67+ljYOzZACSvTEVFK IBu6u3E/vpEYWmTF2v70JLEfA6GF8JfMGJLgRTKpuhSnddM+6tzwZxdmyBdai80WHcgIMyab7FU ROoq5uvL6CdVBJOFA/h23fSWbEi95r2zIMTXQm7CA/VMK2fUH7+Wkb+ZOrFqtxiIJiFT3pGDSKS F X-Received: by 2002:a05:600c:4f0c:b0:439:91dd:cf9c with SMTP id 5b1f17b1804b1-43ba66e1f3amr118907985e9.10.1741019438198; Mon, 03 Mar 2025 08:30:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFdpz0gqig8RUNxdVw3Ebkq3f5eeFacb1rX/1/2my2Nw7/Vx42fOquiEWgwrBfEGJjD+4uhoA== X-Received: by 2002:a05:600c:4f0c:b0:439:91dd:cf9c with SMTP id 5b1f17b1804b1-43ba66e1f3amr118907545e9.10.1741019437826; Mon, 03 Mar 2025 08:30:37 -0800 (PST) Received: from localhost (p200300cbc7349600af274326a2162bfb.dip0.t-ipconnect.de. [2003:cb:c734:9600:af27:4326:a216:2bfb]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43bc06eba55sm45297035e9.21.2025.03.03.08.30.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Mar 2025 08:30:37 -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 v3 09/20] mm/rmap: abstract large mapcount operations for large folios (!hugetlb) Date: Mon, 3 Mar 2025 17:30:02 +0100 Message-ID: <20250303163014.1128035-10-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303163014.1128035-1-david@redhat.com> References: <20250303163014.1128035-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: nPWVAo68XpqXPWC1pJ_sFFeyJwGbaaDRncBKzBH91AY_1741019438 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: pkocr831zi7oubongyymajjxag6f38pi X-Rspamd-Queue-Id: C79E040024 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1741019456-945916 X-HE-Meta: U2FsdGVkX19EdmvtiuMG+XA6VQiqNU83gBhLRtN8TUBsKufEVE74uIPcKwaXyjBt9Z4lmE1VBC2MFraV2mHgVC6II57CxYmegpYzMw6NrwmMVUG/a+3vEVTW4vtwkJBsRNA6CAF/owkVYRZbXaCZQea1lv1Icc5ZYtmcEIUb64n3uR4wrc6ZanWJKC7lQgWmtwx3O9gKc0naezp5aEt3pyUzSCZU2uqEXSJuLZ1a/yB2qNd1VoRinMtC+p3gaIbfJTEyTWfhPr4665/7ceEH7+m7aNPG2LqHvRXLy3VMm/KgZLukYHq8Y9533UZv16Q6tTkM9wuWxv4Q78g612P89spo/DFv8VX1NQyS86YmJFvlPJ1SYMmFEEhOf9r5YE817RIO3KArjgRaGdIDac1clh1O8Qb2slwf56w6qpcViEniw/OzEzJMguRK5d7ePGI/WnvQHzo0Js+8z7W6IouzHIl7wT1YZdj5dLp/SXCVKTEEHoHOlKx1mF/uiImE8w9YS7l8+1Ga/hKnKL5VFwuiPXFcXPTrGLbiXIhC3zS+COWZ9cEdaxgGfL95yfTC5wslZMnyA3PKDmrUNBA21u7l9qWb8Br98igs/F+g5SAmbRa4TBCC5KJMhWNhuVjyR7jlKWEasw9TlqImCcXVAG0VTnaVLPDvAtqHnUNw9+OEc+2PDb2B6EHiRsTrAJlgJS+biXC8mjMB9BUlQ3b97qznykb/DtN7w0ZAMokeE/9pV5ytt029XUKkQ6eaQd17e8zJZKNarHxwgu4wCL6SWKpfsThruSFEc3t3IxyMsQnjgVX0oEjp1+bUT0Fru5hHOX04jAn5Ea8yC8oIuGgaDHlGdsJErFeoEnRveoMBfxk5L2AJJ72+/6hyREzfQ0EkDIPhU3VKWpNzGs/bXTU+B5exbOQ+cAKWRqSa35GFnER29sNj6gZvyKPMMfySbPlWvGviO8yrNL3xkpDL/dQn7YX s8VG8sAY WzBfhaHCmWzx6Cl/MBrP1uSyZqSqhMg7DhUQCovf0LtUYXeIzyfbZRmDUwtmhK0mrE2I2/qsIqxAuWY8dWGNxfHYj/fTQt419W9B9DWitTfcSnBXlMWzScunZkBmCde27NgjSiRIXo/n9Qvjl6c7Mx6EKFma9QZud4s0+YZ9Ct2xuoyN5BWRPaxoh8joDmjjbqD07kJevkufQOQPIC8ruruPgphT8AxiArbAsxOUXsAnmO8GNeF5dfpZsICFaWTz0h+/NCqPoG+gZeStWlrpbxoPmaLExVhvEiDAxL54KuvM1Apro12+UEcYp5op3nXmBGlzdHXqo3ARXe1/hgoV41wl/vjAtgHTsl6PsRRrSjEzFtkLnKiokjF+C/S7fYSjxww8AmyGobSgxkwtecmHYPnBvSghD6qrWdInLi+CRjibdgOpBir5q9ZaFYjNcZn2shgIGfmFGY1mmhvCSBuP5+rdbUHTMqSSf66Qrpza2nV2voE5Zrv7n5+d8vvcOo+NV+5VUSdD63/6Hfm4= 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);