* [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite to new API
@ 2020-02-09 11:58 Yang Xu
2020-02-09 11:58 ` [LTP] [PATCH v1 2/2] syscalls/socketcall03, 04: Cleanup && Convert " Yang Xu
2020-02-10 3:26 ` [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite " Yang Xu
0 siblings, 2 replies; 4+ messages in thread
From: Yang Xu @ 2020-02-09 11:58 UTC (permalink / raw)
To: ltp
Also add EFAULT error test.
Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
.../kernel/syscalls/socketcall/socketcall02.c | 173 ++++--------------
1 file changed, 37 insertions(+), 136 deletions(-)
diff --git a/testcases/kernel/syscalls/socketcall/socketcall02.c b/testcases/kernel/syscalls/socketcall/socketcall02.c
index 7574782ff..6a9d51f4e 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall02.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall02.c
@@ -1,163 +1,64 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
+ * Copyright (c) 2020 Yang Xu <xuyang2018.jy@cn.fujitsu.com>
+ * Author: Sowmya Adiga <sowmya.adiga@wipro.com>
*
- * 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.
- *
+ * This is a error test for the socketcall(2) system call.
*/
-/**************************************************************************
- *
- * TEST IDENTIFIER : socketcall02
- *
- * EXECUTED BY : All user
- *
- * TEST TITLE : Error test for socketcall(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
- * verify socketcall(2) returns -1 and sets errno
- * appropriately if argument passed is invalid.
- *
- *
- * Setup:
- * Setup signal handling.
- * Pause for SIGUSR1 if option specified.
- *
- * Test:
- * Loop if the proper option is given.
- * Execute system call.
- * Check return code, If system call failed (return == -1) &&
- * (errno set == expected errno)
- * Issue sys call pass with expected error
- * otherwise
- * Issue sys call fails with unexpected error
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
- *
- * USAGE: <for command-line>
- * socketcall02 [-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
- * None
- *****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/syscall.h>
+
#include <unistd.h>
+#include <errno.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <linux/net.h>
#include <sys/un.h>
#include <netinet/in.h>
-#include "test.h"
-
-char *TCID = "socketcall02";
-
-#ifdef __NR_socketcall
+#include "tst_test.h"
+#include "lapi/syscalls.h"
-#define socketcall(call, args) syscall(__NR_socketcall, call, args)
-
-void setup();
-void cleanup();
-
-int TST_TOTAL = 1;
+static unsigned long args_valid[3] = {PF_INET, SOCK_STREAM, 0};
struct test_case_t {
int call;
- unsigned long args[3];
- int retval;
- int experrno;
+ unsigned long *args;
+ int exp_err;
char *desc;
-} TC = {
- -1, {
-PF_INET, SOCK_STREAM, 0}, -1, EINVAL, "invalid call"};
+} TC[] = {
+ {0, args_valid, EINVAL, "invalid call(0)"},
+ {21, args_valid, EINVAL, "invalid call(21)"},
+ {SYS_SOCKET, NULL, EFAULT, "invalid args address"},
+};
-int main(int ac, char **av)
+static void verify_socketcall(unsigned int i)
{
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- /* check looping state */
- for (lc = 0; TEST_LOOPING(lc); lc++) {
+ tst_res(TINFO, "%s", TC[i].desc);
- tst_count = 0;
-
- TEST(socketcall(TC.call, TC.args));
-
- /* check return code */
- if ((TEST_RETURN == -1)
- && (TEST_ERRNO == TC.experrno)) {
- tst_resm(TPASS, "socketcall() failed"
- " as expected for %s", TC.desc);
- } else {
- tst_brkm(TFAIL, NULL, "socketcall()"
- " Failed with wrong experrno"
- " =%d got: errno=%d : %s",
- TC.experrno, TEST_ERRNO, strerror(TEST_ERRNO));
- }
+ TEST(tst_syscall(__NR_socketcall, TC[i].call, TC[i].args));
+ if (TST_RET != -1) {
+ tst_res(TFAIL, "socketcall() succeeded unexpectedly");
+ return;
}
-
- /* cleanup and exit */
- cleanup();
-
- tst_exit();
+ if (TST_ERR == TC[i].exp_err)
+ tst_res(TPASS | TTERRNO, "socketcall() failed as expected ");
+ else
+ tst_res(TFAIL | TTERRNO, "socketcall fail expected %s got", tst_strerrno(TC[i].exp_err));
}
-/* setup() - performs all ONE TIME setup for this test. */
-void setup(void)
+static void setup(void)
{
+ unsigned int i;
- 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)
-{
+ for (i = 0; i < ARRAY_SIZE(TC); i++) {
+ if (!TC[i].args)
+ TC[i].args = tst_get_bad_addr(NULL);
+ }
}
-#else
-
-int TST_TOTAL = 0;
-
-int main(void)
-{
- tst_resm(TCONF, "socket call test on this architecture disabled.");
- tst_exit();
-}
+static struct tst_test test = {
+ .setup = setup,
+ .test = verify_socketcall,
+ .tcnt = ARRAY_SIZE(TC),
+};
-#endif
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH v1 2/2] syscalls/socketcall03, 04: Cleanup && Convert to new API
2020-02-09 11:58 [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite to new API Yang Xu
@ 2020-02-09 11:58 ` Yang Xu
2020-02-10 3:26 ` [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite " Yang Xu
1 sibling, 0 replies; 4+ messages in thread
From: Yang Xu @ 2020-02-09 11:58 UTC (permalink / raw)
To: ltp
Merge socketcall04 into socketcall03.
Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
runtest/syscalls | 1 -
.../kernel/syscalls/socketcall/.gitignore | 1 -
.../kernel/syscalls/socketcall/socketcall03.c | 185 +++---------------
.../kernel/syscalls/socketcall/socketcall04.c | 174 ----------------
4 files changed, 32 insertions(+), 329 deletions(-)
delete mode 100644 testcases/kernel/syscalls/socketcall/socketcall04.c
diff --git a/runtest/syscalls b/runtest/syscalls
index 0743cf4e3..a3da81e71 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1350,7 +1350,6 @@ socket02 socket02
socketcall01 socketcall01
socketcall02 socketcall02
socketcall03 socketcall03
-socketcall04 socketcall04
socketpair01 socketpair01
socketpair02 socketpair02
diff --git a/testcases/kernel/syscalls/socketcall/.gitignore b/testcases/kernel/syscalls/socketcall/.gitignore
index 1c8439a57..33ee18123 100644
--- a/testcases/kernel/syscalls/socketcall/.gitignore
+++ b/testcases/kernel/syscalls/socketcall/.gitignore
@@ -1,4 +1,3 @@
/socketcall01
/socketcall02
/socketcall03
-/socketcall04
diff --git a/testcases/kernel/syscalls/socketcall/socketcall03.c b/testcases/kernel/syscalls/socketcall/socketcall03.c
index d6c082c21..ad2a29944 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall03.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall03.c
@@ -1,181 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
+ * Copyright (c) 2020 Yang Xu <xuyang2018.jy@cn.fujitsu.com>
+ * Author: Sowmya Adiga <sowmya.adiga@wipro.com>
*
- * 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.
- *
+ * This is a basic test for the socketcall(2) for bind(2) and listen(2).
*/
-/**************************************************************************
- *
- * TEST IDENTIFIER : socketcall03
- *
- * EXECUTED BY : All user
- *
- * TEST TITLE : Basic test for socketcall(2) for bind(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 socketcall(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>
- * socketcall03 [-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
- * None
- *****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/syscall.h>
#include <unistd.h>
+#include <errno.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <linux/net.h>
#include <sys/un.h>
#include <netinet/in.h>
-#include "test.h"
-
-char *TCID = "socketcall03";
-
-#ifdef __NR_socketcall
+#include "tst_test.h"
+#include "lapi/syscalls.h"
-#define socketcall(call, args) syscall(__NR_socketcall, call, args)
-
-void setup();
-void cleanup();
-void setup1(void);
-
-int TST_TOTAL = 1;
-int s;
-unsigned long args[3];
struct sockaddr_in si;
-struct test_case_t {
- int domain;
- int type;
- int pro;
- int call;
- void (*setupfunc) (void);
- char *desc;
-} TC = {
-AF_INET, SOCK_STREAM, 6, SYS_BIND, setup1, "bind call"};
-
-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;
-
- TC.setupfunc();
-
- TEST(socketcall(TC.call, args));
-
- /* check return code */
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TERRNO, "socketcall() Failed "
- " with return=%ld", TEST_RETURN);
- } else {
- tst_resm(TPASS, "socketcall() passed "
- "for %s with return=%ld ",
- TC.desc, TEST_RETURN);
-
- close(s);
- }
- }
-
- /* cleanup and exit */
- cleanup();
-
- tst_exit();
-}
-
-/*setup1()*/
-void setup1(void)
+static void verify_socketcall(void)
{
- si.sin_family = AF_INET;
- si.sin_addr.s_addr = htons(INADDR_ANY);
- si.sin_port = 0;
+ unsigned long args[3];
+ int s = -1;
- if ((s = socket(TC.domain, TC.type, TC.pro)) == -1) {
- tst_brkm(TBROK, NULL, "socket creation failed");
- }
+ s = SAFE_SOCKET(AF_INET, SOCK_STREAM, 6);
args[0] = s;
args[1] = (unsigned long)&si;
args[2] = sizeof(si);
-}
-/* setup() - performs all ONE TIME setup for this test. */
-void setup(void)
-{
+ TEST(tst_syscall(__NR_socketcall, SYS_BIND, args));
+ if (TST_RET < 0)
+ tst_res(TFAIL | TTERRNO, "socketcall() for bind call failed with %ld", TST_RET);
+ else
+ tst_res(TPASS, "socketcall() for bind call passed, returned %ld", TST_RET);
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
+ args[1] = 1;
+ args[2] = 0;
- TEST_PAUSE;
-}
+ TEST(tst_syscall(__NR_socketcall, SYS_LISTEN, args));
+ if (TST_RET < 0)
+ tst_res(TFAIL | TTERRNO, "socketcall() for listen call failed with %ld", TST_RET);
+ else
+ tst_res(TPASS, "socketcall() for listen call passed, returned %ld", TST_RET);
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
-{
+ SAFE_CLOSE(s);
}
-#else
-
-int TST_TOTAL = 0;
-
-int main(void)
+static void setup(void)
{
- tst_resm(TCONF, "socket call test on this architecture disabled.");
- tst_exit();
+ si.sin_family = AF_INET;
+ si.sin_addr.s_addr = htons(INADDR_ANY);
+ si.sin_port = 0;
}
-#endif
+static struct tst_test test = {
+ .setup = setup,
+ .test_all = verify_socketcall,
+};
diff --git a/testcases/kernel/syscalls/socketcall/socketcall04.c b/testcases/kernel/syscalls/socketcall/socketcall04.c
deleted file mode 100644
index c498b6e74..000000000
--- a/testcases/kernel/syscalls/socketcall/socketcall04.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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.
- *
- */
-/**************************************************************************
- *
- * TEST IDENTIFIER : socketcall04
- *
- * EXECUTED BY : All user
- *
- * TEST TITLE : Basic test for socketcall(2) for listen(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 socketcall(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>
- * socketcall04 [-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
- * None
- *****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <linux/net.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-
-#include "test.h"
-
-char *TCID = "socketcall04";
-
-#ifdef __NR_socketcall
-
-#define socketcall(call, args) syscall(__NR_socketcall, call, args)
-
-void setup();
-void cleanup();
-void setup1(void);
-
-int TST_TOTAL = 1;
-int i, s;
-unsigned long args[3];
-struct sockaddr_in si;
-
-struct test_case_t {
- int domain;
- int type;
- int pro;
- int call;
- void (*setupfunc) (void);
- char *desc;
-} TC = {
-AF_INET, SOCK_STREAM, 6, SYS_LISTEN, setup1, "listen call"};
-
-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;
-
- TC.setupfunc();
-
- TEST(socketcall(TC.call, args));
-
- /* check return code */
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TTERRNO, "socketcall() Failed "
- " with return=%ld", TEST_RETURN);
- } else {
- tst_resm(TPASS, "socketcall() passed "
- "for %s with return=%ld ",
- TC.desc, TEST_RETURN);
- close(s);
- }
- }
-
- /* cleanup and exit */
- cleanup();
-
- tst_exit();
-}
-
-/*setup1()*/
-void setup1(void)
-{
- if ((s = socket(TC.domain, TC.type, TC.pro)) == -1) {
- tst_brkm(TBROK, NULL, "socket creation failed");
- }
- args[0] = s;
- args[1] = 1;
-}
-
-/* setup() - performs all ONE TIME setup for this test. */
-void setup(void)
-{
-
- 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)
-{
-}
-
-#else
-
-int TST_TOTAL = 0;
-
-int main(void)
-{
- tst_resm(TCONF, "socket call test on this architecture disabled.");
- tst_exit();
-}
-
-#endif
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite to new API
2020-02-09 11:58 [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite to new API Yang Xu
2020-02-09 11:58 ` [LTP] [PATCH v1 2/2] syscalls/socketcall03, 04: Cleanup && Convert " Yang Xu
@ 2020-02-10 3:26 ` Yang Xu
2020-02-24 16:34 ` Cyril Hrubis
1 sibling, 1 reply; 4+ messages in thread
From: Yang Xu @ 2020-02-10 3:26 UTC (permalink / raw)
To: ltp
> Also add EFAULT error test.
>
> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> ---
> .../kernel/syscalls/socketcall/socketcall02.c | 173 ++++--------------
> 1 file changed, 37 insertions(+), 136 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/socketcall/socketcall02.c b/testcases/kernel/syscalls/socketcall/socketcall02.c
> index 7574782ff..6a9d51f4e 100644
> --- a/testcases/kernel/syscalls/socketcall/socketcall02.c
> +++ b/testcases/kernel/syscalls/socketcall/socketcall02.c
> @@ -1,163 +1,64 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
> + * Copyright (c) 2020 Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> + * Author: Sowmya Adiga <sowmya.adiga@wipro.com>
> *
> - * 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.
> - *
> + * This is a error test for the socketcall(2) system call.
> */
> -/**************************************************************************
> - *
> - * TEST IDENTIFIER : socketcall02
> - *
> - * EXECUTED BY : All user
> - *
> - * TEST TITLE : Error test for socketcall(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
> - * verify socketcall(2) returns -1 and sets errno
> - * appropriately if argument passed is invalid.
> - *
> - *
> - * Setup:
> - * Setup signal handling.
> - * Pause for SIGUSR1 if option specified.
> - *
> - * Test:
> - * Loop if the proper option is given.
> - * Execute system call.
> - * Check return code, If system call failed (return == -1) &&
> - * (errno set == expected errno)
> - * Issue sys call pass with expected error
> - * otherwise
> - * Issue sys call fails with unexpected error
> - *
> - * Cleanup:
> - * Print errno log and/or timing stats if options given
> - *
> - * USAGE: <for command-line>
> - * socketcall02 [-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
> - * None
> - *****************************************************************************/
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <errno.h>
> -#include <sys/syscall.h>
> +
> #include <unistd.h>
> +#include <errno.h>
> #include <sys/types.h>
> #include <sys/socket.h>
> #include <linux/net.h>
> #include <sys/un.h>
> #include <netinet/in.h>
>
> -#include "test.h"
> -
> -char *TCID = "socketcall02";
> -
> -#ifdef __NR_socketcall
> +#include "tst_test.h"
> +#include "lapi/syscalls.h"
>
> -#define socketcall(call, args) syscall(__NR_socketcall, call, args)
> -
> -void setup();
> -void cleanup();
> -
> -int TST_TOTAL = 1;
> +static unsigned long args_valid[3] = {PF_INET, SOCK_STREAM, 0};
>
> struct test_case_t {
> int call;
> - unsigned long args[3];
> - int retval;
> - int experrno;
> + unsigned long *args;
> + int exp_err;
> char *desc;
> -} TC = {
> - -1, {
> -PF_INET, SOCK_STREAM, 0}, -1, EINVAL, "invalid call"};
> +} TC[] = {
> + {0, args_valid, EINVAL, "invalid call(0)"},
"invalid call(<1)" is more correc.
> + {21, args_valid, EINVAL, "invalid call(21)"},
"invalid call(>20)" is more correct.
> + {SYS_SOCKET, NULL, EFAULT, "invalid args address"},
> +};
>
> -int main(int ac, char **av)
> +static void verify_socketcall(unsigned int i)
> {
> - int lc;
> -
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - /* check looping state */
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> + tst_res(TINFO, "%s", TC[i].desc);
>
> - tst_count = 0;
> -
> - TEST(socketcall(TC.call, TC.args));
> -
> - /* check return code */
> - if ((TEST_RETURN == -1)
> - && (TEST_ERRNO == TC.experrno)) {
> - tst_resm(TPASS, "socketcall() failed"
> - " as expected for %s", TC.desc);
> - } else {
> - tst_brkm(TFAIL, NULL, "socketcall()"
> - " Failed with wrong experrno"
> - " =%d got: errno=%d : %s",
> - TC.experrno, TEST_ERRNO, strerror(TEST_ERRNO));
> - }
> + TEST(tst_syscall(__NR_socketcall, TC[i].call, TC[i].args));
> + if (TST_RET != -1) {
> + tst_res(TFAIL, "socketcall() succeeded unexpectedly");
> + return;
> }
> -
> - /* cleanup and exit */
> - cleanup();
> -
> - tst_exit();
> + if (TST_ERR == TC[i].exp_err)
> + tst_res(TPASS | TTERRNO, "socketcall() failed as expected ");
> + else
> + tst_res(TFAIL | TTERRNO, "socketcall fail expected %s got", tst_strerrno(TC[i].exp_err));
> }
>
> -/* setup() - performs all ONE TIME setup for this test. */
> -void setup(void)
> +static void setup(void)
> {
> + unsigned int i;
>
> - 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)
> -{
> + for (i = 0; i < ARRAY_SIZE(TC); i++) {
> + if (!TC[i].args)
> + TC[i].args = tst_get_bad_addr(NULL);
> + }
> }
>
> -#else
> -
> -int TST_TOTAL = 0;
> -
> -int main(void)
> -{
> - tst_resm(TCONF, "socket call test on this architecture disabled.");
> - tst_exit();
> -}
> +static struct tst_test test = {
> + .setup = setup,
> + .test = verify_socketcall,
> + .tcnt = ARRAY_SIZE(TC),
> +};
>
> -#endif
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite to new API
2020-02-10 3:26 ` [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite " Yang Xu
@ 2020-02-24 16:34 ` Cyril Hrubis
0 siblings, 0 replies; 4+ messages in thread
From: Cyril Hrubis @ 2020-02-24 16:34 UTC (permalink / raw)
To: ltp
Hi!
> > -PF_INET, SOCK_STREAM, 0}, -1, EINVAL, "invalid call"};
> > +} TC[] = {
> > + {0, args_valid, EINVAL, "invalid call(0)"},
> "invalid call(<1)" is more correc.
> > + {21, args_valid, EINVAL, "invalid call(21)"},
> "invalid call(>20)" is more correct.
> > + {SYS_SOCKET, NULL, EFAULT, "invalid args address"},
> > +};
I've fixed these two and pushed both patches, thanks.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-24 16:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-09 11:58 [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite to new API Yang Xu
2020-02-09 11:58 ` [LTP] [PATCH v1 2/2] syscalls/socketcall03, 04: Cleanup && Convert " Yang Xu
2020-02-10 3:26 ` [LTP] [PATCH v1 1/2] syscalls/socketcall02: Cleanup && rewrite " Yang Xu
2020-02-24 16:34 ` Cyril Hrubis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.