Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Christian Kellner <ckellner@redhat.com>
To:     linux-kernel@vger.kernel.org
Cc:     Christian Kellner <christian@kellner.me>,
        Christian Brauner <christian@brauner.io>,
        Shuah Khan <shuah@kernel.org>, linux-kselftest@vger.kernel.org
Subject: [PATCH v2] pidfd: avoid linux/wait.h and sys/wait.h name clashes
Date:   Tue, 15 Oct 2019 18:55:30 +0200
Message-Id: <20191015165531.27469-1-ckellner@redhat.com>
In-Reply-To: <20191011163811.8607-1-ckellner@redhat.com>
References: <20191011163811.8607-1-ckellner@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Christian Kellner <christian@kellner.me>

Both linux/wait.h and sys/wait.h contain values for the first argument
of 'waitid' (P_ALL, P_PID, ...).  While the former uses defines the
latter uses an enum. When linux/wait.h is included before sys/wait.h
this will lead to an error, because P_ALL, P_PID, ... will already
have been substituted to 0, 1, ... respectively and this the resulting
code will be 'typedef enum {0, 1, ...'.
Remove 'linux/wait.h' and rename P_PIDFD to avoid a future clash, in
case P_PIDFD gets added to the idtype_t enum in sys/wait.h.

Signed-off-by: Christian Kellner <christian@kellner.me>
---
 tools/testing/selftests/pidfd/pidfd.h           |  4 ++--
 tools/testing/selftests/pidfd/pidfd_open_test.c |  1 -
 tools/testing/selftests/pidfd/pidfd_poll_test.c |  1 -
 tools/testing/selftests/pidfd/pidfd_wait.c      | 14 +++++++-------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/pidfd/pidfd.h b/tools/testing/selftest=
s/pidfd/pidfd.h
index c6bc68329f4b..9d5e76bd5466 100644
--- a/tools/testing/selftests/pidfd/pidfd.h
+++ b/tools/testing/selftests/pidfd/pidfd.h
@@ -16,8 +16,8 @@
=20
 #include "../kselftest.h"
=20
-#ifndef P_PIDFD
-#define P_PIDFD 3
+#ifndef __P_PIDFD
+#define __P_PIDFD 3
 #endif
=20
 #ifndef CLONE_PIDFD
diff --git a/tools/testing/selftests/pidfd/pidfd_open_test.c b/tools/testin=
g/selftests/pidfd/pidfd_open_test.c
index b9fe75fc3e51..8a59438ccc78 100644
--- a/tools/testing/selftests/pidfd/pidfd_open_test.c
+++ b/tools/testing/selftests/pidfd/pidfd_open_test.c
@@ -6,7 +6,6 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <linux/types.h>
-#include <linux/wait.h>
 #include <sched.h>
 #include <signal.h>
 #include <stdbool.h>
diff --git a/tools/testing/selftests/pidfd/pidfd_poll_test.c b/tools/testin=
g/selftests/pidfd/pidfd_poll_test.c
index 4b115444dfe9..610811275357 100644
--- a/tools/testing/selftests/pidfd/pidfd_poll_test.c
+++ b/tools/testing/selftests/pidfd/pidfd_poll_test.c
@@ -3,7 +3,6 @@
 #define _GNU_SOURCE
 #include <errno.h>
 #include <linux/types.h>
-#include <linux/wait.h>
 #include <poll.h>
 #include <signal.h>
 #include <stdbool.h>
diff --git a/tools/testing/selftests/pidfd/pidfd_wait.c b/tools/testing/sel=
ftests/pidfd/pidfd_wait.c
index 7079f8eef792..7e9170b84b81 100644
--- a/tools/testing/selftests/pidfd/pidfd_wait.c
+++ b/tools/testing/selftests/pidfd/pidfd_wait.c
@@ -54,7 +54,7 @@ static int test_pidfd_wait_simple(void)
 =09=09ksft_exit_fail_msg("%s test: failed to open /proc/self %s\n",
 =09=09=09=09   test_name, strerror(errno));
