Re: [PATCH v2 1/2] tests: move common definitions and functions into pidfd.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I'm terribly sorry. I forgot to add a link to the original version of
this patch with Christian's comments. It's at:
https://lore.kernel.org/linux-kselftest/20190723173907.196488-1-surenb@xxxxxxxxxx
and I think I addressed all comments there.
The patch should apply cleanly to the latest Linus' ToT (v5.3-rc1).
Thanks,
Suren.

On Wed, Jul 24, 2019 at 5:22 PM Suren Baghdasaryan <surenb@xxxxxxxxxx> wrote:
>
> Move definitions and functions used across different pidfd tests into
> pidfd.h header.
>
> Signed-off-by: Suren Baghdasaryan <surenb@xxxxxxxxxx>
> ---
>  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
>



[Index of Archives]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]

  Powered by Linux