From: Suren Baghdasaryan <surenb@google.com>
To: surenb@google.com
Cc: christian@brauner.io, arnd@arndb.de, ebiederm@xmission.com,
keescook@chromium.org, joel@joelfernandes.org, dancol@google.com,
tglx@linutronix.de, jannh@google.com, dhowells@redhat.com,
mtk.manpages@gmail.com, luto@kernel.org,
akpm@linux-foundation.org, oleg@redhat.com, cyphar@cyphar.com,
torvalds@linux-foundation.org, viro@zeniv.linux.org.uk,
linux-api@vger.kernel.org, linux-kselftest@vger.kernel.org,
kernel-team@android.com
Subject: [PATCH v2 1/2] tests: move common definitions and functions into pidfd.h
Date: Wed, 24 Jul 2019 17:22:03 -0700 [thread overview]
Message-ID: <20190725002204.185225-1-surenb@google.com> (raw)
Move definitions and functions used across different pidfd tests into
pidfd.h header.
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
tools/testing/selftests/pidfd/pidfd.h | 18 ++++++++++++++++++
.../testing/selftests/pidfd/pidfd_open_test.c | 5 -----
tools/testing/selftests/pidfd/pidfd_test.c | 10 ----------
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/tools/testing/selftests/pidfd/pidfd.h b/tools/testing/selftests/pidfd/pidfd.h
index 8452e910463f..db4377af6be7 100644
--- a/tools/testing/selftests/pidfd/pidfd.h
+++ b/tools/testing/selftests/pidfd/pidfd.h
@@ -16,6 +16,14 @@
#include "../kselftest.h"
+#ifndef __NR_pidfd_open
+#define __NR_pidfd_open -1
+#endif
+
+#ifndef __NR_pidfd_send_signal
+#define __NR_pidfd_send_signal -1
+#endif
+
/*
* The kernel reserves 300 pids via RESERVED_PIDS in kernel/pid.c
* That means, when it wraps around any pid < 300 will be skipped.
@@ -53,5 +61,15 @@ int wait_for_pid(pid_t pid)
return WEXITSTATUS(status);
}
+static inline int sys_pidfd_open(pid_t pid, unsigned int flags)
+{
+ return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static inline int sys_pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
+ unsigned int flags)
+{
+ return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
+}
#endif /* __PIDFD_H */
diff --git a/tools/testing/selftests/pidfd/pidfd_open_test.c b/tools/testing/selftests/pidfd/pidfd_open_test.c
index 0377133dd6dc..b9fe75fc3e51 100644
--- a/tools/testing/selftests/pidfd/pidfd_open_test.c
+++ b/tools/testing/selftests/pidfd/pidfd_open_test.c
@@ -22,11 +22,6 @@
#include "pidfd.h"
#include "../kselftest.h"
-static inline int sys_pidfd_open(pid_t pid, unsigned int flags)
-{
- return syscall(__NR_pidfd_open, pid, flags);
-}
-
static int safe_int(const char *numstr, int *converted)
{
char *err = NULL;
diff --git a/tools/testing/selftests/pidfd/pidfd_test.c b/tools/testing/selftests/pidfd/pidfd_test.c
index 7eaa8a3de262..17b2fd621726 100644
--- a/tools/testing/selftests/pidfd/pidfd_test.c
+++ b/tools/testing/selftests/pidfd/pidfd_test.c
@@ -21,10 +21,6 @@
#include "pidfd.h"
#include "../kselftest.h"
-#ifndef __NR_pidfd_send_signal
-#define __NR_pidfd_send_signal -1
-#endif
-
#define str(s) _str(s)
#define _str(s) #s
#define CHILD_THREAD_MIN_WAIT 3 /* seconds */
@@ -47,12 +43,6 @@ static pid_t pidfd_clone(int flags, int *pidfd, int (*fn)(void *))
#endif
}
-static inline int sys_pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
- unsigned int flags)
-{
- return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
-}
-
static int signal_received;
static void set_signal_received_on_sigusr1(int sig)
--
2.22.0.709.g102302147b-goog
next reply other threads:[~2019-07-25 0:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 0:22 Suren Baghdasaryan [this message]
2019-07-25 0:22 ` [PATCH v2 2/2] tests: add pidfd poll tests Suren Baghdasaryan
2019-07-25 11:25 ` Christian Brauner
2019-07-25 11:58 ` Yann Droneaud
2019-07-25 15:48 ` Suren Baghdasaryan
2019-07-25 20:57 ` Yann Droneaud
2019-07-25 21:10 ` Suren Baghdasaryan
2019-07-25 21:14 ` Yann Droneaud
2019-07-25 0:34 ` [PATCH v2 1/2] tests: move common definitions and functions into pidfd.h Suren Baghdasaryan
2019-07-25 11:26 ` Christian Brauner
2019-07-25 11:23 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190725002204.185225-1-surenb@google.com \
--to=surenb@google.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=christian@brauner.io \
--cc=cyphar@cyphar.com \
--cc=dancol@google.com \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=jannh@google.com \
--cc=joel@joelfernandes.org \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mtk.manpages@gmail.com \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).