* [LTP] [PATCH v2 1/3] lapi/sem.h: Add SEM_STAT_ANY
@ 2020-12-24 9:58 Feiyu Zhu
2020-12-24 9:58 ` [LTP] [PATCH v2 2/3] Add SAFE_SEMCTL() and SAFE_SEMGET() macro Feiyu Zhu
2020-12-24 9:58 ` [LTP] [PATCH v2 3/3] syscalls/ipc: semctl09: add a test for SEM_STAT_ANY Feiyu Zhu
0 siblings, 2 replies; 4+ messages in thread
From: Feiyu Zhu @ 2020-12-24 9:58 UTC (permalink / raw)
To: ltp
1) Rename semun.h to sem.h and apply it
2) Add SEM_STAT_ANY
Signed-off-by: Feiyu Zhu <zhufy.jy@cn.fujitsu.com>
Reviewed-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
include/ipcsem.h | 2 +-
include/lapi/sem.h | 28 +++++++++++++++++++++++++
include/lapi/semun.h | 22 -------------------
testcases/kernel/containers/sysvipc/sem_comm.c | 3 +--
testcases/kernel/ipc/pipeio/pipeio.c | 3 +--
testcases/kernel/ipc/semaphore/sem01.c | 3 +--
testcases/kernel/ipc/semaphore/sem02.c | 3 +--
testcases/kernel/sched/process_stress/process.c | 3 +--
testcases/kernel/syscalls/ipc/semctl/semctl08.c | 2 +-
testcases/kernel/syscalls/ipc/semop/semop01.c | 3 +--
testcases/kernel/syscalls/ipc/semop/semop02.c | 3 +--
testcases/kernel/syscalls/ipc/semop/semop03.c | 3 +--
testcases/kernel/syscalls/sendmsg/sendmsg02.c | 3 +--
13 files changed, 39 insertions(+), 42 deletions(-)
create mode 100644 include/lapi/sem.h
delete mode 100644 include/lapi/semun.h
diff --git a/include/ipcsem.h b/include/ipcsem.h
index 6a37672..09a0b3c 100644
--- a/include/ipcsem.h
+++ b/include/ipcsem.h
@@ -29,7 +29,7 @@
#include <sys/sem.h>
#include "test.h"
-#include "lapi/semun.h"
+#include "lapi/sem.h"
void cleanup(void);
void setup(void);
diff --git a/include/lapi/sem.h b/include/lapi/sem.h
new file mode 100644
index 0000000..7cef3d5
--- /dev/null
+++ b/include/lapi/sem.h
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2015 Linux Test Project
+ */
+
+#include <sys/sem.h>
+
+#ifndef LAPI_SEM_H
+#define LAPI_SEM_H
+
+#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
+/* union semun is defined by including <sys/sem.h> */
+#else
+/* according to X/OPEN we have to define it ourselves */
+union semun {
+ int val; /* value for SETVAL */
+ struct semid_ds *buf; /* buffer for IPC_STAT, IPC_SET */
+ unsigned short *array; /* array for GETALL, SETALL */
+ /* Linux specific part: */
+ struct seminfo *__buf; /* buffer for IPC_INFO */
+};
+#endif
+
+#ifndef SEM_STAT_ANY
+# define SEM_STAT_ANY 20
+#endif
+
+#endif /* LAPI_SEM_H */
diff --git a/include/lapi/semun.h b/include/lapi/semun.h
deleted file mode 100644
index 1a9dc98..0000000
--- a/include/lapi/semun.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (c) 2015 Linux Test Project
- */
-
-#ifndef SEMUN_H__
-#define SEMUN_H__
-
-#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
-/* union semun is defined by including <sys/sem.h> */
-#else
-/* according to X/OPEN we have to define it ourselves */
-union semun {
- int val; /* value for SETVAL */
- struct semid_ds *buf; /* buffer for IPC_STAT, IPC_SET */
- unsigned short *array; /* array for GETALL, SETALL */
- /* Linux specific part: */
- struct seminfo *__buf; /* buffer for IPC_INFO */
-};
-#endif
-
-#endif /* SEMUN_H__ */
diff --git a/testcases/kernel/containers/sysvipc/sem_comm.c b/testcases/kernel/containers/sysvipc/sem_comm.c
index 09cc163..a2c354a 100644
--- a/testcases/kernel/containers/sysvipc/sem_comm.c
+++ b/testcases/kernel/containers/sysvipc/sem_comm.c
@@ -27,7 +27,6 @@
#define _GNU_SOURCE
#include <sys/ipc.h>
-#include <sys/sem.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <stdio.h>
@@ -35,7 +34,7 @@
#include "ipcns_helper.h"
#include "test.h"
#include "safe_macros.h"
-#include "lapi/semun.h"
+#include "lapi/sem.h"
#define TESTKEY 124426L
char *TCID = "sem_comm";
diff --git a/testcases/kernel/ipc/pipeio/pipeio.c b/testcases/kernel/ipc/pipeio/pipeio.c
index b9421cb..ab5c2cf 100644
--- a/testcases/kernel/ipc/pipeio/pipeio.c
+++ b/testcases/kernel/ipc/pipeio/pipeio.c
@@ -47,13 +47,12 @@
#include <string.h>
#include <signal.h>
#include <sys/stat.h>
-#include <sys/sem.h>
#include "tlibio.h"
#include "test.h"
#include "safe_macros.h"
-#include "lapi/semun.h"
+#include "lapi/sem.h"
char *TCID = "pipeio";
int TST_TOTAL = 1;
diff --git a/testcases/kernel/ipc/semaphore/sem01.c b/testcases/kernel/ipc/semaphore/sem01.c
index 5a45238..582624d 100644
--- a/testcases/kernel/ipc/semaphore/sem01.c
+++ b/testcases/kernel/ipc/semaphore/sem01.c
@@ -40,8 +40,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/ipc.h>
-#include <sys/sem.h>
-#include "lapi/semun.h"
+#include "lapi/sem.h"
int verbose = 0;
int loops = 100;
diff --git a/testcases/kernel/ipc/semaphore/sem02.c b/testcases/kernel/ipc/semaphore/sem02.c
index 81e77d6..34b714b 100644
--- a/testcases/kernel/ipc/semaphore/sem02.c
+++ b/testcases/kernel/ipc/semaphore/sem02.c
@@ -45,12 +45,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <sys/sem.h>
#include <errno.h>
#include <pthread.h>
#include <sys/types.h>
#include <sys/ipc.h>
-#include "lapi/semun.h"
+#include "lapi/sem.h"
#include "test.h"
#define KEY IPC_PRIVATE
diff --git a/testcases/kernel/sched/process_stress/process.c b/testcases/kernel/sched/process_stress/process.c
index f23dcbb..a5ff809 100644
--- a/testcases/kernel/sched/process_stress/process.c
+++ b/testcases/kernel/sched/process_stress/process.c
@@ -40,11 +40,10 @@
#include <sys/msg.h>
#include <sys/resource.h>
#include <sys/select.h>
-#include <sys/sem.h>
#include <sys/shm.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include "lapi/semun.h"
+#include "lapi/sem.h"
/* indexes into environment variable array */
#define ADBG 0
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl08.c b/testcases/kernel/syscalls/ipc/semctl/semctl08.c
index 40c2e17..1878bd4 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl08.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl08.c
@@ -6,7 +6,7 @@
* Cross verify the _high fields being set to 0 by the kernel.
*/
#include "lapi/sembuf.h"
-#include "lapi/semun.h"
+#include "lapi/sem.h"
#include "tst_test.h"
#include "libnewipc.h"
diff --git a/testcases/kernel/syscalls/ipc/semop/semop01.c b/testcases/kernel/syscalls/ipc/semop/semop01.c
index b20eef4..2072635 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop01.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop01.c
@@ -8,10 +8,9 @@
*/
#include <stdlib.h>
-#include <sys/sem.h>
#include "tst_test.h"
#include "libnewipc.h"
-#include "lapi/semun.h"
+#include "lapi/sem.h"
#include "semop.h"
#define NSEMS 4
diff --git a/testcases/kernel/syscalls/ipc/semop/semop02.c b/testcases/kernel/syscalls/ipc/semop/semop02.c
index 2c3ec2c..d8181db 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop02.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop02.c
@@ -22,10 +22,9 @@
#define _GNU_SOURCE
#include <pwd.h>
#include <sys/ipc.h>
-#include <sys/sem.h>
#include "tst_test.h"
#include "libnewipc.h"
-#include "lapi/semun.h"
+#include "lapi/sem.h"
#include "semop.h"
static int valid_sem_id = -1;
diff --git a/testcases/kernel/syscalls/ipc/semop/semop03.c b/testcases/kernel/syscalls/ipc/semop/semop03.c
index 3a79ed3..636b715 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop03.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop03.c
@@ -11,10 +11,9 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <sys/sem.h>
#include "tst_test.h"
#include "libnewipc.h"
-#include "lapi/semun.h"
+#include "lapi/sem.h"
#include "semop.h"
static key_t semkey;
diff --git a/testcases/kernel/syscalls/sendmsg/sendmsg02.c b/testcases/kernel/syscalls/sendmsg/sendmsg02.c
index aa3c88d..f72e9db 100644
--- a/testcases/kernel/syscalls/sendmsg/sendmsg02.c
+++ b/testcases/kernel/syscalls/sendmsg/sendmsg02.c
@@ -34,7 +34,6 @@
#define _GNU_SOURCE
#include <sys/ipc.h>
#include <sys/stat.h>
-#include <sys/sem.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
@@ -45,7 +44,7 @@
#include "config.h"
#include "test.h"
#include "safe_macros.h"
-#include "lapi/semun.h"
+#include "lapi/sem.h"
char *TCID = "sendmsg02";
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH v2 2/3] Add SAFE_SEMCTL() and SAFE_SEMGET() macro
2020-12-24 9:58 [LTP] [PATCH v2 1/3] lapi/sem.h: Add SEM_STAT_ANY Feiyu Zhu
@ 2020-12-24 9:58 ` Feiyu Zhu
2020-12-24 9:58 ` [LTP] [PATCH v2 3/3] syscalls/ipc: semctl09: add a test for SEM_STAT_ANY Feiyu Zhu
1 sibling, 0 replies; 4+ messages in thread
From: Feiyu Zhu @ 2020-12-24 9:58 UTC (permalink / raw)
To: ltp
Signed-off-by: Feiyu Zhu <zhufy.jy@cn.fujitsu.com>
Reviewed-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
include/tst_safe_sysv_ipc.h | 14 ++++++++++++++
lib/tst_safe_sysv_ipc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/include/tst_safe_sysv_ipc.h b/include/tst_safe_sysv_ipc.h
index 3e0e50e..bb65326 100644
--- a/include/tst_safe_sysv_ipc.h
+++ b/include/tst_safe_sysv_ipc.h
@@ -9,6 +9,7 @@
#include <sys/ipc.h>
#include <sys/msg.h>
#include <sys/shm.h>
+#include <sys/sem.h>
int safe_msgget(const char *file, const int lineno, key_t key, int msgflg);
#define SAFE_MSGGET(key, msgflg) \
@@ -51,4 +52,17 @@ int safe_shmctl(const char *file, const int lineno, int shmid, int cmd,
(shmid) = ((cmd) == IPC_RMID ? -1 : (shmid)); \
tst_ret_;})
+int safe_semget(const char *file, const int lineno, key_t key, int nsems,
+ int semflg);
+#define SAFE_SEMGET(key, nsems, semflg) \
+ safe_semget(__FILE__, __LINE__, (key), (nsems), (semflg))
+
+int safe_semctl(const char *file, const int lineno, int semid, int semnum,
+ int cmd, ...);
+#define SAFE_SEMCTL(semid, semnum, cmd, ...) ({ \
+ int tst_ret_ = safe_semctl(__FILE__, __LINE__, (semid), (semnum), \
+ (cmd), ##__VA_ARGS__); \
+ (semid) = ((cmd) == IPC_RMID ? -1 : (semid)); \
+ tst_ret_; })
+
#endif /* TST_SAFE_SYSV_IPC_H__ */
diff --git a/lib/tst_safe_sysv_ipc.c b/lib/tst_safe_sysv_ipc.c
index 155e03b..70f2568 100644
--- a/lib/tst_safe_sysv_ipc.c
+++ b/lib/tst_safe_sysv_ipc.c
@@ -10,6 +10,7 @@
#define TST_NO_DEFAULT_MAIN
#include "tst_test.h"
#include "tst_safe_sysv_ipc.h"
+#include "lapi/sem.h"
/*
* The IPC_STAT, IPC_SET and IPC_RMID can return either 0 or -1.
@@ -175,3 +176,49 @@ int safe_shmctl(const char *file, const int lineno, int shmid, int cmd,
return rval;
}
+
+int safe_semget(const char *file, const int lineno, key_t key, int nsems,
+ int semflg)
+{
+ int rval;
+
+ rval = semget(key, nsems, semflg);
+
+ if (rval == -1) {
+ tst_brk_(file, lineno, TBROK | TERRNO,
+ "semget(%i, %i, %x) failed", (int)key, nsems, semflg);
+ } else if (rval < 0) {
+ tst_brk_(file, lineno, TBROK | TERRNO,
+ "Invalid semget(%i, %i, %x) return value %d",
+ (int)key, nsems, semflg, rval);
+ }
+
+ return rval;
+}
+
+int safe_semctl(const char *file, const int lineno, int semid, int semnum,
+ int cmd, ...)
+{
+ int rval;
+ va_list va;
+ union semun un;
+
+ va_start(va, cmd);
+
+ un = va_arg(va, union semun);
+
+ va_end(va);
+
+ rval = semctl(semid, semnum, cmd, un);
+
+ if (rval == -1) {
+ tst_brk_(file, lineno, TBROK | TERRNO,
+ "semctl(%i, %i, %i,...) failed", semid, semnum, cmd);
+ } else if (ret_check(cmd, rval)) {
+ tst_brk_(file, lineno, TBROK | TERRNO,
+ "Invalid semctl(%i, %i, %i,...) return value %d", semid,
+ semnum, cmd, rval);
+ }
+
+ return rval;
+}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH v2 3/3] syscalls/ipc: semctl09: add a test for SEM_STAT_ANY
2020-12-24 9:58 [LTP] [PATCH v2 1/3] lapi/sem.h: Add SEM_STAT_ANY Feiyu Zhu
2020-12-24 9:58 ` [LTP] [PATCH v2 2/3] Add SAFE_SEMCTL() and SAFE_SEMGET() macro Feiyu Zhu
@ 2020-12-24 9:58 ` Feiyu Zhu
2020-12-30 8:28 ` Yang Xu
1 sibling, 1 reply; 4+ messages in thread
From: Feiyu Zhu @ 2020-12-24 9:58 UTC (permalink / raw)
To: ltp
Validate the content of the seminfo structure and the return value.
The return value is highest used index to a kernel table, so we call
semctl() with SEM_STAT_ANY which shouldn't fail if the value is correct.
We also test SEM_STAT_ANY by calling semctl() directly by syscall(),
because glibc have a bug that caused fails to pass the buffer specified
by the caller to the kernel.
We parse /proc/sysvipc/sem and check that the information is
consistent with the content of seminfo structure.
Signed-off-by: Feiyu Zhu <zhufy.jy@cn.fujitsu.com>
Reviewed-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
runtest/syscalls | 1 +
runtest/syscalls-ipc | 1 +
testcases/kernel/syscalls/ipc/semctl/.gitignore | 1 +
testcases/kernel/syscalls/ipc/semctl/Makefile | 2 +-
testcases/kernel/syscalls/ipc/semctl/semctl09.c | 197 ++++++++++++++++++++++++
5 files changed, 201 insertions(+), 1 deletion(-)
create mode 100644 testcases/kernel/syscalls/ipc/semctl/semctl09.c
diff --git a/runtest/syscalls b/runtest/syscalls
index 28174dd..1549916 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1179,6 +1179,7 @@ semctl05 semctl05
semctl06 semctl06
semctl07 semctl07
semctl08 semctl08
+semctl09 semctl09
semget01 semget01
semget02 semget02
diff --git a/runtest/syscalls-ipc b/runtest/syscalls-ipc
index 9524b1a..68fff40 100644
--- a/runtest/syscalls-ipc
+++ b/runtest/syscalls-ipc
@@ -37,6 +37,7 @@ semctl05 semctl05
semctl06 semctl06
semctl07 semctl07
semctl08 semctl08
+semctl09 semctl09
semget01 semget01
semget02 semget02
diff --git a/testcases/kernel/syscalls/ipc/semctl/.gitignore b/testcases/kernel/syscalls/ipc/semctl/.gitignore
index 6189a04..87d8393 100644
--- a/testcases/kernel/syscalls/ipc/semctl/.gitignore
+++ b/testcases/kernel/syscalls/ipc/semctl/.gitignore
@@ -6,3 +6,4 @@
/semctl06
/semctl07
/semctl08
+/semctl09
diff --git a/testcases/kernel/syscalls/ipc/semctl/Makefile b/testcases/kernel/syscalls/ipc/semctl/Makefile
index f711e77..c6d8597 100644
--- a/testcases/kernel/syscalls/ipc/semctl/Makefile
+++ b/testcases/kernel/syscalls/ipc/semctl/Makefile
@@ -8,6 +8,6 @@ LTPLIBS = ltpipc ltpnewipc
include $(top_srcdir)/include/mk/testcases.mk
semctl01 semctl02 semctl03 semctl04 semctl05 semctl06 semctl07: LTPLDLIBS = -lltpipc
-semctl08: LTPLDLIBS = -lltpnewipc
+semctl08 semctl09: LTPLDLIBS = -lltpnewipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl09.c b/testcases/kernel/syscalls/ipc/semctl/semctl09.c
new file mode 100644
index 0000000..131bfbc
--- /dev/null
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl09.c
@@ -0,0 +1,197 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 FUJITSU LIMITED. All rights reserved.
+ * Author: Feiyu Zhu <zhufy.jy@cn.fujitsu.com>
+ */
+/*\
+ * [DESCRIPTION]
+ *
+ * Call semctl() with SEM_INFO flag and check that:
+ *
+ * * The returned index points to a valid SEM by calling SEM_STAT_ANY
+ * * Also count that valid indexes < returned max index sums up to semusz
+ * * And the data are consistent with /proc/sysvipc/sem
+ *
+ * There is a possible race between the call to the semctl() and read from the
+ * proc file so this test cannot be run in parallel with any IPC testcases that
+ * adds or removes semaphore set.
+ *
+ * Note what we create a semaphore set in the test setup to make sure
+ * that there is@least one during the testrun.
+ *
+ * Also note that for SEM_INFO the members of the seminfo structure have
+ * completely different meaning than their names seems to suggest.
+ *
+ * We also calling semctl() directly by syscall(), because of a glibc bug:
+ * * semctl SEM_STAT_ANY fails to pass the buffer specified by the caller
+ * * to the kernel.
+ * * https://sourceware.org/bugzilla/show_bug.cgi?id=26637
+ *
+ * The glibc bug was fixed in:
+ * * commit 574500a108be1d2a6a0dc97a075c9e0a98371aba
+ * * Author: Dmitry V. Levin <ldv@altlinux.org>
+ * * Date: Tue, 29 Sep 2020 17:10:20 +0000 (14:10 -0300)
+\*/
+
+#include <stdio.h>
+#include <pwd.h>
+#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
+#include "libnewipc.h"
+#include "lapi/sem.h"
+#include "lapi/syscalls.h"
+
+static int sem_id = -1;
+static uid_t nobody_uid, root_uid;
+static union semun un;
+
+/*
+ * Note: semctl man-pages may have wrong description. We should use sem_ds
+ * struct(un.buf) instead of seminfo struct(un.__buf).
+ */
+static inline int do_semctl(int semid, int semnum, int cmd)
+{
+ switch (tst_variant) {
+ case 0:
+ return tst_syscall(__NR_semctl, semid, semnum, cmd, &un.buf);
+ case 1:
+ return semctl(semid, semnum, cmd, &un.buf);
+ }
+ return -1;
+}
+
+static void test_info(void)
+{
+ switch (tst_variant) {
+ case 0:
+ tst_res(TINFO, "Test SYS_semctl syscall");
+ break;
+ case 1:
+ tst_res(TINFO, "Test libc semctl()");
+ break;
+ }
+}
+
+static struct tcases {
+ uid_t *uid;
+ char *desc;
+} tests[] = {
+ {&nobody_uid, "with nobody user",},
+ {&root_uid, "with root user",},
+};
+
+static void parse_proc_sysvipc(struct seminfo *info)
+{
+ FILE *f = fopen("/proc/sysvipc/sem", "r");
+ int semset_cnt = 0;
+ int sem_cnt = 0;
+
+ /* Eat header */
+ for (;;) {
+ int c = fgetc(f);
+
+ if (c == '\n' || c == EOF)
+ break;
+ }
+
+ int nsems;
+ /*
+ * Sum sem set, nsems for all elements listed, which should equal
+ * the data returned in the seminfo structure.
+ */
+ while (fscanf(f, "%*i %*i %*i %i %*i %*i %*i %*i %*i %*i",
+ &nsems) > 0){
+ semset_cnt++;
+ sem_cnt += nsems;
+ }
+
+ if (info->semusz != semset_cnt) {
+ tst_res(TFAIL, "semusz = %i, expected %i",
+ info->semusz, semset_cnt);
+ } else {
+ tst_res(TPASS, "semset_cnt = %i", semset_cnt);
+ }
+
+ if (info->semaem != sem_cnt) {
+ tst_res(TFAIL, "semaem = %i, expected %i",
+ info->semaem, sem_cnt);
+ } else {
+ tst_res(TPASS, "sen_cnt = %i", sem_cnt);
+ }
+
+ fclose(f);
+}
+
+static void verify_semctl(unsigned int n)
+{
+ struct tcases *tc = &tests[n];
+ int i, semid, cnt = 0;
+ struct seminfo info;
+ union semun arg;
+
+ tst_res(TINFO, "Test SEM_STAT_ANY %s", tc->desc);
+
+ SAFE_SETEUID(*tc->uid);
+
+ arg.__buf = &info;
+
+ TEST(semctl(sem_id, 0, SEM_INFO, arg));
+
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "semctl(sem_id, 0, SEM_INFO, ...)");
+ return;
+ }
+
+ semid = do_semctl(TST_RET, 0, SEM_STAT_ANY);
+
+ if (errno == EFAULT) {
+ tst_res(TFAIL, "SEM_STAT_ANY doesn't pass the buffer "
+ "specified by the caller to kernel");
+ return;
+ } else if (semid == -1) {
+ tst_res(TFAIL | TTERRNO, "SEM_INFO haven't returned a valid index");
+ } else {
+ tst_res(TPASS, "SEM_INFO returned valid index %li to semid %i",
+ TST_RET, semid);
+ }
+
+ for (i = 0; i <= TST_RET; i++) {
+ if ((do_semctl(i, 0, SEM_STAT_ANY)) != -1)
+ cnt++;
+ }
+
+ if (cnt == info.semusz) {
+ tst_res(TPASS, "Counted used = %i", cnt);
+ } else {
+ tst_res(TFAIL, "Counted used = %i, semuse = %i",
+ cnt, info.semusz);
+ }
+
+ parse_proc_sysvipc(&info);
+}
+
+static void setup(void)
+{
+ struct passwd *ltpuser = SAFE_GETPWNAM("nobody");
+
+ nobody_uid = ltpuser->pw_uid;
+ root_uid = 0;
+
+ sem_id = SAFE_SEMGET(IPC_PRIVATE, 2, IPC_CREAT | 0600);
+ test_info();
+}
+
+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),
+ .test_variants = 2,
+ .needs_root = 1,
+};
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH v2 3/3] syscalls/ipc: semctl09: add a test for SEM_STAT_ANY
2020-12-24 9:58 ` [LTP] [PATCH v2 3/3] syscalls/ipc: semctl09: add a test for SEM_STAT_ANY Feiyu Zhu
@ 2020-12-30 8:28 ` Yang Xu
0 siblings, 0 replies; 4+ messages in thread
From: Yang Xu @ 2020-12-30 8:28 UTC (permalink / raw)
To: ltp
Hi!
Merged this patchset, thanks!
Best Regards
Yang Xu
> Validate the content of the seminfo structure and the return value.
>
> The return value is highest used index to a kernel table, so we call
> semctl() with SEM_STAT_ANY which shouldn't fail if the value is correct.
>
> We also test SEM_STAT_ANY by calling semctl() directly by syscall(),
> because glibc have a bug that caused fails to pass the buffer specified
> by the caller to the kernel.
>
> We parse /proc/sysvipc/sem and check that the information is
> consistent with the content of seminfo structure.
>
> Signed-off-by: Feiyu Zhu<zhufy.jy@cn.fujitsu.com>
> Reviewed-by: Yang Xu<xuyang2018.jy@cn.fujitsu.com>
> ---
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-30 8:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-24 9:58 [LTP] [PATCH v2 1/3] lapi/sem.h: Add SEM_STAT_ANY Feiyu Zhu
2020-12-24 9:58 ` [LTP] [PATCH v2 2/3] Add SAFE_SEMCTL() and SAFE_SEMGET() macro Feiyu Zhu
2020-12-24 9:58 ` [LTP] [PATCH v2 3/3] syscalls/ipc: semctl09: add a test for SEM_STAT_ANY Feiyu Zhu
2020-12-30 8:28 ` Yang Xu
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.