Commit c2d312a6 authored by Ryan Roberts's avatar Ryan Roberts Committed by Kefeng Wang
Browse files

selftests/mm: support multi-size THP interface in thp_settings 

mainline inclusion
from mainline-v6.8-rc1
commit 4f5070a5e40db2e9dbf5fff4ec678d6fbb338d5c
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I98AW9
CVE: NA

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

Save and restore the new per-size hugepage enabled setting, if available
on the running kernel.

Since the number of per-size directories is not fixed, solve this as
simply as possible by catering for a maximum number in the thp_settings
struct (20).  Each array index is the order.  The value of THP_NEVER is
changed to 0 so that all of these new settings default to THP_NEVER and
the user only needs to fill in the ones they want to enable.

Link: https://lkml.kernel.org/r/20231207161211.2374093-8-ryan.roberts@arm.com


Signed-off-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Tested-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Tested-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Barry Song <v-songbaohua@oppo.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Itaru Kitayama <itaru.kitayama@gmail.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Yin Fengwei <fengwei.yin@intel.com>
Cc: Yu Zhao <yuzhao@google.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 4f5070a5e40db2e9dbf5fff4ec678d6fbb338d5c)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
parent 44492607

tools/testing/selftests/mm/khugepaged.c

+3 −0
Original line number Diff line number Diff line
@@ -1141,6 +1141,7 @@ static void parse_test_type(int argc, const char **argv) 


int main(int argc, const char **argv)

{

	int hpage_pmd_order;

	struct thp_settings default_settings = {

		.thp_enabled = THP_MADVISE,

		.thp_defrag = THP_DEFRAG_ALWAYS,
@@ -1175,11 +1176,13 @@ int main(int argc, const char **argv) 
		exit(EXIT_FAILURE);

	}

	hpage_pmd_nr = hpage_pmd_size / page_size;

	hpage_pmd_order = __builtin_ctz(hpage_pmd_nr);



	default_settings.khugepaged.max_ptes_none = hpage_pmd_nr - 1;

	default_settings.khugepaged.max_ptes_swap = hpage_pmd_nr / 8;

	default_settings.khugepaged.max_ptes_shared = hpage_pmd_nr / 2;

	default_settings.khugepaged.pages_to_scan = hpage_pmd_nr * 8;

	default_settings.hugepages[hpage_pmd_order].enabled = THP_INHERIT;



	save_settings();

	thp_push_settings(&default_settings);

tools/testing/selftests/mm/thp_settings.c

+54 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ static struct thp_settings saved_settings; 
static char dev_queue_read_ahead_path[PATH_MAX];



static const char * const thp_enabled_strings[] = {

	"never",

	"always",

	"inherit",

	"madvise",

	"never",

	NULL

};
@@ -198,6 +199,10 @@ void thp_write_num(const char *name, unsigned long num) 


void thp_read_settings(struct thp_settings *settings)

{

	unsigned long orders = thp_supported_orders();

	char path[PATH_MAX];

	int i;



	*settings = (struct thp_settings) {

		.thp_enabled = thp_read_string("enabled", thp_enabled_strings),

		.thp_defrag = thp_read_string("defrag", thp_defrag_strings),
@@ -218,11 +223,26 @@ void thp_read_settings(struct thp_settings *settings) 
	};

	if (dev_queue_read_ahead_path[0])

		settings->read_ahead_kb = read_num(dev_queue_read_ahead_path);



	for (i = 0; i < NR_ORDERS; i++) {

		if (!((1 << i) & orders)) {

			settings->hugepages[i].enabled = THP_NEVER;

			continue;

		}

		snprintf(path, PATH_MAX, "hugepages-%ukB/enabled",

			(getpagesize() >> 10) << i);

		settings->hugepages[i].enabled =

			thp_read_string(path, thp_enabled_strings);

	}

}



void thp_write_settings(struct thp_settings *settings)

{

	struct khugepaged_settings *khugepaged = &settings->khugepaged;

	unsigned long orders = thp_supported_orders();

	char path[PATH_MAX];

	int enabled;

	int i;



	thp_write_string("enabled", thp_enabled_strings[settings->thp_enabled]);

	thp_write_string("defrag", thp_defrag_strings[settings->thp_defrag]);
@@ -242,6 +262,15 @@ void thp_write_settings(struct thp_settings *settings) 


	if (dev_queue_read_ahead_path[0])

		write_num(dev_queue_read_ahead_path, settings->read_ahead_kb);



	for (i = 0; i < NR_ORDERS; i++) {

		if (!((1 << i) & orders))

			continue;

		snprintf(path, PATH_MAX, "hugepages-%ukB/enabled",

			(getpagesize() >> 10) << i);

		enabled = settings->hugepages[i].enabled;

		thp_write_string(path, thp_enabled_strings[enabled]);

	}

}



struct thp_settings *thp_current_settings(void)
@@ -294,3 +323,27 @@ void thp_set_read_ahead_path(char *path) 
		sizeof(dev_queue_read_ahead_path));

	dev_queue_read_ahead_path[sizeof(dev_queue_read_ahead_path) - 1] = '\0';

}



unsigned long thp_supported_orders(void)

{

	unsigned long orders = 0;

	char path[PATH_MAX];

	char buf[256];

	int ret;

	int i;



	for (i = 0; i < NR_ORDERS; i++) {

		ret = snprintf(path, PATH_MAX, THP_SYSFS "hugepages-%ukB/enabled",

			(getpagesize() >> 10) << i);

		if (ret >= PATH_MAX) {

			printf("%s: Pathname is too long\n", __func__);

			exit(EXIT_FAILURE);

		}



		ret = read_file(path, buf, sizeof(buf));

		if (ret)

			orders |= 1UL << i;

	}



	return orders;

}

tools/testing/selftests/mm/thp_settings.h

+10 −1
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ 
#include <stdint.h>



enum thp_enabled {

	THP_NEVER,

	THP_ALWAYS,

	THP_INHERIT,

	THP_MADVISE,

	THP_NEVER,

};



enum thp_defrag {
@@ -29,6 +30,12 @@ enum shmem_enabled { 
	SHMEM_FORCE,

};



#define NR_ORDERS 20



struct hugepages_settings {

	enum thp_enabled enabled;

};



struct khugepaged_settings {

	bool defrag;

	unsigned int alloc_sleep_millisecs;
@@ -46,6 +53,7 @@ struct thp_settings { 
	bool use_zero_page;

	struct khugepaged_settings khugepaged;

	unsigned long read_ahead_kb;

	struct hugepages_settings hugepages[NR_ORDERS];

};



int read_file(const char *path, char *buf, size_t buflen);
@@ -67,5 +75,6 @@ void thp_restore_settings(void); 
void thp_save_settings(void);



void thp_set_read_ahead_path(char *path);

unsigned long thp_supported_orders(void);



#endif /* __THP_SETTINGS_H__ */