From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH V2 2/3] mm/ksm: extend 'max_page_sharing' before ksm testing
Date: Thu, 31 Mar 2016 15:31:15 +0200 [thread overview]
Message-ID: <20160331133114.GC21298@rei.lan> (raw)
In-Reply-To: <1458707157-31233-2-git-send-email-liwang@redhat.com>
Hi!
> testcases/kernel/mem/include/mem.h | 3 +++
> testcases/kernel/mem/ksm/ksm01.c | 4 ++++
> testcases/kernel/mem/ksm/ksm02.c | 3 +++
> testcases/kernel/mem/ksm/ksm03.c | 4 ++++
> testcases/kernel/mem/ksm/ksm04.c | 4 ++++
> testcases/kernel/mem/ksm/ksm06.c | 4 ++++
> testcases/kernel/mem/lib/mem.c | 22 +++++++++++++++++++++-
> 7 files changed, 43 insertions(+), 1 deletion(-)
>
> diff --git a/testcases/kernel/mem/include/mem.h b/testcases/kernel/mem/include/mem.h
> index 43988fe..69d08dd 100644
> --- a/testcases/kernel/mem/include/mem.h
> +++ b/testcases/kernel/mem/include/mem.h
> @@ -43,7 +43,10 @@ void testoom(int mempolicy, int lite, int retcode, int allow_sigkill);
> /* KSM */
>
> #define PATH_KSM "/sys/kernel/mm/ksm/"
> +int max_page_sharing;
This value is not modified outside the library. It makes no sense to
declare it in the header.
As a matter of fact it would be far better to declare it as static int
inside the library so that there is no chance that it will be modified
by the testcases.
> +void save_max_page_sharing(void);
> +void restore_max_page_sharing(void);
> void test_ksm_merge_across_nodes(unsigned long nr_pages);
>
> /* THP */
> diff --git a/testcases/kernel/mem/ksm/ksm01.c b/testcases/kernel/mem/ksm/ksm01.c
> index b62df06..824881c 100644
> --- a/testcases/kernel/mem/ksm/ksm01.c
> +++ b/testcases/kernel/mem/ksm/ksm01.c
> @@ -106,6 +106,8 @@ void setup(void)
> if (access(PATH_KSM, F_OK) == -1)
> tst_brkm(TCONF, NULL, "KSM configuration is not enabled");
>
> + save_max_page_sharing();
> +
> /*
> * kernel commit 90bd6fd introduced a new KSM sysfs knob
> * /sys/kernel/mm/ksm/merge_across_nodes, setting it to '0'
> @@ -128,4 +130,6 @@ void cleanup(void)
> if (access(PATH_KSM "merge_across_nodes", F_OK) == 0)
> FILE_PRINTF(PATH_KSM "merge_across_nodes",
> "%d", merge_across_nodes);
> +
> + restore_max_page_sharing();
> }
> diff --git a/testcases/kernel/mem/ksm/ksm02.c b/testcases/kernel/mem/ksm/ksm02.c
> index 537ec01..6274f8a 100644
> --- a/testcases/kernel/mem/ksm/ksm02.c
> +++ b/testcases/kernel/mem/ksm/ksm02.c
> @@ -125,6 +125,8 @@ void cleanup(void)
> FILE_PRINTF(PATH_KSM "merge_across_nodes",
> "%d", merge_across_nodes);
>
> + restore_max_page_sharing();
> +
> umount_mem(CPATH, CPATH_NEW);
> }
>
> @@ -136,6 +138,7 @@ void setup(void)
> tst_brkm(TCONF, NULL, "2.6.32 or greater kernel required");
> if (access(PATH_KSM, F_OK) == -1)
> tst_brkm(TCONF, NULL, "KSM configuration is not enabled");
> + save_max_page_sharing();
>
> if (access(PATH_KSM "merge_across_nodes", F_OK) == 0) {
> SAFE_FILE_SCANF(NULL, PATH_KSM "merge_across_nodes",
> diff --git a/testcases/kernel/mem/ksm/ksm03.c b/testcases/kernel/mem/ksm/ksm03.c
> index b73e023..979222a 100644
> --- a/testcases/kernel/mem/ksm/ksm03.c
> +++ b/testcases/kernel/mem/ksm/ksm03.c
> @@ -113,6 +113,8 @@ void setup(void)
> SAFE_FILE_PRINTF(NULL, PATH_KSM "merge_across_nodes", "1");
> }
>
> + save_max_page_sharing();
> +
> mount_mem("memcg", "cgroup", "memory", MEMCG_PATH, MEMCG_PATH_NEW);
> tst_sig(FORK, DEF_HANDLER, NULL);
> TEST_PAUSE;
> @@ -124,5 +126,7 @@ void cleanup(void)
> FILE_PRINTF(PATH_KSM "merge_across_nodes",
> "%d", merge_across_nodes);
>
> + restore_max_page_sharing();
> +
> umount_mem(MEMCG_PATH, MEMCG_PATH_NEW);
> }
> diff --git a/testcases/kernel/mem/ksm/ksm04.c b/testcases/kernel/mem/ksm/ksm04.c
> index 0c1d4e0..4beeed6 100644
> --- a/testcases/kernel/mem/ksm/ksm04.c
> +++ b/testcases/kernel/mem/ksm/ksm04.c
> @@ -127,6 +127,8 @@ void cleanup(void)
> FILE_PRINTF(PATH_KSM "merge_across_nodes",
> "%d", merge_across_nodes);
>
> + restore_max_page_sharing();
> +
> umount_mem(CPATH, CPATH_NEW);
> umount_mem(MEMCG_PATH, MEMCG_PATH_NEW);
> }
> @@ -146,6 +148,8 @@ void setup(void)
> SAFE_FILE_PRINTF(NULL, PATH_KSM "merge_across_nodes", "1");
> }
>
> + save_max_page_sharing();
> +
> tst_sig(FORK, DEF_HANDLER, cleanup);
> TEST_PAUSE;
> mount_mem("cpuset", "cpuset", NULL, CPATH, CPATH_NEW);
> diff --git a/testcases/kernel/mem/ksm/ksm06.c b/testcases/kernel/mem/ksm/ksm06.c
> index 02d304f..2092746 100644
> --- a/testcases/kernel/mem/ksm/ksm06.c
> +++ b/testcases/kernel/mem/ksm/ksm06.c
> @@ -105,6 +105,8 @@ void setup(void)
> SAFE_FILE_SCANF(NULL, PATH_KSM "sleep_millisecs",
> "%d", &sleep_millisecs);
>
> + save_max_page_sharing();
> +
> tst_sig(FORK, DEF_HANDLER, cleanup);
> TEST_PAUSE;
> }
> @@ -116,6 +118,8 @@ void cleanup(void)
> FILE_PRINTF(PATH_KSM "sleep_millisecs",
> "%d", sleep_millisecs);
> FILE_PRINTF(PATH_KSM "run", "%d", run);
> +
> + restore_max_page_sharing();
> }
>
> static void usage(void)
> diff --git a/testcases/kernel/mem/lib/mem.c b/testcases/kernel/mem/lib/mem.c
> index 7b5bb35..084e5a4 100644
> --- a/testcases/kernel/mem/lib/mem.c
> +++ b/testcases/kernel/mem/lib/mem.c
> @@ -230,6 +230,20 @@ void testoom(int mempolicy, int lite, int retcode, int allow_sigkill)
>
> /* KSM */
>
> +void save_max_page_sharing(void)
> +{
> + if (access(PATH_KSM "max_page_sharing", F_OK) == 0)
> + SAFE_FILE_SCANF(NULL, PATH_KSM "max_page_sharing",
> + "%d", &max_page_sharing);
> +}
> +
> +void restore_max_page_sharing(void)
> +{
> + if (access(PATH_KSM "max_page_sharing", F_OK) == 0)
> + FILE_PRINTF(PATH_KSM "max_page_sharing",
> + "%d", max_page_sharing);
> +}
> +
> static void check(char *path, long int value)
> {
> char fullpath[BUFSIZ];
> @@ -502,9 +516,12 @@ void create_same_memory(int size, int num, int unit)
> stop_ksm_children(child, num);
>
> tst_resm(TINFO, "KSM merging...");
> + if (access(PATH_KSM "max_page_sharing", F_OK) == 0)
> + SAFE_FILE_PRINTF(cleanup, PATH_KSM "max_page_sharing",
> + "%ld", size * pages * num);
> SAFE_FILE_PRINTF(cleanup, PATH_KSM "run", "1");
> SAFE_FILE_PRINTF(cleanup, PATH_KSM "pages_to_scan", "%ld",
> - size * pages *num);
> + size * pages * num);
> SAFE_FILE_PRINTF(cleanup, PATH_KSM "sleep_millisecs", "0");
>
> resume_ksm_children(child, num);
> @@ -595,6 +612,9 @@ void test_ksm_merge_across_nodes(unsigned long nr_pages)
> SAFE_FILE_PRINTF(cleanup, PATH_KSM "sleep_millisecs", "0");
> SAFE_FILE_PRINTF(cleanup, PATH_KSM "pages_to_scan", "%ld",
> nr_pages * num_nodes);
> + if (access(PATH_KSM "max_page_sharing", F_OK) == 0)
> + SAFE_FILE_PRINTF(cleanup, PATH_KSM "max_page_sharing",
> + "%ld", nr_pages * num_nodes);
> /*
> * merge_across_nodes setting can be changed only when there
> * are no ksm shared pages in system, so set run 2 to unmerge
--
Cyril Hrubis
chrubis@suse.cz
next prev parent reply other threads:[~2016-03-31 13:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 4:25 [LTP] [PATCH V2 1/3] mm/ksm: taking use of SAFE_FILE_ macro for ksm05.c Li Wang
2016-03-23 4:25 ` [LTP] [PATCH V2 2/3] mm/ksm: extend 'max_page_sharing' before ksm testing Li Wang
2016-03-23 4:25 ` [LTP] [PATCH V2 3/3] mm/oom: enable ksm before OOM-KSM testing Li Wang
2016-03-31 13:52 ` Cyril Hrubis
2016-04-01 9:45 ` Li Wang
2016-03-31 13:31 ` Cyril Hrubis [this message]
2016-04-01 6:18 ` [LTP] [PATCH V2 2/3] mm/ksm: extend 'max_page_sharing' before ksm testing Li Wang
2016-04-07 13:38 ` Cyril Hrubis
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=20160331133114.GC21298@rei.lan \
--to=chrubis@suse.cz \
--cc=ltp@lists.linux.it \
/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