| Message ID | 20240205083805.6713-1-xuyang2018.jy@fujitsu.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | munlockall01: Convert to new API | expand |
Hello Yang, On Monday, February 5, 2024 9:38:05 AM CET Yang Xu via ltp wrote: > Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> > --- > .../kernel/syscalls/munlockall/munlockall01.c | 140 ++---------------- > 1 file changed, 15 insertions(+), 125 deletions(-) > > diff --git a/testcases/kernel/syscalls/munlockall/munlockall01.c > b/testcases/kernel/syscalls/munlockall/munlockall01.c index > 51f731b65..f265e574f 100644 > --- a/testcases/kernel/syscalls/munlockall/munlockall01.c > +++ b/testcases/kernel/syscalls/munlockall/munlockall01.c > @@ -1,134 +1,24 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later original test has GPLv2 > /* > * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved. > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of version 2 of the GNU General Public License as > - * published by the Free Software Foundation. > - * > - * This program is distributed in the hope that it would be useful, but > - * WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. > - * > - * You should have received a copy of the GNU General Public License along > - * with this program; if not, write the Free Software Foundation, Inc., > - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > - * > + * Copyright (c) Linux Test Project, 2002-2024 > */ > -/************************************************************************** > - * > - * TEST IDENTIFIER : munlockall01 > - * > - * EXECUTED BY : root / superuser > - * > - * TEST TITLE : Basic test for munlockall(2) > - * > - * TEST CASE TOTAL : 1 > - * > - * AUTHOR : sowmya adiga<sowmya.adiga@wipro.com> > - * > - * SIGNALS > - * Uses SIGUSR1 to pause before test if option set. > - * (See the parse_opts(3) man page). > - * > - * DESCRIPTION > - * This is a phase I test for the munlockall(2) system call. > - * It is intended to provide a limited exposure of the system call. > - * > - * Setup: > - * Setup signal handling. > - * Pause for SIGUSR1 if option specified. > - * > - * Test: > - * Execute system call > - * Check return code, if system call failed (return=-1) > - * Log the errno and Issue a FAIL message. > - * Otherwise, Issue a PASS message. > - * > - * Cleanup: > - * Print errno log and/or timing stats if options given > - * > - * USAGE: <for command-line> > - * munlockall01 [-c n] [-e] [-i n] [-I x] [-p x] [-t] > - * where, -c n : Run n copies concurrently > - * -e : Turn on errno logging. > - * -h : Show this help screen > - * -i n : Execute test n times. > - * -I x : Execute test for x seconds. > - * -p : Pause for SIGUSR1 before starting > - * -P x : Pause for x seconds between iterations. > - * t : Turn on syscall timing. > - * > - * RESTRICTIONS > - * Must be root/superuser to run it. > - > *************************************************************************** > **/ -#include <errno.h> > -#include <sys/mman.h> > -#include "test.h" > - > -void setup(); > -void cleanup(); > - > -char *TCID = "munlockall01"; > -int TST_TOTAL = 1; > - > -#if !defined(UCLINUX) > - > -int main(int ac, char **av) > -{ > - int lc; > - > - tst_parse_opts(ac, av, NULL, NULL); > > - setup(); > - > - /* check looping state */ > - for (lc = 0; TEST_LOOPING(lc); lc++) { > - > - tst_count = 0; > - > - TEST(munlockall()); > - > - /* check return code */ > - if (TEST_RETURN == -1) { > - tst_resm(TFAIL | TTERRNO, "munlockall() Failed with" > - " return=%ld", TEST_RETURN); > - } else { > - tst_resm(TPASS, "munlockall() passed with" > - " return=%ld ", TEST_RETURN); > - > - } > - } > - > - /* cleanup and exit */ > - cleanup(); > - tst_exit(); > - > -} > - > -#else > - > -int main(void) > -{ > - tst_resm(TINFO, "test is not available on uClinux"); > - tst_exit(); > -} > +/* > + * [Description] > + * > + * Check the basic function of munlockall(2) system call. > + */ > > -#endif /* if !defined(UCLINUX) */ > +#include <sys/mman.h> I think we do not need this header. > +#include "tst_test.h" > > -/* setup() - performs all ONE TIME setup for this test. */ > -void setup(void) > +static void verify_munlockall(void) > { > - tst_require_root(); > - > - tst_sig(NOFORK, DEF_HANDLER, cleanup); > - > - TEST_PAUSE; > + TST_EXP_PASS(munlockall()); > } > > -/* > - * cleanup() - performs all ONE TIME cleanup for this test at > - * completion or premature exit. > - */ > -void cleanup(void) > -{ > -} > +static struct tst_test test = { > + .needs_root = 1, > + .test_all = verify_munlockall, > +}; Conversion to new API looks good, but maybe we can improve the test a bit by locking few or all pages before testing the munlockall. Thanks, Avinesh
diff --git a/testcases/kernel/syscalls/munlockall/munlockall01.c b/testcases/kernel/syscalls/munlockall/munlockall01.c index 51f731b65..f265e574f 100644 --- a/testcases/kernel/syscalls/munlockall/munlockall01.c +++ b/testcases/kernel/syscalls/munlockall/munlockall01.c @@ -1,134 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * + * Copyright (c) Linux Test Project, 2002-2024 */ -/************************************************************************** - * - * TEST IDENTIFIER : munlockall01 - * - * EXECUTED BY : root / superuser - * - * TEST TITLE : Basic test for munlockall(2) - * - * TEST CASE TOTAL : 1 - * - * AUTHOR : sowmya adiga<sowmya.adiga@wipro.com> - * - * SIGNALS - * Uses SIGUSR1 to pause before test if option set. - * (See the parse_opts(3) man page). - * - * DESCRIPTION - * This is a phase I test for the munlockall(2) system call. - * It is intended to provide a limited exposure of the system call. - * - * Setup: - * Setup signal handling. - * Pause for SIGUSR1 if option specified. - * - * Test: - * Execute system call - * Check return code, if system call failed (return=-1) - * Log the errno and Issue a FAIL message. - * Otherwise, Issue a PASS message. - * - * Cleanup: - * Print errno log and/or timing stats if options given - * - * USAGE: <for command-line> - * munlockall01 [-c n] [-e] [-i n] [-I x] [-p x] [-t] - * where, -c n : Run n copies concurrently - * -e : Turn on errno logging. - * -h : Show this help screen - * -i n : Execute test n times. - * -I x : Execute test for x seconds. - * -p : Pause for SIGUSR1 before starting - * -P x : Pause for x seconds between iterations. - * t : Turn on syscall timing. - * - * RESTRICTIONS - * Must be root/superuser to run it. - *****************************************************************************/ -#include <errno.h> -#include <sys/mman.h> -#include "test.h" - -void setup(); -void cleanup(); - -char *TCID = "munlockall01"; -int TST_TOTAL = 1; - -#if !defined(UCLINUX) - -int main(int ac, char **av) -{ - int lc; - - tst_parse_opts(ac, av, NULL, NULL); - setup(); - - /* check looping state */ - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - TEST(munlockall()); - - /* check return code */ - if (TEST_RETURN == -1) { - tst_resm(TFAIL | TTERRNO, "munlockall() Failed with" - " return=%ld", TEST_RETURN); - } else { - tst_resm(TPASS, "munlockall() passed with" - " return=%ld ", TEST_RETURN); - - } - } - - /* cleanup and exit */ - cleanup(); - tst_exit(); - -} - -#else - -int main(void) -{ - tst_resm(TINFO, "test is not available on uClinux"); - tst_exit(); -} +/* + * [Description] + * + * Check the basic function of munlockall(2) system call. + */ -#endif /* if !defined(UCLINUX) */ +#include <sys/mman.h> +#include "tst_test.h" -/* setup() - performs all ONE TIME setup for this test. */ -void setup(void) +static void verify_munlockall(void) { - tst_require_root(); - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; + TST_EXP_PASS(munlockall()); } -/* - * cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - */ -void cleanup(void) -{ -} +static struct tst_test test = { + .needs_root = 1, + .test_all = verify_munlockall, +};
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> --- .../kernel/syscalls/munlockall/munlockall01.c | 140 ++---------------- 1 file changed, 15 insertions(+), 125 deletions(-)