[3/3] syscalls/semctl01: Convert into new api

From: Yang Xu <xuyang2018.jy@fujitsu.com>

1)Use SAFE MACRO
2)Remove useless macro and UCLINUX

Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
 testcases/kernel/syscalls/ipc/semctl/Makefile |   4 +-
 .../kernel/syscalls/ipc/semctl/semctl01.c     | 528 +++++-------------
 2 files changed, 149 insertions(+), 383 deletions(-)

On 23.03.2021 13:57, Yang Xu wrote:
> From: Yang Xu <xuyang2018.jy@fujitsu.com>
> 
> 1)Use SAFE MACRO
> 2)Remove useless macro and UCLINUX
> 
> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
> ---
>  testcases/kernel/syscalls/ipc/semctl/Makefile |   4 +-
>  .../kernel/syscalls/ipc/semctl/semctl01.c     | 528 +++++-------------
>  2 files changed, 149 insertions(+), 383 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/ipc/semctl/Makefile b/testcases/kernel/syscalls/ipc/semctl/Makefile
> index 7b7a11d62..8178d74ec 100644
> --- a/testcases/kernel/syscalls/ipc/semctl/Makefile
> +++ b/testcases/kernel/syscalls/ipc/semctl/Makefile
> @@ -7,7 +7,7 @@ LTPLIBS = ltpipc ltpnewipc
>  
>  include $(top_srcdir)/include/mk/testcases.mk
>  
> -semctl01 semctl06: LTPLDLIBS = -lltpipc
> -semctl02 semctl03 semctl04 semctl05 semctl07 semctl08 semctl09: LTPLDLIBS = -lltpnewipc
> +semctl06: LTPLDLIBS = -lltpipc
> +semctl01 semctl02 semctl03 semctl04 semctl05 semctl07 semctl08 semctl09: LTPLDLIBS = -lltpnewipc
>  
>  include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl01.c b/testcases/kernel/syscalls/ipc/semctl/semctl01.c
> index 2f443db89..45e61c3b2 100644
> --- a/testcases/kernel/syscalls/ipc/semctl/semctl01.c
> +++ b/testcases/kernel/syscalls/ipc/semctl/semctl01.c
> @@ -1,59 +1,21 @@
> +// 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
>   */
> -
> -/*
> - * NAME
> - *	semctl01.c
> - *
> - * DESCRIPTION
> - *	semctl01 - test the 13 possible semctl() commands
> - *
> - * ALGORITHM
> - *	create a semaphore set with read and alter permissions
> - *	loop if that option was specified
> - *	  loop through the test cases
> - *	    do any setup required for the test case
> - *	    make the semctl() call using the TEST() macro
> - *	    check the return code
> - *	      if failure, issue a FAIL message.
> - *	    otherwise,
> - *	      if doing functionality testing
> - *		call the appropriate test function
> - *		if correct,
> - *			issue a PASS message
> - *		otherwise
> - *			issue a FAIL message
> - *	call cleanup
> +/*\
> + * Test the 13 possible semctl() commands
>   */
> -
> -
> -#ifndef _GNU_SOURCE
>  #define _GNU_SOURCE
> -#endif
> -#include <sys/wait.h>
> -#include "ipcsem.h"
> -#include "safe_macros.h"
> -
> -char *TCID = "semctl01";
> -
> -static int sem_id_1 = -1;
> -static int sem_index;
> +#include <stdlib.h>
> +#include "tst_safe_sysv_ipc.h"
> +#include "tst_test.h"
> +#include "lapi/sem.h"
> +#include "libnewipc.h"
>  
> +#define INCVAL 2
> +#define NEWMODE 066
> +#define NCHILD  5
> +#define SEMUN_CAST (union semun)
>  /*
>   * These are the various setup and check functions for the 10 different
>   * commands that are available for the semctl() call.
> @@ -67,363 +29,171 @@ static void func_gval(int);
>  static void sall_setup(void), func_sall(void);
>  static void func_sval(void);
>  static void func_rmid(void);
> -static void child_cnt(void);
> -static void child_pid(void);
>  static void func_iinfo(int);
>  static void func_sinfo(void);
>  static void func_sstat(int);
>  

We could drop all these declarations by moving tcases struct
just before verify_semctl().


> +static key_t key;
> +static int sem_id = -1;
> +static int sem_index;
>  static struct semid_ds buf;
>  static struct seminfo ipc_buf;
>  static unsigned short array[PSEMS];
>  static struct sembuf sops;
> -
> -#define INCVAL 2
> -#define NEWMODE	066
> -#define NCHILD	5
> -#define SEM2	2
> -#define SEM4	4
> -#define ONE	1
> -#ifdef _XLC_COMPILER
> -#define SEMUN_CAST
> -#else
> -#define SEMUN_CAST (union semun)
> -#endif
> -
>  static int pid_arr[NCHILD];
>  
> -#ifdef UCLINUX
> -#define PIPE_NAME	"semctl01"
> -static char *argv0;
> -static int sem_op;
> -#endif
> -
> -static struct test_case_t {
> +static struct tcases {
>  	int *semid;
>  	int semnum;
>  	int cmd;
>  	void (*func_test) ();
>  	union semun arg;
>  	void (*func_setup) ();
> -} TC[] = {
> -	{&sem_id_1, 0, IPC_STAT, func_stat, SEMUN_CAST & buf, NULL},
> -	{&sem_id_1, 0, IPC_SET, func_set, SEMUN_CAST & buf, set_setup},
> -	{&sem_id_1, 0, GETALL, func_gall, SEMUN_CAST array, NULL},
> -	{&sem_id_1, SEM4, GETNCNT, func_cnt, SEMUN_CAST & buf, cnt_setup},
> -	{&sem_id_1, SEM2, GETPID, func_pid, SEMUN_CAST & buf, pid_setup},
> -	{&sem_id_1, SEM2, GETVAL, func_gval, SEMUN_CAST & buf, NULL},
> -	{&sem_id_1, SEM4, GETZCNT, func_cnt, SEMUN_CAST & buf, cnt_setup},
> -	{&sem_id_1, 0, SETALL, func_sall, SEMUN_CAST array, sall_setup},
> -	{&sem_id_1, SEM4, SETVAL, func_sval, SEMUN_CAST INCVAL, NULL},
> -	{&sem_id_1, 0, IPC_INFO, func_iinfo, SEMUN_CAST & ipc_buf, NULL},
> -	{&sem_id_1, 0, SEM_INFO, func_sinfo, SEMUN_CAST & ipc_buf, NULL},
> +} tests[] = {
> +	{&sem_id, 0, IPC_STAT, func_stat, SEMUN_CAST & buf, NULL},
> +	{&sem_id, 0, IPC_SET, func_set, SEMUN_CAST & buf, set_setup},
> +	{&sem_id, 0, GETALL, func_gall, SEMUN_CAST array, NULL},
> +	{&sem_id, 4, GETNCNT, func_cnt, SEMUN_CAST & buf, cnt_setup},
> +	{&sem_id, 2, GETPID, func_pid, SEMUN_CAST & buf, pid_setup},
> +	{&sem_id, 2, GETVAL, func_gval, SEMUN_CAST & buf, NULL},
> +	{&sem_id, 4, GETZCNT, func_cnt, SEMUN_CAST & buf, cnt_setup},
> +	{&sem_id, 0, SETALL, func_sall, SEMUN_CAST array, sall_setup},
> +	{&sem_id, 4, SETVAL, func_sval, SEMUN_CAST INCVAL, NULL},
> +	{&sem_id, 0, IPC_INFO, func_iinfo, SEMUN_CAST & ipc_buf, NULL},
> +	{&sem_id, 0, SEM_INFO, func_sinfo, SEMUN_CAST & ipc_buf, NULL},
>  	{&sem_index, 0, SEM_STAT, func_sstat, SEMUN_CAST & buf, NULL},
> -	{&sem_id_1, 0, IPC_RMID, func_rmid, SEMUN_CAST & buf, NULL},
> +	{&sem_id, 0, IPC_RMID, func_rmid, SEMUN_CAST & buf, NULL},
>  };
>  
> -int TST_TOTAL = ARRAY_SIZE(TC);
> -
>  static void kill_all_children(void)
>  {
> -	int j, status;
> -
> -	for (j = 0; j < NCHILD; j++) {
> -		SAFE_KILL(cleanup, pid_arr[j], SIGKILL);
> -	}
> -
> -	/*
> -	 * make sure children finished before we proceed with next testcase
> -	 */
> -	for (j = 0; j < NCHILD; j++) {
> -		SAFE_WAIT(cleanup, &status);
> -	}
> -}
> -
> -int main(int argc, char *argv[])
> -{
> -	int lc;
> -	int i;
> +	int j;
>  
> -	tst_parse_opts(argc, argv, NULL, NULL);
> -
> -#ifdef UCLINUX
> -	argv0 = argv[0];
> -	maybe_run_child(&child_pid, "nd", 1, &sem_id_1);
> -	maybe_run_child(&child_cnt, "ndd", 2, &sem_id_1, &sem_op);
> -#endif
> -
> -	setup();
> -
> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
> -		tst_count = 0;
> -
> -		for (i = 0; i < TST_TOTAL; i++) {
> -
> -			/*
> -			 * Set up any conditions if needed
> -			 */
> -			if (TC[i].func_setup != NULL) {
> -				/* call the setup function */
> -				switch (TC[i].cmd) {
> -				case GETNCNT:
> -					(*TC[i].func_setup) (-ONE);
> -					break;
> -				case GETZCNT:
> -					(*TC[i].func_setup) (0);
> -					break;
> -				default:
> -					(*TC[i].func_setup) ();
> -					break;
> -				}
> -			}
> -
> -			TEST(semctl(*(TC[i].semid), TC[i].semnum, TC[i].cmd,
> -				    TC[i].arg));
> -
> -			if (TEST_RETURN == -1) {
> -				tst_resm(TFAIL, "%s call failed - errno = %d "
> -					 ": %s", TCID, TEST_ERRNO,
> -					 strerror(TEST_ERRNO));
> -			} else {
> -				/*
> -				 * call the appropriate test function
> -				 * and pass the return value where it
> -				 * is needed to perform certain tests.
> -				 */
> -				switch (TC[i].cmd) {
> -				case GETNCNT:
> -				case GETZCNT:
> -				case GETPID:
> -				case GETVAL:
> -				case IPC_INFO:
> -				case SEM_STAT:
> -					(*TC[i].func_test) (TEST_RETURN);
> -					break;
> -				default:
> -					(*TC[i].func_test) ();
> -					break;
> -				}
> -			}
> -
> -			/*
> -			 * If testing GETNCNT or GETZCNT, clean up the children.
> -			 */
> -			switch (TC[i].cmd) {
> -			case GETNCNT:
> -			case GETZCNT:
> -				kill_all_children();
> -				break;
> -			}
> -		}
> -		/*
> -		 * recreate the semaphore resource if looping
> -		 */
> -		if (TEST_LOOPING(lc)) {
> -			sem_id_1 = semget(semkey, PSEMS,
> -					  IPC_CREAT | IPC_EXCL | SEM_RA);
> -			if (sem_id_1 == -1)
> -				tst_brkm(TBROK, cleanup,
> -					 "couldn't recreate " "semaphore");
> -		}
> -	}
> +	for (j = 0; j < NCHILD; j++)
> +		SAFE_KILL(pid_arr[j], SIGKILL);
>  
> -	cleanup();
> -
> -	tst_exit();
> +	for (j = 0; j < NCHILD; j++)
> +		SAFE_WAIT(NULL);
>  }
>  
> -/*
> - * func_stat() - check the functionality of the IPC_STAT command with semctl()
> - */
>  static void func_stat(void)
>  {
> -	/* check the number of semaphores and the ipc_perm.mode value */
>  	if (buf.sem_nsems == PSEMS && buf.sem_perm.mode == (SEM_RA))
> -		tst_resm(TPASS, "buf.sem_nsems and buf.sem_perm.mode"
> -			 " are correct");
> +		tst_res(TPASS, "buf.sem_nsems and buf.sem_perm.mode are correct");
>  	else
> -		tst_resm(TFAIL, "semaphore STAT info is incorrect");
> +		tst_res(TFAIL, "semaphore STAT info is incorrect");
>  }
>  
> -/*
> - * set_setup() - set up for the IPC_SET command with semctl()
> - */
>  static void set_setup(void)
>  {
> -	/* set up a new mode for the semaphore set */
>  	buf.sem_perm.mode = SEM_RA | NEWMODE;
>  }
>  
> -/*
> - * func_set() - check the functionality of the IPC_SET command with semctl()
> - */
>  static void func_set(void)
>  {
> -	/* first stat the semaphore to get the new data */
> -	if (semctl(sem_id_1, 0, IPC_STAT, (union semun)&buf) == -1) {
> -		tst_resm(TBROK, "stat failed in func_set()");
> -		return;
> -	}
> +	SAFE_SEMCTL(sem_id, 0, IPC_STAT, (union semun)&buf);
>  
> -	/* check that the new mode is what we set */
>  	if (buf.sem_perm.mode == (SEM_RA | NEWMODE))
> -		tst_resm(TPASS, "buf.sem_perm.mode is correct");
> +		tst_res(TPASS, "buf.sem_perm.mode is correct");
>  	else
> -		tst_resm(TFAIL, "semaphore mode info is incorrect");
> +		tst_res(TFAIL, "semaphore mode info is incorrect");
>  }
>  
> -/*
> - * func_gall() - check the functionality of the GETALL command with semctl()
> - */
>  static void func_gall(void)
>  {
>  	int i;
>  
> -	/* the initial value of the primitive semaphores should be zero */
>  	for (i = 0; i < PSEMS; i++) {
>  		if (array[i] != 0) {
> -			tst_resm(TFAIL, "semaphore %d has unexpected value", i);
> +			tst_res(TFAIL, "semaphore %d has unexpected value", i);
>  			return;
>  		}
>  	}
> -	tst_resm(TPASS, "semaphores have expected values");
> +	tst_res(TPASS, "semaphores have expected values");
> +}
> +
> +static void child_cnt(void)
> +{
> +	sops.sem_num = 4;
> +	sops.sem_flg = 0;
> +
> +	/*
> +	 * Do a semop that will cause the child to sleep.
> +	 * The child process will be killed in the func_ncnt
> +	 * routine which should cause an error to be return
> +	 * by the semop() call.
> +	 */
> +	if (semop(sem_id, &sops, 1) != -1)
> +		tst_brk(TBROK, "semop succeeded - cnt_setup");
>  }
>  
> -/*
> - * cnt_setup() - set up for the GETNCNT and GETZCNT commands with semctl()
> - */
>  static void cnt_setup(int opval)
>  {
>  	int pid, i;
>  
> -	sops.sem_num = SEM4;
> +	sops.sem_num = 4;
>  	sops.sem_flg = 0;
> -
>  	/*
>  	 * if seting up for GETZCNT, the semaphore value needs to be positive
>  	 */
>  	if (opval == 0) {
> -		/* initialize the semaphore value to ONE */
> -		sops.sem_op = ONE;
> -		if (semop(sem_id_1, &sops, 1) == -1)
> -			tst_brkm(TBROK, cleanup, "semop #1 failed - cnt_setup");
> +		sops.sem_op = 1;
> +		SAFE_SEMOP(sem_id, &sops, 1);
>  	}
>  
> -	/* set the correct operation */
>  	sops.sem_op = opval;
>  	for (i = 0; i < NCHILD; i++) {
> -		/* fork five children to wait */
> -		pid = FORK_OR_VFORK();
> -		if (pid == -1)
> -			tst_brkm(TBROK, cleanup, "fork failed in cnt_setup");
> -
> +		pid = SAFE_FORK();
>  		if (pid == 0) {
> -#ifdef UCLINUX
> -			sem_op = sops.sem_op;
> -			if (self_exec(argv0, "ndd", 2, sem_id_1, sem_op) < 0)
> -				tst_brkm(TBROK, cleanup, "self_exec failed "
> -					 "in cnt_setup");
> -#else
>  			child_cnt();
> -#endif
>  		} else {
> -			TST_PROCESS_STATE_WAIT(cleanup, pid, 'S');
> -			/* save the pid so we can kill it later */
> +			TST_PROCESS_STATE_WAIT(pid, 'S', 0);
>  			pid_arr[i] = pid;
>  		}
>  	}
>  }
>  
> -static void child_cnt(void)
> +static void func_cnt(int rval)
>  {
> -#ifdef UCLINUX
> -	sops.sem_op = (short int)sem_op;
> -#endif
> +	if (rval == NCHILD)
> +		tst_res(TPASS, "number of sleeping processes is correct");
> +	else
> +		tst_res(TFAIL, "number of sleeping processes is not correct");
> +}
>  
> -	sops.sem_num = SEM4;
> +static void child_pid(void)
> +{
> +	sops.sem_num = 2;
> +	sops.sem_op = 1;
>  	sops.sem_flg = 0;
> -
>  	/*
> -	 * Do a semop that will cause the child to sleep.
> -	 * The child process will be killed in the func_ncnt
> -	 * routine which should cause an error to be return
> -	 * by the semop() call.
> +	 * Do a semop that will increment the semaphore.
>  	 */
> -	if (semop(sem_id_1, &sops, 1) != -1)
> -		tst_resm(TBROK, "semop succeeded - cnt_setup");
> -
> +	SAFE_SEMOP(sem_id, &sops, 1);
>  	exit(0);
>  }
>  
> -/*
> - * func_cnt() - check the functionality of the GETNCNT and GETZCNT commands
> - *	        with semctl()
> - */
> -static void func_cnt(int rval)
> -{
> -
> -	if (rval == NCHILD)
> -		tst_resm(TPASS, "number of sleeping processes is correct");
> -	else
> -		tst_resm(TFAIL, "number of sleeping processes is not correct");
> -}
> -
> -/*
> - * pid_setup() - set up for the GETPID command with semctl()
> - */
>  static void pid_setup(void)
>  {
>  	int pid;
>  
> -	/*
> -	 * Fork a child to do a semop that will pass.
> -	 */
> -	pid = FORK_OR_VFORK();
> -	if (pid == -1)
> -		tst_brkm(TBROK, cleanup, "fork failed in pid_setup()");
> -
> -	if (pid == 0) {		/* child */
> -#ifdef UCLINUX
> -		if (self_exec(argv0, "nd", 1, sem_id_1) < 0)
> -			tst_brkm(TBROK, cleanup, "self_exec failed "
> -				 "in pid_setup()");
> -#else
> +	pid = SAFE_FORK();
> +	if (pid == 0) {
>  		child_pid();
> -#endif
>  	} else {
> -		pid_arr[SEM2] = pid;
> -		TST_PROCESS_STATE_WAIT(cleanup, pid, 'Z');
> +		pid_arr[2] = pid;
> +		TST_PROCESS_STATE_WAIT(pid, 'Z', 0);
>  	}
>  }
>  
> -static void child_pid(void)
> -{
> -	sops.sem_num = SEM2;
> -	sops.sem_op = ONE;
> -	sops.sem_flg = 0;
> -	/*
> -	 * Do a semop that will increment the semaphore.
> -	 */
> -	if (semop(sem_id_1, &sops, 1) == -1)
> -		tst_resm(TBROK, "semop failed - pid_setup");
> -	exit(0);
> -}
> -
> -/*
> - * func_pid() - check the functionality of the GETPID command with semctl()
> - */
>  static void func_pid(int rval)
>  {
> -	/* compare the rval (pid) to the saved pid from the setup */
> -	if (rval == pid_arr[SEM2])
> -		tst_resm(TPASS, "last pid value is correct");
> +	if (rval == pid_arr[2])
> +		tst_res(TPASS, "last pid value is correct");
>  	else
> -		tst_resm(TFAIL, "last pid value is not correct");
> +		tst_res(TFAIL, "last pid value is not correct");
>  }
>  
> -/*
> - * func_gval() - check the functionality of the GETVAL command with semctl()
> - */
>  static void func_gval(int rval)
>  {
>  	/*
> @@ -431,142 +201,138 @@ static void func_gval(int rval)
>  	 * to ONE as it was set in the last test (GETPID).
>  	 */
>  	if (rval == 1)
> -		tst_resm(TPASS, "semaphore value is correct");
> +		tst_res(TPASS, "semaphore value is correct");
>  	else
> -		tst_resm(TFAIL, "semaphore value is not correct");
> +		tst_res(TFAIL, "semaphore value is not correct");
>  }
>  
> -/*
> - * all_setup() - set up for the SETALL command with semctl()
> - */
>  static void sall_setup(void)
>  {
>  	int i;
>  
>  	for (i = 0; i < PSEMS; i++) {
> -		/* initialize the array values to 3 */
>  		array[i] = 3;
>  	}
>  }
>  
> -/*
> - * func_sall() - check the functionality of the SETALL command with semctl()
> - */
>  static void func_sall(void)
>  {
>  	int i;
>  	unsigned short rarray[PSEMS];
>  
> -	/*
> -	 * do a GETALL and compare the values to those set above
> -	 */
> -
> -	if (semctl(sem_id_1, 0, GETALL, (union semun)rarray) == -1)
> -		tst_brkm(TBROK, cleanup, "semctl failed in func_sall");
> -
> +	SAFE_SEMCTL(sem_id, 0, GETALL, (union semun)rarray);
>  	for (i = 0; i < PSEMS; i++) {
>  		if (array[i] != rarray[i]) {
> -			tst_resm(TFAIL, "semaphore values are not correct");
> +			tst_res(TFAIL, "semaphore values are not correct");
>  			return;
>  		}
>  	}
>  
> -	tst_resm(TPASS, "semaphore values are correct");
> +	tst_res(TPASS, "semaphore values are correct");
>  }
>  
> -/*
> - * func_sval() - check the functionality of the SETVAL command with semctl()
> - */
>  static void func_sval(void)
>  {
>  	int semv;
>  	union semun arr;
>  
> -	/*
> -	 * do a GETVAL and compare it to the value set above
> -	 */
> -
> -	semv = semctl(sem_id_1, SEM4, GETVAL, arr);
> -	if (semv == -1)
> -		tst_brkm(TBROK, cleanup, "semctl failed in func_sval");
> -
> +	semv = SAFE_SEMCTL(sem_id, 4, GETVAL, arr);
>  	if (semv != INCVAL)
> -		tst_resm(TFAIL, "semaphore value is not what was set");
> +		tst_res(TFAIL, "semaphore value is not what was set");
>  	else
> -		tst_resm(TPASS, "semaphore value is correct");
> +		tst_res(TPASS, "semaphore value is correct");
>  }
>  
> -/*
> - * func_rmid() - check the functionality of the IPC_RMID command with semctl()
> - */
>  static void func_rmid(void)
>  {
> -
> -	/*
> -	 * do a semop() - we should get EINVAL
> -	 */
> -	if (semop(sem_id_1, &sops, 1) != -1)
> -		tst_resm(TFAIL, "semop succeeded on expected fail");
> -
> -	if (errno != EINVAL)
> -		tst_resm(TFAIL, "returned errno - %d - is not expected", errno);
> -	else
> -		tst_resm(TPASS, "semaphore appears to be removed");
> -
> -	sem_id_1 = -1;
> +	TST_EXP_FAIL(semop(sem_id, &sops, 1), EINVAL, "semaphore appears to be removed");
> +	sem_id = -1;
>  }
>  
>  static void func_iinfo(int hidx)
>  {
>  	if (hidx >= 0) {
>  		sem_index = hidx;
> -		tst_resm(TPASS, "the highest index is correct");
> +		tst_res(TPASS, "the highest index is correct");
>  	} else {
>  		sem_index = 0;
> -		tst_resm(TFAIL, "the highest index is incorrect");
> +		tst_res(TFAIL, "the highest index is incorrect");
>  	}
>  }
>  
>  static void func_sinfo(void)
>  {
>  	if (ipc_buf.semusz < 1)
> -		tst_resm(TFAIL, "number of semaphore sets is incorrect");
> +		tst_res(TFAIL, "number of semaphore sets is incorrect");
>  	else
> -		tst_resm(TPASS, "number of semaphore sets is correct");
> +		tst_res(TPASS, "number of semaphore sets is correct");
>  }
>  
>  static void func_sstat(int semidx)
>  {
>  	if (semidx >= 0)
> -		tst_resm(TPASS, "id of the semaphore set is correct");
> +		tst_res(TPASS, "id of the semaphore set is correct");
>  	else
> -		tst_resm(TFAIL, "id of the semaphore set is incorrect");
> +		tst_res(TFAIL, "id of the semaphore set is incorrect");
>  }
>  
> -void setup(void)
> +static void verify_semctl(unsigned int n)
>  {
> +	struct tcases *tc = &tests[n];
> +	int rval;
>  
> -	tst_sig(FORK, DEF_HANDLER, cleanup);
> -
> -	TEST_PAUSE;
> -
> -	tst_tmpdir();
> -
> -	TST_CHECKPOINT_INIT(tst_rmdir);
> +	if (sem_id == -1)
> +		sem_id = SAFE_SEMGET(key, PSEMS, IPC_CREAT | IPC_EXCL | SEM_RA);
> +	if (tc->func_setup != NULL) {
> +		switch (tc->cmd) {
> +		case GETNCNT:
> +			tc->func_setup(-1);
> +			break;
> +		case GETZCNT:
> +			tc->func_setup(0);
> +			break;
> +		default:
> +			tc->func_setup();
> +			break;
> +		}
> +	}
>  
> -	/* get an IPC resource key */
> -	semkey = getipckey();
> +	rval = SAFE_SEMCTL(*(tc->semid), tc->semnum, tc->cmd, tc->arg);
> +	switch (tc->cmd) {
> +	case GETNCNT:
> +	case GETZCNT:
> +	case GETPID:
> +	case GETVAL:
> +	case IPC_INFO:
> +	case SEM_STAT:
> +		(*tc->func_test)(rval);
> +		break;
> +	default:
> +		(*tc->func_test)();
> +		break;
> +	}
>  
> -	/* create a semaphore set with read and alter permissions */
> -	sem_id_1 = semget(semkey, PSEMS, IPC_CREAT | IPC_EXCL | SEM_RA);
> -	if (sem_id_1 == -1)
> -		tst_brkm(TBROK, cleanup, "couldn't create semaphore in setup");
> +	if (tc->cmd == GETNCNT || tc->cmd == GETZCNT)
> +		kill_all_children();
>  }
>  
> -void cleanup(void)
> +static void setup(void)
>  {
> -	/* if it exists, remove the semaphore resource */
> -	rm_sema(sem_id_1);
> +	key = GETIPCKEY();
> +	sem_id = SAFE_SEMGET(key, PSEMS, IPC_CREAT | IPC_EXCL | SEM_RA);
> +}
>  
> -	tst_rmdir();
> +static void cleanup(void)
> +{
> +	if (sem_id >= 0)
> +		SAFE_SEMCTL(sem_id, 0, IPC_RMID);
>  }
> +
> +static struct tst_test test = {
> +	.setup = setup,
> +	.cleanup = cleanup,
> +	.test = verify_semctl,
> +	.tcnt = ARRAY_SIZE(tests),
> +	.needs_root = 1,

Does it really require root?

> +	.forks_child = 1,
> +};
>

Hi Alexey
> On 23.03.2021 13:57, Yang Xu wrote:
>> From: Yang Xu<xuyang2018.jy@fujitsu.com>
>>   /*
>>    * These are the various setup and check functions for the 10 different
>>    * commands that are available for the semctl() call.
>> @@ -67,363 +29,171 @@ static void func_gval(int);
>>   static void sall_setup(void), func_sall(void);
>>   static void func_sval(void);
>>   static void func_rmid(void);
>> -static void child_cnt(void);
>> -static void child_pid(void);
>>   static void func_iinfo(int);
>>   static void func_sinfo(void);
>>   static void func_sstat(int);
>>
>
> We could drop all these declarations by moving tcases struct
> just before verify_semctl().
Yes. Thanks for catching this.

>> +
>> +static struct tst_test test = {
>> +	.setup = setup,
>> +	.cleanup = cleanup,
>> +	.test = verify_semctl,
>> +	.tcnt = ARRAY_SIZE(tests),
>> +	.needs_root = 1,
>
> Does it really require root?
See ftok(3) manpage, it said "The  ftok()  function uses the identity of 
the file named by the given pathname (which must refer to an existing, 
accessible file)".
ftok source code
key_t
ftok (const char *pathname, int proj_id)
{
   struct stat64 st;
   key_t key;

   if (__stat64 (pathname, &st) < 0)
     return (key_t) -1;

   key = ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16)
          | ((proj_id & 0xff) << 24));

   return key;
}

To ensure ftok succeed, we must require root. Or, modify GETIPCKEY api, 
we can use tmp directory. Anyhow, I will send a v2 to remove useless 
funtion declartion firstly.

Best Regards
Yang Xu
>
>> +	.forks_child = 1,
>> +};
>>
>
>

Hi!
> > Does it really require root?
> See ftok(3) manpage, it said "The  ftok()  function uses the identity of 
> the file named by the given pathname (which must refer to an existing, 
> accessible file)".
> ftok source code
> key_t
> ftok (const char *pathname, int proj_id)
> {
>    struct stat64 st;
>    key_t key;
> 
>    if (__stat64 (pathname, &st) < 0)
>      return (key_t) -1;
> 
>    key = ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16)
>           | ((proj_id & 0xff) << 24));
> 
>    return key;
> }
> 
> To ensure ftok succeed, we must require root. Or, modify GETIPCKEY api, 
> we can use tmp directory. Anyhow, I will send a v2 to remove useless 
> funtion declartion firstly.

Unless we are sharing the semaphore with a process that wasn't worked
from the test process we can also pass IPC_PRIVATE instead of the key.

Hi Cyril, Alexey
> Hi!
>>> Does it really require root?
>> See ftok(3) manpage, it said "The  ftok()  function uses the identity of
>> the file named by the given pathname (which must refer to an existing,
>> accessible file)".
>> ftok source code
>> key_t
>> ftok (const char *pathname, int proj_id)
>> {
>>     struct stat64 st;
>>     key_t key;
>>
>>     if (__stat64 (pathname,&st)<  0)
>>       return (key_t) -1;
>>
>>     key = ((st.st_ino&  0xffff) | ((st.st_dev&  0xff)<<  16)
>>            | ((proj_id&  0xff)<<  24));
>>
>>     return key;
>> }
>>
>> To ensure ftok succeed, we must require root. Or, modify GETIPCKEY api,
>> we can use tmp directory. Anyhow, I will send a v2 to remove useless
>> funtion declartion firstly.
>
> Unless we are sharing the semaphore with a process that wasn't worked
> from the test process we can also pass IPC_PRIVATE instead of the key.

My ltp working directory is /root/ltp, then run "su xuyang" to run 
semctl01 case under /root/ltp/testcases/kernel/syscalls/ipc/semctl, then 
I got ftok failure as below:

[xuyang@localhost semctl]$ ./semctl01
tst_test.c:1289: TINFO: Timeout per run is 0h 05m 00s
libnewipc.c:44: TBROK: ftok() failed at semctl01.c:308: EACCES (13)

I guess this situation maybe meaningless(Usually, user has access 
privilege for their ltp directory or install directory ). So needs_root 
is useless.

I guess maintainers can remove this directly instead of sending a v3.

Best Regards
Yang Xu
>

Hi!
> >> To ensure ftok succeed, we must require root. Or, modify GETIPCKEY api,
> >> we can use tmp directory. Anyhow, I will send a v2 to remove useless
> >> funtion declartion firstly.
> >
> > Unless we are sharing the semaphore with a process that wasn't worked
> > from the test process we can also pass IPC_PRIVATE instead of the key.
> 
> My ltp working directory is /root/ltp, then run "su xuyang" to run 
> semctl01 case under /root/ltp/testcases/kernel/syscalls/ipc/semctl, then 
> I got ftok failure as below:
> 
> [xuyang@localhost semctl]$ ./semctl01
> tst_test.c:1289: TINFO: Timeout per run is 0h 05m 00s
> libnewipc.c:44: TBROK: ftok() failed at semctl01.c:308: EACCES (13)
> 
> I guess this situation maybe meaningless(Usually, user has access 
> privilege for their ltp directory or install directory ). So needs_root 
> is useless.
> 
> I guess maintainers can remove this directly instead of sending a v3.

The point I was trying to make is that you can pass IPC_PRIVATE instead
of the key to semget() and you don't have to use ftok() at all.

Hi Cyril
> Hi!
>>>> To ensure ftok succeed, we must require root. Or, modify GETIPCKEY api,
>>>> we can use tmp directory. Anyhow, I will send a v2 to remove useless
>>>> funtion declartion firstly.
>>>
>>> Unless we are sharing the semaphore with a process that wasn't worked
>>> from the test process we can also pass IPC_PRIVATE instead of the key.
>>
>> My ltp working directory is /root/ltp, then run "su xuyang" to run
>> semctl01 case under /root/ltp/testcases/kernel/syscalls/ipc/semctl, then
>> I got ftok failure as below:
>>
>> [xuyang@localhost semctl]$ ./semctl01
>> tst_test.c:1289: TINFO: Timeout per run is 0h 05m 00s
>> libnewipc.c:44: TBROK: ftok() failed at semctl01.c:308: EACCES (13)
>>
>> I guess this situation maybe meaningless(Usually, user has access
>> privilege for their ltp directory or install directory ). So needs_root
>> is useless.
>>
>> I guess maintainers can remove this directly instead of sending a v3.
>
> The point I was trying to make is that you can pass IPC_PRIVATE instead
> of the key to semget() and you don't have to use ftok() at all.
Now, I see. Thanks. Will send a v3.
>