Commit 0c06a1c0 authored by Liu Shixin's avatar Liu Shixin Committed by Zheng Zengkai
Browse files

mm/dynamic_hugetlb: add interface to configure the count of hugepages 

hulk inclusion
category: feature
bugzilla: 46904, https://gitee.com/openeuler/kernel/issues/I4QSHG


CVE: NA

--------------------------------

Add two interfaces in mem_cgroup to configure the count of 1G/2M hugepages
in dhugetlb_pool.

Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 226133ee

include/linux/dynamic_hugetlb.h

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ struct dhugetlb_pool { 
};



bool dhugetlb_hide_files(struct cftype *cft);

ssize_t write_2M_reserved_pages(struct kernfs_open_file *of,

				char *buf, size_t nbytes, loff_t off);

ssize_t write_1G_reserved_pages(struct kernfs_open_file *of,

				char *buf, size_t nbytes, loff_t off);

ssize_t write_hugepage_to_hpool(struct kernfs_open_file *of,

				char *buf, size_t nbytes, loff_t off);

int hugetlb_pool_info_show(struct seq_file *m, void *v);

mm/dynamic_hugetlb.c

+56 −0
Original line number Diff line number Diff line
@@ -255,6 +255,62 @@ bool dhugetlb_hide_files(struct cftype *cft) 
	return false;

}



static ssize_t update_reserved_pages(struct mem_cgroup *memcg, char *buf, int hpages_pool_idx)

{

	struct dhugetlb_pool *hpool = memcg->hpool;

	struct huge_pages_pool *hpages_pool;

	unsigned long nr_pages;

	unsigned long delta;

	char *endp;



	if (!dhugetlb_enabled)

		return -EINVAL;



	buf = strstrip(buf);

	nr_pages = memparse(buf, &endp);

	if (*endp != '\0')

		return -EINVAL;



	if (!get_hpool_unless_zero(hpool))

		return -EINVAL;



	spin_lock(&hpool->reserved_lock);

	spin_lock(&hpool->lock);

	hpages_pool = &hpool->hpages_pool[hpages_pool_idx];

	if (nr_pages > hpages_pool->nr_huge_pages) {

		delta = min(nr_pages - hpages_pool->nr_huge_pages, hpages_pool->free_normal_pages);

		hpages_pool->nr_huge_pages += delta;

		hpages_pool->free_huge_pages += delta;

		hpages_pool->free_normal_pages -= delta;

	} else {

		delta = min(hpages_pool->nr_huge_pages - nr_pages,

			    hpages_pool->free_huge_pages - hpages_pool->resv_huge_pages);

		hpages_pool->nr_huge_pages -= delta;

		hpages_pool->free_huge_pages -= delta;

		hpages_pool->free_normal_pages += delta;

	}

	spin_unlock(&hpool->lock);

	spin_unlock(&hpool->reserved_lock);

	put_hpool(hpool);

	return 0;

}



ssize_t write_2M_reserved_pages(struct kernfs_open_file *of,

				char *buf, size_t nbytes, loff_t off)

{

	struct mem_cgroup *memcg = mem_cgroup_from_css(of_css(of));



	return update_reserved_pages(memcg, buf, HUGE_PAGES_POOL_2M) ?: nbytes;

}



ssize_t write_1G_reserved_pages(struct kernfs_open_file *of,

				char *buf, size_t nbytes, loff_t off)

{

	struct mem_cgroup *memcg = mem_cgroup_from_css(of_css(of));



	return update_reserved_pages(memcg, buf, HUGE_PAGES_POOL_1G) ?: nbytes;

}



ssize_t write_hugepage_to_hpool(struct kernfs_open_file *of,

				char *buf, size_t nbytes, loff_t off)

{

mm/memcontrol.c

+10 −0
Original line number Diff line number Diff line
@@ -5202,6 +5202,16 @@ static struct cftype mem_cgroup_legacy_files[] = { 
		.seq_show = hugetlb_pool_info_show,

		.flags = CFTYPE_NO_PREFIX | CFTYPE_WORLD_WRITABLE | CFTYPE_NOT_ON_ROOT,

	},

	{

		.name = "dhugetlb.1G.reserved_pages",

		.write = write_1G_reserved_pages,

		.flags = CFTYPE_NO_PREFIX | CFTYPE_WORLD_WRITABLE | CFTYPE_NOT_ON_ROOT,

	},

	{

		.name = "dhugetlb.2M.reserved_pages",

		.write = write_2M_reserved_pages,

		.flags = CFTYPE_NO_PREFIX | CFTYPE_WORLD_WRITABLE | CFTYPE_NOT_ON_ROOT,

	},

#endif

#ifdef CONFIG_NUMA

	{