Skip to contentSkip to conversation

getitimer03.c: convert to new LTP API

PATCH In review Avinesh Kumar 3 participants 8 messages Jul 20, 2022 – Oct 10, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 getitimer03.c: convert to new LTP API

---
 .../kernel/syscalls/getitimer/getitimer03.c   | 156 ++----------------
 1 file changed, 17 insertions(+), 139 deletions(-)
testcases/kernel/syscalls/getitimer/getitimer03.c +17 -139
index cc5e83fad..e26a121c1 100644
@@ -1,152 +1,30 @@
+// 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
+ *	03/2001 - Written by Wayne Boyer
+ * Copyright (c) 2022 SUSE LLC Avinesh Kumar <[email protected]>
  */
 
-/* $Header: /cvsroot/ltp/ltp/testcases/kernel/syscalls/getitimer/getitimer03.c,v 1.7 2009/08/28 10:18:24 vapier Exp $ */
-
-/*
- * NAME
- *	getitimer03.c
- *
- * DESCRIPTION
- *	getitimer03 - check that a getitimer() call fails as expected
- *		      with an incorrect first argument.
- *
- * CALLS
- *	getitimer()
- *
- * ALGORITHM
- *	loop if that option was specified
- *	allocate space and set up needed values
- *	issue the system call
- *	check the errno value
- *	  issue a PASS message if we get EINVAL
- *	otherwise, the tests fails
- *	  issue a FAIL message
- *	  break any remaining tests
- *	  call cleanup
- *
- * USAGE:  <for command-line>
- *  getitmer03 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -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.
- *
- * USAGE
- *	./getitimer03
+/*\
+ * [Description]
  *
- * HISTORY
- *	03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
+ * Verify that getitimer() fails with EINVAL when called with
+ * an invalid first argument.
  */
 
-#include "test.h"
-
-#include <errno.h>
-#include <sys/time.h>
-
-void cleanup(void);
-void setup(void);
-
-char *TCID = "getitimer03";
-int TST_TOTAL = 1;
+#include <stdlib.h>
+#include "tst_test.h"
 