=20
-=09pid =3D sys_waitid(P_PIDFD, pidfd, &info, WEXITED, NULL);
+=09pid =3D sys_waitid(__P_PIDFD, pidfd, &info, WEXITED, NULL);
 =09if (pid =3D=3D 0)
 =09=09ksft_exit_fail_msg(
 =09=09=09"%s test: succeeded to wait on invalid pidfd %s\n",
@@ -67,7 +67,7 @@ static int test_pidfd_wait_simple(void)
 =09=09ksft_exit_fail_msg("%s test: failed to open /dev/null %s\n",
 =09=09=09=09   test_name, strerror(errno));
=20
-=09pid =3D sys_waitid(P_PIDFD, pidfd, &info, WEXITED, NULL);
+=09pid =3D sys_waitid(__P_PIDFD, pidfd, &info, WEXITED, NULL);
 =09if (pid =3D=3D 0)
 =09=09ksft_exit_fail_msg(
 =09=09=09"%s test: succeeded to wait on invalid pidfd %s\n",
@@ -83,7 +83,7 @@ static int test_pidfd_wait_simple(void)
 =09if (pid =3D=3D 0)
 =09=09exit(EXIT_SUCCESS);
=20
-=09pid =3D sys_waitid(P_PIDFD, pidfd, &info, WEXITED, NULL);
+=09pid =3D sys_waitid(__P_PIDFD, pidfd, &info, WEXITED, NULL);
 =09if (pid < 0)
 =09=09ksft_exit_fail_msg(
 =09=09=09"%s test: failed to wait on process with pid %d and pidfd %d: %s\=
n",
@@ -145,7 +145,7 @@ static int test_pidfd_wait_states(void)
 =09=09exit(EXIT_SUCCESS);
 =09}
=20
-=09ret =3D sys_waitid(P_PIDFD, pidfd, &info, WSTOPPED, NULL);
+=09ret =3D sys_waitid(__P_PIDFD, pidfd, &info, WSTOPPED, NULL);
 =09if (ret < 0)
 =09=09ksft_exit_fail_msg(
 =09=09=09"%s test: failed to wait on WSTOPPED process with pid %d and pidf=
d %d: %s\n",
@@ -175,7 +175,7 @@ static int test_pidfd_wait_states(void)
 =09=09=09"%s test: failed to send signal to process with pid %d and pidfd =
%d: %s\n",
 =09=09=09test_name, parent_tid, pidfd, strerror(errno));
=20
-=09ret =3D sys_waitid(P_PIDFD, pidfd, &info, WCONTINUED, NULL);
+=09ret =3D sys_waitid(__P_PIDFD, pidfd, &info, WCONTINUED, NULL);
 =09if (ret < 0)
 =09=09ksft_exit_fail_msg(
 =09=09=09"%s test: failed to wait WCONTINUED on process with pid %d and pi=
dfd %d: %s\n",
@@ -199,7 +199,7 @@ static int test_pidfd_wait_states(void)
 =09=09=09test_name, info.si_pid, parent_tid, pidfd,
 =09=09=09strerror(errno));
=20
-=09ret =3D sys_waitid(P_PIDFD, pidfd, &info, WUNTRACED, NULL);
+=09ret =3D sys_waitid(__P_PIDFD, pidfd, &info, WUNTRACED, NULL);
 =09if (ret < 0)
 =09=09ksft_exit_fail_msg(
 =09=09=09"%s test: failed to wait on WUNTRACED process with pid %d and pid=
fd %d: %s\n",
@@ -229,7 +229,7 @@ static int test_pidfd_wait_states(void)
 =09=09=09"%s test: failed to send SIGKILL to process with pid %d and pidfd=
 %d: %s\n",
 =09=09=09test_name, parent_tid, pidfd, strerror(errno));
=20
-=09ret =3D sys_waitid(P_PIDFD, pidfd, &info, WEXITED, NULL);
+=09ret =3D sys_waitid(__P_PIDFD, pidfd, &info, WEXITED, NULL);
 =09if (ret < 0)
 =09=09ksft_exit_fail_msg(
 =09=09=09"%s test: failed to wait on WEXITED process with pid %d and pidfd=
 %d: %s\n",
--=20
2.21.0