From: Baolin Wang <baolin.wang@linux.alibaba.com>
To: akpm@linux-foundation.org, hughd@google.com
Cc: willy@infradead.org, david@redhat.com,
wangkefeng.wang@huawei.com, ying.huang@intel.com,
21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com,
ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com,
p.raghav@samsung.com, baolin.wang@linux.alibaba.com,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 2/6] mm: shmem: add THP validation for PMD-mapped THP related statistics
Date: Tue, 11 Jun 2024 18:11:06 +0800 [thread overview]
Message-ID: <c4b04cbd51e6951cc2436a87be8eaa4a1516faec.1718090413.git.baolin.wang@linux.alibaba.com> (raw)
In-Reply-To: <cover.1718090413.git.baolin.wang@linux.alibaba.com>
In order to extend support for mTHP, add THP validation for PMD-mapped THP
related statistics to avoid statistical confusion.
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Barry Song <v-songbaohua@oppo.com>
---
mm/shmem.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 6868c0af3a69..ae358efc397a 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1647,7 +1647,7 @@ static struct folio *shmem_alloc_and_add_folio(gfp_t gfp,
return ERR_PTR(-E2BIG);
folio = shmem_alloc_folio(gfp, HPAGE_PMD_ORDER, info, index);
- if (!folio)
+ if (!folio && pages == HPAGE_PMD_NR)
count_vm_event(THP_FILE_FALLBACK);
} else {
pages = 1;
@@ -1665,7 +1665,7 @@ static struct folio *shmem_alloc_and_add_folio(gfp_t gfp,
if (xa_find(&mapping->i_pages, &index,
index + pages - 1, XA_PRESENT)) {
error = -EEXIST;
- } else if (huge) {
+ } else if (pages == HPAGE_PMD_NR) {
count_vm_event(THP_FILE_FALLBACK);
count_vm_event(THP_FILE_FALLBACK_CHARGE);
}
@@ -2031,7 +2031,8 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index,
folio = shmem_alloc_and_add_folio(huge_gfp,
inode, index, fault_mm, true);
if (!IS_ERR(folio)) {
- count_vm_event(THP_FILE_ALLOC);
+ if (folio_test_pmd_mappable(folio))
+ count_vm_event(THP_FILE_ALLOC);
goto alloced;
}
if (PTR_ERR(folio) == -EEXIST)
--
2.39.3
next prev parent reply other threads:[~2024-06-11 10:11 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-11 10:11 [PATCH v5 0/6] add mTHP support for anonymous shmem Baolin Wang
2024-06-11 10:11 ` [PATCH v5 1/6] mm: memory: extend finish_fault() to support large folio Baolin Wang
2024-06-11 14:38 ` Zi Yan
2024-06-12 9:28 ` Baolin Wang
2024-06-12 13:40 ` Kefeng Wang
2024-06-13 0:51 ` Baolin Wang
2024-06-11 10:11 ` Baolin Wang [this message]
2024-06-11 10:11 ` [PATCH v5 3/6] mm: shmem: add multi-size THP sysfs interface for anonymous shmem Baolin Wang
2024-06-11 10:11 ` [PATCH v5 4/6] mm: shmem: add mTHP support " Baolin Wang
2024-07-03 17:25 ` Ryan Roberts
2024-07-04 11:15 ` Baolin Wang
2024-07-04 13:58 ` Ryan Roberts
2024-07-04 14:01 ` David Hildenbrand
2024-07-04 15:05 ` Bang Li
2024-07-04 15:54 ` Ryan Roberts
2024-07-05 2:56 ` Baolin Wang
2024-07-05 8:55 ` Ryan Roberts
2024-07-04 14:46 ` Bang Li
2024-07-05 3:01 ` Baolin Wang
2024-07-05 8:42 ` Ryan Roberts
2024-07-05 8:57 ` Baolin Wang
2024-07-05 9:05 ` Ryan Roberts
2024-06-11 10:11 ` [PATCH v5 5/6] mm: shmem: add mTHP size alignment in shmem_get_unmapped_area Baolin Wang
2024-06-11 10:11 ` [PATCH v5 6/6] mm: shmem: add mTHP counters for anonymous shmem Baolin Wang
2024-06-12 8:04 ` Lance Yang
2024-06-12 9:28 ` Baolin Wang
2024-06-12 14:16 ` Lance Yang
2024-06-12 13:46 ` Kefeng Wang
2024-06-13 1:00 ` Baolin Wang
2024-06-12 14:18 ` Lance Yang
2024-06-13 1:08 ` Baolin Wang
2024-07-04 18:43 ` [PATCH v5 0/6] add mTHP support " Matthew Wilcox
2024-07-04 19:03 ` David Hildenbrand
2024-07-04 19:19 ` David Hildenbrand
2024-07-04 19:49 ` Matthew Wilcox
2024-07-05 5:47 ` Baolin Wang
2024-07-05 8:45 ` Ryan Roberts
2024-07-05 8:59 ` David Hildenbrand
2024-07-05 9:13 ` Ryan Roberts
2024-07-05 9:16 ` David Hildenbrand
2024-07-05 9:23 ` Ryan Roberts
2024-07-07 16:39 ` Daniel Gomez
2024-07-09 8:28 ` Ryan Roberts
2024-07-16 13:11 ` Daniel Gomez
2024-07-16 13:22 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4b04cbd51e6951cc2436a87be8eaa4a1516faec.1718090413.git.baolin.wang@linux.alibaba.com \
--to=baolin.wang@linux.alibaba.com \
--cc=21cnbao@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=da.gomez@samsung.com \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=ioworker0@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=p.raghav@samsung.com \
--cc=ryan.roberts@arm.com \
--cc=shy828301@gmail.com \
--cc=wangkefeng.wang@huawei.com \
--cc=willy@infradead.org \
--cc=ying.huang@intel.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox