qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Helge Deller <deller@gmx.de>, Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 05/38] linux-user: Add pidfd_open(), pidfd_send_signal() and pidfd_getfd() syscalls
Date: Wed, 28 Sep 2022 10:14:44 +0200	[thread overview]
Message-ID: <20220928081517.734954-6-laurent@vivier.eu> (raw)
In-Reply-To: <20220928081517.734954-1-laurent@vivier.eu>

From: Helge Deller <deller@gmx.de>

I noticed those were missing when running the glib2.0 testsuite.
Add the syscalls including the strace output.

Signed-off-by: Helge Deller <deller@gmx.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220918194555.83535-4-deller@gmx.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/strace.c    | 28 ++++++++++++++++++++++++++++
 linux-user/strace.list |  9 +++++++++
 linux-user/syscall.c   | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/linux-user/strace.c b/linux-user/strace.c
index 816e67999539..5ac64df02b85 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -3317,6 +3317,34 @@ print_openat(CPUArchState *cpu_env, const struct syscallname *name,
 }
 #endif
 
+#ifdef TARGET_NR_pidfd_send_signal
+static void
+print_pidfd_send_signal(CPUArchState *cpu_env, const struct syscallname *name,
+                abi_long arg0, abi_long arg1, abi_long arg2,
+                abi_long arg3, abi_long arg4, abi_long arg5)
+{
+    void *p;
+    target_siginfo_t uinfo;
+
+    print_syscall_prologue(name);
+    print_raw_param("%d", arg0, 0);
+    print_signal(arg1, 0);
+
+    p = lock_user(VERIFY_READ, arg2, sizeof(target_siginfo_t), 1);
+    if (p) {
+        get_target_siginfo(&uinfo, p);
+        print_siginfo(&uinfo);
+
+        unlock_user(p, arg2, 0);
+    } else {
+        print_pointer(arg2, 1);
+    }
+
+    print_raw_param("%u", arg3, 0);
+    print_syscall_epilogue(name);
+}
+#endif
+
 #ifdef TARGET_NR_mq_unlink
 static void
 print_mq_unlink(CPUArchState *cpu_env, const struct syscallname *name,
diff --git a/linux-user/strace.list b/linux-user/strace.list
index a78cdf3cdfef..4d8b7f6a5e0c 100644
--- a/linux-user/strace.list
+++ b/linux-user/strace.list
@@ -1664,6 +1664,15 @@
 #ifdef TARGET_NR_pipe2
 { TARGET_NR_pipe2, "pipe2", NULL, NULL, NULL },
 #endif
+#ifdef TARGET_NR_pidfd_open
+{ TARGET_NR_pidfd_open, "pidfd_open", "%s(%d,%u)", NULL, NULL },
+#endif
+#ifdef TARGET_NR_pidfd_send_signal
+{ TARGET_NR_pidfd_send_signal, "pidfd_send_signal", NULL, print_pidfd_send_signal, NULL },
+#endif
+#ifdef TARGET_NR_pidfd_getfd
+{ TARGET_NR_pidfd_getfd, "pidfd_getfd", "%s(%d,%d,%u)", NULL, NULL },
+#endif
 #ifdef TARGET_NR_atomic_cmpxchg_32
 { TARGET_NR_atomic_cmpxchg_32, "atomic_cmpxchg_32", NULL, NULL, NULL },
 #endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index abf82bab2a18..850410c9b553 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -346,6 +346,16 @@ _syscall6(int,sys_futex,int *,uaddr,int,op,int,val,
 _syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val,
           const struct timespec *,timeout,int *,uaddr2,int,val3)
 #endif
+#if defined(__NR_pidfd_open) && defined(TARGET_NR_pidfd_open)
+_syscall2(int, pidfd_open, pid_t, pid, unsigned int, flags);
+#endif
+#if defined(__NR_pidfd_send_signal) && defined(TARGET_NR_pidfd_send_signal)
+_syscall4(int, pidfd_send_signal, int, pidfd, int, sig, siginfo_t *, info,
+                             unsigned int, flags);
+#endif
+#if defined(__NR_pidfd_getfd) && defined(TARGET_NR_pidfd_getfd)
+_syscall3(int, pidfd_getfd, int, pidfd, int, targetfd, unsigned int, flags);
+#endif
 #define __NR_sys_sched_getaffinity __NR_sched_getaffinity
 _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
           unsigned long *, user_mask_ptr);
@@ -8683,6 +8693,30 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
         ret = do_open_by_handle_at(arg1, arg2, arg3);
         fd_trans_unregister(ret);
         return ret;
+#endif
+#if defined(__NR_pidfd_open) && defined(TARGET_NR_pidfd_open)
+    case TARGET_NR_pidfd_open:
+        return get_errno(pidfd_open(arg1, arg2));
+#endif
+#if defined(__NR_pidfd_send_signal) && defined(TARGET_NR_pidfd_send_signal)
+    case TARGET_NR_pidfd_send_signal:
+        {
+            siginfo_t uinfo;
+
+            p = lock_user(VERIFY_READ, arg3, sizeof(target_siginfo_t), 1);
+            if (!p) {
+                return -TARGET_EFAULT;
+            }
+            target_to_host_siginfo(&uinfo, p);
+            unlock_user(p, arg3, 0);
+            ret = get_errno(pidfd_send_signal(arg1, target_to_host_signal(arg2),
+                &uinfo, arg4));
+        }
+        return ret;
+#endif
+#if defined(__NR_pidfd_getfd) && defined(TARGET_NR_pidfd_getfd)
+    case TARGET_NR_pidfd_getfd:
+        return get_errno(pidfd_getfd(arg1, arg2, arg3));
 #endif
     case TARGET_NR_close:
         fd_trans_unregister(arg1);
-- 
2.37.3



  parent reply	other threads:[~2022-09-28 10:37 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-28  8:14 [PULL 00/38] Linux user for 7.2 patches Laurent Vivier
2022-09-28  8:14 ` [PULL 01/38] linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default Laurent Vivier
2022-09-28  8:14 ` [PULL 02/38] linux-user: fix readlinkat handling with magic exe symlink Laurent Vivier
2022-09-28  8:14 ` [PULL 03/38] linux-user: Add missing signals in strace output Laurent Vivier
2022-09-28  8:14 ` [PULL 04/38] linux-user: Add missing clock_gettime64() syscall strace Laurent Vivier
2022-09-28  8:14 ` Laurent Vivier [this message]
2022-09-28  8:14 ` [PULL 06/38] linux-user: Log failing executable in EXCP_DUMP() Laurent Vivier
2022-09-28  8:14 ` [PULL 07/38] linux-user/hppa: Use EXCP_DUMP() to show enhanced debug info Laurent Vivier
2022-09-28  8:14 ` [PULL 08/38] linux-user/hppa: Dump IIR on register dump Laurent Vivier
2022-09-28  8:14 ` [PULL 09/38] linux-user: Fix strace of chmod() if mode == 0 Laurent Vivier
2022-09-28  8:14 ` [PULL 10/38] linux-user/hppa: Set TASK_UNMAPPED_BASE to 0xfa000000 for hppa arch Laurent Vivier
2022-09-28  8:14 ` [PULL 11/38] linux-user: Add strace for clock_nanosleep() Laurent Vivier
2022-09-28  8:14 ` [PULL 12/38] linux-user: Show timespec on strace for futex() Laurent Vivier
2022-09-28  8:14 ` [PULL 13/38] linux-user: Provide MADV_* definitions Laurent Vivier
2022-09-28  8:14 ` [PULL 14/38] linux-user: Fix madvise(MADV_DONTNEED) on alpha Laurent Vivier
2022-09-28  8:14 ` [PULL 15/38] linux-user: Implement stracing madvise() Laurent Vivier
2022-09-28  8:14 ` [PULL 16/38] linux-user: Passthrough MADV_DONTNEED for certain file mappings Laurent Vivier
2022-09-28  8:14 ` [PULL 17/38] tests/tcg/linux-test: Add linux-madvise test Laurent Vivier
2022-09-28  8:14 ` [PULL 18/38] linux-user: Fix TARGET_PROT_SEM for XTENSA Laurent Vivier
2022-09-28  8:14 ` [PULL 19/38] linux-user: Add proper strace format strings for getdents()/getdents64() Laurent Vivier
2022-09-28  8:14 ` [PULL 20/38] linux-user/hppa: Add signal trampoline for hppa target Laurent Vivier
2022-09-28  8:15 ` [PULL 21/38] linux-user/hppa: Drop stack guard page on " Laurent Vivier
2022-09-28  8:15 ` [PULL 22/38] linux-user/hppa: Increase guest stack size to 80MB for " Laurent Vivier
2022-09-28  8:15 ` [PULL 23/38] linux-user/hppa: Allow PROT_GROWSUP and PROT_GROWSDOWN in mprotect() Laurent Vivier
2022-09-28  8:15 ` [PULL 24/38] linux-user/hppa: Fix setup_sigcontext() Laurent Vivier
2022-09-28  8:15 ` [PULL 25/38] linux-user: fix bug about missing signum convert of sigqueue Laurent Vivier
2022-09-28  8:15 ` [PULL 26/38] linux-user: Don't assume 0 is not a valid host timer_t value Laurent Vivier
2022-09-28  8:23   ` Jon Alduan
2022-09-28 12:13     ` Peter Maydell
2022-09-28  8:15 ` [PULL 27/38] linux-user/s390x: Save/restore fpc when handling a signal Laurent Vivier
2022-09-28  8:15 ` [PULL 28/38] linux-user: Introduce stubs for ELF AT_BASE_PLATFORM Laurent Vivier
2022-09-28  8:15 ` [PULL 29/38] linux-user: Set ELF_BASE_PLATFORM for MIPS Laurent Vivier
2022-09-28  8:15 ` [PULL 30/38] linux-user: Combine do_futex and do_futex_time64 Laurent Vivier
2022-09-28  8:15 ` [PULL 31/38] linux-user: Sink call to do_safe_futex Laurent Vivier
2022-09-28  8:15 ` [PULL 32/38] linux-user: Implement FUTEX_WAKE_BITSET Laurent Vivier
2022-09-28  8:15 ` [PULL 33/38] linux-user: Convert signal number for FUTEX_FD Laurent Vivier
2022-09-28  8:15 ` [PULL 34/38] linux-user: Implement PI futexes Laurent Vivier
2022-09-28  8:15 ` [PULL 35/38] linux-user: Update print_futex_op Laurent Vivier
2022-09-28  8:15 ` [PULL 36/38] linux-user: Lock log around strace Laurent Vivier
2022-09-28  8:15 ` [PULL 37/38] linux-user: Log tid for strace Laurent Vivier
2022-09-28  8:15 ` [PULL 38/38] linux-user: Add parameters of getrandom() syscall " Laurent Vivier
2022-09-28 20:04 ` [PULL 00/38] Linux user for 7.2 patches Stefan Hajnoczi
2022-09-28 20:23   ` Laurent Vivier

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=20220928081517.734954-6-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=deller@gmx.de \
    --cc=qemu-devel@nongnu.org \
    /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).