From nobody Thu Feb 12 10:55:18 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4266117FD for ; Thu, 13 Jun 2024 00:07:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718237276; cv=none; b=QkNtol0AbL5v7fPVkqa0ArvfEK1avvefYkgW+c7Mbvp0t4bsUAyLWkSOG9ou9ib7itVgWNv52n+vPiqepbv1IAZAMIIOWozwYKVKK6FEhnzcPPgEhlEl96GAUyBkxR3yaobxLxL9Dho/whW3YzVWpb6cxC/6RyXZaoXj0rJ4KrA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718237276; c=relaxed/simple; bh=B2acvhahLEtG+ufScIt/M8IFhSN1fqjqbFneKLjo2SA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=EOhAq2evPSNTrLdplc68CLR7DTC0lvnybyrzLyvlTqZQMIq8NcL0kR6BI1bSuRx+wVGFL0d+Zo3VQqdXobozVubcMqID1th9VRYb3GUBTH3Bpg0AwtxqiNX+PrhRWuDrlSCCNreWtoyNwxUwyMPJaWzIznTgsnyK0j9Y1r5SQlo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UMLZ63CG; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UMLZ63CG" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1f8507aac31so3123435ad.3 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=vger.kernel.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=UMLZ63CGX81Tdw0N1CKJNqDINfVahOuQuFCXo0nd9Ws5u6LApsAx5dU1+8z/Qhj8YA vVBbtCNdk4lxCSe8PcVnuDuvdSqfGmyg1UkjQgfY2fC1uYYDSw5iaPdW/5k8csSKeT87 vqJU4dk3MnHjXSK3CZi9C0AneIdGwNplzwykTmFyCcAj1KrBicWsg6MMvW/ERV5z1QJn G8dWnQ+GJLRf01NqiNu4CZklD541DBCDxfjbgaVMq5rWJPQRfBityptkUA21qvj8q73g w7E0wff3pJ0Agi4LVA6UDAX5JK0D1k27QKIzz1CsuqVtmzl4jbVyvJ3w/OH9dpEOS6KF +jlw== 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=lRH1TbHzATYGomzwMOU+BkE7AuT84qEc1rCVMdXTAhjooNZhq7HMeY6ZW+5/xt4ETs XAnWopCScfUvTGTsT/YiyIdhU/4IVepk+zvnrCW1N7f121CLhizf1pywEJXC93hHxa+7 ew2+9b0b+cTQtkmooHDQh3DLA7rH8Ytz+vV1DrLHWLKwrAMYEgeKwAje+YyChcY+bYpq tffYd5QqJ97m3h57TStVTB2u0fMmERKqsnFAUUbn6pMj/vECfxtC3rU1Uw/wdSyYR1LZ 9n6IzfqdU/td9FroxS/oqTllojZuZe2+4FolMnLJAp8xgkN+DIhrvH2LXw8DG9o4+irT +emQ== X-Forwarded-Encrypted: i=1; AJvYcCU6KVknKv2AcnEDrY2tpH2Z5h4+rVn9y7JTQcqrgmP2TaSh2FYtHC9GNA9RzYKFRiA7yyLueoe+Ywm7DpJhdHPaffsNv+g7pKHt87sW X-Gm-Message-State: AOJu0YzFgHpJLZOvW1r0S/cnEKhz6l1+GuSbYz3hxOA71Z+K20J1e+rU sSXD4RWjbKL9ek0Dxq/Yq48A+o+z9oU39t6uYKd5iQGl2Eedkoay 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Barry Song In the case of do_swap_page(), a new anonymous folio isn=E2=80=99t necessar= ily 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 pa= ge *, 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, u= nsigned long addr, =20 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 v= m_fault *vmf, =20 entry =3D mk_huge_pmd(page, vma->vm_page_prot); entry =3D 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, u= nsigned long address, =20 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, struc= t vm_area_struct *src_vma *prealloc =3D 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]++; =20 @@ -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) =20 /* ksm created a completely new copy */ if (unlikely(folio !=3D 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 !=3D 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; =20 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, s= truct 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 *v= ma, - unsigned long address) + unsigned long address, rmap_t flags) { int nr =3D folio_nr_pages(folio); int nr_pmdmapped =3D 0; + bool exclusive =3D flags & RMAP_EXCLUSIVE; =20 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, str= uct 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; =20 @@ -1433,7 +1434,8 @@ void folio_add_new_anon_rmap(struct folio *folio, str= uct vm_area_struct *vma, =20 /* increment count (starts at -1) */ atomic_set(&page->_mapcount, 0); - SetPageAnonExclusive(page); + if (exclusive) + SetPageAnonExclusive(page); } =20 /* increment count (starts at -1) */ @@ -1445,7 +1447,8 @@ void folio_add_new_anon_rmap(struct folio *folio, str= uct 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 =3D nr; } =20 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, =20 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 =3D 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); } =20 --=20 2.34.1 From nobody Thu Feb 12 10:55:18 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2911E441D for ; Thu, 13 Jun 2024 00:08:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718237282; cv=none; b=dohwE4vYpxZ9ZRBtLyskF4k2MosgeOrrwp+6vV+hWF1yNvw0247wbOdTsKdAT+YRvZbq6qskha2tyqEVYwvwkcu8dARSvJWPg5sB3PlTVsT1YoVR2QWm11R1DFok4ZeFGya3sDajsTGPnynysXk2WvjprI6lfIZMHju2fEZATVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718237282; c=relaxed/simple; bh=MIJYCIXg4wEjAChU7Wu9NnMe/jbwItlu1Da8lm21jhs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=CwbSafVpw9UfFkoggE9Cn8WD9BLp4zXYpXb127UpfzF3+zi/9Kd6GUdLp6GKZATW5AkylXjtGkGCZvrPKW0w+9u94JAilsI+d0hPr2pheQi4hujYeT7rhyLO2NPTbdg7YMLt7hIfuqSQk90Oy9JllnkES8l+BeHsqtu5TZKQPrc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OUSiHaRZ; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OUSiHaRZ" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f480624d0fso3661755ad.1 for ; Wed, 12 Jun 2024 17:08:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718237280; x=1718842080; darn=vger.kernel.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=oOir94itApCcnCYgLiAuZL5MLif6sFkW68CX2FRT/Do=; b=OUSiHaRZTfcv7IhCW+VnWChvh5wohWS+1WVOVT1KDlauge5Cc1yAOsugE84ZSlry7G tRXLae4Q40FSr/WSlFePBR8piV8MZZMFOg09l0dqu5U+Ulzib0/1FutWinjr9iTsDdAK y2FGlsuRMsDxIi87vQKng6i9knzlrvdPaoL6mQvNMIuuXRIKx7EFWeDf2aXFby3Q6rNw L5hqZ3rT3DBDaDD40hxUjBHFvcmZ9fqLWtHi1rWV3kiHvbmVrEoO6i5No2AqGOHtPFKv t/98QMBJw2YwFiuYGAVCvBYHjKBu4HqL2D14bJeiWY+qew/xMZbCefntZ5Dvy6tM3h5c l2bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718237280; x=1718842080; 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=oOir94itApCcnCYgLiAuZL5MLif6sFkW68CX2FRT/Do=; b=n2MeUAWUUYCVcQr4k+0dD8pcRXKKBPpR57Vo+A73MHUBrtvZjHRj1o/REE/ra/wfvj WPG/PPBoW11vCmP/dt0rC9ryDoZW3SJa80lV67QtuNHUoZihUQ1zfLaOALhJgjrhotrP 3YO1sDNhBtHVeNRFo7cHU/DgI4MbDDgbd1nZ4EOqiWHpU5rLdEt9kVw03AScxsFiTH4Y sjJFXStagPtKUf445U7loCiMxcEN92jRAAEaFOS76WFBAdTEycsY22M73NrWdLLS4f7B HzQ3IvRGcnWT93y91DLdr5zPiE+bzQGDuq2cM82Kx5HFLc26HpzPmkXUn83nsIgS9127 459w== X-Forwarded-Encrypted: i=1; AJvYcCWnjboGlLhwucZQ6Vnswiiuq989YsMxRCEkcu/pkyavhjCvY9JaI9p813/Lkpkn4YlBzHDHV8umpFcliI/qDlUeckLo8SrsTW3mPOtC X-Gm-Message-State: AOJu0Yx01vc6OxkbzomMdpKttWqu7/5qxIj0aBDGlI9BcBYh7Q9y0dO0 zDFy00TEJycv/85pBAzFkK7bEvJLij7sQ0IGusUE3lkDrpqNzijr X-Google-Smtp-Source: AGHT+IF6Dwth/q4utPM0FRywSk8vwXXsQspGeBZ4bBzg0jTpx0YsRNhvhNn2CVgfUyqsr9q7gfvTsQ== X-Received: by 2002:a17:902:db11:b0:1f7:3042:9727 with SMTP id d9443c01a7336-1f83b522f7emr36687645ad.4.1718237280269; Wed, 12 Jun 2024 17:08:00 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 17:07:59 -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 2/3] mm: do_swap_page: use folio_add_new_anon_rmap() if folio_test_anon(folio)==false Date: Thu, 13 Jun 2024 12:07:20 +1200 Message-Id: <20240613000721.23093-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Barry Song For the !folio_test_anon(folio) case, we can now invoke folio_add_new_anon_= rmap() with the rmap flags set to either EXCLUSIVE or non-EXCLUSIVE. This action w= ill suppress the VM_WARN_ON_FOLIO check within __folio_add_anon_rmap() while in= itiating the process of bringing up mTHP swapin. static __always_inline void __folio_add_anon_rmap(struct folio *folio, struct page *page, int nr_pages, struct vm_area_struct *vm= a, unsigned long address, rmap_t flags, enum rmap_level level) { ... if (unlikely(!folio_test_anon(folio))) { VM_WARN_ON_FOLIO(folio_test_large(folio) && level !=3D RMAP_LEVEL_PMD, folio); } ... } It also enhances the code=E2=80=99s readability. Suggested-by: David Hildenbrand Signed-off-by: Barry Song --- mm/memory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 2f94921091fb..9c962f62f928 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4339,6 +4339,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) if (unlikely(folio !=3D swapcache && swapcache)) { folio_add_new_anon_rmap(folio, vma, address, RMAP_EXCLUSIVE); folio_add_lru_vma(folio, vma); + } else if (!folio_test_anon(folio)) { + folio_add_new_anon_rmap(folio, vma, address, rmap_flags); } else { folio_add_anon_rmap_ptes(folio, page, nr_pages, vma, address, rmap_flags); --=20 2.34.1 From nobody Thu Feb 12 10:55:18 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27F965382 for ; Thu, 13 Jun 2024 00:08:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718237288; cv=none; b=B+NZWxhJytnKe1BazPe3jG6GTWWOPEciN2ArDL6U5Qr/hxb48ERkNsQfuPlFZfuxGvvtWh/Xqd8y71EPVsAhyQthBaVijw5jB7EwnmA9XIAHbE9vxUvpG6lKuooGCAdkX04lzYI+S/NuzOEE49qKoOmGvuW5nxNABV65C+0mPB0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718237288; c=relaxed/simple; bh=WND7e/sneIYamSwVZtwK+Jk7CqxRkWKfBklPXPWTRbg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TLNpxDjvDsOPfCvczYmtH02Q4lwtVyicJqDKq71B8mxDPxqCZqpXMtkh6qABqYXSgJLWNpej9wBJYs+khHRvu4+N4TJvb/bFrJYu0AjaFUrKyv6gVmKGB4dLO4z4pX8QU7DGu6SKYy2njpxxzUmzgUGU2hIzHl95aQwUVk5xiT8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mtqGFxq0; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mtqGFxq0" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1f70509b811so3275615ad.1 for ; Wed, 12 Jun 2024 17:08:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718237286; x=1718842086; darn=vger.kernel.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=bCCgBtm4kYdnlOxW6KC7ddfNlNkcCijSw9u/7Ny6adI=; b=mtqGFxq0s718aGq/qUQq+dCjlxcPFZxeudcZvKeSJcHLfa8qh3mLWs+iA0ejWTNeQ+ qPbBt36H+IZs5hN4h28886tw7/FqxlSg7ezsFCcE7FLj8dBSAFDo39p1f58qPXZUl17a yxc5rgCqwK574hHH0SsgSU00QUX83X84JgR369wCD428RoezejV1yTt1/JVpH6u+yJ+X sDd4a829IAGcLpHD82XPPQuK2C4Qjqo5tH687qNPlEy1CHaqbcY6Q/ifNMhr+ZEoTYSB PWhfvxs/T9p7FtPI/XCOw5VGg014d+aERSrSPH2SqXxxn4dssEjLgUP89KFL5f0U+YIq MhyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718237286; x=1718842086; 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=bCCgBtm4kYdnlOxW6KC7ddfNlNkcCijSw9u/7Ny6adI=; b=MzBRylS1H96gIYacn5Q2nsSPlSn/Moz1JBL/lIjlwmVHK756tCfPINfMpYL7ljZCB7 RTLsTSfTqZ6oG6jcp4cJejfLLoMVFweoJeL7Ld1i8NYRe4kNTnbhwTIynQHDoazIsO/Y Af0QHLQxdOVcdPWoppXaNSo5QuDSiI1EL4nsDWDtnHZas+OfIKvAlshK6+BicItP2qF+ xr3zX5UIbvXYeGLvtBXnQ3ji1/yllVJEZJ+bqwehG5VzkOJ6jAr3u2rT/0l+SoVHTxXo tHMXj/NE4ADYq3a61J11rU2xiH8yXYl/V54yYoAUKtpN90E4W6JW7ZP3G2u9m+EdE19Q WbBQ== X-Forwarded-Encrypted: i=1; AJvYcCW33UfnXD/B3ubdxpKPnTczz7QKjPcV06CKcklg1a4JI9AXobFax65iOfB8zbKICPNVjTzXlVwYSxlz/v/LMjIp6LlZ6+Jo8YfGcc5A X-Gm-Message-State: AOJu0Yxvn7VWPWuLaACntAR9++NlpMym/nnGU+QqOLstIcYzGgPzXBTH kZBgqGlnSoUk4+pxXvAO3Kh+J4idWPNNukU93lfpd7LLO+uw+PJZ X-Google-Smtp-Source: AGHT+IF3arrhaKJraeaVPGonKcs+bjSohtVRGhBzdoUWTP+KTk/DXUJQQ7qlrLIgRjj+zyClZOrwPA== X-Received: by 2002:a17:903:188:b0:1f7:1c84:13cc with SMTP id d9443c01a7336-1f83b713848mr38288865ad.42.1718237286072; Wed, 12 Jun 2024 17:08:06 -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.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 17:08:05 -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 3/3] mm: remove folio_test_anon(folio)==false path in __folio_add_anon_rmap() Date: Thu, 13 Jun 2024 12:07:21 +1200 Message-Id: <20240613000721.23093-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Barry Song The folio_test_anon(folio)=3D=3Dfalse case within do_swap_page() has been relocated to folio_add_new_anon_rmap(). Additionally, two other callers consistently pass anonymous folios. stack 1: remove_migration_pmd -> folio_add_anon_rmap_pmd -> __folio_add_anon_rmap stack 2: __split_huge_pmd_locked -> folio_add_anon_rmap_ptes -> __folio_add_anon_rmap __folio_add_anon_rmap() only needs to handle the cases folio_test_anon(folio)=3D=3Dtrue now. Suggested-by: David Hildenbrand Signed-off-by: Barry Song --- mm/rmap.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index e612d999811a..e84c706c8241 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1299,21 +1299,10 @@ static __always_inline void __folio_add_anon_rmap(s= truct folio *folio, =20 nr =3D __folio_add_rmap(folio, page, nr_pages, level, &nr_pmdmapped); =20 - if (unlikely(!folio_test_anon(folio))) { - VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio); - /* - * For a PTE-mapped large folio, we only know that the single - * PTE is exclusive. Further, __folio_set_anon() might not get - * folio->index right when not given the address of the head - * page. - */ - VM_WARN_ON_FOLIO(folio_test_large(folio) && - level !=3D RMAP_LEVEL_PMD, folio); - __folio_set_anon(folio, vma, address, - !!(flags & RMAP_EXCLUSIVE)); - } else if (likely(!folio_test_ksm(folio))) { + VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio); + + if (likely(!folio_test_ksm(folio))) __page_check_anon_rmap(folio, page, vma, address); - } =20 __folio_mod_stat(folio, nr, nr_pmdmapped); =20 --=20 2.34.1