From patchwork Tue Mar 10 01:49:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 5973621 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0C09A9F380 for ; Tue, 10 Mar 2015 01:53:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 26EB220295 for ; Tue, 10 Mar 2015 01:53:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E41720222 for ; Tue, 10 Mar 2015 01:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752651AbbCJBv5 (ORCPT ); Mon, 9 Mar 2015 21:51:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33383 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751515AbbCJBvy (ORCPT ); Mon, 9 Mar 2015 21:51:54 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2A1p3Re015916 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 9 Mar 2015 21:51:03 -0400 Received: from ad.nay.redhat.com (dhcp-14-137.nay.redhat.com [10.66.14.137]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2A1nJNB004165; Mon, 9 Mar 2015 21:50:50 -0400 From: Fam Zheng To: linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Alexander Viro , Andrew Morton , Kees Cook , Andy Lutomirski , David Herrmann , Alexei Starovoitov , Miklos Szeredi , David Drysdale , Oleg Nesterov , "David S. Miller" , Vivek Goyal , Mike Frysinger , "Theodore Ts'o" , Heiko Carstens , Rasmus Villemoes , Rashika Kheria , Hugh Dickins , Mathieu Desnoyers , Fam Zheng , Peter Zijlstra , linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, Josh Triplett , "Michael Kerrisk (man-pages)" , Paolo Bonzini , Omar Sandoval , Jonathan Corbet , shane.seymour@hp.com, dan.j.rosenberg@gmail.com Subject: [PATCH v4 6/9] epoll: Add implementation for epoll_pwait1 Date: Tue, 10 Mar 2015 09:49:12 +0800 Message-Id: <1425952155-27603-7-git-send-email-famz@redhat.com> In-Reply-To: <1425952155-27603-1-git-send-email-famz@redhat.com> References: <1425952155-27603-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is the new implementation for poll which has a flags parameter and packs a number of parameters into a structure. The main advantage of it over existing epoll_pwait is about timeout: epoll_pwait expects a relative millisecond value, while epoll_pwait1 accepts 1) a timespec which is in nanosecond granularity; 2) a clockid to allow using a clock other than CLOCK_MONOTONIC. The 'flags' field in params is reserved for now and must be zero. The next step would be allowing absolute timeout value. Signed-off-by: Fam Zheng --- fs/eventpoll.c | 39 ++++++++++++++++++++++++++++++++++++++- include/linux/syscalls.h | 5 +++++ include/uapi/linux/eventpoll.h | 8 ++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 54dc63f..06a59fc 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -2085,7 +2085,6 @@ SYSCALL_DEFINE4(epoll_ctl_batch, int, epfd, int, flags, cmd_size = sizeof(struct epoll_ctl_cmd) * ncmds; /* TODO: optimize for small arguments like select/poll with a stack * allocated buffer */ - kcmds = kmalloc(cmd_size, GFP_KERNEL); if (!kcmds) return -ENOMEM; @@ -2119,6 +2118,44 @@ out: return ret; } +SYSCALL_DEFINE5(epoll_pwait1, int, epfd, int, flags, + struct epoll_event __user *, events, + int, maxevents, + struct epoll_wait_params __user *, params) +{ + struct epoll_wait_params p; + ktime_t kt = { 0 }; + sigset_t sigmask; + struct timespec timeout; + + if (flags) + return -EINVAL; + if (!params) + return -EINVAL; + if (copy_from_user(&p, params, sizeof(p))) + return -EFAULT; + if (p.size != sizeof(p)) + return -EINVAL; + if (p.sigmask) { + if (copy_from_user(&sigmask, p.sigmask, sizeof(sigmask))) + return -EFAULT; + if (p.sigsetsize != sizeof(p.sigmask)) + return -EINVAL; + } + if (p.timeout) { + if (copy_from_user(&timeout, p.timeout, sizeof(timeout))) + return -EFAULT; + if (!timespec_valid(&timeout)) + return -EINVAL; + kt = timespec_to_ktime(timeout); + } else { + kt = ns_to_ktime(-1); + } + + return epoll_pwait_do(epfd, events, maxevents, p.clockid, + kt, p.sigmask ? &sigmask : NULL); +} + #ifdef CONFIG_COMPAT COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events, diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 7d784e3..a4823d9 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -13,6 +13,7 @@ struct epoll_event; struct epoll_ctl_cmd; +struct epoll_wait_params; struct iattr; struct inode; struct iocb; @@ -635,6 +636,10 @@ asmlinkage long sys_epoll_pwait(int epfd, struct epoll_event __user *events, int maxevents, int timeout, const sigset_t __user *sigmask, size_t sigsetsize); +asmlinkage long sys_epoll_pwait1(int epfd, int flags, + struct epoll_event __user *events, + int maxevents, + struct epoll_wait_params __user *params); asmlinkage long sys_epoll_ctl_batch(int epfd, int flags, int ncmds, struct epoll_ctl_cmd __user *cmds); diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h index 4e18b17..05ae035 100644 --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h @@ -72,6 +72,14 @@ struct epoll_ctl_cmd { int result; } EPOLL_PACKED; +struct epoll_wait_params { + int size; + int clockid; + struct timespec *timeout; + sigset_t *sigmask; + size_t sigsetsize; +} EPOLL_PACKED; + #ifdef CONFIG_PM_SLEEP static inline void ep_take_care_of_epollwakeup(struct epoll_event *epev) {