@@ -1,28 +1,8 @@
-################################################################################
-## ##
-## Copyright (c) International Business Machines Corp., 2007 ##
-## ##
-## 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 ##
-## ##
-################################################################################
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) International Business Machines Corp., 2007
+# Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/testcases.mk
-include $(abs_srcdir)/../Makefile.inc
-
-LDLIBS := -lclone $(LDLIBS)
-
include $(top_srcdir)/include/mk/generic_leaf_target.mk
new file mode 100644
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) International Business Machines Corp., 2007
+ * Rishikesh K Rajak <risrajak@in.ibm.com>
+ * Copyright (C) 2022 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
+ */
+
+#ifndef COMMON_H
+#define COMMON_H
+
+#include <stdlib.h>
+#include "tst_test.h"
+#include "lapi/syscalls.h"
+#include "lapi/namespaces_constants.h"
+
+enum {
+ T_CLONE,
+ T_UNSHARE,
+ T_NONE,
+};
+
+static int dummy_child(void *v)
+{
+ (void)v;
+ return 0;
+}
+
+static void check_newipc(void)
+{
+ int pid, status;
+
+ if (tst_kvercmp(2, 6, 19) < 0)
+ tst_brk(TCONF, "CLONE_NEWIPC not supported");
+
+ pid = ltp_clone_quick(CLONE_NEWIPC | SIGCHLD, dummy_child, NULL);
+ if (pid < 0)
+ tst_brk(TCONF | TERRNO, "CLONE_NEWIPC not supported");
+
+ SAFE_WAITPID(pid, &status, 0);
+}
+
+static int clone_test(unsigned long clone_flags, int (*fn1)(void *arg),
+ void *arg1)
+{
+ int ret;
+
+ ret = ltp_clone_quick(clone_flags | SIGCHLD, fn1, arg1);
+
+ if (ret != -1) {
+ /* no errors: we'll get the PID id that means success */
+ ret = 0;
+ }
+
+ return ret;
+}
+
+static int unshare_test(unsigned long clone_flags, int (*fn1)(void *arg),
+ void *arg1)
+{
+ int pid, ret = 0;
+ int retpipe[2];
+ char buf[2];
+
+ SAFE_PIPE(retpipe);
+
+ pid = fork();
+ if (pid < 0) {
+ SAFE_CLOSE(retpipe[0]);
+ SAFE_CLOSE(retpipe[1]);
+ tst_brk(TBROK, "fork");
+ }
+
+ if (!pid) {
+ SAFE_CLOSE(retpipe[0]);
+
+ ret = tst_syscall(SYS_unshare, clone_flags);
+ if (ret == -1) {
+ SAFE_WRITE(1, retpipe[1], "0", 2);
+ SAFE_CLOSE(retpipe[1]);
+ exit(1);
+ } else {
+ SAFE_WRITE(1, retpipe[1], "1", 2);
+ }
+
+ SAFE_CLOSE(retpipe[1]);
+
+ ret = fn1(arg1);
+ exit(ret);
+ }
+
+ SAFE_CLOSE(retpipe[1]);
+ SAFE_READ(1, retpipe[0], &buf, 2);
+ SAFE_CLOSE(retpipe[0]);
+
+ if (*buf == '0')
+ return -1;
+
+ return ret;
+}
+
+static int plain_test(int (*fn1)(void *arg), void *arg1)
+{
+ int ret = 0, pid;
+
+ pid = SAFE_FORK();
+ if (!pid)
+ exit(fn1(arg1));
+
+ return ret;
+}
+
+static void clone_unshare_test(int use_clone, unsigned long clone_flags,
+ int (*fn1)(void *arg), void *arg1)
+{
+ int ret = 0;
+
+ switch (use_clone) {
+ case T_NONE:
+ ret = plain_test(fn1, arg1);
+ break;
+ case T_CLONE:
+ ret = clone_test(clone_flags, fn1, arg1);
+ break;
+ case T_UNSHARE:
+ ret = unshare_test(clone_flags, fn1, arg1);
+ break;
+ default:
+ ret = -1;
+ tst_brk(TBROK, "%s: bad use_clone option: %d", __FUNCTION__,
+ use_clone);
+ break;
+ }
+
+ if (ret == -1)
+ tst_brk(TBROK, "child2 clone failed");
+}
+
+#endif
deleted file mode 100644
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) International Business Machines Corp., 2007
-* 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
-*
-* Author: Rishikesh K Rajak <risrajak@in.ibm.com>
-***************************************************************************/
-#include <sched.h>
-#include "../libclone/libclone.h"
-#include "test.h"
-#include "safe_macros.h"
-
-static int dummy_child(void *v)
-{
- (void) v;
- return 0;
-}
-
-static void check_newipc(void)
-{
- int pid, status;
-
- if (tst_kvercmp(2, 6, 19) < 0)
- tst_brkm(TCONF, NULL, "CLONE_NEWIPC not supported");
-
- pid = do_clone_unshare_test(T_CLONE, CLONE_NEWIPC, dummy_child, NULL);
- if (pid == -1)
- tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWIPC not supported");
-
- SAFE_WAIT(NULL, &status);
-}
This is the step 1 before rewriting all sysvipc tests using new LTP API. Substituted ipcns_helper.h with a common.h header for all tests. The new common.h file includes some helpers functions, as well as specific clone functionalities. Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.de> --- testcases/kernel/containers/sysvipc/Makefile | 26 +--- testcases/kernel/containers/sysvipc/common.h | 138 ++++++++++++++++++ .../kernel/containers/sysvipc/ipcns_helper.h | 41 ------ 3 files changed, 141 insertions(+), 64 deletions(-) create mode 100644 testcases/kernel/containers/sysvipc/common.h delete mode 100644 testcases/kernel/containers/sysvipc/ipcns_helper.h