From patchwork Mon Jun 17 23:11:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 13701542 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 7A54EC27C79 for ; Mon, 17 Jun 2024 23:12:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F14738D0007; Mon, 17 Jun 2024 19:12:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E9CAA8D0001; Mon, 17 Jun 2024 19:12:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CEFAC8D0007; Mon, 17 Jun 2024 19:12:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id ACD158D0001 for ; Mon, 17 Jun 2024 19:12:04 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6278D1201C0 for ; Mon, 17 Jun 2024 23:12:04 +0000 (UTC) X-FDA: 82241930568.24.BEF9433 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf10.hostedemail.com (Postfix) with ESMTP id 7F693C000B for ; Mon, 17 Jun 2024 23:12:02 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=WSlGpQwc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718665915; 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=wvhtOkp6Hw1ojSxAohAyFTdYS+FS6nTiQQWXEJjk460=; b=2gFzwdMONAumVLI1iMSJ2JturtZPS8YEPhyNvV1vHRVyX3oIlM6SXT3am9FwKgjts7rQk5 i0x+N5PGXW5X0dDmWLaI7BAWKepBZG2S1QIzHtwy4C3XN13yruBnqLFPBfzXHY++0SjbKR qcn9ZuVSEbg77/b+kYJvvN3KFUkJDpw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718665915; a=rsa-sha256; cv=none; b=eB+xUEtl6U1zuGizOOAtJTTqyduYck0bhsrVbu6QSh7eNm9S6d5VWFCxO7rehrsMI5UEId c2oXTDK1Z34SiCoOIOvIrD7/Aj3YcxgxYIr5jEMcLW9SM9hBr0VQwUbu0Sy83/OzaKLJdj emH7lTpVIObMcHYyDY7zYMN7H+8TLVU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=WSlGpQwc; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=21cnbao@gmail.com Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f717b3f2d8so41391435ad.1 for ; Mon, 17 Jun 2024 16:12:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718665921; x=1719270721; 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=wvhtOkp6Hw1ojSxAohAyFTdYS+FS6nTiQQWXEJjk460=; b=WSlGpQwcvelkRzIqon83k2+8EorLXx9FhsP9HJ6aYpVCiyH9m++/m1r7wVcO70ZWOz VSJnZ5Rqkz/xO3n3XaLyv2r6YGngmPSBJ3yWjQ7vSCypm7sgZVFRZ7e19KgWAq+51jjT uj8uAvBZcdzm0jCWG57xzzCs34apL2YfRDXYRe9tBmxWQAYRSE/4vZ2pn8Nu0A+9XQG4 tn4pPXoz6s7pp/7pKUP3GaerlYo1zHu5yuWTOllAAUb4IZIwS98dkCULl5XeH/+Ws6Jm VPd/o4StXEwBzG9JWR4z6/rNr+SYtUcbUcNJJbU/i78eRvFCdqJzb2WS6HCk+SW6G+Ko 95Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718665921; x=1719270721; 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=wvhtOkp6Hw1ojSxAohAyFTdYS+FS6nTiQQWXEJjk460=; b=NIpjHqYHibhjbLflt5b+ZHGCyfBkKBsbA04x79ijWC+BqFOQFp2VUNNVX++vPUGP40 ikbGZ0iOsvNQMWB0rObUCHOio2X/4N9L+rJZhl+MU90VxlvA52b6vOHBy8uxUfhqCPkn iW96Wk9dOtl0Q2UObp0yJvV4/pysm8CuIm+ipKk+LCUVGcTXOoepZEmAqz9ryPS2x2X8 L33GJ+p0ukv9L7vyMWCSlbnFrV6et3VTC3ohaAZFuTXOWwIhWOc+3DrYsxVkJJnr1nF4 VVIwKcuQOZt4BjmdvK2DR+i6KBosNMO49QeX5S7Ufa/Yuy37ecxRS5Xeg5YV7c6HWqwT PZuw== X-Forwarded-Encrypted: i=1; AJvYcCUhiFtWlJHHetj+pMy/v3tUvBgstNf+hJIHPE2wfKKkZmohA/7/hpVCO/BDJbUA9FnOROGMgmYugulgapBzsugLSAY= X-Gm-Message-State: AOJu0Ywo7NIBjXbGoeZCrSTfkObmqoZjOc8M+DG7XWDQGaAQrWBEnZ7L nOggo2xADK/x3aWhYsIKVw+Zqc/Ei5sllliyCqeDISmvX7wftgOC X-Google-Smtp-Source: AGHT+IEqogOoRViu3dOHOoOaWtAQ5vCl8sRMCFCuC7Yuj7hzSrXBJwI06s26PAHRuB+06AGttKgb1A== X-Received: by 2002:a17:902:e546:b0:1f7:3a70:9e71 with SMTP id d9443c01a7336-1f98b22ddd8mr13264205ad.13.1718665921157; Mon, 17 Jun 2024 16:12:01 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855e5a0d5sm84658605ad.43.2024.06.17.16.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 16:12:00 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: akpm@linux-foundation.org, david@redhat.com, linux-mm@kvack.org Cc: baolin.wang@linux.alibaba.com, chrisl@kernel.org, linux-kernel@vger.kernel.org, mhocko@suse.com, ryan.roberts@arm.com, shy828301@gmail.com, surenb@google.com, v-songbaohua@oppo.com, willy@infradead.org, ying.huang@intel.com, yosryahmed@google.com, yuzhao@google.com, Shuai Yuan Subject: [PATCH v2 1/3] mm: extend rmap flags arguments for folio_add_new_anon_rmap Date: Tue, 18 Jun 2024 11:11:35 +1200 Message-Id: <20240617231137.80726-2-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240617231137.80726-1-21cnbao@gmail.com> References: <20240617231137.80726-1-21cnbao@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 7F693C000B X-Stat-Signature: wjr19tgdjqpq75hqkz5g69cz1n6azgga X-Rspam-User: X-HE-Tag: 1718665922-134235 X-HE-Meta: U2FsdGVkX1++vnB3HInLo1dyz/hUxVxQfsERz5QkRvj+TOvkTZKxd7W6C9CDckwtuJULoINHjWvxIJGXGXW4UJZprN5MnengG2JrcBYrcyQx7ewJRu3rQfiWxC6Blei87U6QpZT/OCd8bIuq5jjCb8USY9GYpQ70cbTb/Nnuhkz0EdTunRDipsZivshlYdcfL3StIkAd8xGxqvalxCFQH4Aq8zSUspQfuteyJcmFQvGBjHju2ehezPqAfDhoJHK512cNok1TvN4wKCy+L5KpQDLH7tRYuaQphOrnvXWY04nQDuG8xntDn6hdj3AFCmfFyuIMbJVRzfA4gseB38AJzDnYZQh9zB9yPLaX0uqyTsAP6bcTthqJK22/3+/vINQDHFlxxTJCy643z1alMl5I/1AwLikfKjo7rtzTTiAipFCe7nYGYf7slOtPcvTPZKpfzCKGXNPkgE/tdkY6IjgSrTziR6T2gblkGfQWna3a+Ckx5TiOMXLtwzGaKt/pEJW7fbuph969B2nBKu0/0yQLmgZcPkbbsaTrLl0zSvf5+7rop6Uu3oavE5PPPZRZTxSevkZMoZwQhakk0TomTmPwW/mBt/zhagBQgXnZB3oUMc6x36o43awoWlALojsrCSUpJlN3G/bo3uydtd1Pu69WL3VQ89iufxo1DcsyN/kOlPu+iJ/1dJEMzIYsedIIN61UHhFpBrsm57pvS9/hCkfitiB9yJPjc/e6cZN/s+o+Yi6hVXV9PyLSkGlCgjxutsp9nuN23oE6JrrHH/nWvK2shB+l9o56XT0PdmZS4KMpeYYAoFwx/xtc5/SIq93ATEUBHEPFsN3DVWVWf9mEfx9RCS3VZrTCEztw8uBxGIYb72vfs0qJNWs7aNeM6SsqTfI0xsQ1CcnF9kIHNvtGySJzwm9qMWU+JMu1xEdXCKECCJQQdLe9Sf2LzRK64w+4VRpEzrkubHjGOhddhTElmjy zcjDVP41 AYLMgbQD6YmzqmLPJp/s+lxmc7t2Jhbc6bETZ0CaLXM3RZBbdFBT+D5H2+AL299X3uZ8nofgGY89i+0huZKHvg/sF6REt9X3SA1osBJBABpwl/0B/0F0wSrmQPFS26XrRLf2iJAPDsbpNrf4vZ2RH/DsJiKjizcG1taDgy/qEVXq6R9BVAXnMWmt8ep7d1EJeRf95yhYhKAN7zpxd3D+9Yyi5kmEd/sV0aa5xv2qXd8DneXygESJx7195FNn9gelvBkrLXeYedQWENrvrtjYUkTZX8YAWPYwNTZwS6fnBh9OBmbIwkWL1wIrKHOazt5l7XWJQWTp60Adc4MQ5M7YPoy/v3Q8p+pTwShndWAtwepYFebwg1sCx1xLJM84q4u343zYORs4Ixy4+XezY5MGHqMoI+1igNEX6q7yJYczYo2XdL15OP24PSA97chgDCco2b+7JumrQLXWITatby0yLtGq4GHizhGT3UuFxhEaXwAVy6EV3AJBxHRCnHg== 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 a swap-in, a new anonymous folio is not necessarily exclusive. This patch updates the rmap flags to allow a new anonymous folio to be treated as either exclusive or non-exclusive. To maintain the existing behavior, we always use EXCLUSIVE as the default setting. Suggested-by: David Hildenbrand Signed-off-by: Barry Song Tested-by: Shuai Yuan 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 | 17 ++++++++++------- mm/swapfile.c | 2 +- mm/userfaultfd.c | 2 +- 9 files changed, 22 insertions(+), 19 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index b1bbe237ea4c..23d336e5d502 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 425374ae06ed..9e2357ab9b9a 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 b7137d9c99a9..1f24ecdafe05 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 a3c99ac63155..2b19bb92eda5 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1406,25 +1406,26 @@ 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 || address + (nr << PAGE_SHIFT) > vma->vm_end, vma); __folio_set_swapbacked(folio); - __folio_set_anon(folio, vma, address, true); + __folio_set_anon(folio, vma, address, exclusive); 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); }