From patchwork Thu Jun 13 00:07:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 13695692 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 BB37CC27C53 for ; Thu, 13 Jun 2024 00:07:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54AEA6B0095; Wed, 12 Jun 2024 20:07:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F9786B0096; Wed, 12 Jun 2024 20:07:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 373796B0098; Wed, 12 Jun 2024 20:07:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1A4AC6B0095 for ; Wed, 12 Jun 2024 20:07:59 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8E3E58172A for ; Thu, 13 Jun 2024 00:07:58 +0000 (UTC) X-FDA: 82223927436.16.2322EF4 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf20.hostedemail.com (Postfix) with ESMTP id A78411C000B for ; Thu, 13 Jun 2024 00:07:55 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=JVXa7B6e; spf=pass (imf20.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718237275; 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=6NpqziHdDLqAIiqSY8F5xKMZFmANNGDCABcj+bnMA4Y=; b=qp+GOBYmyg9alzxnHw8R7YAEVvDA9oeY+GN96g26kQxeSNyXssZ2roshFNOhE6nFuANlv5 cZ+WN/63ZOF2ZAHEvdFbCGcOVneTHTYlyfLsgXuoXA1va43ZtZHSg0242j4burmRty+JYY mCyFCYUgMoaYyYKs47Oh5IGT5fRsCbo= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=JVXa7B6e; spf=pass (imf20.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718237275; a=rsa-sha256; cv=none; b=v7hMKePm4zeAwnpgI8JeapkmFyzz3YRqApSw43wrEKdNlYqyVBg3o+c+b63oHf9xvAzfRR Gerddd2hA09+0A9IZQuwO9Pe0XQc5+7qCRpXuxw0wThGOLfb+awa4QExzHlAnTH93ItD11 6HY6jBXOPRhYYhkIZe2VMNjjJCxLl80= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1f6b0a40721so3494075ad.2 for ; Wed, 12 Jun 2024 17:07:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718237274; x=1718842074; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6NpqziHdDLqAIiqSY8F5xKMZFmANNGDCABcj+bnMA4Y=; b=JVXa7B6eUFKNxTl99gOkosgr/ajOLp3WWaR2kL+FAzL/NJHDvpg1OnQO4i0xIcfQ1B 3CI+LU4e+lOWokixJXDg4tkDeHwjHpy3QpcJrhfdgoVhBFKyOTkxLfW+Jvd2gJimtnAf lpZWd0e/gqe/bOv7Pf9Ur1refNWtxaf6xbGOHr0FtP7A6GCN5jFrXDieIwQ5SD5i7ZhC 1QTztDPGEbCuHUKtWBXxYeLZMBCJVidBXKSX2jVecZMT9MYPMo/1pvBuUYlfDdbKicth FBfQBMSg/Ca3GP6CSRgkKN67rzcHWhBm/WETeUyYhORsyL5E20SppsuSvy98Ur9CAL0H 1n2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718237274; x=1718842074; 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=6NpqziHdDLqAIiqSY8F5xKMZFmANNGDCABcj+bnMA4Y=; b=QppQ+6+WD7f0hig1R111qnm5sObkOUTsHZJv5MPv0Ynm9UJqVApMRtutpq7hVrEwwy zMLXn63gPfAlTij/M9NY60B69RdRXhX1zjO4CdWQ3jg+COOZvQqWEPs4/k5uShDcSBhY 3AxlXJK1bm0d03Z6ewG1SBQZCTy1Y/oon9EU01iqsstQg8NNCPl94Kt9k/e/dYCNT89v NLt4ood58JTKtKAddHXDhJYrUx1HEtONbWLTuwd+W9FEoR09E1Sx3Q2v3or//hNlJdn1 Gu2dHmiTUZygsxKexOpNr9Xi3i7FkoxpsPQIh/YX9TntnNep6hU+OyW/OmF/3xQnxwiw 9Iww== X-Forwarded-Encrypted: i=1; AJvYcCVPdA6D1zB3EkJLDnVZdpK8EcrBFIWYv6UliSmdyXxXvSHQ2m44CtMxXA16oyqmBB7Yqn9XzaGLlCc98PfFLGKev4Q= X-Gm-Message-State: AOJu0Yz1VCphRAafde7tKQAHTSrnk0KnfETq62jwBX6nf37Mx4ZZ4fjx 0NAlPzhxy1qsxUjZ1lcgxedYmQO6lPzMPklG1HBBTmaOja8YLHAI X-Google-Smtp-Source: AGHT+IFqnSJUmDgIo8AipknzKgGcCL0uU9MekGnVAVXd4ZlmgCCLwGt5Rq6fxNTCV4HDqJOXsCvfbw== X-Received: by 2002:a17:902:d482:b0:1f6:7815:2325 with SMTP id d9443c01a7336-1f83b71a137mr39747405ad.56.1718237274424; Wed, 12 Jun 2024 17:07:54 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855f1af16sm525515ad.246.2024.06.12.17.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 17:07:53 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: david@redhat.com, akpm@linux-foundation.org, linux-mm@kvack.org Cc: chrisl@kernel.org, linux-kernel@vger.kernel.org, mhocko@suse.com, ryan.roberts@arm.com, baolin.wang@linux.alibaba.com, yosryahmed@google.com, shy828301@gmail.com, surenb@google.com, v-songbaohua@oppo.com, willy@infradead.org, ying.huang@intel.com, yuzhao@google.com Subject: [PATCH RFC 1/3] mm: extend rmap flags arguments for folio_add_new_anon_rmap Date: Thu, 13 Jun 2024 12:07:19 +1200 Message-Id: <20240613000721.23093-2-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240613000721.23093-1-21cnbao@gmail.com> References: <20240613000721.23093-1-21cnbao@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: A78411C000B X-Stat-Signature: dh3yc3mp9ffyuqsjq7wstd7hcas3759f X-HE-Tag: 1718237275-373285 X-HE-Meta: U2FsdGVkX1+BKC5LhiJOftlHpMXg+CVCblGz/+e5dhO7xNOaDaL0rSmYYO0bIZXS4n1Skfmw25rUCdsKuivtDM21KfLRMd/hbJue8yR53R/qMBHPxDV4Y7RSFkIC62bIrJ/DE0LIXRVnwkLphhwuPJvDHvfbafHkon+1DuTAJ1DFFFPlujENAKB3TPt1wCfidL+20lcGlO98KdAshhE/IpB/xcFgyP3WumIMy335UbpLVZcGgAXQeivQ1lGyoz+KDl09ds3IPRn7V/ScAnis49bHdEycEeVvbXYi6iyqEUvXI6wm5LFlw1Dq8GYwdA4j7NmTqoprn+YX7t6u23p5Lf2XjjGx2q69h3MqzhJWuoGsJZd+fxmwafTjzVrHBN8y04zXTc4hqAf5mRLRC6pNCQYZdk24X5cYf3AgWzh0sW2U+CnOmRsDibZI+gZBvjB7WS/api19Ee/UoOvRPG5tzPkChFq8RinNonkDwCMUKlFYOnzj20ahgbp0bcTFgaNkTqj+LBaoNEfZe5yEYsgUvqwzlMdmimxEYZyyEtylTsTpDzDXTaZHz+C6RY3MVb6XeYNdLQJBLZH6aQgy1MjyojwOkLoPYYaQKxFCtcxmiYsOV5tO9GzAk/n1w6LRtODAFIYq63rcJLW9E0/ZkMAaUHN8cqCL1YeSW2DJUVz41UI/TG3MuWC6hV4IqLuK9njsPbohLe2pWosnh9Sx6KCwhjg1NVIbCA1WaWbgkVGJXUNTWbJnrV2zcGgo5JRatCDd9eQUW3pEDvdENrymnYjAvWj8z9wFPBoHZ5qN9aKVXFXd5mN/jEltjaZTjMxuJc2wAMFBMIhr4AL77UyhybF4tCOdnJx4c5/2TsrtAkD3zfn/ngwSteicDgrJUnVKPu0f2/UcD2GhxAQJwsjbffCbU5FNirKPfNrbO7dVG5/EVYJYdYU+jzGgcWQSDnPzAUhhCAKyGcd56KyqoYZrKhh x2ym36/U quTp8qUUMOuzW489crbYiKg/JLYcpTURPJ+F27O5wp9Z3KAYuk56Ypw0uOtQKtWKRPLDZ0odMYtSrCYqn21orfVPZzhYFxuvft3i61hxRzeOEYM0STUa/ehgNG5v2RoGc88i9CN1KhxzXXoxvSKUX2t7cGn2/o9nEYIzvsh1E0kEesj3QA6QqIaxDsI+qKlAubgict5PLxaY/T/U4r+EE6QPM1PDHbwsJOQsvM9cB44VHsbsUsbwVUULqiQeTEuTD2uRRjmUUMdhVeWAVjBAKMC7/yqxc0IaaayYuR14RCcjCug97hklO52NSxcJWWpe6WuDGAh9+8tIwEZ7kXfxwi/jZ30frxkW5X1KEyQHDw7Y1XLh0/tgRLipdlRZNIy28MggJpnPPpxzXTMUzOl3kGp2yZ6Qp075bs7OL1CPL0/Unv9BsxGBk/4uWDOJzu7fVLOuWgfz+8eGlM8xeP44zH9VkzYQQR/C25hJbPN6D8Ca7/Kt1CPC/9fv/h48+UlGQMcUuym4O5MvR9ikrFw8g4grNAzAXaiDKXY7Q 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: From: Barry Song In the case of do_swap_page(), a new anonymous folio isn’t necessarily exclusive. This patch extends the rmap flags to allow treating a new anon folio as either exclusive or non-exclusive. To maintain the current behavior, we always use EXCLUSIVE as arguments. Suggested-by: David Hildenbrand Signed-off-by: Barry Song --- include/linux/rmap.h | 2 +- kernel/events/uprobes.c | 2 +- mm/huge_memory.c | 2 +- mm/khugepaged.c | 2 +- mm/memory.c | 10 +++++----- mm/migrate_device.c | 2 +- mm/rmap.c | 15 +++++++++------ mm/swapfile.c | 2 +- mm/userfaultfd.c | 2 +- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index cae38a2a643d..01a64e7e72b9 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -244,7 +244,7 @@ void folio_add_anon_rmap_ptes(struct folio *, struct page *, int nr_pages, void folio_add_anon_rmap_pmd(struct folio *, struct page *, struct vm_area_struct *, unsigned long address, rmap_t flags); void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *, - unsigned long address); + unsigned long address, rmap_t flags); void folio_add_file_rmap_ptes(struct folio *, struct page *, int nr_pages, struct vm_area_struct *); #define folio_add_file_rmap_pte(folio, page, vma) \ diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 2c83ba776fc7..c20368aa33dd 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -181,7 +181,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, if (new_page) { folio_get(new_folio); - folio_add_new_anon_rmap(new_folio, vma, addr); + folio_add_new_anon_rmap(new_folio, vma, addr, RMAP_EXCLUSIVE); folio_add_lru_vma(new_folio, vma); } else /* no new page, just dec_mm_counter for old_page */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f409ea9fcc18..09a83e43c71a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -973,7 +973,7 @@ static vm_fault_t __do_huge_pmd_anonymous_page(struct vm_fault *vmf, entry = mk_huge_pmd(page, vma->vm_page_prot); entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); - folio_add_new_anon_rmap(folio, vma, haddr); + folio_add_new_anon_rmap(folio, vma, haddr, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, vma); pgtable_trans_huge_deposit(vma->vm_mm, vmf->pmd, pgtable); set_pmd_at(vma->vm_mm, haddr, vmf->pmd, entry); diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 774a97e6e2da..4d759a7487d0 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1213,7 +1213,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, spin_lock(pmd_ptl); BUG_ON(!pmd_none(*pmd)); - folio_add_new_anon_rmap(folio, vma, address); + folio_add_new_anon_rmap(folio, vma, address, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, vma); pgtable_trans_huge_deposit(mm, pmd, pgtable); set_pmd_at(mm, address, pmd, _pmd); diff --git a/mm/memory.c b/mm/memory.c index 54d7d2acdf39..2f94921091fb 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -930,7 +930,7 @@ copy_present_page(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma *prealloc = NULL; copy_user_highpage(&new_folio->page, page, addr, src_vma); __folio_mark_uptodate(new_folio); - folio_add_new_anon_rmap(new_folio, dst_vma, addr); + folio_add_new_anon_rmap(new_folio, dst_vma, addr, RMAP_EXCLUSIVE); folio_add_lru_vma(new_folio, dst_vma); rss[MM_ANONPAGES]++; @@ -3400,7 +3400,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) * some TLBs while the old PTE remains in others. */ ptep_clear_flush(vma, vmf->address, vmf->pte); - folio_add_new_anon_rmap(new_folio, vma, vmf->address); + folio_add_new_anon_rmap(new_folio, vma, vmf->address, RMAP_EXCLUSIVE); folio_add_lru_vma(new_folio, vma); BUG_ON(unshare && pte_write(entry)); set_pte_at(mm, vmf->address, vmf->pte, entry); @@ -4337,7 +4337,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) /* ksm created a completely new copy */ if (unlikely(folio != swapcache && swapcache)) { - folio_add_new_anon_rmap(folio, vma, address); + folio_add_new_anon_rmap(folio, vma, address, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, vma); } else { folio_add_anon_rmap_ptes(folio, page, nr_pages, vma, address, @@ -4592,7 +4592,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) #ifdef CONFIG_TRANSPARENT_HUGEPAGE count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_FAULT_ALLOC); #endif - folio_add_new_anon_rmap(folio, vma, addr); + folio_add_new_anon_rmap(folio, vma, addr, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, vma); setpte: if (vmf_orig_pte_uffd_wp(vmf)) @@ -4790,7 +4790,7 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio, /* copy-on-write page */ if (write && !(vma->vm_flags & VM_SHARED)) { VM_BUG_ON_FOLIO(nr != 1, folio); - folio_add_new_anon_rmap(folio, vma, addr); + folio_add_new_anon_rmap(folio, vma, addr, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, vma); } else { folio_add_file_rmap_ptes(folio, page, nr, vma); diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 051d0a3ccbee..6d66dc1c6ffa 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -658,7 +658,7 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate, goto unlock_abort; inc_mm_counter(mm, MM_ANONPAGES); - folio_add_new_anon_rmap(folio, vma, addr); + folio_add_new_anon_rmap(folio, vma, addr, RMAP_EXCLUSIVE); if (!folio_is_zone_device(folio)) folio_add_lru_vma(folio, vma); folio_get(folio); diff --git a/mm/rmap.c b/mm/rmap.c index b9e5943c8349..e612d999811a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1406,14 +1406,14 @@ void folio_add_anon_rmap_pmd(struct folio *folio, struct page *page, * This means the inc-and-test can be bypassed. * The folio does not have to be locked. * - * If the folio is pmd-mappable, it is accounted as a THP. As the folio - * is new, it's assumed to be mapped exclusively by a single process. + * If the folio is pmd-mappable, it is accounted as a THP. */ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, - unsigned long address) + unsigned long address, rmap_t flags) { int nr = folio_nr_pages(folio); int nr_pmdmapped = 0; + bool exclusive = flags & RMAP_EXCLUSIVE; VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); VM_BUG_ON_VMA(address < vma->vm_start || @@ -1424,7 +1424,8 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, if (likely(!folio_test_large(folio))) { /* increment count (starts at -1) */ atomic_set(&folio->_mapcount, 0); - SetPageAnonExclusive(&folio->page); + if (exclusive) + SetPageAnonExclusive(&folio->page); } else if (!folio_test_pmd_mappable(folio)) { int i; @@ -1433,7 +1434,8 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, /* increment count (starts at -1) */ atomic_set(&page->_mapcount, 0); - SetPageAnonExclusive(page); + if (exclusive) + SetPageAnonExclusive(page); } /* increment count (starts at -1) */ @@ -1445,7 +1447,8 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, /* increment count (starts at -1) */ atomic_set(&folio->_large_mapcount, 0); atomic_set(&folio->_nr_pages_mapped, ENTIRELY_MAPPED); - SetPageAnonExclusive(&folio->page); + if (exclusive) + SetPageAnonExclusive(&folio->page); nr_pmdmapped = nr; } diff --git a/mm/swapfile.c b/mm/swapfile.c index 9c6d8e557c0f..ae1d2700f6a3 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1911,7 +1911,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, folio_add_anon_rmap_pte(folio, page, vma, addr, rmap_flags); } else { /* ksm created a completely new copy */ - folio_add_new_anon_rmap(folio, vma, addr); + folio_add_new_anon_rmap(folio, vma, addr, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, vma); } new_pte = pte_mkold(mk_pte(page, vma->vm_page_prot)); diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 5e7f2801698a..8dedaec00486 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -216,7 +216,7 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd, folio_add_lru(folio); folio_add_file_rmap_pte(folio, page, dst_vma); } else { - folio_add_new_anon_rmap(folio, dst_vma, dst_addr); + folio_add_new_anon_rmap(folio, dst_vma, dst_addr, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, dst_vma); }