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 5/6] mm: shmem: add mTHP size alignment in shmem_get_unmapped_area
Date: Tue, 11 Jun 2024 18:11:09 +0800 [thread overview]
Message-ID: <0c549b57cf7db07503af692d8546ecfad0fcce52.1718090413.git.baolin.wang@linux.alibaba.com> (raw)
In-Reply-To: <cover.1718090413.git.baolin.wang@linux.alibaba.com>
Although the top-level hugepage allocation can be turned off, anonymous shmem
can still use mTHP by configuring the sysfs interface located at
'/sys/kernel/mm/transparent_hugepage/hugepage-XXkb/shmem_enabled'. Therefore,
add alignment for mTHP size to provide a suitable alignment address in
shmem_get_unmapped_area().
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Tested-by: Lance Yang <ioworker0@gmail.com>
---
mm/shmem.c | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index e849c88452b2..f5469c357be6 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2394,6 +2394,7 @@ unsigned long shmem_get_unmapped_area(struct file *file,
unsigned long inflated_len;
unsigned long inflated_addr;
unsigned long inflated_offset;
+ unsigned long hpage_size;
if (len > TASK_SIZE)
return -ENOMEM;
@@ -2412,8 +2413,6 @@ unsigned long shmem_get_unmapped_area(struct file *file,
if (shmem_huge == SHMEM_HUGE_DENY)
return addr;
- if (len < HPAGE_PMD_SIZE)
- return addr;
if (flags & MAP_FIXED)
return addr;
/*
@@ -2425,8 +2424,11 @@ unsigned long shmem_get_unmapped_area(struct file *file,
if (uaddr == addr)
return addr;
+ hpage_size = HPAGE_PMD_SIZE;
if (shmem_huge != SHMEM_HUGE_FORCE) {
struct super_block *sb;
+ unsigned long __maybe_unused hpage_orders;
+ int order = 0;
if (file) {
VM_BUG_ON(file->f_op != &shmem_file_operations);
@@ -2439,18 +2441,38 @@ unsigned long shmem_get_unmapped_area(struct file *file,
if (IS_ERR(shm_mnt))
return addr;
sb = shm_mnt->mnt_sb;
+
+ /*
+ * Find the highest mTHP order used for anonymous shmem to
+ * provide a suitable alignment address.
+ */
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ hpage_orders = READ_ONCE(huge_shmem_orders_always);
+ hpage_orders |= READ_ONCE(huge_shmem_orders_within_size);
+ hpage_orders |= READ_ONCE(huge_shmem_orders_madvise);
+ if (SHMEM_SB(sb)->huge != SHMEM_HUGE_NEVER)
+ hpage_orders |= READ_ONCE(huge_shmem_orders_inherit);
+
+ if (hpage_orders > 0) {
+ order = highest_order(hpage_orders);
+ hpage_size = PAGE_SIZE << order;
+ }
+#endif
}
- if (SHMEM_SB(sb)->huge == SHMEM_HUGE_NEVER)
+ if (SHMEM_SB(sb)->huge == SHMEM_HUGE_NEVER && !order)
return addr;
}
- offset = (pgoff << PAGE_SHIFT) & (HPAGE_PMD_SIZE-1);
- if (offset && offset + len < 2 * HPAGE_PMD_SIZE)
+ if (len < hpage_size)
+ return addr;
+
+ offset = (pgoff << PAGE_SHIFT) & (hpage_size - 1);
+ if (offset && offset + len < 2 * hpage_size)
return addr;
- if ((addr & (HPAGE_PMD_SIZE-1)) == offset)
+ if ((addr & (hpage_size - 1)) == offset)
return addr;
- inflated_len = len + HPAGE_PMD_SIZE - PAGE_SIZE;
+ inflated_len = len + hpage_size - PAGE_SIZE;
if (inflated_len > TASK_SIZE)
return addr;
if (inflated_len < len)
@@ -2463,10 +2485,10 @@ unsigned long shmem_get_unmapped_area(struct file *file,
if (inflated_addr & ~PAGE_MASK)
return addr;
- inflated_offset = inflated_addr & (HPAGE_PMD_SIZE-1);
+ inflated_offset = inflated_addr & (hpage_size - 1);
inflated_addr += offset - inflated_offset;
if (inflated_offset > offset)
- inflated_addr += HPAGE_PMD_SIZE;
+ inflated_addr += hpage_size;
if (inflated_addr > TASK_SIZE - len)
return addr;
--
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 ` [PATCH v5 2/6] mm: shmem: add THP validation for PMD-mapped THP related statistics Baolin Wang
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 ` Baolin Wang [this message]
2024-06-11 10:11 ` [PATCH v5 6/6] mm: shmem: add mTHP counters " 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=0c549b57cf7db07503af692d8546ecfad0fcce52.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