Re: [LTP] [PATCH v3 2/2] swapon03: Try to swapon() as many files until it fails

[Cyril Hrubis <chrubis@suse.cz>]

Hi!
> Suggested-by: Michal Hocko <mhocko@suse.com>
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> Changes v2->v3:
> * Add -i2 to runtest/syscalls.
> * Slightly simpler code (no mmap() needed) due cleanup in a previous
>   commit (removed fork()).
> 
>  runtest/syscalls                            |  2 +-
>  testcases/kernel/syscalls/swapon/swapon03.c | 54 +++++++++++++--------
>  2 files changed, 34 insertions(+), 22 deletions(-)
> 
> diff --git a/runtest/syscalls b/runtest/syscalls
> index 54d94c0ca2..80dedef749 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -1646,7 +1646,7 @@ swapoff02 swapoff02
>  
>  swapon01 swapon01
>  swapon02 swapon02
> -swapon03 swapon03
> +swapon03 swapon03 -i2
>  
>  #Exclusive syscall() for POWER6 machines only
>  switch01 endian_switch01
> diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c
> index c014a48912..548a5a522f 100644
> --- a/testcases/kernel/syscalls/swapon/swapon03.c
> +++ b/testcases/kernel/syscalls/swapon/swapon03.c
> @@ -6,9 +6,12 @@
>   */
>  
>  /*\
> - * This test case checks whether swapon(2) system call returns:
> + * Test checks whether :man2:`swapon` system call returns EPERM when the maximum
> + * number of swap files are already in use.
>   *
> - *  - EPERM when there are more than MAX_SWAPFILES already in use.
> + * NOTE: test does not try to calculate MAX_SWAPFILES from the internal
> + * kernel implementation, instead make sure few swaps were created before
> + * maximum was reached.
>   */
>  
>  #include <stdio.h>
> @@ -20,6 +23,13 @@
>  #include "lapi/syscalls.h"
>  #include "libswap.h"
>  
> +/*
> + * MAX_SWAPFILES from the internal kernel implementation is currently <23, 29>,
> + * depending on kernel configuration (see man swapon(2). Chose small enough
> + * value for future changes.
> + */
> +#define NUM_SWAP_FILES 15

It would be slightly better if we renamed this to MIN_SWAP_FILES since
this is the minimal number of swapfiles we expect to be able to create.

>  #define MNTPOINT	"mntpoint"
>  #define TEST_FILE	MNTPOINT"/testswap"
>  
> @@ -27,31 +37,33 @@ static int swapfiles;
>  
>  static int setup_swap(void)
>  {
> -	int j, max_swapfiles, used_swapfiles;
> +	int used_swapfiles, expected_swapfiles;

Here as well, s/expected_swapfiles/min_swapfiles/

>  	char filename[FILENAME_MAX];
>  
> -	/* Determine how many more files are to be created */
> -	max_swapfiles = tst_max_swapfiles();
>  	used_swapfiles = tst_count_swaps();
> -	swapfiles = max_swapfiles - used_swapfiles;
> -	if (swapfiles > max_swapfiles)
> -		swapfiles = max_swapfiles;
> +	expected_swapfiles = NUM_SWAP_FILES - used_swapfiles;
>  
> -	/*create and turn on remaining swapfiles */
> -	for (j = 0; j < swapfiles; j++) {
> +	if (expected_swapfiles < 0)
> +		tst_brk(TCONF, "too many used swap files (%d)", used_swapfiles);

Do we really have to quit here? If all swap slots are already used we
will not create any additioinal swaps and just go directly to the test.
If there are some slot left, we will fill them.

The only difference is taht we shouldn't expect a failure until this
number of swaps has been reached.

So we should do:

	if (swapon(filename, 0) == -1) {
		if (errno == EPERM && swapfiles > min_swapfiles)
			break;

		tst_res(TFAIL | TERRNO, "swapon(%s, 0)", filename);
	}

> -		/* Create the swapfile */
> -		snprintf(filename, sizeof(filename), "%s%02d", TEST_FILE, j + 2);
> -		SAFE_MAKE_SMALL_SWAPFILE(filename);
> +	SAFE_MAKE_SMALL_SWAPFILE(TEST_FILE);
> +	swapfiles++;

Why do we increase the number of swapfiles here? We only created the
file. Isn't the swapfiles counter for swaps that were enabled by
swapon()?

> -		/* turn on the swap file */
> -		TST_EXP_PASS_SILENT(swapon(filename, 0));
> -		if (!TST_PASS)
> -			tst_brk(TFAIL, "Failed to setup swap files");
> +	while (true) {
> +		/* Create the swapfile */
> +		snprintf(filename, sizeof(filename), "%s%02d", TEST_FILE, swapfiles);
> +		MAKE_SMALL_SWAPFILE(filename);
> +
> +		/* Quit on a first swap file over max, check for EPERM */
> +		if (swapon(filename, 0) == -1) {
> +			if (errno != EPERM)
> +				tst_res(TFAIL | TERRNO, "swapon(%s, 0)", filename);
> +			break;
> +		}
> +		swapfiles++;
>  	}
>  
>  	tst_res(TINFO, "Successfully created %d swap files", swapfiles);
> -	MAKE_SMALL_SWAPFILE(TEST_FILE);
>  
>  	return 0;
>  }
> @@ -61,7 +73,7 @@ static int setup_swap(void)
>   */
>  static int check_and_swapoff(const char *filename)
>  {
> -	char cmd_buffer[256];
> +	char cmd_buffer[FILENAME_MAX+28];
>  	int rc = -1;
>  
>  	snprintf(cmd_buffer, sizeof(cmd_buffer), "grep -q '%s.*file' /proc/swaps", filename);
> @@ -82,8 +94,8 @@ static void clean_swap(void)
>  	int j;
>  	char filename[FILENAME_MAX];
>  
> -	for (j = 0; j < swapfiles; j++) {
> -		snprintf(filename, sizeof(filename), "%s%02d", TEST_FILE, j + 2);
> +	for (j = 1; j < swapfiles; j++) {
> +		snprintf(filename, sizeof(filename), "%s%02d", TEST_FILE, j);
>  		check_and_swapoff(filename);
>  	}
>  
> -- 
> 2.51.0
> 

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp