qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
	Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 34/38] linux-user: Implement PI futexes
Date: Wed, 28 Sep 2022 10:15:13 +0200	[thread overview]
Message-ID: <20220928081517.734954-35-laurent@vivier.eu> (raw)
In-Reply-To: <20220928081517.734954-1-laurent@vivier.eu>

From: Richard Henderson <richard.henderson@linaro.org>

Define the missing FUTEX_* constants in syscall_defs.h

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220829021006.67305-6-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/syscall.c      | 10 ++++++++++
 linux-user/syscall_defs.h |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 3f144e3c1f5d..2e954d8dbd9e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7788,8 +7788,17 @@ static int do_futex(CPUState *cpu, bool time64, target_ulong uaddr,
     case FUTEX_WAIT_BITSET:
         val = tswap32(val);
         break;
+    case FUTEX_WAIT_REQUEUE_PI:
+        val = tswap32(val);
+        haddr2 = g2h(cpu, uaddr2);
+        break;
+    case FUTEX_LOCK_PI:
+    case FUTEX_LOCK_PI2:
+        break;
     case FUTEX_WAKE:
     case FUTEX_WAKE_BITSET:
+    case FUTEX_TRYLOCK_PI:
+    case FUTEX_UNLOCK_PI:
         timeout = 0;
         break;
     case FUTEX_FD:
@@ -7797,6 +7806,7 @@ static int do_futex(CPUState *cpu, bool time64, target_ulong uaddr,
         timeout = 0;
         break;
     case FUTEX_CMP_REQUEUE:
+    case FUTEX_CMP_REQUEUE_PI:
         val3 = tswap32(val3);
         /* fall through */
     case FUTEX_REQUEUE:
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 1e3577bfa56f..01ee10a88fe0 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2699,6 +2699,9 @@ struct target_drm_i915_getparam {
 #define FUTEX_TRYLOCK_PI        8
 #define FUTEX_WAIT_BITSET       9
 #define FUTEX_WAKE_BITSET       10
+#define FUTEX_WAIT_REQUEUE_PI   11
+#define FUTEX_CMP_REQUEUE_PI    12
+#define FUTEX_LOCK_PI2          13
 
 #define FUTEX_PRIVATE_FLAG      128
 #define FUTEX_CLOCK_REALTIME    256
-- 
2.37.3



  parent reply	other threads:[~2022-09-28  9:57 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 ` [PULL 05/38] linux-user: Add pidfd_open(), pidfd_send_signal() and pidfd_getfd() syscalls Laurent Vivier
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 ` Laurent Vivier [this message]
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-35-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.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).