-int main(int ac, char **av)
+static void run(void)
 {
-	int lc;
 	struct itimerval *value;
 
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();		/* global setup */
-
-	/* The following loop checks looping state if -i option given */
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset tst_count in case we are looping */
-		tst_count = 0;
-
-		/* allocate some space for the timer structure */
-
-		if ((value = malloc((size_t)sizeof(struct itimerval))) ==
-		    NULL) {
-			tst_brkm(TBROK, cleanup, "value malloc failed");
-		}
-
-		/*
-		 * issue the system call with the TEST() macro
-		 * ITIMER_REAL = 0, ITIMER_VIRTUAL = 1 and ITIMER_PROF = 2
-		 */
-
-		/* make the first value negative to get a failure */
-		TEST(getitimer(-ITIMER_PROF, value));
-
-		if (TEST_RETURN == 0) {
-			tst_resm(TFAIL, "call failed to produce expected error "
-				 "- errno = %d - %s", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-			continue;
-		}
-
-		switch (TEST_ERRNO) {
-		case EINVAL:
-			tst_resm(TPASS, "expected failure - errno = %d - %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-			break;
-		default:
-			tst_resm(TFAIL, "call failed to produce expected error "
-				 "- errno = %d - %s", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-		}
-
-		/*
-		 * clean up things in case we are looping
-		 */
-
-		free(value);
-		value = NULL;
-	}
-
-	cleanup();
-
-	tst_exit();
-}
-
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
-{
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
+	value = SAFE_MALLOC(sizeof(struct itimerval));
+	TST_EXP_FAIL(getitimer(-ITIMER_PROF, value), EINVAL);
+	free(value);
+	value = NULL;
 }
 
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void cleanup(void)
-{
-
-}
+static struct tst_test test = {
+	.test_all = run
+};
Signature · 5 lines
2.36.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

Hi Avinesh,

Thank you for doing this. The code achievement is absolutely right but we can do something unify to better manage the error test in LTP.

My suggestion is to combine this invalid-argument test into getitimer02.c by creating a structure that populates with arguments of getitimer(). Then we can traversal each item to complete all error tests for a syscall just in one testcase. (see madvise02.c)

e.g.

static struct tcase {
       int which;
       struct itimerval *curr_value;
} tcases[] = {
       {},
};
Signature · 2 lines
Regards,
Li Wang
Signature · 2 lines
-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw

Hi Avinesh, Li,

Quoted 9 lines

Hi Avinesh,

Thank you for doing this. The code achievement is absolutely right but we can do something unify to better manage the error test in LTP.

My suggestion is to combine this invalid-argument test into getitimer02.c by creating a structure that populates with arguments of getitimer(). Then we can traversal each item to complete all error tests for a syscall just in one testcase. (see madvise02.c)

Avinesh, do you plan to follow Li's suggestion (which makes sense) and send a patch this week (e.g. before git freeze due LTP releasing process?)

Kind regards,
Petr

Quoted 8 lines

e.g.

static struct tcase {
       int which;
       struct itimerval *curr_value;
} tcases[] = {
       {},
};
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#3 lore raw

PATCH v2 1/1 getitimer03.c: convert to new LTP API

From: Avinesh Kumar <[email protected]>

---

Notes:
Hi Avinesh,

As this patch pending there with no action more than six weeks, I just help to moving on the test convert-work in my suggest way, if you have any different thought, please feel free add comments and review. Thanks! -- Li Wang

v1 --> v2
* combine error test into 02 to better manage the error test in LTP

 .../kernel/syscalls/getitimer/getitimer02.c   |  45 +++++-
 .../kernel/syscalls/getitimer/getitimer03.c   | 152 ------------------
 2 files changed, 39 insertions(+), 158 deletions(-)
 delete mode 100644 testcases/kernel/syscalls/getitimer/getitimer03.c
testcases/kernel/syscalls/getitimer/getitimer02.c +39 -6
index a91e6434d..863e8e0a8 100644
@@ -1,30 +1,63 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) International Business Machines  Corp., 2001
- * 03/2001 - Written by Wayne Boyer
+ *               03/2001 - Written by Wayne Boyer
+ * Copyright (c) 2022 SUSE LLC Avinesh Kumar <[email protected]>
  */
 
 /*\
  * [Description]
  *
- * Check that a getitimer() call fails with EFAULT with invalid itimerval pointer.
+ * Check that getitimer() call fails:
+ *   1. EFAULT with invalid itimerval pointer
+ *   2. EINVAL when called with an invalid first argument
  */
 
+#include <stdlib.h>
 #include <errno.h>
 #include <sys/time.h>
 #include "tst_test.h"
 #include "lapi/syscalls.h"
 
+static struct itimerval *value;
+static struct itimerval *invalid;
+
+static struct tcase {
+       int which;
+       struct itimerval **val;
+       int exp_errno;
+} tcases[] = {
+       {ITIMER_REAL, &invalid, EFAULT},
+       {-ITIMER_PROF, &value, EINVAL},
+};
+
 static int sys_getitimer(int which, void *curr_value)
 {
-	return tst_syscall(__NR_getitimer, which, curr_value);
+        return tst_syscall(__NR_getitimer, which, curr_value);
+}
+
+static void setup(void)
+{
+        value = SAFE_MALLOC(sizeof(struct itimerval));
+        invalid = (struct itimerval *)-1;
+}
+
+static void verify_getitimer(unsigned int i)
+{
+        struct tcase *tc = &tcases[i];
+
+        TST_EXP_FAIL(sys_getitimer(tc->which, *(tc->val)), tc->exp_errno);
 }
 
-static void verify_getitimer(void)
+static void cleanup(void)
 {
-	TST_EXP_FAIL(sys_getitimer(ITIMER_REAL, (struct itimerval *)-1), EFAULT);
+        free(value);
+        value = NULL;
 }
 
 static struct tst_test test = {
-	.test_all = verify_getitimer,
+        .tcnt = ARRAY_SIZE(tcases),
+        .test = verify_getitimer,
+        .setup = setup,
+        .cleanup = cleanup,
 };
testcases/kernel/syscalls/getitimer/getitimer03.c deleted +0 -152

152 lines not on this page · raw message

Signature · 5 lines
2.35.3


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#4 lore raw

Hi Li,

Sorry, I missed acting on the review comments you had provided. Thank you for implementing them. Your patch looks good, I have tested as well.

Quoted 245 lines · IST Li Wang

From: Avinesh Kumar <[email protected]>

---

Notes:
Hi Avinesh,

As this patch pending there with no action more than six weeks, I just help to moving on the test convert-work in my suggest way, if you have any different thought, please feel free add comments and review. Thanks! -- Li Wang

v1 --> v2
* combine error test into 02 to better manage the error test in LTP

 .../kernel/syscalls/getitimer/getitimer02.c   |  45 +++++-
 .../kernel/syscalls/getitimer/getitimer03.c   | 152 ------------------
 2 files changed, 39 insertions(+), 158 deletions(-)
 delete mode 100644 testcases/kernel/syscalls/getitimer/getitimer03.c
testcases/kernel/syscalls/getitimer/getitimer02.c +39 -6
index a91e6434d..863e8e0a8 100644
@@ -1,30 +1,63 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) International Business Machines  Corp., 2001
- * 03/2001 - Written by Wayne Boyer
+ *               03/2001 - Written by Wayne Boyer
+ * Copyright (c) 2022 SUSE LLC Avinesh Kumar <[email protected]>
  */
 
 /*\
  * [Description]
  *
- * Check that a getitimer() call fails with EFAULT with invalid itimerval pointer.
+ * Check that getitimer() call fails:
+ *   1. EFAULT with invalid itimerval pointer
+ *   2. EINVAL when called with an invalid first argument
  */
 
+#include <stdlib.h>
 #include <errno.h>
 #include <sys/time.h>
 #include "tst_test.h"
 #include "lapi/syscalls.h"
 
+static struct itimerval *value;
+static struct itimerval *invalid;
+
+static struct tcase {
+       int which;
+       struct itimerval **val;
+       int exp_errno;
+} tcases[] = {
+       {ITIMER_REAL, &invalid, EFAULT},
+       {-ITIMER_PROF, &value, EINVAL},
+};
+
 static int sys_getitimer(int which, void *curr_value)
 {
-	return tst_syscall(__NR_getitimer, which, curr_value);
+        return tst_syscall(__NR_getitimer, which, curr_value);
+}
+
+static void setup(void)
+{
+        value = SAFE_MALLOC(sizeof(struct itimerval));
+        invalid = (struct itimerval *)-1;
+}
+
+static void verify_getitimer(unsigned int i)
+{
+        struct tcase *tc = &tcases[i];
+
+        TST_EXP_FAIL(sys_getitimer(tc->which, *(tc->val)), tc->exp_errno);
 }
 
-static void verify_getitimer(void)
+static void cleanup(void)
 {
-	TST_EXP_FAIL(sys_getitimer(ITIMER_REAL, (struct itimerval *)-1), EFAULT);
+        free(value);
+        value = NULL;
 }
 
 static struct tst_test test = {
-	.test_all = verify_getitimer,
+        .tcnt = ARRAY_SIZE(tcases),
+        .test = verify_getitimer,
+        .setup = setup,
+        .cleanup = cleanup,
 };
testcases/kernel/syscalls/getitimer/getitimer03.c deleted +0 -142
deleted file mode 100644
index cc5e83fad..000000000
@@ -1,152 +0,0 @@
-/*
- * 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
- */
-
-/* $Header: /cvsroot/ltp/ltp/testcases/kernel/syscalls/getitimer/getitimer03.c,v 1.7 2009/08/28 10:18:24 vapier Exp $ */
-
-/*
- * NAME
- *	getitimer03.c
- *
- * DESCRIPTION
- *	getitimer03 - check that a getitimer() call fails as expected
- *		      with an incorrect first argument.
- *
- * CALLS
- *	getitimer()
- *
- * ALGORITHM
- *	loop if that option was specified
- *	allocate space and set up needed values
- *	issue the system call
- *	check the errno value
- *	  issue a PASS message if we get EINVAL
- *	otherwise, the tests fails
- *	  issue a FAIL message
- *	  break any remaining tests
- *	  call cleanup
- *
- * USAGE:  <for command-line>
- *  getitmer03 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -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.
- *
- * USAGE
- *	./getitimer03
- *
- * HISTORY
- *	03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
- */
-
-#include "test.h"
-
-#include <errno.h>
-#include <sys/time.h>
-
-void cleanup(void);
-void setup(void);
-
-char *TCID = "getitimer03";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
-{
-	int lc;
-	struct itimerval *value;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();		/* global setup */
-
-	/* The following loop checks looping state if -i option given */
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset tst_count in case we are looping */
-		tst_count = 0;
-
-		/* allocate some space for the timer structure */
-
-		if ((value = malloc((size_t)sizeof(struct itimerval))) ==
-		    NULL) {
-			tst_brkm(TBROK, cleanup, "value malloc failed");
-		}
-
-		/*
-		 * issue the system call with the TEST() macro
-		 * ITIMER_REAL = 0, ITIMER_VIRTUAL = 1 and ITIMER_PROF = 2
-		 */
-
-		/* make the first value negative to get a failure */
-		TEST(getitimer(-ITIMER_PROF, value));
-
-		if (TEST_RETURN == 0) {
-			tst_resm(TFAIL, "call failed to produce expected error "
-				 "- errno = %d - %s", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-			continue;
-		}
-
-		switch (TEST_ERRNO) {
-		case EINVAL:
-			tst_resm(TPASS, "expected failure - errno = %d - %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-			break;
-		default:
-			tst_resm(TFAIL, "call failed to produce expected error "
-				 "- errno = %d - %s", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-		}
-
-		/*
-		 * clean up things in case we are looping
-		 */
-
-		free(value);
-		value = NULL;
-	}
-
-	cleanup();
-
-	tst_exit();
-}
-
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
-{
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;

testcases/kernel/syscalls/getitimer/getitimer03.c line 152

Quoted 10 lines
testcases/kernel/syscalls/getitimer/getitimer03.c deleted +0 -10
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void cleanup(void)
-{
-
-}

Regards,
Avinesh

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#5 lore raw

Hi Avinesh, Petr,

Quoted 6 lines · Avinesh Kumar

Hi Li,

Sorry, I missed acting on the review comments you had provided. Thank you for
implementing them. Your patch looks good, I have tested as well.

Thanks, btw we also need to take care of the .gitignore and syscalls run test file.
Someone can help add this when merging the patch.

runtest/syscalls +0 -1
@@ -466,7 +466,6 @@ gethostname01 gethostname01
 
 getitimer01 getitimer01
 getitimer02 getitimer02
-getitimer03 getitimer03
 
 getpagesize01 getpagesize01
 
(quoted diff) +0 -0

b/testcases/kernel/syscalls/getitimer/.gitignore
index 6533d4b50..0a46a1021 100644

testcases/kernel/syscalls/getitimer/.gitignore +0 -1
@@ -1,3 +1,2 @@
 /getitimer01
 /getitimer02
-/getitimer03
Signature · 2 lines
Regards,
Li Wang
Signature · 2 lines
-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#6 lore raw

Hi all,

Pushed V2 with minor fixes.

Quoted 39 lines · Li Wang

Hi Avinesh, Petr,

Quoted 6 lines · Avinesh Kumar

Hi Li,

Sorry, I missed acting on the review comments you had provided. Thank you for
implementing them. Your patch looks good, I have tested as well.

Thanks, btw we also need to take care of the .gitignore and syscalls run test file.
Someone can help add this when merging the patch.

runtest/syscalls +0 -1
@@ -466,7 +466,6 @@ gethostname01 gethostname01
 
 getitimer01 getitimer01
 getitimer02 getitimer02
-getitimer03 getitimer03
 
 getpagesize01 getpagesize01
 
testcases/kernel/syscalls/getitimer/.gitignore +0 -2
index 6533d4b50..0a46a1021 100644
@@ -1,3 +1,2 @@
 /getitimer01
 /getitimer02
-/getitimer03
 
--

Regards,
Li Wang

Signature · 2 lines
Regards,
Li Wang
Signature · 2 lines
-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#7 lore raw

Hi Avinesh, Li,

FYI missing space in docparse before list causes list not being formatted. I fixed it in fa9a4c29e ("getitimer02: Fix docparse format").

Kind regards,
Petr

+++ testcases/kernel/syscalls/getitimer/getitimer02.c @@ -9,6 +9,7 @@
* [Description]
*
* Check that getitimer() call fails:
+ *
* 1. EFAULT with invalid itimerval pointer
* 2. EINVAL when called with an invalid first argument */

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp