On 17/07/2024 08:12, Ryan Roberts wrote:
> In addition to `always` and `never`, add `always+exec` as an option for:
>
> /sys/kernel/mm/transparent_hugepage/hugepages-*kB/file_enabled
>
> `always+exec` acts like `always` but additionally marks the hugepage
> size as the preferred hugepage size for sections of any file mapped with
> execute permission. A maximum of one hugepage size can be marked as
> `exec` at a time, so applying it to a new size implicitly removes it
> from any size it was previously set for.
Just to document discussion around this which happened in the THP Cabal meeting,
there was a proposal to avoid user controls by always always allocating the
largest folio that we can for an exec mapping, given the bounds of the VMA. But
we concluded that this would likely cause latency concerns for some workloads
(e.g. increased app start up time). We then thought about setting a ceiling on
the folio size to allocate (e.g. 64K). But in that case, who decides what the
right ceiling value is? So, in my opinion, we are back to user controls.
Thanks,
Ryan
>
> Change readahead to use this flagged exec size; when a request is made
> for an executable mapping, do a synchronous read of the size in a
> naturally aligned manner.
>
> On arm64 if memory is physically contiguous and naturally aligned to the
> "contpte" size, we can use contpte mappings, which improves utilization
> of the TLB. When paired with the "multi-size THP" changes, this works
> well to reduce dTLB pressure. However iTLB pressure is still high due to
> executable mappings having a low liklihood of being in the required
> folio size and mapping alignment, even when the filesystem supports
> readahead into large folios (e.g. XFS).
>
> The reason for the low liklihood is that the current readahead algorithm
> starts with an order-2 folio and increases the folio order by 2 every
> time the readahead mark is hit. But most executable memory is faulted in
> fairly randomly and so the readahead mark is rarely hit and most
> executable folios remain order-2. This is observed impirically and
> confirmed from discussion with a gnu linker expert; in general, the
> linker does nothing to group temporally accessed text together
> spacially. Additionally, with the current read-around approach there are
> no alignment guarrantees between the file and folio. This is
> insufficient for arm64's contpte mapping requirement (order-4 for 4K
> base pages).
>
> So it seems reasonable to special-case the read(ahead) logic for
> executable mappings. The trade-off is performance improvement (due to
> more efficient storage of the translations in iTLB) vs potential read
> amplification (due to reading too much data around the fault which won't
> be used), and the latter is independent of base page size.
>
> Of course if no hugepage size is marked as `always+exec` the old
> behaviour is maintained.
>
> Performance Benchmarking
> ------------------------
>
> The below shows kernel compilation and speedometer javascript benchmarks
> on Ampere Altra arm64 system. When the patch is applied, `always+exec`
> is set for 64K folios.
>
> First, confirmation that this patch causes more memory to be contained
> in 64K folios (this is for all file-backed memory so includes
> non-executable too):
>
> | File-backed folios | Speedometer | Kernel Compile |
> | by size as percentage |-----------------|-----------------|
> | of all mapped file mem | before | after | before | after |
> |=========================|========|========|========|========|
> |file-thp-aligned-16kB | 45% | 9% | 46% | 7% |
> |file-thp-aligned-32kB | 2% | 0% | 3% | 1% |
> |file-thp-aligned-64kB | 3% | 63% | 5% | 80% |
> |file-thp-aligned-128kB | 11% | 11% | 0% | 0% |
> |file-thp-unaligned-16kB | 1% | 0% | 3% | 1% |
> |file-thp-unaligned-128kB | 1% | 0% | 0% | 0% |
> |file-thp-partial | 0% | 0% | 0% | 0% |
> |-------------------------|--------|--------|--------|--------|
> |file-cont-aligned-64kB | 16% | 75% | 5% | 80% |
>
> The above shows that for both use cases, the amount of file memory
> backed by 16K folios reduces and the amount backed by 64K folios
> increases significantly. And the amount of memory that is contpte-mapped
> significantly increases (last line).
>
> And this is reflected in performance improvement:
>
> Kernel Compilation (smaller is faster):
> | kernel | real-time | kern-time | user-time | peak memory |
> |----------|-------------|-------------|-------------|---------------|
> | before | 0.0% | 0.0% | 0.0% | 0.0% |
> | after | -1.6% | -2.1% | -1.7% | 0.0% |
>
> Speedometer (bigger is faster):
> | kernel | runs_per_min | peak memory |
> |----------|----------------|---------------|
> | before | 0.0% | 0.0% |
> | after | 1.3% | 1.0% |
>
> Both benchmarks show a ~1.5% improvement once the patch is applied.
>
> Signed-off-by: Ryan Roberts <ryan.roberts@xxxxxxx>
> ---
> Documentation/admin-guide/mm/transhuge.rst | 6 +++++
> include/linux/huge_mm.h | 11 ++++++++
> mm/filemap.c | 11 ++++++++
> mm/huge_memory.c | 31 +++++++++++++++++-----
> 4 files changed, 52 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst
> index 9f3ed504c646..1aaf8e3a0b5a 100644
> --- a/Documentation/admin-guide/mm/transhuge.rst
> +++ b/Documentation/admin-guide/mm/transhuge.rst
> @@ -292,12 +292,18 @@ memory from a set of allowed sizes. By default all THP sizes that the page cache
> supports are allowed, but this set can be modified with one of::
>
> echo always >/sys/kernel/mm/transparent_hugepage/hugepages-<size>kB/file_enabled
> + echo always+exec >/sys/kernel/mm/transparent_hugepage/hugepages-<size>kB/file_enabled
> echo never >/sys/kernel/mm/transparent_hugepage/hugepages-<size>kB/file_enabled
>
> where <size> is the hugepage size being addressed, the available sizes for which
> vary by system. ``always`` adds the hugepage size to the set of allowed sizes,
> and ``never`` removes the hugepage size from the set of allowed sizes.
>
> +``always+exec`` acts like ``always`` but additionally marks the hugepage size as
> +the preferred hugepage size for sections of any file mapped executable. A
> +maximum of one hugepage size can be marked as ``exec`` at a time, so applying it
> +to a new size implicitly removes it from any size it was previously set for.
> +
> In some situations, constraining the allowed sizes can reduce memory
> fragmentation, resulting in fewer allocation fallbacks and improved system
> performance.
> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
> index 19ced8192d39..3571ea0c3d8c 100644
> --- a/include/linux/huge_mm.h
> +++ b/include/linux/huge_mm.h
> @@ -177,12 +177,18 @@ extern unsigned long huge_anon_orders_always;
> extern unsigned long huge_anon_orders_madvise;
> extern unsigned long huge_anon_orders_inherit;
> extern unsigned long huge_file_orders_always;
> +extern int huge_file_exec_order;
>
> static inline unsigned long file_orders_always(void)
> {
> return READ_ONCE(huge_file_orders_always);
> }
>
> +static inline int file_exec_order(void)
> +{
> + return READ_ONCE(huge_file_exec_order);
> +}
> +
> static inline bool hugepage_global_enabled(void)
> {
> return transparent_hugepage_flags &
> @@ -453,6 +459,11 @@ static inline unsigned long file_orders_always(void)
> return 0;
> }
>
> +static inline int file_exec_order(void)
> +{
> + return -1;
> +}
> +
> static inline bool folio_test_pmd_mappable(struct folio *folio)
> {
> return false;
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 870016fcfdde..c4a3cc6a2e46 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -3128,6 +3128,7 @@ static struct file *do_sync_mmap_readahead(struct vm_fault *vmf)
> struct file *fpin = NULL;
> unsigned long vm_flags = vmf->vma->vm_flags;
> unsigned int mmap_miss;
> + int exec_order = file_exec_order();
>
> #ifdef CONFIG_TRANSPARENT_HUGEPAGE
> /* Use the readahead code, even if readahead is disabled */
> @@ -3147,6 +3148,16 @@ static struct file *do_sync_mmap_readahead(struct vm_fault *vmf)
> }
> #endif
>
> + /* If explicit order is set for exec mappings, use it. */
> + if ((vm_flags & VM_EXEC) && exec_order >= 0) {
> + fpin = maybe_unlock_mmap_for_io(vmf, fpin);
> + ra->size = 1UL << exec_order;
> + ra->async_size = 0;
> + ractl._index &= ~((unsigned long)ra->size - 1);
> + page_cache_ra_order(&ractl, ra, exec_order);
> + return fpin;
> + }
> +
> /* If we don't want any read-ahead, don't bother */
> if (vm_flags & VM_RAND_READ)
> return fpin;
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index e8fe28fe9cf9..4249c0bc9388 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -81,6 +81,7 @@ unsigned long huge_anon_orders_always __read_mostly;
> unsigned long huge_anon_orders_madvise __read_mostly;
> unsigned long huge_anon_orders_inherit __read_mostly;
> unsigned long huge_file_orders_always __read_mostly;
> +int huge_file_exec_order __read_mostly = -1;
>
> unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,
> unsigned long vm_flags,
> @@ -462,6 +463,7 @@ static const struct attribute_group hugepage_attr_group = {
> static void hugepage_exit_sysfs(struct kobject *hugepage_kobj);
> static void thpsize_release(struct kobject *kobj);
> static DEFINE_SPINLOCK(huge_anon_orders_lock);
> +static DEFINE_SPINLOCK(huge_file_orders_lock);
> static LIST_HEAD(thpsize_list);
>
> static ssize_t anon_enabled_show(struct kobject *kobj,
> @@ -531,11 +533,15 @@ static ssize_t file_enabled_show(struct kobject *kobj,
> {
> int order = to_thpsize(kobj)->order;
> const char *output;
> + bool exec;
>
> - if (test_bit(order, &huge_file_orders_always))
> - output = "[always] never";
> - else
> - output = "always [never]";
> + if (test_bit(order, &huge_file_orders_always)) {
> + exec = READ_ONCE(huge_file_exec_order) == order;
> + output = exec ? "always [always+exec] never" :
> + "[always] always+exec never";
> + } else {
> + output = "always always+exec [never]";
> + }
>
> return sysfs_emit(buf, "%s\n", output);
> }
> @@ -547,13 +553,24 @@ static ssize_t file_enabled_store(struct kobject *kobj,
> int order = to_thpsize(kobj)->order;
> ssize_t ret = count;
>
> - if (sysfs_streq(buf, "always"))
> + spin_lock(&huge_file_orders_lock);
> +
> + if (sysfs_streq(buf, "always")) {
> set_bit(order, &huge_file_orders_always);
> - else if (sysfs_streq(buf, "never"))
> + if (huge_file_exec_order == order)
> + huge_file_exec_order = -1;
> + } else if (sysfs_streq(buf, "always+exec")) {
> + set_bit(order, &huge_file_orders_always);
> + huge_file_exec_order = order;
> + } else if (sysfs_streq(buf, "never")) {
> clear_bit(order, &huge_file_orders_always);
> - else
> + if (huge_file_exec_order == order)
> + huge_file_exec_order = -1;
> + } else {
> ret = -EINVAL;
> + }
>
> + spin_unlock(&huge_file_orders_lock);
> return ret;
> }
>
> --
> 2.43.0
>
