[LTP] [PATCH 1/2] madvise06: Fix segfault

[Cyril Hrubis]

Hi!
> Test required update after 687f0cbc00 to use struct tst_path_val.
> While at it, move the initialization to struct tst_path_val.
> 
> Fixes: 687f0cbc00 ("lib: enhance .save_restore to support set expected value")
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> Is it ok to define it earlier? i.e. before calling sync() ?
> 
>  testcases/kernel/syscalls/madvise/madvise06.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c
> index 54391db283..b21f2cc7de 100644
> --- a/testcases/kernel/syscalls/madvise/madvise06.c
> +++ b/testcases/kernel/syscalls/madvise/madvise06.c
> @@ -54,6 +54,7 @@
>  #define MEMSW_LIMIT (2 * CHUNK_SZ)
>  #define PASS_THRESHOLD (CHUNK_SZ / 4)
>  #define PASS_THRESHOLD_KB (PASS_THRESHOLD / 1024)
> +#define SWAPPINESS "60"
>  
>  static const char drop_caches_fname[] = "/proc/sys/vm/drop_caches";
>  static int pg_sz, stat_refresh_sup;
> @@ -123,10 +124,9 @@ static void setup(void)
>  		SAFE_CG_PRINTF(tst_cg, "memory.swap.max", "%ld", MEMSW_LIMIT);
>  
>  	if (SAFE_CG_HAS(tst_cg, "memory.swappiness")) {
> -		SAFE_CG_PRINT(tst_cg, "memory.swappiness", "60");
> +		SAFE_CG_PRINT(tst_cg, "memory.swappiness", SWAPPINESS);
>  	} else {
>  		check_path("/proc/sys/vm/swappiness");
> -		SAFE_FILE_PRINTF("/proc/sys/vm/swappiness", "%d", 60);
>  	}

I'm not sure if we want to set the "/proc/sys/vm/swappiness"
unconditinally in the .save_restore as previously we set it only if the
cgroup was missing the swappines knob.

So maybe we should go for a minimal fix here, just change the
save_restore to match the new format and don't set the value there.

>  	SAFE_CG_PRINTF(tst_cg, "cgroup.procs", "%d", getpid());
> @@ -229,8 +229,8 @@ static struct tst_test test = {
>  	.min_kver = "3.10.0",
>  	.needs_tmpdir = 1,
>  	.needs_root = 1,
> -	.save_restore = (const char * const[]) {
> -		"?/proc/sys/vm/swappiness",
> +	.save_restore = (const struct tst_path_val const[]) {
> +		{"?/proc/sys/vm/swappiness", SWAPPINESS},
>  		NULL

This has to be terminated by {} now.

>  	},
>  	.needs_cgroup_ctrls = (const char *const []){ "memory", NULL },
> -- 
> 2.35.1
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz