[LTP] [PATCH 1/2] syscalls/getpid01: Convert to new API

[LTP] [PATCH 1/2] syscalls/getpid01: Convert to new API

[Shiyang Ruan]

Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
---
 testcases/kernel/syscalls/getpid/getpid01.c | 164 ++------------------
 1 file changed, 17 insertions(+), 147 deletions(-)

diff --git a/testcases/kernel/syscalls/getpid/getpid01.c b/testcases/kernel/syscalls/getpid/getpid01.c
index b9b069c63..9490afb79 100644
--- a/testcases/kernel/syscalls/getpid/getpid01.c
+++ b/testcases/kernel/syscalls/getpid/getpid01.c
@@ -1,158 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2000 Silicon Graphics, Inc.  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.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * 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.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
  */
-/* $Id: getpid01.c,v 1.8 2009/10/26 14:55:47 subrata_modak Exp $ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER	: getpid01
- *
- *    EXECUTED BY	: anyone
- *
- *    TEST TITLE	: Basic test for getpid(2)
- *
- *    PARENT DOCUMENT	: usctpl01
- *
- *    TEST CASE TOTAL	: 1
- *
- *    WALL CLOCK TIME	: 1
- *
- *    CPU TYPES		: ALL
- *
- *    AUTHOR		: William Roske
- *
- *    CO-PILOT		: Dave Fenner
- *
- *    DATE STARTED	: 03/30/92
- *
- *    INITIAL RELEASE	: UNICOS 7.0
- *
- *    TEST CASES
- *
- * 	1.) getpid(2) returns...(See Description)
- *
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *$
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- *
- *    INTERCASE DEPENDENCIES
- * 	None
- *
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getpid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getpid(2).
- *
- * 	Setup:
- * 	  Setup signal handling.
- *	  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, Issue a PASS message.
- *
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- *
+
+/*\
+ * [DESCRIPTION]
  *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
+ * This is a Phase I test for the getpid(2) system call. It is intended to
+ * provide a limited exposure of the system call.
+\*/
 
 #include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include "test.h"
-
-void setup();
-void cleanup();
-
-char *TCID = "getpid01";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
-{
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		TEST(getpid());
-
-		if (TEST_RETURN == -1)
-			tst_resm(TFAIL | TTERRNO, "getpid failed");
-		else
-			tst_resm(TPASS, "getpid returned %ld", TEST_RETURN);
+#include "tst_test.h"
 
-	}
-
-	cleanup();
-	tst_exit();
-}
-
-void setup(void)
+static void verify_getpid(void)
 {
+	TEST(getpid());
 
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
+	if (TST_RET == -1)
+		tst_res(TFAIL | TTERRNO, "getpid()");
+	else
+		tst_res(TPASS, "getpid() returns %ld", TST_RET);
 }
 
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.test_all = verify_getpid,
+};
-- 
2.30.1

[LTP] [PATCH 2/2] syscalls/getpid02: Convert to new API

[Shiyang Ruan]

Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
---
 testcases/kernel/syscalls/getpid/getpid02.c | 152 +++++---------------
 1 file changed, 34 insertions(+), 118 deletions(-)

diff --git a/testcases/kernel/syscalls/getpid/getpid02.c b/testcases/kernel/syscalls/getpid/getpid02.c
index 6c44ea96a..6b5dd0a63 100644
--- a/testcases/kernel/syscalls/getpid/getpid02.c
+++ b/testcases/kernel/syscalls/getpid/getpid02.c
@@ -1,136 +1,52 @@
+// 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) 2000 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
-/*
- * Test Name: getpid02
- *
- * Test Description:
- *  Verify that getpid() system call gets the process ID of the of the
- *  calling process.
- *
- * Expected Result:
- *  getpid() should return pid of the process on success.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
+/*\
+ * [DESCRIPTION]
  *
- *  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
- *
- * Usage:  <for command-line>
- *  getpid02 [-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.
- */
+ * Verify that getpid() system call gets the process ID of the of the calling
+ * process.
+\*/
 
-#include <unistd.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 
-#include "test.h"
-#include "safe_macros.h"
-
-void setup();			/* Main setup function of test */
-void cleanup();			/* cleanup function for the test */
-
-char *TCID = "getpid02";
-int TST_TOTAL = 1;
+#include "tst_test.h"
 
-int main(int ac, char **av)
+static void verify_getpid(void)
 {
-	int lc;
 	pid_t proc_id;		/* process id of the test process */
 	pid_t pid;		/* process id of the child process */
 	pid_t pproc_id;		/* parent process id */
 	int status;		/* exit status of child process */
 
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		TEST(getpid());
-
-		proc_id = TEST_RETURN;
-
-		if ((pid = FORK_OR_VFORK()) == -1)
-			tst_resm(TFAIL | TERRNO, "fork failed");
-		else if (pid == 0) {
-			pproc_id = getppid();
-
-			if (pproc_id != proc_id)
-				exit(1);
-			exit(0);
-		} else {
-			SAFE_WAIT(cleanup, &status);
-			if (!WIFEXITED(status) ||
-			    WEXITSTATUS(status) != 0)
-				tst_resm(TFAIL, "getpid() returned "
-					 "invalid pid %d", proc_id);
-			else
-				tst_resm(TPASS,
-					 "getpid functionality is correct");
-		}
+	TEST(getpid());
+
+	proc_id = TST_RET;
+
+	if ((pid = SAFE_FORK()) == -1)
+		tst_res(TFAIL | TERRNO, "fork failed");
+	else if (pid == 0) {
+		pproc_id = getppid();
+
+		if (pproc_id != proc_id)
+			exit(1);
+		exit(0);
+	} else {
+		SAFE_WAIT(&status);
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+			tst_res(TFAIL, "getpid() returned invalid pid %d",
+				proc_id);
+		else
+			tst_res(TPASS, "getpid() functionality is correct");
 	}
-
-	cleanup();
-	tst_exit();
 }
 
-void setup(void)
-{
-
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-}
-
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.forks_child = 1,
+	.test_all = verify_getpid,
+};
-- 
2.30.1

[LTP] [PATCH 2/2] syscalls/getpid02: Convert to new API

[Cyril Hrubis]

On Wed, Feb 24, 2021 at 11:12:27AM +0800, Shiyang Ruan wrote:
> Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
> ---
>  testcases/kernel/syscalls/getpid/getpid02.c | 152 +++++---------------
>  1 file changed, 34 insertions(+), 118 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/getpid/getpid02.c b/testcases/kernel/syscalls/getpid/getpid02.c
> index 6c44ea96a..6b5dd0a63 100644
> --- a/testcases/kernel/syscalls/getpid/getpid02.c
> +++ b/testcases/kernel/syscalls/getpid/getpid02.c
> @@ -1,136 +1,52 @@
> +// 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) 2000 Silicon Graphics, Inc.  All Rights Reserved.
         ^
	 Huh? This should be the IBM copyright that was remove above.

>   */
>  
> -/*
> - * Test Name: getpid02
> - *
> - * Test Description:
> - *  Verify that getpid() system call gets the process ID of the of the
> - *  calling process.
> - *
> - * Expected Result:
> - *  getpid() should return pid of the process on success.
> - *
> - * Algorithm:
> - *  Setup:
> - *   Setup signal handling.
> - *   Pause for SIGUSR1 if option specified.
> +/*\
> + * [DESCRIPTION]
>   *
> - *  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
> - *
> - * Usage:  <for command-line>
> - *  getpid02 [-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.
> - */
> + * Verify that getpid() system call gets the process ID of the of the calling
> + * process.

This should be a more concrete. Something as:

Check that getppid() in child returns the same pid as getpid() in
parent.

> +\*/
>  
> -#include <unistd.h>
> -#include <sys/types.h>
> +#include <stdlib.h>
>  #include <errno.h>
> -#include <unistd.h>
> -#include <string.h>
> -#include <signal.h>
> +#include <sys/types.h>
>  #include <sys/wait.h>
>  
> -#include "test.h"
> -#include "safe_macros.h"
> -
> -void setup();			/* Main setup function of test */
> -void cleanup();			/* cleanup function for the test */
> -
> -char *TCID = "getpid02";
> -int TST_TOTAL = 1;
> +#include "tst_test.h"
>  
> -int main(int ac, char **av)
> +	TEST(getpid());
> +
> +	proc_id = TST_RET;

There is no point in using the TEST() macro here, getpid() cannot fail
so there is no point in storing the errno. So this should be just

	proc_pid = getpid();

