Patchwork [v3] linux-user: add ppoll syscall support

login
register
mail settings
Submitter Mike Frysinger
Date Jan. 24, 2011, 3:57 a.m.
Message ID <1295841472-19118-1-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/80088/
State New
Headers show

Comments

Mike Frysinger - Jan. 24, 2011, 3:57 a.m.
Some architectures (like Blackfin) only implement ppoll (and skip poll).
So add support for it using existing poll code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
v3
	- call ppoll syscall directly so timespec updates get passed back
	- tweak style
	- use new sigsets

 linux-user/syscall.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 2 deletions(-)
Peter Maydell - Jan. 24, 2011, 11:55 a.m.
On 24 January 2011 03:57, Mike Frysinger <vapier@gentoo.org> wrote:
> Some architectures (like Blackfin) only implement ppoll (and skip poll).
> So add support for it using existing poll code.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> v3
>        - call ppoll syscall directly so timespec updates get passed back
>        - tweak style
>        - use new sigsets

This version looks OK to me and works for my fairly simple
testcase.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6116ab5..02aab0f 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -529,6 +529,15 @@  static int sys_inotify_init1(int flags)
 #undef TARGET_NR_inotify_rm_watch
 #endif /* CONFIG_INOTIFY  */
 
+#if defined(TARGET_NR_ppoll)
+#ifndef __NR_ppoll
+# define __NR_ppoll -1
+#endif
+#define __NR_sys_ppoll __NR_ppoll
+_syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds,
+          struct timespec *, timeout, const __sigset_t *, sigmask,
+          size_t, sigsetsize)
+#endif
 
 extern int personality(int);
 extern int flock(int, int);
@@ -6230,8 +6239,13 @@  abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         ret = do_select(arg1, arg2, arg3, arg4, arg5);
         break;
 #endif
-#ifdef TARGET_NR_poll
+#if defined(TARGET_NR_poll) || defined(TARGET_NR_ppoll)
+# ifdef TARGET_NR_poll
     case TARGET_NR_poll:
+# endif
+# ifdef TARGET_NR_ppoll
+    case TARGET_NR_ppoll:
+# endif
         {
             struct target_pollfd *target_pfd;
             unsigned int nfds = arg2;
@@ -6242,12 +6256,46 @@  abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
             target_pfd = lock_user(VERIFY_WRITE, arg1, sizeof(struct target_pollfd) * nfds, 1);
             if (!target_pfd)
                 goto efault;
+
             pfd = alloca(sizeof(struct pollfd) * nfds);
             for(i = 0; i < nfds; i++) {
                 pfd[i].fd = tswap32(target_pfd[i].fd);
                 pfd[i].events = tswap16(target_pfd[i].events);
             }
-            ret = get_errno(poll(pfd, nfds, timeout));
+
+# ifdef TARGET_NR_ppoll
+            if (num == TARGET_NR_ppoll) {
+                struct timespec _timeout_ts, *timeout_ts = &_timeout_ts;
+                target_sigset_t *target_set;
+                sigset_t set;
+
+                if (arg3) {
+                    if (target_to_host_timespec(timeout_ts, arg3)) {
+                        unlock_user(target_pfd, arg1, 0);
+                        goto efault;
+                    }
+                } else {
+                    timeout_ts = NULL;
+                }
+
+                target_set = lock_user(VERIFY_READ, arg4, sizeof(target_sigset_t), 1);
+                if (!target_set) {
+                    unlock_user(target_pfd, arg1, 0);
+                    goto efault;
+                }
+                target_to_host_sigset(&set, target_set);
+
+                ret = get_errno(sys_ppoll(pfd, nfds, timeout_ts, &set, _NSIG/8));
+
+                if (!is_error(ret) && arg3) {
+                    host_to_target_timespec(arg3, timeout_ts);
+                }
+
+                unlock_user(target_set, arg4, 0);
+            } else
+# endif
+                ret = get_errno(poll(pfd, nfds, timeout));
+
             if (!is_error(ret)) {
                 for(i = 0; i < nfds; i++) {
                     target_pfd[i].revents = tswap16(pfd[i].revents);