2021-04-30 04:40:58

by Nanyong Sun

Subject: [PATCH -next] khugepaged: selftests: remove debug_cow

The debug_cow attribute had been removed since commit 4958e4d86ecb01
("mm: thp: remove debug_cow switch"), so remove it in selftest code too,
otherwise the khugepaged test will fail.

Signed-off-by: Nanyong Sun <[email protected]>
---
tools/testing/selftests/vm/khugepaged.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/tools/testing/selftests/vm/khugepaged.c b/tools/testing/selftests/vm/khugepaged.c
index 8b7582130..155120b67 100644
--- a/tools/testing/selftests/vm/khugepaged.c
+++ b/tools/testing/selftests/vm/khugepaged.c
@@ -86,7 +86,6 @@ struct settings {
enum thp_enabled thp_enabled;
enum thp_defrag thp_defrag;
enum shmem_enabled shmem_enabled;
- bool debug_cow;
bool use_zero_page;
struct khugepaged_settings khugepaged;
};
@@ -95,7 +94,6 @@ static struct settings default_settings = {
.thp_enabled = THP_MADVISE,
.thp_defrag = THP_DEFRAG_ALWAYS,
.shmem_enabled = SHMEM_NEVER,
- .debug_cow = 0,
.use_zero_page = 0,
.khugepaged = {
.defrag = 1,
@@ -268,7 +266,6 @@ static void write_settings(struct settings *settings)
write_string("defrag", thp_defrag_strings[settings->thp_defrag]);
write_string("shmem_enabled",
shmem_enabled_strings[settings->shmem_enabled]);
- write_num("debug_cow", settings->debug_cow);
write_num("use_zero_page", settings->use_zero_page);

write_num("khugepaged/defrag", khugepaged->defrag);
@@ -304,7 +301,6 @@ static void save_settings(void)
.thp_defrag = read_string("defrag", thp_defrag_strings),
.shmem_enabled =
read_string("shmem_enabled", shmem_enabled_strings),
- .debug_cow = read_num("debug_cow"),
.use_zero_page = read_num("use_zero_page"),
};
saved_settings.khugepaged = (struct khugepaged_settings) {
--
2.25.1

2021-05-28 05:45:04

by Nanyong Sun

Subject: Re: [PATCH -next] khugepaged: selftests: remove debug_cow

On 2021/4/30 13:11, Nanyong Sun wrote:

> The debug_cow attribute had been removed since commit 4958e4d86ecb01
> ("mm: thp: remove debug_cow switch"), so remove it in selftest code too,
> otherwise the khugepaged test will fail.
>
> Signed-off-by: Nanyong Sun <[email protected]>
> ---
> tools/testing/selftests/vm/khugepaged.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/tools/testing/selftests/vm/khugepaged.c b/tools/testing/selftests/vm/khugepaged.c
> index 8b7582130..155120b67 100644
> --- a/tools/testing/selftests/vm/khugepaged.c
> +++ b/tools/testing/selftests/vm/khugepaged.c
> @@ -86,7 +86,6 @@ struct settings {
> enum thp_enabled thp_enabled;
> enum thp_defrag thp_defrag;
> enum shmem_enabled shmem_enabled;
> - bool debug_cow;
> bool use_zero_page;
> struct khugepaged_settings khugepaged;
> };
> @@ -95,7 +94,6 @@ static struct settings default_settings = {
> .thp_enabled = THP_MADVISE,
> .thp_defrag = THP_DEFRAG_ALWAYS,
> .shmem_enabled = SHMEM_NEVER,
> - .debug_cow = 0,
> .use_zero_page = 0,
> .khugepaged = {
> .defrag = 1,
> @@ -268,7 +266,6 @@ static void write_settings(struct settings *settings)
> write_string("defrag", thp_defrag_strings[settings->thp_defrag]);
> write_string("shmem_enabled",
> shmem_enabled_strings[settings->shmem_enabled]);
> - write_num("debug_cow", settings->debug_cow);
> write_num("use_zero_page", settings->use_zero_page);
>
> write_num("khugepaged/defrag", khugepaged->defrag);
> @@ -304,7 +301,6 @@ static void save_settings(void)
> .thp_defrag = read_string("defrag", thp_defrag_strings),
> .shmem_enabled =
> read_string("shmem_enabled", shmem_enabled_strings),
> - .debug_cow = read_num("debug_cow"),
> .use_zero_page = read_num("use_zero_page"),
> };
> saved_settings.khugepaged = (struct khugepaged_settings) {

This patch has not been responded for a long time.

Could someone please help to deal with it ?

2021-05-28 11:02:17

by Kirill A. Shutemov

Subject: Re: [PATCH -next] khugepaged: selftests: remove debug_cow

On Fri, Apr 30, 2021 at 01:11:17PM +0800, Nanyong Sun wrote:
> The debug_cow attribute had been removed since commit 4958e4d86ecb01
> ("mm: thp: remove debug_cow switch"), so remove it in selftest code too,
> otherwise the khugepaged test will fail.
>
> Signed-off-by: Nanyong Sun <[email protected]>

Acked-by: Kirill A. Shutemov <[email protected]>

--
Kirill A. Shutemov