libswap: add two method to create swapfile
PATCH 1/3 libswap: add two method to create swapfile
This introduces new functionality to the libswap library by adding two methods for creating a swapfile: SWAPFILE_BY_SIZE and SWAPFILE_BY_BLOCKS. The make_swapfile function is updated to accept an additional enum swapfile_method parameter to specify the creation method.
Two macros, MAKE_SWAPFILE_SIZE and MAKE_SWAPFILE_BLKS, are defined to simplify the interface for creating swapfiles by size and by blocks respectively.
--- include/libswap.h | 16 ++++++++++++++-- libs/libltpswap/libswap.c | 30 ++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 10 deletions(-)
include/libswap.h +14 -2
@@ -11,10 +11,22 @@#ifndef __LIBSWAP_H__#define __LIBSWAP_H__ +enum swapfile_method { +SWAPFILE_BY_SIZE , +SWAPFILE_BY_BLOCKS +}; +/* -* Make a swap file +* Create a swapfile of a specified size or number of blocks. */ -int make_swapfile (const char *swapfile,int blocks,int safe); +int make_swapfile (const char *swapfile,unsigned int num, +int safe,enum swapfile_method method); + +#define MAKE_SWAPFILE_SIZE (swapfile, size, safe) \ + make_swapfile(swapfile, size, safe, SWAPFILE_BY_SIZE) + +#define MAKE_SWAPFILE_BLKS (swapfile, blocks, safe) \ + make_swapfile(swapfile, blocks, safe, SWAPFILE_BY_BLOCKS)/* * Check swapon/swapoff support status of filesystems or files
libs/libltpswap/libswap.c +22 -8
@@ -133,23 +133,37 @@ out:return contiguous; } -int make_swapfile (const char *swapfile,int blocks,int safe) +int make_swapfile (const char *swapfile,unsigned int num,int safe,enum swapfile_method method) {struct statvfs fs_info;unsigned long blk_size, bs;size_t pg_size =sysconf (_SC_PAGESIZE);char mnt_path[100 ]; +unsigned int blocks;if (statvfs ("." , &fs_info) ==-1 )return -1 ; blk_size = fs_info.f_bsize; -/* To guarantee at least one page can be swapped out */ -if (blk_size * blocks < pg_size) - bs = pg_size; -else - bs = blk_size; +switch (method) { +case SWAPFILE_BY_BLOCKS : + blocks = num; +if (blk_size * blocks < pg_size) + bs = pg_size; +else + bs = blk_size; +break ; +case SWAPFILE_BY_SIZE : +if (num *1024 *1024 < pg_size) + bs = pg_size; +else + bs = blk_size; + blocks = (num *1024 *1024 ) / blk_size; +break ; +default : +return -1 ; + }if (sscanf (swapfile,"%[^/]" , mnt_path) !=1 )tst_brk (TBROK ,"sscanf failed" );
@@ -175,13 +189,13 @@ int make_swapfile(const char *swapfile, int blocks, int safe) argv[2 ] =NULL ;return tst_cmd (argv,"/dev/null" ,"/dev/null" , safe ? -TST_CMD_PASS_RETVAL |TST_CMD_TCONF_ON_MISSING :0 ); +TST_CMD_PASS_RETVAL |TST_CMD_TCONF_ON_MISSING :0 ); }bool is_swap_supported (const char *filename) {int i, sw_support =0 ; -int ret =make_swapfile (filename,10 ,1 ); +int ret =MAKE_SWAPFILE_BLKS (filename,10 ,1 );int fi_contiguous =file_is_contiguous (filename);long fs_type =tst_fs_type (filename);const char *fstype =tst_fs_type_name (fs_type);
Signature · 5 lines
2.40.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 2/3 swapon/off: replace make_swapfile by new macro
--- testcases/kernel/syscalls/swapoff/swapoff01.c | 2 +- testcases/kernel/syscalls/swapoff/swapoff02.c | 2 +- testcases/kernel/syscalls/swapon/swapon01.c | 2 +- testcases/kernel/syscalls/swapon/swapon02.c | 4 ++-- testcases/kernel/syscalls/swapon/swapon03.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-)
testcases/kernel/syscalls/swapoff/swapoff01.c +1 -1
@@ -44,7 +44,7 @@ static void setup(void) {is_swap_supported (TEST_FILE ); -if (make_swapfile (SWAP_FILE ,65536 ,1 )) +if (MAKE_SWAPFILE_BLKS (SWAP_FILE ,65536 ,1 ))tst_brk (TBROK ,"Failed to create file for swap" ); }
testcases/kernel/syscalls/swapoff/swapoff02.c +1 -1
@@ -88,7 +88,7 @@ static void setup(void)is_swap_supported (TEST_FILE ); -if (make_swapfile (SWAP_FILE ,10 ,1 )) +if (MAKE_SWAPFILE_BLKS (SWAP_FILE ,10 ,1 ))tst_brk (TBROK ,"Failed to create file for swap" ); }
testcases/kernel/syscalls/swapon/swapon01.c +1 -1
@@ -38,7 +38,7 @@ static void verify_swapon(void)static void setup (void ) {is_swap_supported (SWAP_FILE ); -make_swapfile (SWAP_FILE ,10 ,0 ); +MAKE_SWAPFILE_BLKS (SWAP_FILE ,10 ,0 );SAFE_CG_PRINTF (tst_cg,"cgroup.procs" ,"%d" ,getpid ());SAFE_CG_PRINTF (tst_cg,"memory.max" ,"%lu" ,TESTMEM );
testcases/kernel/syscalls/swapon/swapon02.c +2 -2
@@ -50,8 +50,8 @@ static void setup(void)is_swap_supported (TEST_FILE );SAFE_TOUCH (NOTSWAP_FILE ,0777 ,NULL ); -make_swapfile (SWAP_FILE ,10 ,0 ); -make_swapfile (USED_FILE ,10 ,0 ); +MAKE_SWAPFILE_BLKS (SWAP_FILE ,10 ,0 ); +MAKE_SWAPFILE_BLKS (USED_FILE ,10 ,0 );if (tst_syscall (__NR_swapon,USED_FILE ,0 ))tst_res (TWARN |TERRNO ,"swapon(alreadyused) failed" );
testcases/kernel/syscalls/swapon/swapon03.c +2 -2
@@ -49,7 +49,7 @@ static int setup_swap(void)/* Create the swapfile */ snprintf (filename,sizeof (filename),"%s%02d" ,TEST_FILE , j +2 ); -make_swapfile (filename,10 ,0 ); +MAKE_SWAPFILE_BLKS (filename,10 ,0 );/* turn on the swap file */ TST_EXP_PASS_SILENT (swapon (filename,0 ));
@@ -62,7 +62,7 @@ static int setup_swap(void)tst_brk (TFAIL ,"Failed to setup swap files" );tst_res (TINFO ,"Successfully created %d swap files" , swapfiles); -make_swapfile (TEST_FILE ,10 ,0 ); +MAKE_SWAPFILE_BLKS (TEST_FILE ,10 ,0 );return 0 ; }
Signature · 5 lines
2.40.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 3/3 swapon: create 128MB swapfile
In reply to Li WangThe modification in the setup function changes the swap file creation approach. Instead of allocating swap space based on a number of blocks (which potentially could be too small for the polluted memory, thus causing an OOM), it now uses a fixed size of 128 units for the swap file creation.
This is likely a conservative figure to prevent the OOM killer from being triggered due to excessive memory allocation for the swap file, helping ensure the test runs successfully on systems with zero swap space.
--- testcases/kernel/syscalls/swapon/swapon01.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
testcases/kernel/syscalls/swapon/swapon01.c +1 -1
@@ -38,7 +38,7 @@ static void verify_swapon(void)static void setup (void ) {is_swap_supported (SWAP_FILE ); -MAKE_SWAPFILE_BLKS (SWAP_FILE ,10 ,0 ); +MAKE_SWAPFILE_SIZE (SWAP_FILE ,128 ,0 );SAFE_CG_PRINTF (tst_cg,"cgroup.procs" ,"%d" ,getpid ());SAFE_CG_PRINTF (tst_cg,"memory.max" ,"%lu" ,TESTMEM );
Signature · 5 lines
2.40.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 84 lines · Li Wang
This introduces new functionality to the libswap library by adding two methods for creating a swapfile:
SWAPFILE_BY_SIZEandSWAPFILE_BY_BLOCKS.
Themake_swapfilefunction is updated to accept an additional enumswapfile_methodparameter to specify the creation method.Two macros,
MAKE_SWAPFILE_SIZEandMAKE_SWAPFILE_BLKS, are defined to simplify the interface for creating swapfiles by size and by blocks respectively.--- include/libswap.h | 16 ++++++++++++++-- libs/libltpswap/libswap.c | 30 ++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 10 deletions(-)include/libswap.h +14
-2@@ -11,10 +11,22 @@#ifndef __LIBSWAP_H__#define __LIBSWAP_H__ +enum swapfile_method { +SWAPFILE_BY_SIZE , +SWAPFILE_BY_BLOCKS +}; +/* -* Make a swap file +* Create a swapfile of a specified size or number of blocks. */ -int make_swapfile (const char *swapfile,int blocks,int safe); +int make_swapfile (const char *swapfile,unsigned int num, +int safe,enum swapfile_method method); + +#define MAKE_SWAPFILE_SIZE (swapfile, size, safe) \ + make_swapfile(swapfile, size, safe, SWAPFILE_BY_SIZE) + +#define MAKE_SWAPFILE_BLKS (swapfile, blocks, safe) \ + make_swapfile(swapfile, blocks, safe, SWAPFILE_BY_BLOCKS)/* * Check swapon/swapoff support status of filesystems or files libs/libltpswap/libswap.c +10
-6@@ -133,23 +133,37 @@ out:return contiguous; } -int make_swapfile (const char *swapfile,int blocks,int safe) +int make_swapfile (const char *swapfile,unsigned int num,int safe,enum swapfile_method method) {struct statvfs fs_info;unsigned long blk_size, bs;size_t pg_size =sysconf (_SC_PAGESIZE);char mnt_path[100 ]; +unsigned int blocks;if (statvfs ("." , &fs_info) ==-1 )return -1 ; blk_size = fs_info.f_bsize; -/* To guarantee at least one page can be swapped out */ -if (blk_size * blocks < pg_size) - bs = pg_size; -else - bs = blk_size; +switch (method) { +case SWAPFILE_BY_BLOCKS : + blocks = num; +if (blk_size * blocks < pg_size) + bs = pg_size; +else + bs = blk_size; +break ;
libs/libltpswap/libswap.c out:
Quoted 10 lines
libs/libltpswap/libswap.c +10
-0+case SWAPFILE_BY_SIZE : +if (num *1024 *1024 < pg_size) + bs = pg_size; +else + bs = blk_size; + blocks = (num *1024 *1024 ) / blk_size; +break ; +default : +return -1 ; + }
Obviously, this part is too ugly, I would take the way Wei posted in another thread, thanks.
Something like:
+ if (method == SWAPFILE_BY_SIZE)
+ blocks = num * 1024 * 1024 / blk_size;
+ else if (method == SWAPFILE_BY_BLOCKS)
+ blocks = num;
+ else
+ tst_brk(TBROK, "Invalide method.");
Quoted 30 lines
if (sscanf(swapfile, "%[^/]", mnt_path) != 1) tst_brk(TBROK, "sscanf failed");libs/libltpswap/libswap.c +2
-2@@ -175,13 +189,13 @@ int make_swapfile(const char *swapfile, int blocks, int safe) argv[2 ] =NULL ;return tst_cmd (argv,"/dev/null" ,"/dev/null" , safe ? -TST_CMD_PASS_RETVAL |TST_CMD_TCONF_ON_MISSING :0 ); + TST_CMD_PASS_RETVAL | TST_CMD_TCONF_ON_MISSING : 0); }bool is_swap_supported (const char *filename) {int i, sw_support =0 ; -int ret =make_swapfile (filename,10 ,1 ); +int ret =MAKE_SWAPFILE_BLKS (filename,10 ,1 );int fi_contiguous = file_is_contiguous(filename); long fs_type = tst_fs_type(filename); const char *fstype = tst_fs_type_name(fs_type);--
2.40.1--
Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp