iopl: convert to new API
PATCH v2 1/2 iopl: convert to new API
--- testcases/kernel/syscalls/iopl/iopl01.c | 172 ++++------------- testcases/kernel/syscalls/iopl/iopl02.c | 247 +++++------------------- 2 files changed, 86 insertions(+), 333 deletions(-)
testcases/kernel/syscalls/iopl/iopl01.c +36 -136
@@ -1,162 +1,62 @@ +// 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, 2020 +* Copyright (c) Wipro Technologies Ltd, 2002 */ -/********************************************************** -* -* TEST IDENTIFIER : iopl01 -* -* EXECUTED BY : superuser -* -* TEST TITLE : Basic test for iopl(2) -* -* TEST CASE TOTAL : 4 -* -* AUTHOR : Subhab Biswas <[email protected]> -* -* 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 iopl(2) system call. -* It is intended to provide a limited exposure of the system call. -* -* Setup: -* Setup signal handling. -* Test caller is superuser -* 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) -* Issue FAIL message with errno. -* Otherwise, Issue PASS message. -* -* Cleanup: -* Print errno log and/or timing stats if options given + +/* +* This is a basic test for iopl(2) system call. * -* USAGE: <for command-line> -* iopl01 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-h] [-f] [-p] -* where, -c n : Run n copies concurrently. -* -e : Turn on errno logging. -* -h : Show help screen -* -f : Turn off functional testing -* -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. +* Test the system call for possible privelege levels. +* As the privelge level for a normal process is 0, start by +* setting/changing the level to 0. * -****************************************************************/ - -char *TCID ="iopl01" ; - -#if defined __i386__ || defined(__x86_64__) +* Author: Subhab Biswas <[email protected]> +*/ #include <errno.h> #include <unistd.h> #include <sys/io.h> -#include "test.h" - -static void setup (); -static void cleanup (); +#include "tst_test.h" -int TST_TOTAL =4 ; - -int level;/* I/O privilege level of the process */ +#if defined __i386__ || defined(__x86_64__) -int main (int ac,char **av) +static void verify_iopl (void ) { +int total_level =4 ; +int level; -int lc; +for (level =0 ; level < total_level; ++level) { -tst_parse_opts (ac, av,NULL ,NULL ); +TEST (iopl (level)); -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ; - -/* -* Test the system call for possible privelege levels. -* As the privelge level for a normal process is 0, -* start by setting/changing the level to 0. -*/ -for (level =0 ; level <TST_TOTAL ; ++level) { - -TEST (iopl (level)); - -if (TEST_RETURN ==-1 ) { -tst_resm (TFAIL ,"iopl() failed for level %d, " -"errno=%d : %s" , level, -TEST_ERRNO ,strerror (TEST_ERRNO )); - }else { -tst_resm (TPASS ,"iopl() passed for level %d, " -"returned %ld" , level,TEST_RETURN ); - } +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO ,"iopl() failed for level %d, " +"errno=%d : %s" , level, +TST_ERR ,tst_strerrno (TST_ERR )); + }else { +tst_res (TPASS ,"iopl() passed for level %d, " +"returned %ld" , level,TST_RET ); } } - -/* cleanup and exit */ -cleanup (); -tst_exit (); - } -/* setup() - performs all ONE TIME setup for this test */ -void setup (void ) +static void cleanup (void ) { -tst_require_root (); - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -} - -/* -*cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -*/ -void cleanup (void ) -{ -/* * back to I/O privilege for normal process. */ -if (iopl (0 ) ==-1 ) { -tst_resm (TWARN ,"iopl() cleanup failed" ); - } - +if (iopl (0 ) ==-1 ) +tst_res (TWARN ,"iopl() cleanup failed" ); } -#else /* __i386__ */ - -#include "test.h" - -int TST_TOTAL =0 ; - -int main (void ) -{ -tst_resm (TPASS , -"LSB v1.3 does not specify iopl() for this architecture." ); -tst_exit (); -} +static struct tst_test test = { + .test_all = verify_iopl, + .needs_root =1 , + .cleanup = cleanup, +}; -#endif /* __i386__ */ +#else +TST_TEST_TCONF ("LSB v1.3 does not specify iopl() for this architecture. (only for i386 or x86_64)" ); +#endif /* __i386_, __x86_64__*/
testcases/kernel/syscalls/iopl/iopl02.c +50 -197
271 lines not on this page · raw message
Signature · 1 line
2.21.1
PATCH v2 2/2 ioperm: Convert to new API
--- testcases/kernel/syscalls/ioperm/ioperm01.c | 181 +++---------- testcases/kernel/syscalls/ioperm/ioperm02.c | 273 +++++--------------- 2 files changed, 99 insertions(+), 355 deletions(-)
testcases/kernel/syscalls/ioperm/ioperm01.c +39 -142
@@ -1,178 +1,75 @@ +// 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, 2020 +* Copyright (c) Wipro Technologies Ltd, 2002 */ -/********************************************************** -* -* TEST IDENTIFIER : ioperm01 -* -* EXECUTED BY : superuser -* -* TEST TITLE : Basic test for ioperm(2) -* -* TEST CASE TOTAL : 1 -* -* AUTHOR : Subhab Biswas <[email protected]> -* -* 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 ioperm(2) system call. -* It is intended to provide a limited exposure of the system call. -* -* Setup: -* Setup signal handling. -* Test caller is superuser -* 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) -* Issue FAIL message with errno. -* Otherwise, Issue PASS message. -* -* Cleanup: -* Print errno log and/or timing stats if options given -* -* USAGE: <for command-line> -* ioperm01 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-h] [-f] [-p] -* where, -c n : Run n copies concurrently. -* -e : Turn on errno logging. -* -h : Show help screen -* -f : Turn off functional testing -* -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. -* -****************************************************************/ -char *TCID ="ioperm01" ; - -#if defined __i386__ || defined(__x86_64__) +/* +* This is a basic test for ioperm(2) system call. +* It is intended to provide a limited exposure of the system call. +* +* Author: Subhab Biswas <[email protected]> +*/ #include <errno.h> #include <unistd.h> #include <sys/io.h> -#include "test.h" +#include "tst_test.h" + +#if defined __i386__ || defined(__x86_64__) -unsigned long io_addr;/*kernel version dependant io start address */ -#define NUM_BYTES 3/* number of bytes from start address */ -#define TURN_ON 1 -#define TURN_OFF 0 +unsigned long io_addr; +#define NUM_BYTES 3#ifndef IO_BITMAP_BITS #define IO_BITMAP_BITS 1024#endif -static void setup (); -static void cleanup (); - -int TST_TOTAL =1 ; - -int main (int ac,char **av) +static void verify_ioperm (void ) { +TEST (ioperm (io_addr,NUM_BYTES ,1 )); -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ; - -/* -* Test the system call. -*/ -TEST (ioperm (io_addr,NUM_BYTES ,TURN_ON )); - -if (TEST_RETURN ==-1 ) { -tst_resm (TFAIL ,"ioperm() failed for port address " -"%lu, errno=%d : %s" , io_addr, -TEST_ERRNO ,strerror (TEST_ERRNO )); - }else { -tst_resm (TPASS ,"ioperm() passed for port " -"address %lu, returned %lu" , - io_addr,TEST_RETURN ); - } +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO ,"ioperm() failed for port address " +"%lu, errno=%d : %s" , io_addr, +TST_ERR ,tst_strerrno (TST_ERR )); + }else { +tst_res (TPASS ,"ioperm() passed for port " +"address %lu, returned %lu" , + io_addr,TST_RET ); } - -/* cleanup and exit */ -cleanup (); -tst_exit (); - } -/* setup() - performs all ONE TIME setup for this test */ -void setup (void ) +static void setup (void ) { -tst_require_root (); - -tst_sig (NOFORK ,DEF_HANDLER , cleanup); -/* * The value of IO_BITMAP_BITS (include/asm-i386/processor.h) changed * from kernel 2.6.8 to permit 16-bits ioperm * * Ricky Ng-Adam, [email protected] * */ -if (tst_kvercmp (2 ,6 ,8 ) <0 ) { -/*get ioperm on 1021, 1022, 1023 */ +if (tst_kvercmp (2 ,6 ,8 ) <0 ) io_addr =IO_BITMAP_BITS -NUM_BYTES ; - }else { -/*get ioperm on 65533, 65534, 65535 */ +else io_addr =IO_BITMAP_BITS -NUM_BYTES ; - } - -TEST_PAUSE ; - } -/* -*cleanup() - performs all ONE TIME cleanup for this test at -* completion or premature exit. -*/ -void cleanup (void ) +static void cleanup (void ) { -/* * Reset I/O privileges for the specified port. */ -if ((ioperm (io_addr,NUM_BYTES ,TURN_OFF )) ==-1 ) { -tst_brkm (TBROK ,NULL ,"ioperm() cleanup failed" ); - } - +if ((ioperm (io_addr,NUM_BYTES ,0 )) ==-1 ) +tst_brk (TBROK |TTERRNO ,"ioperm() cleanup failed" ); } -#else /* __i386__ */ - -#include "test.h" - -int TST_TOTAL =0 ; - -int main (void ) -{ -tst_resm (TPASS , -"LSB v1.3 does not specify ioperm() for this architecture." ); -tst_exit (); -} +static struct tst_test test = { + .test_all = verify_ioperm, + .needs_root =1 , + .setup = setup, + .cleanup = cleanup, +}; -#endif /* __i386__ */ +#else +TST_TEST_TCONF ("LSB v1.3 does not specify ioperm() for this architecture. (only for i386 or x86_64)" ); +#endif /* __i386_, __x86_64__*/
testcases/kernel/syscalls/ioperm/ioperm02.c +60 -213
310 lines not on this page · raw message
Signature · 1 line
2.21.1
PATCH v2 2/2 ioperm: Convert to new API
PATCH v2 2/2 ioperm: Convert to new API
In reply to Li WangHi Li,
Actually it fails to build on non-intel.
https://travis-ci.org/github/pevik/ltp/jobs/708655670/usr/src/ltp/testcases/kernel/syscalls/iopl/iopl02.c:21:10: fatal error: sys/io.h: No such file or directory 9793 #include <sys/io.h>
https://travis-ci.org/github/pevik/ltp/builds/708655668
<sys/io.h> needs to be included behind #if defined __i386__ || defined(__x86_64__) guarder.
Please fix it before merge.
Kind regards,
Petr
PATCH v2 2/2 ioperm: Convert to new API
Hi Petr,
Quoted 8 lines · Petr Vorel
Hi Li,
Actually it fails to build on non-intel.
https://travis-ci.org/github/pevik/ltp/jobs/708655670/usr/src/ltp/testcases/kernel/syscalls/iopl/iopl02.c:21:10: fatal error:sys/io.h: No such file or directory
9793 #include <sys/io.h>
Quoted 5 lines
https://travis-ci.org/github/pevik/ltp/builds/708655668
<
sys/io.h> needs to be included behind #if defined__i386__||defined(__x86_64__)guarder.
Thanks for catching this, I have fixed it and pushed.
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20200716/a795b7e5/attachment.htm>
PATCH v2 1/2 iopl: convert to new API
In reply to Li Wang