> +	if ((pid = SAFE_FORK()) == -1)
> +		tst_res(TFAIL | TERRNO, "fork failed");

SAFE_FORK() cannot fail, that is the whole point of safe macros.

> +	else if (pid == 0) {
> +		pproc_id = getppid();
> +
> +		if (pproc_id != proc_id)
> +			exit(1);
> +		exit(0);

We don't have to propagate the exit value like this anymore.

You should use the tst_res(TFAIL/TPASS, ...) in the child process
directly instead.

> +	} else {
> +		SAFE_WAIT(&status);
> +		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
> +			tst_res(TFAIL, "getpid() returned invalid pid %d",
> +				proc_id);
> +		else
> +			tst_res(TPASS, "getpid() functionality is correct");
>  	}
> -
> -	cleanup();
> -	tst_exit();
>  }
>  
> -void setup(void)
> -{
> -
> -	tst_sig(FORK, DEF_HANDLER, cleanup);
> -
> -	TEST_PAUSE;
> -}
> -
> -void cleanup(void)
> -{
> -}
> +static struct tst_test test = {
> +	.forks_child = 1,
> +	.test_all = verify_getpid,
> +};
> -- 
> 2.30.1
> 
> 
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH 1/2] syscalls/getpid01: Convert to new API

[Cyril Hrubis]

Hi!
> +static void verify_getpid(void)
>  {
> +	TEST(getpid());
>  
> -	tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> -	TEST_PAUSE;
> +	if (TST_RET == -1)
> +		tst_res(TFAIL | TTERRNO, "getpid()");
> +	else
> +		tst_res(TPASS, "getpid() returns %ld", TST_RET);

The POSIX actually mandates that getpid() cannot fail and is always
successful. Given that this test seems to be useless and could be
removed or replaced with something more sane.

I guess that what we can do is to check if the return value from
getpid() is greater than 1, since pid 1 is special no other process than
init can have pid == 1. And the value has to be smaller or equal to
/proc/sys/kernel/pid_max as well.

So what would I do here would be:

* read /proc/sys/kernel/pid_max value
* loop 100 times or so
  - fork a child
  - check that the pid in child is > 1 and <= pid_max

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] 回复: [PATCH 1/2] syscalls/getpid01: Convert to new API

[ruansy.fnst]

> Hi!
> > +static void verify_getpid(void)
> >  {
> > +     TEST(getpid());
> > 
> > -     tst_sig(NOFORK, DEF_HANDLER, cleanup);
> > -
> > -     TEST_PAUSE;
> > +     if (TST_RET == -1)
> > +             tst_res(TFAIL | TTERRNO, "getpid()");
> > +     else
> > +             tst_res(TPASS, "getpid() returns %ld", TST_RET);
>
> The POSIX actually mandates that getpid() cannot fail and is always
> successful. Given that this test seems to be useless and could be
> removed or replaced with something more sane.
>
> I guess that what we can do is to check if the return value from
> getpid() is greater than 1, since pid 1 is special no other process than
> init can have pid == 1. And the value has to be smaller or equal to
> /proc/sys/kernel/pid_max as well.
>
> So what would I do here would be:
>
> * read /proc/sys/kernel/pid_max value
> * loop 100 times or so
>   - fork a child
>   - check that the pid in child is > 1 and <= pid_max

Do you mean loop 100 times to fork 100 children processes?  I tried in this
way and found that the pid number just increased sequentially from +0 to +100
(Because no other processes were created during the test).  So, I am not sure
if 100 times is enough to test the range?


--
Thanks,
Ruan Shiyang.

>
> --
> Cyril Hrubis
> chrubis@suse.cz

[LTP] ????: [PATCH 1/2] syscalls/getpid01: Convert to new API

[Cyril Hrubis]

Hi!
> Do you mean loop 100 times to fork 100 children processes?  I tried in this
> way and found that the pid number just increased sequentially from +0 to +100
> (Because no other processes were created during the test).  So, I am not sure
> if 100 times is enough to test the range?

I'm not sure if it's reasonable to test the whole range, my intention
was to run the test a few times since fork+getpid() should fast enough,
but I guess that if it's fast enough we can fork enough times for the
pid to wrap around.

-- 
Cyril Hrubis
chrubis@suse.cz