From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 0AC9C6B0038 for ; Mon, 17 Oct 2016 08:18:20 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id t25so193129140pfg.3 for ; Mon, 17 Oct 2016 05:18:20 -0700 (PDT) Received: from mga11.intel.com (mga11.intel.com. [192.55.52.93]) by mx.google.com with ESMTPS id s17si27224279pgh.144.2016.10.17.05.18.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Oct 2016 05:18:18 -0700 (PDT) From: "Kirill A. Shutemov" Subject: [PATCH] shmem: avoid huge pages for small files Date: Mon, 17 Oct 2016 15:18:09 +0300 Message-Id: <20161017121809.189039-1-kirill.shutemov@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: To: Hugh Dickins , Andrea Arcangeli , Andrew Morton Cc: Andi Kleen , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Huge pages are detrimental for small file: they causes noticible overhead on both allocation performance and memory footprint. This patch aimed to address this issue by avoiding huge pages until file grown to specified size. This would cover most of the cases where huge pages causes regressions in performance. By default the minimal file size to allocate huge pages is equal to size of huge page. We add two handle to specify minimal file size for huge pages: - mount option 'huge_min_size'; - sysfs file /sys/kernel/mm/transparent_hugepage/shmem_min_size for in-kernel tmpfs mountpoint; Few notes: - if shmem_enabled is set to 'force', the limit is ignored. We still want to generate as many pages as possible for functional testing. - the limit doesn't affect khugepaged behaviour: it still can collapse pages based on its settings; - remount of the filesystem doesn't affect previously allocated pages, but the limit is applied for new allocations; Signed-off-by: Kirill A. Shutemov --- Documentation/vm/transhuge.txt | 6 +++++ include/linux/huge_mm.h | 1 + include/linux/shmem_fs.h | 1 + mm/huge_memory.c | 1 + mm/shmem.c | 56 ++++++++++++++++++++++++++++++++++++++---- 5 files changed, 60 insertions(+), 5 deletions(-) diff --git a/Documentation/vm/transhuge.txt b/Documentation/vm/transhuge.txt index 2ec6adb5a4ce..40006d193687 100644 --- a/Documentation/vm/transhuge.txt +++ b/Documentation/vm/transhuge.txt @@ -238,6 +238,12 @@ values: - "force": Force the huge option on for all - very useful for testing; +Tehre's limit on minimal file size before kenrel starts allocate huge +pages for it. By default it's size of huge page. + +You can adjust the limit using "huge_min_size=" mount option or +/sys/kernel/mm/transparent_hugepage/shmem_min_size for in-kernel mount. + == Need of application restart == The transparent_hugepage/enabled values and tmpfs mount option only affect diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 9b9f65d99873..515b96a5a592 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -52,6 +52,7 @@ extern ssize_t single_hugepage_flag_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf, enum transparent_hugepage_flag flag); extern struct kobj_attribute shmem_enabled_attr; +extern struct kobj_attribute shmem_min_size_attr; #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) #define HPAGE_PMD_NR (1<a_ops != &shmem_aops) goto alloc_nohuge; @@ -1675,14 +1678,17 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, goto alloc_nohuge; if (shmem_huge == SHMEM_HUGE_FORCE) goto alloc_huge; + i_size = i_size_read(inode); + if (i_size < sbinfo->huge_min_size && + index < (sbinfo->huge_min_size >> PAGE_SHIFT)) + goto alloc_nohuge; switch (sbinfo->huge) { - loff_t i_size; pgoff_t off; case SHMEM_HUGE_NEVER: goto alloc_nohuge; case SHMEM_HUGE_WITHIN_SIZE: off = round_up(index, HPAGE_PMD_NR); - i_size = round_up(i_size_read(inode), PAGE_SIZE); + i_size = round_up(i_size, PAGE_SIZE); if (i_size >= HPAGE_PMD_SIZE && i_size >> PAGE_SHIFT >= off) goto alloc_huge; @@ -3349,6 +3355,10 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo, huge != SHMEM_HUGE_NEVER) goto bad_val; sbinfo->huge = huge; + } else if (!strcmp(this_char, "huge_min_size")) { + sbinfo->huge_min_size = memparse(value, &rest); + if (*rest) + goto bad_val; #endif #ifdef CONFIG_NUMA } else if (!strcmp(this_char,"mpol")) { @@ -3382,6 +3392,8 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data) int error = -EINVAL; config.mpol = NULL; + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGE_PAGECACHE)) + config.huge_min_size = HPAGE_PMD_SIZE; if (shmem_parse_options(data, &config, true)) return error; @@ -3403,6 +3415,7 @@ static int shmem_remount_fs(struct super_block *sb, int *flags, char *data) error = 0; sbinfo->huge = config.huge; + sbinfo->huge_min_size = config.huge_min_size; sbinfo->max_blocks = config.max_blocks; sbinfo->max_inodes = config.max_inodes; sbinfo->free_inodes = config.max_inodes - inodes; @@ -3438,8 +3451,10 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) from_kgid_munged(&init_user_ns, sbinfo->gid)); #ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE /* Rightly or wrongly, show huge mount option unmasked by shmem_huge */ - if (sbinfo->huge) + if (sbinfo->huge) { seq_printf(seq, ",huge=%s", shmem_format_huge(sbinfo->huge)); + seq_printf(seq, ",huge_min_size=%llu", sbinfo->huge_min_size); + } #endif shmem_show_mpol(seq, sbinfo->mpol); return 0; @@ -3542,6 +3557,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) sbinfo->mode = S_IRWXUGO | S_ISVTX; sbinfo->uid = current_fsuid(); sbinfo->gid = current_fsgid(); + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGE_PAGECACHE)) + sbinfo->huge_min_size = HPAGE_PMD_SIZE; sb->s_fs_info = sbinfo; #ifdef CONFIG_TMPFS @@ -3780,9 +3797,10 @@ int __init shmem_init(void) } #ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE - if (has_transparent_hugepage() && shmem_huge < SHMEM_HUGE_DENY) + if (has_transparent_hugepage() && shmem_huge < SHMEM_HUGE_DENY) { SHMEM_SB(shm_mnt->mnt_sb)->huge = shmem_huge; - else + SHMEM_SB(shm_mnt->mnt_sb)->huge_min_size = shmem_huge_min_size; + } else shmem_huge = 0; /* just in case it was patched */ #endif return 0; @@ -3848,6 +3866,34 @@ static ssize_t shmem_enabled_store(struct kobject *kobj, struct kobj_attribute shmem_enabled_attr = __ATTR(shmem_enabled, 0644, shmem_enabled_show, shmem_enabled_store); + +static ssize_t shmem_min_size_show(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) +{ + return sprintf(buf, "%llu\n", shmem_huge_min_size); +} + + +static ssize_t shmem_min_size_store(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, size_t count) +{ + unsigned long long size; + char *end; + + size = memparse(buf, &end); + if (end == buf) + return -EINVAL; + if (*end == '\n') + end++; + if (*end != '\0') + return -EINVAL; + shmem_huge_min_size = size; + SHMEM_SB(shm_mnt->mnt_sb)->huge_min_size = size; + return end - buf; +} + +struct kobj_attribute shmem_min_size_attr = + __ATTR(shmem_min_size, 0644, shmem_min_size_show, shmem_min_size_store); #endif /* CONFIG_TRANSPARENT_HUGE_PAGECACHE && CONFIG_SYSFS */ #ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE -- 2.9.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org