syscalls: munmap: Convert to new API
v6 cover syscalls: munmap: Convert to new API
---
Changes in v6:
- munmap01: Simplified cleanup unmap logic (suggested by Andrea)
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- munmap01: Fixed cleanup unmap logic
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- munmap01: Set map_addr to NULL after unmapping
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Stopped using "mapped" variable
- Simplified cleanup() in munmap01
- Removed unnecessary comments
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- munmap03: Use static variables for specific test cases
- munmap01: Use fork() instead of signals
- Overall comment cleanup
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Ricardo B. Marlière (3):
syscalls: munmap01: Convert to new API
syscalls: munmap02: Make it a variant of munmap01
syscalls: munmap03: Convert to new API
runtest/syscalls | 1 - testcases/kernel/syscalls/munmap/.gitignore | 1 - testcases/kernel/syscalls/munmap/munmap01.c | 279 ++++++++-------------------- testcases/kernel/syscalls/munmap/munmap02.c | 252 ------------------------- testcases/kernel/syscalls/munmap/munmap03.c | 169 +++++------------ 5 files changed, 117 insertions(+), 585 deletions(-)
---
base-commit: 16cd67ef1f85e6b14c182fa49632a5014560edfa
change-id: 20250703-conversions-munmap-3b6a29faa268
Best regards,
Signature · 5 lines
Ricardo B. Marlière <[email protected]> -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v6 1/3 syscalls: munmap01: Convert to new API
From: Ricardo B. Marlière <[email protected]>
--- testcases/kernel/syscalls/munmap/munmap01.c | 262 ++++++---------------------- 1 file changed, 54 insertions(+), 208 deletions(-)
testcases/kernel/syscalls/munmap/munmap01.c +54 -208
@@ -1,235 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* 07/2001 Ported by Wayne Boyer +* Copyright (c) 2025 SUSE LLC Ricardo B. Marlière <[email protected]> */ -/* -* Test Name: munmap01 -* -* Test Description: -* Verify that, munmap call will succeed to unmap a mapped file or -* anonymous shared memory region from the calling process's address space -* and after successful completion of munmap, the unmapped region is no -* longer accessible. -* -* Expected Result: -* munmap call should succeed to unmap a mapped file or anonymous shared -* memory region from the process's address space and it returns with a -* value 0, further reference to the unmapped region should result in a -* segmentation fault (SIGSEGV). +/*\ +* Verify that, munmap call will succeed to unmap a mapped file or +* anonymous shared memory region from the calling process's address space +* and after successful completion of munmap, the unmapped region is no +* longer accessible. * -* Algorithm: -* Setup: -* Setup signal handling. -* Create temporary directory. -* Pause for SIGUSR1 if option specified. -* -* Test: -* Loop if the proper options are given. -* Execute system call -* Check return code, if system call failed (return=-1) -* Log the errno and Issue a FAIL message. -* Otherwise, -* Verify the Functionality of system call -* if successful, -* Issue Functionality-Pass message. -* Otherwise, -* Issue Functionality-Fail message. -* Cleanup: -* Print errno log and/or timing stats if options given -* Delete the temporary directory created. -* -* Usage: <for command-line> -* munmap01 [-c n] [-f] [-i n] [-I x] [-P x] [-t] -* where, -c n : Run n copies concurrently. -* -f : Turn off functionality Testing. -* -i n : Execute test n times. -* -I x : Execute test for x seconds. -* -P x : Pause for x seconds between iterations. -* -t : Turn on syscall timing. -* -* HISTORY -* 07/2001 Ported by Wayne Boyer -* -* RESTRICTIONS: -* None.$ +* munmap call should succeed to unmap a mapped file or anonymous shared +* memory region from the process's address space and it returns with a +* value 0, further reference to the unmapped region should result in a +* segmentation fault (SIGSEGV). */ -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/stat.h> -#include <sys/mman.h> - -#include "test.h" -#include "safe_macros.h" - -#define TEMPFILE "mmapfile" -char *TCID ="munmap01" ; -int TST_TOTAL =1 ; +#include "tst_test.h" -char *addr;/* addr of memory mapped region */ -int fildes;/* file descriptor for tempfile */ -unsigned int map_len;/* length of the region to be mapped */ +static int fd =-1 ; +static char *map_addr; +static unsigned int map_len; -void setup ();/* Main setup function of test */ -void cleanup ();/* cleanup function for the test */ -void sig_handler ();/* signal catching function */ - -int main (int ac,char **av) +static void run (void ) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ; - -setup (); - -/* -* Call munmap to unmap the mapped region of the -* temporary file from the calling process's address space. -*/ -TEST (munmap (addr, map_len)); - -/* Check for the return value of munmap() */ -if (TEST_RETURN ==-1 ) { -tst_resm (TFAIL ,"munmap() fails, errno=%d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); -continue ; - } +int status; -/* -* Check whether further reference is possible -* to the unmapped memory region by writing -* to the first byte of region with -* some arbitrary number. -*/ - *addr =50 ; +SAFE_MUNMAP (map_addr, map_len); -/* This message is printed if no SIGSEGV */ -tst_resm (TFAIL ,"process succeeds to refer unmapped memory region" ); +/* +* Check whether further reference is possible to the unmapped memory +* region by writing to the first byte of region with some arbitrary +* number. +*/ +if (!SAFE_FORK ()) { + *map_addr =50 ; +_exit (0 ); + } -cleanup (); + map_addr =NULL ; +SAFE_WAIT (&status); +if (WIFSIGNALED (status) &&WTERMSIG (status) ==SIGSEGV ) { +tst_res (TPASS ,"Child was unable to access unmapped memory" ); +return ; } -tst_exit (); +tst_res (TFAIL ,"Child succeeds to refer unmapped memory region" ); } -/* -* setup() - performs all ONE TIME setup for this test. -* -* Set up signal handler to catch SIGSEGV. -* Get system page size, create a temporary file for reading/writing, -* write one byte data into it, map the open file for the specified -* map length. -*/ -void setup (void ) +static void setup (void ) { -size_t page_sz; - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); +size_t page_sz =SAFE_SYSCONF (_SC_PAGESIZE); -/* call signal function to trap the signal generated */ -if (signal (SIGSEGV , sig_handler) ==SIG_ERR ) { -tst_brkm (TBROK , cleanup,"signal fails to catch signal" ); - } - -TEST_PAUSE ; - -/* Get the system page size */ - page_sz =getpagesize (); - -/* -* Get the length of the open file to be mapped into process -* address space. -*/ map_len =3 * page_sz; -tst_tmpdir (); - -/* Creat a temporary file used for mapping */ -if ((fildes =open (TEMPFILE ,O_RDWR |O_CREAT ,0666 )) <0 ) { -tst_brkm (TBROK , cleanup,"open() on %s Failed, errno=%d : %s" , -TEMPFILE , errno,strerror (errno)); - } - -/* -* move the file pointer to maplength position from the beginning -* of the file. -*/ -SAFE_LSEEK (cleanup, fildes, map_len,SEEK_SET ); - -/* Write one byte into temporary file */ -if (write (fildes,"a" ,1 ) !=1 ) { -tst_brkm (TBROK , cleanup,"write() on %s Failed, errno=%d : %s" , -TEMPFILE , errno,strerror (errno)); - } - -/* -* map the open file 'TEMPFILE' from its beginning up to the maplength -* into the calling process's address space at the system choosen -* with read/write permissions to the mapped region. -*/ - addr =mmap (0 , map_len,PROT_READ |PROT_WRITE , -MAP_FILE |MAP_SHARED , fildes,0 ); + fd =SAFE_OPEN ("mmapfile" ,O_RDWR |O_CREAT ,0666 ); -/* check for the return value of mmap system call */ -if (addr == (char *)MAP_FAILED ) { -tst_brkm (TBROK , cleanup,"mmap() Failed on %s, errno=%d : %s" , -TEMPFILE , errno,strerror (errno)); - } +SAFE_LSEEK (fd, map_len,SEEK_SET ); +SAFE_WRITE (SAFE_WRITE_ALL , fd,"a" ,1 ); + map_addr =SAFE_MMAP (0 , map_len,PROT_READ |PROT_WRITE , +MAP_FILE |MAP_SHARED , fd,0 ); } -/* -* sig_handler() - signal catching function. -* This function is used to trap the signal generated when tried to read or -* write to the memory mapped region which is already detached from the -* calling process address space. -* this function is invoked when SIGSEGV generated and it calls test -* cleanup function and exit the program. -*/ -void sig_handler (void ) +static void cleanup (void ) { -tst_resm (TPASS ,"Functionality of munmap() successful" ); - -/* Invoke test cleanup function and exit */ -cleanup (); - -tst_exit (); +if (map_addr) +SAFE_MUNMAP (map_addr, map_len); +if (fd !=-1 ) +SAFE_CLOSE (fd); } -/* -* cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -* Close the temporary file. -* Remove the temporary directory. -*/ -void cleanup (void ) -{ - -/* Close the temporary file */ -if (close (fildes) <0 ) { -tst_brkm (TFAIL ,NULL ,"close() on %s Failed, errno=%d : %s" , -TEMPFILE , errno,strerror (errno)); - } - -tst_rmdir (); -} +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .needs_tmpdir =1 , + .forks_child =1 , +};
Signature · 5 lines
2.50.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v6 2/3 syscalls: munmap02: Make it a variant of munmap01
In reply to Ricardo B. Marlière via ltpFrom: Ricardo B. Marlière <[email protected]>
--- runtest/syscalls | 1 - testcases/kernel/syscalls/munmap/.gitignore | 1 - testcases/kernel/syscalls/munmap/munmap01.c | 45 +++-- testcases/kernel/syscalls/munmap/munmap02.c | 252 ---------------------------- 4 files changed, 33 insertions(+), 266 deletions(-)
runtest/syscalls +0 -1
@@ -949,7 +949,6 @@ munlock02 munlock02 munlockall01 munlockall01 munmap01 munmap01 -munmap02 munmap02 munmap03 munmap03 nanosleep01 nanosleep01
testcases/kernel/syscalls/munmap/.gitignore +0 -1
@@ -1,3 +1,2 @@ /munmap01 -/munmap02 /munmap03
testcases/kernel/syscalls/munmap/munmap01.c +33 -12
93 lines not on this page · raw message
testcases/kernel/syscalls/munmap/munmap02.c deleted +0 -252
252 lines not on this page · raw message
Signature · 5 lines
2.50.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v6 3/3 syscalls: munmap03: Convert to new API
In reply to Ricardo B. Marlière via ltpFrom: Ricardo B. Marlière <[email protected]>
--- testcases/kernel/syscalls/munmap/munmap03.c | 169 ++++++++-------------------- 1 file changed, 44 insertions(+), 125 deletions(-)
testcases/kernel/syscalls/munmap/munmap03.c +44 -125
@@ -1,148 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* -* Copyright (c) International Business Machines Corp., 2001 -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* Copyright (c) International Business Machines Corp., 2001 +* 07/2001 Ported by Wayne Boyer +* Copyright (c) 2025 SUSE LLC Ricardo B. Marlière <[email protected]> */ -/* -* Test Description: -* Verify that, -* 1. munmap() fails with -1 return value and sets errno to EINVAL -* if addresses in the range [addr,addr+len) are outside the valid -* range for the address space of a process. -* 2. munmap() fails with -1 return value and sets errno to EINVAL -* if the len argument is 0. -* 3. munmap() fails with -1 return value and sets errno to EINVAL -* if the addr argument is not a multiple of the page size as -* returned by sysconf(). +/*\ +* Verify that, munmap() fails with errno: * -* HISTORY -* 07/2001 Ported by Wayne Boyer +* - EINVAL, if addresses in the range [addr,addr+len) are outside the valid +* range for the address space of a process. +* - EINVAL, if the len argument is 0. +* - EINVAL, if the addr argument is not a multiple of the page size as +* returned by sysconf(). */ -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/mman.h> -#include <sys/resource.h> -#include <sys/stat.h> - -#include "test.h" -#include "safe_macros.h" - -char *TCID ="munmap03" ; +#include "tst_test.h" static size_t page_sz; -static char *global_addr; -static size_t global_maplen; - -static void setup (void ); -static void cleanup (void ); - -static void test_einval1 (void ); -static void test_einval2 (void ); -static void test_einval3 (void ); -static void (*testfunc[])(void ) = { test_einval1, test_einval2, test_einval3 }; -int TST_TOTAL =ARRAY_SIZE (testfunc); - -int main (int ac,char **av) +static char *map_addr; +static char *map_addr_out; +static size_t map_len; +static size_t map_len_zero; + +static struct tcase { +int exp_errno; +char **addr; +size_t *len; +} tcases[] = { + {EINVAL , &map_addr_out, &map_len }, + {EINVAL , &map_addr, &map_len_zero }, + {EINVAL , &map_addr +1 , &map_len }, +}; + +static void run (unsigned int i) { -int i, lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - tst_count =0 ; +struct tcase *tc = &tcases[i]; -for (i =0 ; i <TST_TOTAL ; i++) - (*testfunc[i])(); - } - -cleanup (); -tst_exit (); +TST_EXP_FAIL (munmap (tc->addr, *tc->len), tc->exp_errno); }static void setup (void ) -{ -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - - page_sz = (size_t )sysconf (_SC_PAGESIZE); - - global_maplen = page_sz *2 ; - global_addr =SAFE_MMAP (cleanup,NULL , global_maplen,PROT_READ | -PROT_WRITE ,MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); -} - -static void check_and_print (int expected_errno) -{ -if (TEST_RETURN ==-1 ) { -if (TEST_ERRNO == expected_errno) { -tst_resm (TPASS |TTERRNO ,"failed as expected" ); - }else { -tst_resm (TFAIL |TTERRNO , -"failed unexpectedly; expected - %d : %s" , - expected_errno,strerror (expected_errno)); - } - }else { -tst_resm (TFAIL ,"munmap succeeded unexpectedly" ); - } -} - -static void test_einval1 (void ) {struct rlimit brkval; -char *addr; -size_t map_len; - -SAFE_GETRLIMIT (cleanup,RLIMIT_DATA , &brkval); - addr = (char *)brkval.rlim_max; + page_sz =SAFE_SYSCONF (_SC_PAGESIZE); map_len = page_sz *2 ; + map_addr =SAFE_MMAP (NULL , map_len,PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); -TEST (munmap (addr, map_len)); - -check_and_print (EINVAL ); -} - -static void test_einval2 (void ) -{ -char *addr = global_addr; -size_t map_len =0 ; - -TEST (munmap (addr, map_len)); - -check_and_print (EINVAL ); -} - -static void test_einval3 (void ) -{ -char *addr = (char *)(global_addr +1 ); -size_t map_len = page_sz; - -TEST (munmap (addr, map_len)); - -check_and_print (EINVAL ); +SAFE_GETRLIMIT (RLIMIT_DATA , &brkval); + map_addr_out = (char *)brkval.rlim_max; }static void cleanup (void ) { -if (munmap (global_addr, global_maplen) ==-1 ) -tst_resm (TWARN |TERRNO ,"munmap failed" ); +if (map_addr) +SAFE_MUNMAP (map_addr, map_len); } + +static struct tst_test test = { + .test = run, + .tcnt =ARRAY_SIZE (tcases), + .setup = setup, + .cleanup = cleanup, +};
Signature · 5 lines
2.50.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 43 lines · Ricardo B. Marlière
Signed-off-by Ricardo B. Marlière <[email protected]>---
Changes in v6:
- munmap01: Simplified cleanup unmap logic (suggested by Andrea)
- Link to v5: https://lore.kernel.org/r/[email protected]Changes in v5:
- munmap01: Fixed cleanup unmap logic
- Link to v4: https://lore.kernel.org/r/[email protected]Changes in v4:
- munmap01: Setmap_addrto NULL after unmapping
- Link to v3: https://lore.kernel.org/r/[email protected]Changes in v3:
- Stopped using "mapped" variable
- Simplifiedcleanup()in munmap01
- Removed unnecessary comments
- Link to v2: https://lore.kernel.org/r/[email protected]Changes in v2:
- munmap03: Use static variables for specific test cases
- munmap01: Usefork()instead of signals
- Overall comment cleanup
- Link to v1: https://lore.kernel.org/r/[email protected]---
Ricardo B. Marlière (3):
syscalls: munmap01: Convert to new API
syscalls: munmap02: Make it a variant of munmap01
syscalls: munmap03: Convert to new APIruntest/syscalls | 1 - testcases/kernel/syscalls/munmap/.gitignore | 1 - testcases/kernel/syscalls/munmap/munmap01.c | 279 ++++++++-------------------- testcases/kernel/syscalls/munmap/munmap02.c | 252 ------------------------- testcases/kernel/syscalls/munmap/munmap03.c | 169 +++++------------ 5 files changed, 117 insertions(+), 585 deletions(-)---
base-commit:16cd67ef1f85e6b14c182fa49632a5014560edfa
change-id: 20250703-conversions-munmap-3b6a29faa268Best regards,
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Merged thanks!
- Andrea
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp