aio poll, io_pgetevents and a new in-kernel poll API V2
Subsystems (40)
Hi all,
this series adds support for the IOCB_CMD_POLL operation to poll for the readyness of file descriptors using the aio subsystem. The API is based on patches that existed in RHAS2.1 and RHEL3, which means it already is supported by libaio. To implement the poll support efficiently new methods to poll are introduced in struct file_operations: get_poll_head and poll_mask. The first one returns a wait_queue_head to wait on (lifetime is bound by the file), and the second does a non-blocking check for the POLL* events. This allows aio poll to work without any additional context switches, unlike epoll.
To make the interface fully useful a new io_pgetevents system call is added, which atomically saves and restores the signal mask over the io_pgetevents system call. It it the logical equivalent to pselect and ppoll for io_pgetevents.
The corresponding libaio changes for io_pgetevents support and documentation, as well as a test case will be posted in a separate series.
The changes were sponsored by Scylladb, and improve performance of the seastar framework up to 10%, while also removing the need for a privileged SCHED_FIFO epoll listener thread.
The patches are on top of Als __poll_t annoations, so I've also prepared a git branch on top of those here:
git://git.infradead.org/users/hch/vfs.git aio-poll
Gitweb:
http://git.infradead.org/users/hch/vfs.git/shortlog/refs/heads/aio-poll.2
Libaio changes:
http://git.infradead.org/users/hch/libaio.git/shortlog/refs/heads/aio-poll
Seastar changes:
https://github.com/avikivity/seastar/commits/aio
Changes since V1:
- handle the NULL ->poll case in vfs_poll
- dropped the file argument to the ->poll_mask socket operation
- replace the ->pre_poll socket operation with ->get_poll_head as in the file operations
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 1/32 fs: update documentation for __poll_t
--- Documentation/filesystems/Locking | 2 +- Documentation/filesystems/vfs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/filesystems/Locking +1 -1
@@ -439,7 +439,7 @@ prototypes: ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); int (*iterate) (struct file *, struct dir_context *); - unsigned int (*poll) (struct file *, struct poll_table_struct *); + __poll_t (*poll) (struct file *, struct poll_table_struct *); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *);
Documentation/filesystems/vfs.txt +1 -1
@@ -856,7 +856,7 @@ struct file_operations { ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); int (*iterate) (struct file *, struct dir_context *); - unsigned int (*poll) (struct file *, struct poll_table_struct *); + __poll_t (*poll) (struct file *, struct poll_table_struct *); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *);
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 2/32 fs: add new vfs_poll and file_can_poll helpers
In reply to Christoph HellwigThese abstract out calls to the poll method in preparation for changes to those methods.
--- drivers/staging/comedi/drivers/serial2002.c | 4 ++-- drivers/vfio/virqfd.c | 2 +- drivers/vhost/vhost.c | 2 +- fs/eventpoll.c | 5 ++--- fs/select.c | 25 +++++++++---------------- include/linux/poll.h | 12 ++++++++++++ mm/memcontrol.c | 2 +- net/9p/trans_fd.c | 18 ++++-------------- virt/kvm/eventfd.c | 2 +- 9 files changed, 33 insertions(+), 39 deletions(-)
drivers/staging/comedi/drivers/serial2002.c +2 -2
@@ -121,7 +121,7 @@ static void serial2002_tty_read_poll_wait(struct file *f, int timeout)long elapsed;__poll_t mask; - mask = f->f_op->poll (f, &table.pt); + mask =vfs_poll (f, &table.pt);if (mask & (POLLRDNORM |POLLRDBAND |POLLIN |POLLHUP |POLLERR )) {break ;
@@ -144,7 +144,7 @@ static int serial2002_tty_read(struct file *f, int timeout) result =-1 ;if (!IS_ERR (f)) { -if (f->f_op->poll) { +if (file_can_poll (f)) {serial2002_tty_read_poll_wait (f, timeout);if (kernel_read (f, &ch,1 , &pos) ==1 )
drivers/vfio/virqfd.c +1 -1
@@ -166,7 +166,7 @@ int vfio_virqfd_enable(void *opaque,init_waitqueue_func_entry (&virqfd->wait, virqfd_wakeup);init_poll_funcptr (&virqfd->pt, virqfd_ptable_queue_proc); - events = irqfd.file->f_op->poll (irqfd.file, &virqfd->pt); + events =vfs_poll (irqfd.file, &virqfd->pt);/* * Check if there was an event already pending on the eventfd
drivers/vhost/vhost.c +1 -1
@@ -209,7 +209,7 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file)if (poll->wqh)return 0 ; - mask = file->f_op->poll (file, &poll->table); + mask =vfs_poll (file, &poll->table);if (mask)vhost_poll_wakeup (&poll->wait,0 ,0 ,poll_to_key (mask));if (mask &POLLERR ) {
fs/eventpoll.c +2 -3
@@ -882,8 +882,7 @@ static unsigned int ep_item_poll(const struct epitem *epi, poll_table *pt, pt->_key = epi->event.events;if (!is_file_epoll (epi->ffd.file)) -return epi->ffd.file->f_op->poll (epi->ffd.file, pt) & - epi->event.events; +return vfs_poll (epi->ffd.file, pt) & epi->event.events; ep = epi->ffd.file->private_data;poll_wait (epi->ffd.file, &ep->poll_wait, pt);
@@ -2015,7 +2014,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,/* The target file descriptor must support poll */ error = -EPERM ; -if (!tf.file->f_op->poll) +if (!file_can_poll (tf.file)) goto error_tgt_fput;/* Check if EPOLLWAKEUP is allowed */
fs/select.c +9 -16
@@ -503,14 +503,10 @@ static int do_select(int n, fd_set_bits *fds, struct timespec64 *end_time)continue ; f =fdget (i);if (f.file) { -const struct file_operations *f_op; - f_op = f.file->f_op; - mask =DEFAULT_POLLMASK ; -if (f_op->poll) { -wait_key_set (wait, in, out, - bit, busy_flag); - mask = (*f_op->poll)(f.file, wait); - } +wait_key_set (wait, in, out, bit, + busy_flag); + mask =vfs_poll (f.file, wait); +fdput (f);if ((mask &POLLIN_SET ) && (in & bit)) { res_in |= bit;
@@ -819,14 +815,11 @@ static inline __poll_t do_pollfd(struct pollfd *pollfd, poll_table *pwait,/* userland u16 ->events contains POLL... bitmap */ __poll_t filter =demangle_poll (pollfd->events) |POLLERR |POLLHUP ; - mask =DEFAULT_POLLMASK ; -if (f.file->f_op->poll) { - pwait->_key = filter; - pwait->_key |= busy_flag; - mask = f.file->f_op->poll (f.file, pwait); -if (mask & busy_flag) - *can_busy_poll = true; - } + pwait->_key = filter | busy_flag; + mask =vfs_poll (f.file, pwait); +if (mask & busy_flag) + *can_busy_poll = true; +/* Mask out unneeded events. */ mask &= filter;fdput (f);
include/linux/poll.h +12 -0
@@ -73,6 +73,18 @@ static inline void init_poll_funcptr(poll_table *pt, poll_queue_proc qproc) pt->_key = ~(__poll_t )0 ;/* all events enabled */ } +static inline bool file_can_poll (struct file *file) +{ +return file->f_op->poll; +} + +static inline __poll_t vfs_poll (struct file *file,struct poll_table_struct *pt) +{ +if (unlikely (!file->f_op->poll)) +return DEFAULT_POLLMASK ; +return file->f_op->poll (file, pt); +} +struct poll_table_entry {struct file *filp;__poll_t key;
mm/memcontrol.c +1 -1
@@ -3928,7 +3928,7 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of,if (ret) goto out_put_css; - efile.file->f_op->poll (efile.file, &event->pt); +vfs_poll (efile.file, &event->pt);spin_lock (&memcg->event_list_lock);list_add (&event->list, &memcg->event_list);
net/9p/trans_fd.c +4 -14
@@ -231,7 +231,7 @@ static void p9_conn_cancel(struct p9_conn *m, int err)static __poll_t p9_fd_poll (struct p9_client *client,struct poll_table_struct *pt,int *err) { -__poll_t ret, n; +__poll_t ret;struct p9_trans_fd *ts =NULL ;if (client && client->status == Connected)
@@ -243,19 +243,9 @@ p9_fd_poll(struct p9_client *client, struct poll_table_struct *pt, int *err)return POLLERR ; } -if (!ts->rd->f_op->poll) - ret =DEFAULT_POLLMASK ; -else - ret = ts->rd->f_op->poll (ts->rd, pt); - -if (ts->rd != ts->wr) { -if (!ts->wr->f_op->poll) - n =DEFAULT_POLLMASK ; -else - n = ts->wr->f_op->poll (ts->wr, pt); - ret = (ret & ~POLLOUT ) | (n & ~POLLIN ); - } - + ret =vfs_poll (ts->rd, pt); +if (ts->rd != ts->wr) + ret = (vfs_poll (ts->wr, pt) & ~POLLIN ) | (ret & ~POLLOUT );return ret; }
virt/kvm/eventfd.c +1 -1
@@ -397,7 +397,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)* Check if there was an event already pending on the eventfd * before we registered, and trigger it as if we didn't miss it. */ - events = f.file->f_op->poll (f.file, &irqfd->pt); + events =vfs_poll (f.file, &irqfd->pt);if (events &POLLIN )schedule_work (&irqfd->inject);
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 3/32 fs: introduce new ->get_poll_head and ->poll_mask methods
In reply to Christoph Hellwig->get_poll_head returns the waitqueue that the poll operation is going to sleep on. Note that this means we can only use a single waitqueue for the poll, unlike some current drivers that use two waitqueues for different events. But now that we have keyed wakeups and heavily use those for poll there aren't that many good reason left to keep the multiple waitqueues, and if there are any ->poll is still around, the driver just won't support aio poll.
->poll_mask is called after the wakeup to return the actual mask of events reported by poll. It can be called with the waitqueue lock held in some cases.
--- Documentation/filesystems/Locking | 7 ++++++- Documentation/filesystems/vfs.txt | 11 +++++++++++ include/linux/fs.h | 2 ++ include/linux/poll.h | 21 ++++++++++++++++++--- 4 files changed, 37 insertions(+), 4 deletions(-)
Documentation/filesystems/Locking +6 -1
@@ -440,6 +440,8 @@ prototypes: ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); int (*iterate) (struct file *, struct dir_context *); __poll_t (*poll) (struct file *, struct poll_table_struct *); + struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t); + __poll_t (*poll_mask) (struct file *, __poll_t); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *);
@@ -470,7 +472,7 @@ prototypes: }; locking rules: - All may block. + All except for ->poll_mask may block. ->llseek() locking has moved from llseek to the individual llseek implementations. If your fs is not using generic_file_llseek, you
@@ -498,6 +500,9 @@ in sys_read() and friends. the lease within the individual filesystem to record the result of the operation +->poll_mask can be called with or without the waitqueue lock for the waitqueue +returned from ->get_poll_head. + --------------------------- dquot_operations ------------------------------- prototypes: int (*write_dquot) (struct dquot *);
Documentation/filesystems/vfs.txt +11 -0
@@ -857,6 +857,8 @@ struct file_operations { ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); int (*iterate) (struct file *, struct dir_context *); __poll_t (*poll) (struct file *, struct poll_table_struct *); + struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t); + __poll_t (*poll_mask) (struct file *, __poll_t); long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); long (*compat_ioctl) (struct file *, unsigned int, unsigned long); int (*mmap) (struct file *, struct vm_area_struct *);
@@ -901,6 +903,15 @@ otherwise noted. activity on this file and (optionally) go to sleep until there is activity. Called by the select(2) and poll(2) system calls + get_poll_head: Returns the struct wait_queue_head that poll, select, + epoll or aio poll should wait on in case this instance only has single + waitqueue. + + poll_mask: return the mask of POLL* values describing the file descriptor + state. Called before going to sleep on the waitqueue returned by + get_poll_head, and after it has been woken. If ->get_poll_head and + ->poll_mask are implemented ->poll does not need to be implement. + unlocked_ioctl: called by the ioctl(2) system call. compat_ioctl: called by the ioctl(2) system call when 32 bit system calls
include/linux/fs.h +2 -0
@@ -1699,6 +1699,8 @@ struct file_operations {int (*iterate) (struct file *,struct dir_context *);int (*iterate_shared) (struct file *,struct dir_context *);__poll_t (*poll) (struct file *,struct poll_table_struct *); +struct wait_queue_head * (*get_poll_head)(struct file *,__poll_t ); +__poll_t (*poll_mask) (struct file *,__poll_t );long (*unlocked_ioctl) (struct file *,unsigned int ,unsigned long );long (*compat_ioctl) (struct file *,unsigned int ,unsigned long );int (*mmap) (struct file *,struct vm_area_struct *);
include/linux/poll.h +18 -3
@@ -75,14 +75,29 @@ static inline void init_poll_funcptr(poll_table *pt, poll_queue_proc qproc)static inline bool file_can_poll (struct file *file) { -return file->f_op->poll; +return file->f_op->poll || + (file->f_op->get_poll_head && file->f_op->poll_mask); }static inline __poll_t vfs_poll (struct file *file,struct poll_table_struct *pt) { -if (unlikely (!file->f_op->poll)) +unsigned int events =poll_requested_events (pt); + +if (unlikely (!file_can_poll (file))) +return DEFAULT_POLLMASK ; + +if (file->f_op->poll) +return file->f_op->poll (file, pt); + +poll_wait (file, file->f_op->get_poll_head (file, events), pt); +return file->f_op->poll_mask (file, events); +} + +static inline __poll_t vfs_poll_mask (struct file *file,__poll_t events) +{ +if (unlikely (!file->f_op->poll_mask))return DEFAULT_POLLMASK ; -return file->f_op->poll (file, pt); +return file->f_op->poll_mask (file, events) & events; }struct poll_table_entry {
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 4/32 net: refactor socket_poll
In reply to Christoph HellwigFactor out two busy poll related helpers for late reuse, and remove a command that isn't very helpful, especially with the __poll_t annotations in place.
--- include/net/busy_poll.h | 15 +++++++++++++++ net/socket.c | 21 ++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-)
include/net/busy_poll.h +15 -0
@@ -121,6 +121,21 @@ static inline void sk_busy_loop(struct sock *sk, int nonblock)#endif } +static inline void sock_poll_busy_loop (struct socket *sock,__poll_t events) +{ +if (sk_can_busy_loop (sock->sk) && + events && (events &POLL_BUSY_LOOP )) { +/* once, only if requested by syscall */ +sk_busy_loop (sock->sk,1 ); + } +} + +/* if this socket can poll_ll, tell the system call */ +static inline __poll_t sock_poll_busy_flag (struct socket *sock) +{ +return sk_can_busy_loop (sock->sk) ?POLL_BUSY_LOOP :0 ; +} +/* used in the NIC receive handler to mark the skb */ static inline void skb_mark_napi_id (struct sk_buff *skb,struct napi_struct *napi)
net/socket.c +4 -17
@@ -1097,24 +1097,11 @@ EXPORT_SYMBOL(sock_create_lite);/* No kernel lock held - perfect */ static __poll_t sock_poll (struct file *file,poll_table *wait) { -__poll_t busy_flag =0 ; -struct socket *sock; - -/* -* We can't return errors to poll, so it's either yes or no. -*/ - sock = file->private_data; - -if (sk_can_busy_loop (sock->sk)) { -/* this socket can poll_ll so tell the system call */ - busy_flag =POLL_BUSY_LOOP ; - -/* once, only if requested by syscall */ -if (wait && (wait->_key &POLL_BUSY_LOOP )) -sk_busy_loop (sock->sk,1 ); - } +struct socket *sock = file->private_data; +__poll_t events =poll_requested_events (wait); -return busy_flag | sock->ops->poll (file, sock, wait); +sock_poll_busy_loop (sock, events); +return sock->ops->poll (file, sock, wait) |sock_poll_busy_flag (sock); }static int sock_mmap (struct file *file,struct vm_area_struct *vma)
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 5/32 net: add support for ->poll_mask in proto_ops
In reply to Christoph HellwigThe socket file operations still implement ->poll until all protocols are switched over.
--- include/linux/net.h | 3 +++ net/socket.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 5 deletions(-)
include/linux/net.h +3 -0
@@ -147,6 +147,9 @@ struct proto_ops {int (*getname) (struct socket *sock,struct sockaddr *addr,int *sockaddr_len,int peer); +struct wait_queue_head *(*get_poll_head)(struct socket *sock, +__poll_t events); +__poll_t (*poll_mask) (struct socket *sock,__poll_t events);__poll_t (*poll) (struct file *file,struct socket *sock,struct poll_table_struct *wait); int (*ioctl) (struct socket *sock, unsigned int cmd,
net/socket.c +46 -5
74 lines not on this page · raw message
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 6/32 net: remove sock_no_poll
In reply to Christoph HellwigNow that sock_poll handles a NULL ->poll or ->poll_mask there is no need for a stub.
--- crypto/af_alg.c | 1 - crypto/algif_hash.c | 2 -- crypto/algif_rng.c | 1 - drivers/isdn/mISDN/socket.c | 1 - drivers/net/ppp/pptp.c | 1 - include/net/sock.h | 2 -- net/bluetooth/bnep/sock.c | 1 - net/bluetooth/cmtp/sock.c | 1 - net/bluetooth/hidp/sock.c | 1 - net/core/sock.c | 6 ------ 10 files changed, 17 deletions(-)
crypto/af_alg.c +0 -1
@@ -345,7 +345,6 @@ static const struct proto_ops alg_proto_ops = { .sendpage = sock_no_sendpage, .sendmsg = sock_no_sendmsg, .recvmsg = sock_no_recvmsg, - .poll = sock_no_poll, .bind = alg_bind, .release = af_alg_release,
crypto/algif_hash.c +0 -2
@@ -293,7 +293,6 @@ static struct proto_ops algif_hash_ops = { .mmap = sock_no_mmap, .bind = sock_no_bind, .setsockopt = sock_no_setsockopt, - .poll = sock_no_poll, .release = af_alg_release, .sendmsg = hash_sendmsg,
@@ -401,7 +400,6 @@ static struct proto_ops algif_hash_ops_nokey = { .mmap = sock_no_mmap, .bind = sock_no_bind, .setsockopt = sock_no_setsockopt, - .poll = sock_no_poll, .release = af_alg_release, .sendmsg = hash_sendmsg_nokey,
crypto/algif_rng.c +0 -1
@@ -106,7 +106,6 @@ static struct proto_ops algif_rng_ops = { .bind = sock_no_bind, .accept = sock_no_accept, .setsockopt = sock_no_setsockopt, - .poll = sock_no_poll, .sendmsg = sock_no_sendmsg, .sendpage = sock_no_sendpage,
drivers/isdn/mISDN/socket.c +0 -1
@@ -746,7 +746,6 @@ static const struct proto_ops base_sock_ops = { .getname = sock_no_getname, .sendmsg = sock_no_sendmsg, .recvmsg = sock_no_recvmsg, - .poll = sock_no_poll, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt,
drivers/net/ppp/pptp.c +0 -1
@@ -627,7 +627,6 @@ static const struct proto_ops pptp_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = pptp_getname, - .poll = sock_no_poll, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt,
include/net/sock.h +0 -2
@@ -1578,8 +1578,6 @@ int sock_no_connect(struct socket *, struct sockaddr *, int, int);int sock_no_socketpair (struct socket *,struct socket *);int sock_no_accept (struct socket *,struct socket *,int ,bool );int sock_no_getname (struct socket *,struct sockaddr *,int *,int ); -__poll_t sock_no_poll (struct file *,struct socket *, -struct poll_table_struct *);int sock_no_ioctl (struct socket *,unsigned int ,unsigned long );int sock_no_listen (struct socket *,int );int sock_no_shutdown (struct socket *,int );
net/bluetooth/bnep/sock.c +0 -1
@@ -175,7 +175,6 @@ static const struct proto_ops bnep_sock_ops = { .getname = sock_no_getname, .sendmsg = sock_no_sendmsg, .recvmsg = sock_no_recvmsg, - .poll = sock_no_poll, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt,
net/bluetooth/cmtp/sock.c +0 -1
@@ -178,7 +178,6 @@ static const struct proto_ops cmtp_sock_ops = { .getname = sock_no_getname, .sendmsg = sock_no_sendmsg, .recvmsg = sock_no_recvmsg, - .poll = sock_no_poll, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt,
net/bluetooth/hidp/sock.c +0 -1
@@ -208,7 +208,6 @@ static const struct proto_ops hidp_sock_ops = { .getname = sock_no_getname, .sendmsg = sock_no_sendmsg, .recvmsg = sock_no_recvmsg, - .poll = sock_no_poll, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt,
net/core/sock.c +0 -6
@@ -2496,12 +2496,6 @@ int sock_no_getname(struct socket *sock, struct sockaddr *saddr, }EXPORT_SYMBOL (sock_no_getname); -__poll_t sock_no_poll (struct file *file,struct socket *sock,poll_table *pt) -{ -return 0 ; -} -EXPORT_SYMBOL (sock_no_poll); -int sock_no_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg) {return -EOPNOTSUPP ;
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 7/32 net/tcp: convert to ->poll_mask
In reply to Christoph Hellwig--- include/net/tcp.h | 4 ++-- net/ipv4/af_inet.c | 3 ++- net/ipv4/tcp.c | 33 ++++++++++++++------------------- net/ipv6/af_inet6.c | 3 ++- 4 files changed, 20 insertions(+), 23 deletions(-)
include/net/tcp.h +2 -2
@@ -387,8 +387,8 @@ bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst);void tcp_close (struct sock *sk,long timeout);void tcp_init_sock (struct sock *sk);void tcp_init_transfer (struct sock *sk,int bpf_op); -__poll_t tcp_poll (struct file *file,struct socket *sock, -struct poll_table_struct *wait); +struct wait_queue_head *tcp_get_poll_head (struct socket *sock,__poll_t events); +__poll_t tcp_poll_mask (struct socket *sock,__poll_t events);int tcp_getsockopt (struct sock *sk,int level,int optname,char __user *optval,int __user *optlen); int tcp_setsockopt(struct sock *sk, int level, int optname,
net/ipv4/af_inet.c +2 -1
@@ -934,7 +934,8 @@ const struct proto_ops inet_stream_ops = { .socketpair = sock_no_socketpair, .accept = inet_accept, .getname = inet_getname, - .poll = tcp_poll, + .get_poll_head = tcp_get_poll_head, + .poll_mask = tcp_poll_mask, .ioctl = inet_ioctl, .listen = inet_listen, .shutdown = inet_shutdown,
net/ipv4/tcp.c +14 -19
@@ -486,35 +486,30 @@ static void tcp_tx_timestamp(struct sock *sk, u16 tsflags) } } +struct wait_queue_head *tcp_get_poll_head (struct socket *sock,__poll_t events) +{ +sock_poll_busy_loop (sock, events); +sock_rps_record_flow (sock->sk); +return sk_sleep (sock->sk); +} +EXPORT_SYMBOL (tcp_get_poll_head); +/* -* Wait for a TCP event. -* -* Note that we don't need to lock the socket, as the upper poll layers -* take care of normal races (between the test and the event) and we don't -* go look at any of the socket buffers directly. +* Socket is not locked. We are protected from async events by poll logic and +* correct handling of state changes made by other threads is impossible in +* any case. */ -__poll_t tcp_poll (struct file *file,struct socket *sock,poll_table *wait) +__poll_t tcp_poll_mask (struct socket *sock,__poll_t events) { -__poll_t mask;struct sock *sk = sock->sk;const struct tcp_sock *tp =tcp_sk (sk); +__poll_t mask =0 ;int state; -sock_rps_record_flow (sk); - -sock_poll_wait (file,sk_sleep (sk), wait); - state =sk_state_load (sk);if (state ==TCP_LISTEN )return inet_csk_listen_poll (sk); -/* Socket is not locked. We are protected from async events -* by poll logic and correct handling of state changes -* made by other threads is impossible in any case. -*/ - - mask =0 ; -/* * POLLHUP is certainly not done right. But poll() doesn't * have a notion of HUP in just one direction, and for a
@@ -595,7 +590,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)return mask; } -EXPORT_SYMBOL (tcp_poll); +EXPORT_SYMBOL (tcp_poll_mask);int tcp_ioctl (struct sock *sk,int cmd,unsigned long arg) {
net/ipv6/af_inet6.c +2 -1
@@ -544,7 +544,8 @@ const struct proto_ops inet6_stream_ops = { .socketpair = sock_no_socketpair, /* a do nothing */ .accept = inet_accept, /* ok */ .getname = inet6_getname, - .poll = tcp_poll, /* ok */ + .get_poll_head = tcp_get_poll_head, + .poll_mask = tcp_poll_mask, /* ok */ .ioctl = inet6_ioctl, /* must change */ .listen = inet_listen, /* ok */ .shutdown = inet_shutdown, /* ok */
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 8/32 net/unix: convert to ->poll_mask
In reply to Christoph Hellwig--- net/unix/af_unix.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-)
net/unix/af_unix.c +11 -19
@@ -638,9 +638,8 @@ static int unix_stream_connect(struct socket *, struct sockaddr *,static int unix_socketpair (struct socket *,struct socket *);static int unix_accept (struct socket *,struct socket *,int ,bool );static int unix_getname (struct socket *,struct sockaddr *,int *,int ); -static __poll_t unix_poll (struct file *,struct socket *,poll_table *); -static __poll_t unix_dgram_poll (struct file *,struct socket *, -poll_table *); +static __poll_t unix_poll_mask (struct socket *,__poll_t ); +static __poll_t unix_dgram_poll_mask (struct socket *,__poll_t );static int unix_ioctl (struct socket *,unsigned int ,unsigned long );static int unix_shutdown (struct socket *,int );static int unix_stream_sendmsg (struct socket *,struct msghdr *,size_t );
@@ -681,7 +680,7 @@ static const struct proto_ops unix_stream_ops = { .socketpair = unix_socketpair, .accept = unix_accept, .getname = unix_getname, - .poll = unix_poll, + .poll_mask = unix_poll_mask, .ioctl = unix_ioctl, .listen = unix_listen, .shutdown = unix_shutdown,
@@ -704,7 +703,7 @@ static const struct proto_ops unix_dgram_ops = { .socketpair = unix_socketpair, .accept = sock_no_accept, .getname = unix_getname, - .poll = unix_dgram_poll, + .poll_mask = unix_dgram_poll_mask, .ioctl = unix_ioctl, .listen = sock_no_listen, .shutdown = unix_shutdown,
@@ -726,7 +725,7 @@ static const struct proto_ops unix_seqpacket_ops = { .socketpair = unix_socketpair, .accept = unix_accept, .getname = unix_getname, - .poll = unix_dgram_poll, + .poll_mask = unix_dgram_poll_mask, .ioctl = unix_ioctl, .listen = unix_listen, .shutdown = unix_shutdown,
@@ -2640,13 +2639,10 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)return err; } -static __poll_t unix_poll (struct file *file,struct socket *sock,poll_table *wait) +static __poll_t unix_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk; -__poll_t mask; - -sock_poll_wait (file,sk_sleep (sk), wait); - mask =0 ; +__poll_t mask =0 ;/* exceptional events? */ if (sk->sk_err)
@@ -2675,15 +2671,11 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wareturn mask; } -static __poll_t unix_dgram_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t unix_dgram_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk, *other; -unsigned int writable; -__poll_t mask; - -sock_poll_wait (file,sk_sleep (sk), wait); - mask =0 ; +int writable; +__poll_t mask =0 ;/* exceptional events? */ if (sk->sk_err || !skb_queue_empty (&sk->sk_error_queue))
@@ -2709,7 +2701,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock, }/* No write status requested, avoid expensive OUT tests. */ -if (!(poll_requested_events (wait) & (POLLWRBAND |POLLWRNORM |POLLOUT ))) +if (!(events & (POLLWRBAND |POLLWRNORM |POLLOUT )))return mask; writable =unix_writable (sk);
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 9/32 net: convert datagram_poll users tp ->poll_mask
In reply to Christoph Hellwig--- drivers/isdn/mISDN/socket.c | 2 +- drivers/net/ppp/pppoe.c | 2 +- drivers/staging/irda/net/af_irda.c | 6 +++--- include/linux/skbuff.h | 3 +-- include/net/udp.h | 2 +- net/appletalk/ddp.c | 2 +- net/ax25/af_ax25.c | 2 +- net/bluetooth/hci_sock.c | 2 +- net/can/bcm.c | 2 +- net/can/raw.c | 2 +- net/core/datagram.c | 13 ++++--------- net/decnet/af_decnet.c | 6 +++--- net/ieee802154/socket.c | 4 ++-- net/ipv4/af_inet.c | 6 +++--- net/ipv4/udp.c | 10 +++++----- net/ipv6/af_inet6.c | 2 +- net/ipv6/raw.c | 4 ++-- net/ipx/af_ipx.c | 2 +- net/kcm/kcmsock.c | 4 ++-- net/key/af_key.c | 2 +- net/l2tp/l2tp_ip.c | 2 +- net/l2tp/l2tp_ip6.c | 2 +- net/l2tp/l2tp_ppp.c | 2 +- net/llc/af_llc.c | 2 +- net/netlink/af_netlink.c | 2 +- net/netrom/af_netrom.c | 2 +- net/nfc/rawsock.c | 4 ++-- net/packet/af_packet.c | 9 ++++----- net/phonet/socket.c | 2 +- net/qrtr/qrtr.c | 2 +- net/rose/af_rose.c | 2 +- net/x25/af_x25.c | 2 +- 32 files changed, 52 insertions(+), 59 deletions(-)
drivers/isdn/mISDN/socket.c +1 -1
@@ -589,7 +589,7 @@ static const struct proto_ops data_sock_ops = { .getname = data_sock_getname, .sendmsg = mISDN_sock_sendmsg, .recvmsg = mISDN_sock_recvmsg, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = data_sock_setsockopt,
drivers/net/ppp/pppoe.c +1 -1
@@ -1119,7 +1119,7 @@ static const struct proto_ops pppoe_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = pppoe_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt,
drivers/staging/irda/net/af_irda.c +3 -3
@@ -2600,7 +2600,7 @@ static const struct proto_ops irda_seqpacket_ops = { .socketpair = sock_no_socketpair, .accept = irda_accept, .getname = irda_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = irda_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = irda_compat_ioctl,
@@ -2624,7 +2624,7 @@ static const struct proto_ops irda_dgram_ops = { .socketpair = sock_no_socketpair, .accept = irda_accept, .getname = irda_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = irda_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = irda_compat_ioctl,
@@ -2649,7 +2649,7 @@ static const struct proto_ops irda_ultra_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = irda_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = irda_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = irda_compat_ioctl,
include/linux/skbuff.h +1 -2
@@ -3241,8 +3241,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags, int *peeked, int *off, int *err);struct sk_buff *skb_recv_datagram (struct sock *sk,unsigned flags,int noblock,int *err); -__poll_t datagram_poll (struct file *file,struct socket *sock, -struct poll_table_struct *wait); +__poll_t datagram_poll_mask (struct socket *sock,__poll_t events);int skb_copy_datagram_iter (const struct sk_buff *from,int offset,struct iov_iter *to,int size); static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
include/net/udp.h +1 -1
@@ -275,7 +275,7 @@ int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);int udp_init_sock (struct sock *sk);int __udp_disconnect (struct sock *sk,int flags);int udp_disconnect (struct sock *sk,int flags); -__poll_t udp_poll (struct file *file,struct socket *sock,poll_table *wait); +__poll_t udp_poll_mask (struct socket *sock,__poll_t events);struct sk_buff *skb_udp_tunnel_segment (struct sk_buff *skb,netdev_features_t features,bool is_ipv6);
net/appletalk/ddp.c +1 -1
@@ -1870,7 +1870,7 @@ static const struct proto_ops atalk_dgram_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = atalk_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = atalk_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = atalk_compat_ioctl,
net/ax25/af_ax25.c +1 -1
@@ -1955,7 +1955,7 @@ static const struct proto_ops ax25_proto_ops = { .socketpair = sock_no_socketpair, .accept = ax25_accept, .getname = ax25_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = ax25_ioctl, .listen = ax25_listen, .shutdown = ax25_shutdown,
net/bluetooth/hci_sock.c +1 -1
@@ -1975,7 +1975,7 @@ static const struct proto_ops hci_sock_ops = { .sendmsg = hci_sock_sendmsg, .recvmsg = hci_sock_recvmsg, .ioctl = hci_sock_ioctl, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = hci_sock_setsockopt,
net/can/bcm.c +1 -1
@@ -1670,7 +1670,7 @@ static const struct proto_ops bcm_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */ .listen = sock_no_listen, .shutdown = sock_no_shutdown,
net/can/raw.c +1 -1
@@ -843,7 +843,7 @@ static const struct proto_ops raw_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = raw_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = can_ioctl, /* use can_ioctl() from af_can.c */ .listen = sock_no_listen, .shutdown = sock_no_shutdown,
net/core/datagram.c +4 -9
@@ -819,9 +819,8 @@ EXPORT_SYMBOL(skb_copy_and_csum_datagram_msg);/** * datagram_poll - generic datagram poll -* @file: file struct * @sock: socket -* @wait: poll table +* @events to wait for * * Datagram poll: Again totally generic. This also handles * sequenced packet sockets providing the socket receive queue
@@ -831,14 +830,10 @@ EXPORT_SYMBOL(skb_copy_and_csum_datagram_msg);* and you use a different write policy from sock_writeable() * then please supply your own write_space callback. */ -__poll_t datagram_poll (struct file *file,struct socket *sock, -poll_table *wait) +__poll_t datagram_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk; -__poll_t mask; - -sock_poll_wait (file,sk_sleep (sk), wait); - mask =0 ; +__poll_t mask =0 ;/* exceptional events? */ if (sk->sk_err || !skb_queue_empty (&sk->sk_error_queue))
@@ -871,4 +866,4 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,return mask; } -EXPORT_SYMBOL (datagram_poll); +EXPORT_SYMBOL (datagram_poll_mask);
net/decnet/af_decnet.c +3 -3
@@ -1209,11 +1209,11 @@ static int dn_getname(struct socket *sock, struct sockaddr *uaddr,int *uaddr_len } -static __poll_t dn_poll (struct file *file,struct socket *sock,poll_table *wait) +static __poll_t dn_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;struct dn_scp *scp =DN_SK (sk); -__poll_t mask =datagram_poll (file, sock, wait); +__poll_t mask =datagram_poll_mask (sock, events);if (!skb_queue_empty (&scp->other_receive_queue)) mask |=POLLRDBAND ;
@@ -2343,7 +2343,7 @@ static const struct proto_ops dn_proto_ops = { .socketpair = sock_no_socketpair, .accept = dn_accept, .getname = dn_getname, - .poll = dn_poll, + .poll_mask = dn_poll_mask, .ioctl = dn_ioctl, .listen = dn_listen, .shutdown = dn_shutdown,
net/ieee802154/socket.c +2 -2
@@ -423,7 +423,7 @@ static const struct proto_ops ieee802154_raw_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = ieee802154_sock_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
@@ -969,7 +969,7 @@ static const struct proto_ops ieee802154_dgram_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = ieee802154_sock_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
net/ipv4/af_inet.c +3 -3
@@ -967,7 +967,7 @@ const struct proto_ops inet_dgram_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = inet_getname, - .poll = udp_poll, + .poll_mask = udp_poll_mask, .ioctl = inet_ioctl, .listen = sock_no_listen, .shutdown = inet_shutdown,
@@ -988,7 +988,7 @@ EXPORT_SYMBOL(inet_dgram_ops);/* * For SOCK_RAW sockets; should be the same as inet_dgram_ops but without -* udp_poll +* udp_poll_mask */ static const struct proto_ops inet_sockraw_ops = { .family =PF_INET ,
@@ -999,7 +999,7 @@ static const struct proto_ops inet_sockraw_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = inet_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = inet_ioctl, .listen = sock_no_listen, .shutdown = inet_shutdown,
net/ipv4/udp.c +5 -5
@@ -2493,7 +2493,7 @@ int compat_udp_getsockopt(struct sock *sk, int level, int optname,* udp_poll - wait for a UDP event. * @file - file struct * @sock - socket -* @wait - poll table +* @events - events to wait for * * This is same as datagram poll, except for the special case of * blocking sockets. If application is using a blocking fd
@@ -2502,9 +2502,9 @@ int compat_udp_getsockopt(struct sock *sk, int level, int optname,* but then block when reading it. Add special case code * to work around these arguably broken applications. */ -__poll_t udp_poll (struct file *file,struct socket *sock,poll_table *wait) +__poll_t udp_poll_mask (struct socket *sock,__poll_t events) { -__poll_t mask =datagram_poll (file, sock, wait); +__poll_t mask =datagram_poll_mask (sock, events);struct sock *sk = sock->sk;if (!skb_queue_empty (&udp_sk (sk)->reader_queue))
@@ -2513,14 +2513,14 @@ __poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait)sock_rps_record_flow (sk);/* Check for false positives due to checksum errors */ -if ((mask &POLLRDNORM ) && !(file->f_flags &O_NONBLOCK ) && +if ((mask &POLLRDNORM ) && !(sock->file->f_flags &O_NONBLOCK ) && !(sk->sk_shutdown &RCV_SHUTDOWN ) &&first_packet_length (sk) ==-1 ) mask &= ~(POLLIN |POLLRDNORM );return mask; } -EXPORT_SYMBOL (udp_poll); +EXPORT_SYMBOL (udp_poll_mask);int udp_abort (struct sock *sk,int err) {
net/ipv6/af_inet6.c +1 -1
@@ -575,7 +575,7 @@ const struct proto_ops inet6_dgram_ops = { .socketpair = sock_no_socketpair, /* a do nothing */ .accept = sock_no_accept, /* a do nothing */ .getname = inet6_getname, - .poll = udp_poll, /* ok */ + .poll_mask = udp_poll_mask, /* ok */ .ioctl = inet6_ioctl, /* must change */ .listen = sock_no_listen, /* ok */ .shutdown = inet_shutdown, /* ok */
net/ipv6/raw.c +2 -2
@@ -1344,7 +1344,7 @@ void raw6_proc_exit(void) }#endif /* CONFIG_PROC_FS */ -/* Same as inet6_dgram_ops, sans udp_poll. */ +/* Same as inet6_dgram_ops, sans udp_poll_mask. */ const struct proto_ops inet6_sockraw_ops = { .family =PF_INET6 , .owner =THIS_MODULE ,
@@ -1354,7 +1354,7 @@ const struct proto_ops inet6_sockraw_ops = { .socketpair = sock_no_socketpair, /* a do nothing */ .accept = sock_no_accept, /* a do nothing */ .getname = inet6_getname, - .poll = datagram_poll, /* ok */ + .poll_mask = datagram_poll_mask, /* ok */ .ioctl = inet6_ioctl, /* must change */ .listen = sock_no_listen, /* ok */ .shutdown = inet_shutdown, /* ok */
net/ipx/af_ipx.c +1 -1
@@ -1967,7 +1967,7 @@ static const struct proto_ops ipx_dgram_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = ipx_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = ipx_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ipx_compat_ioctl,
net/kcm/kcmsock.c +2 -2
@@ -1872,7 +1872,7 @@ static const struct proto_ops kcm_dgram_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = kcm_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
@@ -1893,7 +1893,7 @@ static const struct proto_ops kcm_seqpacket_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = kcm_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
net/key/af_key.c +1 -1
@@ -3716,7 +3716,7 @@ static const struct proto_ops pfkey_ops = {/* Now the operations that really occur. */ .release = pfkey_release, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .sendmsg = pfkey_sendmsg, .recvmsg = pfkey_recvmsg, };
net/l2tp/l2tp_ip.c +1 -1
@@ -618,7 +618,7 @@ static const struct proto_ops l2tp_ip_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = l2tp_ip_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = inet_ioctl, .listen = sock_no_listen, .shutdown = inet_shutdown,
net/l2tp/l2tp_ip6.c +1 -1
@@ -757,7 +757,7 @@ static const struct proto_ops l2tp_ip6_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = l2tp_ip6_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = inet6_ioctl, .listen = sock_no_listen, .shutdown = inet_shutdown,
net/l2tp/l2tp_ppp.c +1 -1
@@ -1787,7 +1787,7 @@ static const struct proto_ops pppol2tp_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = pppol2tp_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = pppol2tp_setsockopt,
net/llc/af_llc.c +1 -1
@@ -1180,7 +1180,7 @@ static const struct proto_ops llc_ui_ops = { .socketpair = sock_no_socketpair, .accept = llc_ui_accept, .getname = llc_ui_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = llc_ui_ioctl, .listen = llc_ui_listen, .shutdown = llc_ui_shutdown,
net/netlink/af_netlink.c +1 -1
@@ -2633,7 +2633,7 @@ static const struct proto_ops netlink_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = netlink_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = netlink_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
net/netrom/af_netrom.c +1 -1
@@ -1367,7 +1367,7 @@ static const struct proto_ops nr_proto_ops = { .socketpair = sock_no_socketpair, .accept = nr_accept, .getname = nr_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = nr_ioctl, .listen = nr_listen, .shutdown = sock_no_shutdown,
net/nfc/rawsock.c +2 -2
@@ -284,7 +284,7 @@ static const struct proto_ops rawsock_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
@@ -304,7 +304,7 @@ static const struct proto_ops rawsock_raw_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
net/packet/af_packet.c +4 -5
@@ -4073,12 +4073,11 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd,return 0 ; } -static __poll_t packet_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t packet_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;struct packet_sock *po =pkt_sk (sk); -__poll_t mask =datagram_poll (file, sock, wait); +__poll_t mask =datagram_poll_mask (sock, events);spin_lock_bh (&sk->sk_receive_queue.lock);if (po->rx_ring.pg_vec) {
@@ -4423,7 +4422,7 @@ static const struct proto_ops packet_ops_spkt = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = packet_getname_spkt, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = packet_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
@@ -4444,7 +4443,7 @@ static const struct proto_ops packet_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = packet_getname, - .poll = packet_poll, + .poll_mask = packet_poll_mask, .ioctl = packet_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
net/phonet/socket.c +1 -1
@@ -449,7 +449,7 @@ const struct proto_ops phonet_dgram_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = pn_socket_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = pn_socket_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
net/qrtr/qrtr.c +1 -1
@@ -1024,7 +1024,7 @@ static const struct proto_ops qrtr_proto_ops = { .recvmsg = qrtr_recvmsg, .getname = qrtr_getname, .ioctl = qrtr_ioctl, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .shutdown = sock_no_shutdown, .setsockopt = sock_no_setsockopt, .getsockopt = sock_no_getsockopt,
net/rose/af_rose.c +1 -1
@@ -1484,7 +1484,7 @@ static const struct proto_ops rose_proto_ops = { .socketpair = sock_no_socketpair, .accept = rose_accept, .getname = rose_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = rose_ioctl, .listen = rose_listen, .shutdown = sock_no_shutdown,
net/x25/af_x25.c +1 -1
@@ -1750,7 +1750,7 @@ static const struct proto_ops x25_proto_ops = { .socketpair = sock_no_socketpair, .accept = x25_accept, .getname = x25_getname, - .poll = datagram_poll, + .poll_mask = datagram_poll_mask, .ioctl = x25_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = compat_x25_ioctl,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 10/32 net/dccp: convert to ->poll_mask
In reply to Christoph Hellwig--- net/dccp/dccp.h | 3 +-- net/dccp/ipv4.c | 2 +- net/dccp/ipv6.c | 2 +- net/dccp/proto.c | 13 ++----------- 4 files changed, 5 insertions(+), 15 deletions(-)
net/dccp/dccp.h +1 -2
@@ -316,8 +316,7 @@ int dccp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock, int flags, int *addr_len);void dccp_shutdown (struct sock *sk,int how);int inet_dccp_listen (struct socket *sock,int backlog); -__poll_t dccp_poll (struct file *file,struct socket *sock, -poll_table *wait); +__poll_t dccp_poll_mask (struct socket *sock,__poll_t events);int dccp_v4_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len);void dccp_req_err (struct sock *sk,u64 seq);
net/dccp/ipv4.c +1 -1
@@ -983,7 +983,7 @@ static const struct proto_ops inet_dccp_ops = { .accept = inet_accept, .getname = inet_getname,/* FIXME: work on tcp_poll to rename it to inet_csk_poll */ - .poll = dccp_poll, + .poll_mask = dccp_poll_mask, .ioctl = inet_ioctl,/* FIXME: work on inet_listen to rename it to sock_common_listen */ .listen = inet_dccp_listen,
net/dccp/ipv6.c +1 -1
@@ -1069,7 +1069,7 @@ static const struct proto_ops inet6_dccp_ops = { .socketpair = sock_no_socketpair, .accept = inet_accept, .getname = inet6_getname, - .poll = dccp_poll, + .poll_mask = dccp_poll_mask, .ioctl = inet6_ioctl, .listen = inet_dccp_listen, .shutdown = inet_shutdown,
net/dccp/proto.c +2 -11
@@ -311,20 +311,11 @@ int dccp_disconnect(struct sock *sk, int flags)EXPORT_SYMBOL_GPL (dccp_disconnect); -/* -* Wait for a DCCP event. -* -* Note that we don't need to lock the socket, as the upper poll layers -* take care of normal races (between the test and the event) and we don't -* go look at any of the socket buffers directly. -*/ -__poll_t dccp_poll (struct file *file,struct socket *sock, -poll_table *wait) +__poll_t dccp_poll_mask (struct socket *sock,__poll_t events) {__poll_t mask;struct sock *sk = sock->sk; -sock_poll_wait (file,sk_sleep (sk), wait);if (sk->sk_state ==DCCP_LISTEN )return inet_csk_listen_poll (sk);
@@ -366,7 +357,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock,return mask; } -EXPORT_SYMBOL_GPL (dccp_poll); +EXPORT_SYMBOL_GPL (dccp_poll_mask);int dccp_ioctl (struct sock *sk,int cmd,unsigned long arg) {
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 11/32 net/atm: convert to ->poll_mask
In reply to Christoph Hellwig--- net/atm/common.c | 11 +++-------- net/atm/common.h | 2 +- net/atm/pvc.c | 2 +- net/atm/svc.c | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-)
net/atm/common.c +3 -8
@@ -648,16 +648,11 @@ int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size)return error; } -__poll_t vcc_poll (struct file *file,struct socket *sock,poll_table *wait) +__poll_t vcc_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk; -struct atm_vcc *vcc; -__poll_t mask; - -sock_poll_wait (file,sk_sleep (sk), wait); - mask =0 ; - - vcc =ATM_SD (sock); +struct atm_vcc *vcc =ATM_SD (sock); +__poll_t mask =0 ;/* exceptional events */ if (sk->sk_err)
net/atm/common.h +1 -1
@@ -17,7 +17,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci);int vcc_recvmsg (struct socket *sock,struct msghdr *msg,size_t size,int flags);int vcc_sendmsg (struct socket *sock,struct msghdr *m,size_t total_len); -__poll_t vcc_poll (struct file *file,struct socket *sock,poll_table *wait); +__poll_t vcc_poll_mask (struct socket *sock,__poll_t events);int vcc_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg);int vcc_compat_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg); int vcc_setsockopt(struct socket *sock, int level, int optname,
net/atm/pvc.c +1 -1
@@ -114,7 +114,7 @@ static const struct proto_ops pvc_proto_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = pvc_getname, - .poll = vcc_poll, + .poll_mask = vcc_poll_mask, .ioctl = vcc_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = vcc_compat_ioctl,
net/atm/svc.c +1 -1
@@ -637,7 +637,7 @@ static const struct proto_ops svc_proto_ops = { .socketpair = sock_no_socketpair, .accept = svc_accept, .getname = svc_getname, - .poll = vcc_poll, + .poll_mask = vcc_poll_mask, .ioctl = svc_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = svc_compat_ioctl,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 12/32 net/vmw_vsock: convert to ->poll_mask
In reply to Christoph Hellwig--- net/vmw_vsock/af_vsock.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
net/vmw_vsock/af_vsock.c +6 -13
@@ -850,18 +850,11 @@ static int vsock_shutdown(struct socket *sock, int mode)return err; } -static __poll_t vsock_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t vsock_poll_mask (struct socket *sock,__poll_t events) { -struct sock *sk; -__poll_t mask; -struct vsock_sock *vsk; - - sk = sock->sk; - vsk =vsock_sk (sk); - -poll_wait (file,sk_sleep (sk), wait); - mask =0 ; +struct sock *sk = sock->sk; +struct vsock_sock *vsk =vsock_sk (sk); +__poll_t mask =0 ;if (sk->sk_err)/* Signify that there has been an error on this socket. */
@@ -1091,7 +1084,7 @@ static const struct proto_ops vsock_dgram_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = vsock_getname, - .poll = vsock_poll, + .poll_mask = vsock_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = vsock_shutdown,
@@ -1849,7 +1842,7 @@ static const struct proto_ops vsock_stream_ops = { .socketpair = sock_no_socketpair, .accept = vsock_accept, .getname = vsock_getname, - .poll = vsock_poll, + .poll_mask = vsock_poll_mask, .ioctl = sock_no_ioctl, .listen = vsock_listen, .shutdown = vsock_shutdown,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 13/32 net/tipc: convert to ->poll_mask
In reply to Christoph Hellwig--- net/tipc/socket.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
net/tipc/socket.c +5 -9
@@ -693,10 +693,9 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr, }/** -* tipc_poll - read and possibly block on pollmask +* tipc_poll - read pollmask * @file: file structure associated with the socket * @sock: socket for which to calculate the poll bits -* @wait: ??? * * Returns pollmask value *
@@ -710,16 +709,13 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,* imply that the operation will succeed, merely that it should be performed * and will not block. */ -static __poll_t tipc_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t tipc_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;struct tipc_sock *tsk =tipc_sk (sk);struct tipc_group *grp = tsk->group;__poll_t revents =0 ; -sock_poll_wait (file,sk_sleep (sk), wait); -if (sk->sk_shutdown &RCV_SHUTDOWN ) revents |=POLLRDHUP |POLLIN |POLLRDNORM ;if (sk->sk_shutdown ==SHUTDOWN_MASK )
@@ -3005,7 +3001,7 @@ static const struct proto_ops msg_ops = { .socketpair = tipc_socketpair, .accept = sock_no_accept, .getname = tipc_getname, - .poll = tipc_poll, + .poll_mask = tipc_poll_mask, .ioctl = tipc_ioctl, .listen = sock_no_listen, .shutdown = tipc_shutdown,
@@ -3026,7 +3022,7 @@ static const struct proto_ops packet_ops = { .socketpair = tipc_socketpair, .accept = tipc_accept, .getname = tipc_getname, - .poll = tipc_poll, + .poll_mask = tipc_poll_mask, .ioctl = tipc_ioctl, .listen = tipc_listen, .shutdown = tipc_shutdown,
@@ -3047,7 +3043,7 @@ static const struct proto_ops stream_ops = { .socketpair = tipc_socketpair, .accept = tipc_accept, .getname = tipc_getname, - .poll = tipc_poll, + .poll_mask = tipc_poll_mask, .ioctl = tipc_ioctl, .listen = tipc_listen, .shutdown = tipc_shutdown,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 14/32 net/sctp: convert to ->poll_mask
In reply to Christoph Hellwig--- include/net/sctp/sctp.h | 3 +-- net/sctp/ipv6.c | 2 +- net/sctp/protocol.c | 2 +- net/sctp/socket.c | 4 +--- 4 files changed, 4 insertions(+), 7 deletions(-)
include/net/sctp/sctp.h +1 -2
@@ -107,8 +107,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb);int sctp_inet_listen (struct socket *sock,int backlog);void sctp_write_space (struct sock *sk);void sctp_data_ready (struct sock *sk); -__poll_t sctp_poll (struct file *file,struct socket *sock, -poll_table *wait); +__poll_t sctp_poll_mask (struct socket *sock,__poll_t events);void sctp_sock_rfree (struct sk_buff *skb);void sctp_copy_sock (struct sock *newsk,struct sock *sk,struct sctp_association *asoc);
net/sctp/ipv6.c +1 -1
@@ -971,7 +971,7 @@ static const struct proto_ops inet6_seqpacket_ops = { .socketpair = sock_no_socketpair, .accept = inet_accept, .getname = sctp_getname, - .poll = sctp_poll, + .poll_mask = sctp_poll_mask, .ioctl = inet6_ioctl, .listen = sctp_inet_listen, .shutdown = inet_shutdown,
net/sctp/protocol.c +1 -1
@@ -1026,7 +1026,7 @@ static const struct proto_ops inet_seqpacket_ops = { .socketpair = sock_no_socketpair, .accept = inet_accept, .getname = inet_getname, /* Semantics are different. */ - .poll = sctp_poll, + .poll_mask = sctp_poll_mask, .ioctl = inet_ioctl, .listen = sctp_inet_listen, .shutdown = inet_shutdown, /* Looks harmless. */
net/sctp/socket.c +1 -3
@@ -7500,14 +7500,12 @@ int sctp_inet_listen(struct socket *sock, int backlog)* here, again, by modeling the current TCP/UDP code. We don't have * a good way to test with it yet. */ -__poll_t sctp_poll (struct file *file,struct socket *sock,poll_table *wait) +__poll_t sctp_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;struct sctp_sock *sp =sctp_sk (sk);__poll_t mask; -poll_wait (file,sk_sleep (sk), wait); -sock_rps_record_flow (sk);/* A TCP-style listening socket becomes readable when the accept queue
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 15/32 net/bluetooth: convert to ->poll_mask
In reply to Christoph Hellwig--- include/net/bluetooth/bluetooth.h | 2 +- net/bluetooth/af_bluetooth.c | 7 ++----- net/bluetooth/l2cap_sock.c | 2 +- net/bluetooth/rfcomm/sock.c | 2 +- net/bluetooth/sco.c | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-)
include/net/bluetooth/bluetooth.h +1 -1
@@ -271,7 +271,7 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);int bt_sock_stream_recvmsg (struct socket *sock,struct msghdr *msg,size_t len,int flags); -__poll_t bt_sock_poll (struct file *file,struct socket *sock,poll_table *wait); +__poll_t bt_sock_poll_mask (struct socket *sock,__poll_t events);int bt_sock_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg);int bt_sock_wait_state (struct sock *sk,int state,unsigned long timeo);int bt_sock_wait_ready (struct sock *sk,unsigned long flags);
net/bluetooth/af_bluetooth.c +2 -5
@@ -437,16 +437,13 @@ static inline __poll_t bt_accept_poll(struct sock *parent)return 0 ; } -__poll_t bt_sock_poll (struct file *file,struct socket *sock, -poll_table *wait) +__poll_t bt_sock_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;__poll_t mask =0 ;BT_DBG ("sock %p, sk %p" , sock, sk); -poll_wait (file,sk_sleep (sk), wait); -if (sk->sk_state ==BT_LISTEN )return bt_accept_poll (sk);
@@ -478,7 +475,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,return mask; } -EXPORT_SYMBOL (bt_sock_poll); +EXPORT_SYMBOL (bt_sock_poll_mask);int bt_sock_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg) {
net/bluetooth/l2cap_sock.c +1 -1
@@ -1654,7 +1654,7 @@ static const struct proto_ops l2cap_sock_ops = { .getname = l2cap_sock_getname, .sendmsg = l2cap_sock_sendmsg, .recvmsg = l2cap_sock_recvmsg, - .poll = bt_sock_poll, + .poll_mask = bt_sock_poll_mask, .ioctl = bt_sock_ioctl, .mmap = sock_no_mmap, .socketpair = sock_no_socketpair,
net/bluetooth/rfcomm/sock.c +1 -1
@@ -1049,7 +1049,7 @@ static const struct proto_ops rfcomm_sock_ops = { .setsockopt = rfcomm_sock_setsockopt, .getsockopt = rfcomm_sock_getsockopt, .ioctl = rfcomm_sock_ioctl, - .poll = bt_sock_poll, + .poll_mask = bt_sock_poll_mask, .socketpair = sock_no_socketpair, .mmap = sock_no_mmap };
net/bluetooth/sco.c +1 -1
@@ -1198,7 +1198,7 @@ static const struct proto_ops sco_sock_ops = { .getname = sco_sock_getname, .sendmsg = sco_sock_sendmsg, .recvmsg = sco_sock_recvmsg, - .poll = bt_sock_poll, + .poll_mask = bt_sock_poll_mask, .ioctl = bt_sock_ioctl, .mmap = sock_no_mmap, .socketpair = sock_no_socketpair,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 16/32 net/caif: convert to ->poll_mask
In reply to Christoph Hellwig--- net/caif/caif_socket.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
net/caif/caif_socket.c +4 -8
@@ -934,15 +934,11 @@ static int caif_release(struct socket *sock) }/* Copied from af_unix.c:unix_poll(), added CAIF tx_flow handling */ -static __poll_t caif_poll (struct file *file, -struct socket *sock,poll_table *wait) +static __poll_t caif_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk; -__poll_t mask; struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); - -sock_poll_wait (file,sk_sleep (sk), wait); - mask =0 ; +__poll_t mask =0 ;/* exceptional events? */ if (sk->sk_err)
@@ -976,7 +972,7 @@ static const struct proto_ops caif_seqpacket_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = caif_poll, + .poll_mask = caif_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
@@ -997,7 +993,7 @@ static const struct proto_ops caif_stream_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = caif_poll, + .poll_mask = caif_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 17/32 net/nfc: convert to ->poll_mask
In reply to Christoph Hellwig--- net/nfc/llcp_sock.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
net/nfc/llcp_sock.c +3 -6
@@ -549,16 +549,13 @@ static inline __poll_t llcp_accept_poll(struct sock *parent)return 0 ; } -static __poll_t llcp_sock_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t llcp_sock_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;__poll_t mask =0 ;pr_debug ("%p\n" , sk); -sock_poll_wait (file,sk_sleep (sk), wait); -if (sk->sk_state ==LLCP_LISTEN )return llcp_accept_poll (sk);
@@ -900,7 +897,7 @@ static const struct proto_ops llcp_sock_ops = { .socketpair = sock_no_socketpair, .accept = llcp_sock_accept, .getname = llcp_sock_getname, - .poll = llcp_sock_poll, + .poll_mask = llcp_sock_poll_mask, .ioctl = sock_no_ioctl, .listen = llcp_sock_listen, .shutdown = sock_no_shutdown,
@@ -920,7 +917,7 @@ static const struct proto_ops llcp_rawsock_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = llcp_sock_getname, - .poll = llcp_sock_poll, + .poll_mask = llcp_sock_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 18/32 net/phonet: convert to ->poll_mask
In reply to Christoph Hellwig--- net/phonet/socket.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
net/phonet/socket.c +2 -5
@@ -341,15 +341,12 @@ static int pn_socket_getname(struct socket *sock, struct sockaddr *addr,return 0 ; } -static __poll_t pn_socket_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t pn_socket_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;struct pep_sock *pn =pep_sk (sk);__poll_t mask =0 ; -poll_wait (file,sk_sleep (sk), wait); -if (sk->sk_state ==TCP_CLOSE )return POLLERR ;if (!skb_queue_empty (&sk->sk_receive_queue))
@@ -474,7 +471,7 @@ const struct proto_ops phonet_stream_ops = { .socketpair = sock_no_socketpair, .accept = pn_socket_accept, .getname = pn_socket_getname, - .poll = pn_socket_poll, + .poll_mask = pn_socket_poll_mask, .ioctl = pn_socket_ioctl, .listen = pn_socket_listen, .shutdown = sock_no_shutdown,
Signature · 1 line
2.14.2
PATCH 19/32 net/iucv: convert to ->poll_mask
In reply to Christoph Hellwig--- include/net/iucv/af_iucv.h | 2 -- net/iucv/af_iucv.c | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-)
include/net/iucv/af_iucv.h +0 -2
@@ -153,8 +153,6 @@ struct iucv_sock_list {atomic_t autobind_name; }; -__poll_t iucv_sock_poll (struct file *file,struct socket *sock, -poll_table *wait);void iucv_sock_link (struct iucv_sock_list *l,struct sock *s);void iucv_sock_unlink (struct iucv_sock_list *l,struct sock *s);void iucv_accept_enqueue (struct sock *parent,struct sock *sk);
net/iucv/af_iucv.c +2 -5
@@ -1489,14 +1489,11 @@ static inline __poll_t iucv_accept_poll(struct sock *parent)return 0 ; } -__poll_t iucv_sock_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t iucv_sock_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;__poll_t mask =0 ; -sock_poll_wait (file,sk_sleep (sk), wait); -if (sk->sk_state ==IUCV_LISTEN )return iucv_accept_poll (sk);
@@ -2389,7 +2386,7 @@ static const struct proto_ops iucv_sock_ops = { .getname = iucv_sock_getname, .sendmsg = iucv_sock_sendmsg, .recvmsg = iucv_sock_recvmsg, - .poll = iucv_sock_poll, + .poll_mask = iucv_sock_poll_mask, .ioctl = sock_no_ioctl, .mmap = sock_no_mmap, .socketpair = sock_no_socketpair,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 20/32 net/rxrpc: convert to ->poll_mask
In reply to Christoph Hellwig--- net/rxrpc/af_rxrpc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
net/rxrpc/af_rxrpc.c +3 -7
@@ -729,15 +729,11 @@ static int rxrpc_getsockopt(struct socket *sock, int level, int optname,/* * permit an RxRPC socket to be polled */ -static __poll_t rxrpc_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t rxrpc_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;struct rxrpc_sock *rx =rxrpc_sk (sk); -__poll_t mask; - -sock_poll_wait (file,sk_sleep (sk), wait); - mask =0 ; +__poll_t mask =0 ;/* the socket is readable if there are any messages waiting on the Rx * queue */
@@ -940,7 +936,7 @@ static const struct proto_ops rxrpc_rpc_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = rxrpc_poll, + .poll_mask = rxrpc_poll_mask, .ioctl = sock_no_ioctl, .listen = rxrpc_listen, .shutdown = rxrpc_shutdown,
Signature · 1 line
2.14.2
PATCH 21/32 pipe: convert to ->poll_mask
In reply to Christoph Hellwig--- fs/pipe.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
fs/pipe.c +13 -9
@@ -514,19 +514,22 @@ static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) } } -/* No kernel lock held - fine */ -static __poll_t -pipe_poll (struct file *filp,poll_table *wait) +static struct wait_queue_head * +pipe_get_poll_head (struct file *filp,__poll_t events) { -__poll_t mask;struct pipe_inode_info *pipe = filp->private_data; -int nrbufs; -poll_wait (filp, &pipe->wait, wait); +return &pipe->wait; +} + +/* No kernel lock held - fine */ +static __poll_t pipe_poll_mask (struct file *filp,__poll_t events) +{ +struct pipe_inode_info *pipe = filp->private_data; +int nrbufs = pipe->nrbufs; +__poll_t mask =0 ;/* Reading only -- no need for acquiring the semaphore. */ - nrbufs = pipe->nrbufs; - mask =0 ;if (filp->f_mode &FMODE_READ ) { mask = (nrbufs >0 ) ?POLLIN |POLLRDNORM :0 ;if (!pipe->writers && filp->f_version != pipe->w_counter)
@@ -1010,7 +1013,8 @@ const struct file_operations pipefifo_fops = { .llseek = no_llseek, .read_iter = pipe_read, .write_iter = pipe_write, - .poll = pipe_poll, + .get_poll_head = pipe_get_poll_head, + .poll_mask = pipe_poll_mask, .unlocked_ioctl = pipe_ioctl, .release = pipe_release, .fasync = pipe_fasync,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 22/32 eventfd: switch to ->poll_mask
In reply to Christoph Hellwig--- fs/eventfd.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
fs/eventfd.c +11 -4
@@ -114,14 +114,20 @@ static int eventfd_release(struct inode *inode, struct file *file)return 0 ; } -static __poll_t eventfd_poll (struct file *file,poll_table *wait) +static struct wait_queue_head * +eventfd_get_poll_head (struct file *file,__poll_t events) +{ +struct eventfd_ctx *ctx = file->private_data; + +return &ctx->wqh; +} + +static __poll_t eventfd_poll_mask (struct file *file,__poll_t eventmask) {struct eventfd_ctx *ctx = file->private_data;__poll_t events =0 ;u64 count; -poll_wait (file, &ctx->wqh, wait); -/* * All writes to ctx->count occur within ctx->wqh.lock. This read * can be done outside ctx->wqh.lock because we know that poll_wait
@@ -341,7 +347,8 @@ static const struct file_operations eventfd_fops = { .show_fdinfo = eventfd_show_fdinfo, #endif .release = eventfd_release, - .poll = eventfd_poll, + .get_poll_head = eventfd_get_poll_head, + .poll_mask = eventfd_poll_mask, .read = eventfd_read, .write = eventfd_write, .llseek = noop_llseek,
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 23/32 timerfd: convert to ->poll_mask
In reply to Christoph Hellwig--- fs/timerfd.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
fs/timerfd.c +11 -11
@@ -226,21 +226,20 @@ static int timerfd_release(struct inode *inode, struct file *file)kfree_rcu (ctx, rcu);return 0 ; } - -static __poll_t timerfd_poll (struct file *file,poll_table *wait) + +static struct wait_queue_head *timerfd_get_poll_head (struct file *file, +__poll_t eventmask) {struct timerfd_ctx *ctx = file->private_data; -__poll_t events =0 ; -unsigned long flags; -poll_wait (file, &ctx->wqh, wait); +return &ctx->wqh; +} -spin_lock_irqsave (&ctx->wqh.lock, flags); -if (ctx->ticks) - events |=POLLIN ; -spin_unlock_irqrestore (&ctx->wqh.lock, flags); +static __poll_t timerfd_poll_mask (struct file *file,__poll_t eventmask) +{ +struct timerfd_ctx *ctx = file->private_data; -return events; +return ctx->ticks ?POLLIN :0 ; } static ssize_t timerfd_read(struct file *file, char __user *buf, size_t count,
@@ -364,7 +363,8 @@ static long timerfd_ioctl(struct file *file, unsigned int cmd, unsigned long argstatic const struct file_operations timerfd_fops = { .release = timerfd_release, - .poll = timerfd_poll, + .get_poll_head = timerfd_get_poll_head, + .poll_mask = timerfd_poll_mask, .read = timerfd_read, .llseek = noop_llseek, .show_fdinfo = timerfd_show,
Signature · 1 line
2.14.2
PATCH 24/32 aio: don't print the page size at boot time
In reply to Christoph HellwigThe page size is in no way related to the aio code, and printing it in the (debug) dmesg at every boot serves no purpose.
--- fs/aio.c | 3 --- 1 file changed, 3 deletions(-)
fs/aio.c +0 -3
@@ -264,9 +264,6 @@ static int __init aio_setup(void) kiocb_cachep =KMEM_CACHE (aio_kiocb,SLAB_HWCACHE_ALIGN |SLAB_PANIC ); kioctx_cachep =KMEM_CACHE (kioctx,SLAB_HWCACHE_ALIGN |SLAB_PANIC ); - -pr_debug ("sizeof(struct page) = %zu\n" ,sizeof (struct page )); -return 0 ; }__initcall (aio_setup);
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 25/32 aio: remove an outdated comment in aio_complete
In reply to Christoph HellwigThese days we don't treat sync iocbs special in the aio completion code as they never use it. Remove the old comment, and move the BUG_ON for a sync iocb to the top of the function.
--- fs/aio.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
fs/aio.c +2 -9
@@ -1088,6 +1088,8 @@ static void aio_complete(struct kiocb *kiocb, long res, long res2)unsigned tail, pos, head;unsigned long flags; +BUG_ON (is_sync_kiocb (kiocb)); +if (kiocb->ki_flags &IOCB_WRITE ) {struct file *file = kiocb->ki_filp;
@@ -1100,15 +1102,6 @@ static void aio_complete(struct kiocb *kiocb, long res, long res2)file_end_write (file); } -/* -* Special case handling for sync iocbs: -* - events go directly into the iocb for fast handling -* - the sync task with the iocb in its stack holds the single iocb -* ref, no other paths have a way to get another ref -* - the sync task helpfully left a reference to itself in the iocb -*/ -BUG_ON (is_sync_kiocb (kiocb)); -if (iocb->ki_list.next) {unsigned long flags;
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 26/32 aio: refactor read/write iocb setup
In reply to Christoph HellwigDon't reference the kiocb structure from the common aio code, and move any use of it into helper specific to the read/write path. This is in preparation for aio_poll support that wants to use the space for different fields.
--- fs/aio.c | 172 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 98 insertions(+), 74 deletions(-)
fs/aio.c +98 -74
@@ -170,7 +170,9 @@ struct kioctx {#define KIOCB_CANCELLED ((void *) (~0ULL))struct aio_kiocb { -struct kiocb common; +union { +struct kiocb rw; + };struct kioctx *ki_ctx;kiocb_cancel_fn *ki_cancel;
@@ -549,7 +551,7 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)void kiocb_set_cancel_fn (struct kiocb *iocb,kiocb_cancel_fn *cancel) { - struct aio_kiocb *req = container_of(iocb, struct aio_kiocb, common); + struct aio_kiocb *req = container_of(iocb, struct aio_kiocb, rw);struct kioctx *ctx = req->ki_ctx;unsigned long flags;
@@ -582,7 +584,7 @@ static int kiocb_cancel(struct aio_kiocb *kiocb) cancel =cmpxchg (&kiocb->ki_cancel, old,KIOCB_CANCELLED ); }while (cancel != old); -return cancel (&kiocb->common); +return cancel (&kiocb->rw); }static void free_ioctx (struct work_struct *work)
@@ -1040,15 +1042,6 @@ static inline struct aio_kiocb *aio_get_req(struct kioctx *ctx)return NULL ; } -static void kiocb_free (struct aio_kiocb *req) -{ -if (req->common.ki_filp) -fput (req->common.ki_filp); -if (req->ki_eventfd !=NULL ) -eventfd_ctx_put (req->ki_eventfd); -kmem_cache_free (kiocb_cachep, req); -} -static struct kioctx *lookup_ioctx (unsigned long ctx_id) {struct aio_ring __user *ring = (void __user *)ctx_id;
@@ -1079,29 +1072,14 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)/* aio_complete * Called when the io request on the given iocb is complete. */ -static void aio_complete (struct kiocb *kiocb,long res,long res2) +static void aio_complete (struct aio_kiocb *iocb,long res,long res2) { - struct aio_kiocb *iocb = container_of(kiocb, struct aio_kiocb, common);struct kioctx *ctx = iocb->ki_ctx;struct aio_ring *ring;struct io_event *ev_page, *event;unsigned tail, pos, head;unsigned long flags; -BUG_ON (is_sync_kiocb (kiocb)); - -if (kiocb->ki_flags &IOCB_WRITE ) { -struct file *file = kiocb->ki_filp; - -/* -* Tell lockdep we inherited freeze protection from submission -* thread. -*/ -if (S_ISREG (file_inode (file)->i_mode)) -__sb_writers_acquired (file_inode (file)->i_sb,SB_FREEZE_WRITE ); -file_end_write (file); - } -if (iocb->ki_list.next) {unsigned long flags;
@@ -1163,11 +1141,12 @@ static void aio_complete(struct kiocb *kiocb, long res, long res2)* eventfd. The eventfd_signal() function is safe to be called * from IRQ context. */ -if (iocb->ki_eventfd !=NULL ) +if (iocb->ki_eventfd) {eventfd_signal (iocb->ki_eventfd,1 ); +eventfd_ctx_put (iocb->ki_eventfd); + } -/* everything turned out well, dispose of the aiocb. */ -kiocb_free (iocb); +kmem_cache_free (kiocb_cachep, iocb);/* * We have to order our ring_info tail store above and test
@@ -1430,6 +1409,48 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)return -EINVAL ; } +static void aio_complete_rw (struct kiocb *kiocb,long res,long res2) +{ + struct aio_kiocb *iocb = container_of(kiocb, struct aio_kiocb, rw); + +WARN_ON_ONCE (is_sync_kiocb (kiocb)); + +if (kiocb->ki_flags &IOCB_WRITE ) { +struct inode *inode =file_inode (kiocb->ki_filp); + +/* +* Tell lockdep we inherited freeze protection from submission +* thread. +*/ +if (S_ISREG (inode->i_mode)) +__sb_writers_acquired (inode->i_sb,SB_FREEZE_WRITE ); +file_end_write (kiocb->ki_filp); + } + +fput (kiocb->ki_filp); +aio_complete (iocb, res, res2); +} + +static int aio_prep_rw (struct kiocb *req,struct iocb *iocb) +{ +int ret; + + req->ki_filp =fget (iocb->aio_fildes); +if (unlikely (!req->ki_filp)) +return -EBADF ; + req->ki_complete = aio_complete_rw; + req->ki_flags =0 ; + req->ki_pos = iocb->aio_offset; + req->ki_flags =iocb_flags (req->ki_filp); +if (iocb->aio_flags &IOCB_FLAG_RESFD ) + req->ki_flags |=IOCB_EVENTFD ; + req->ki_hint =file_write_hint (req->ki_filp); + ret =kiocb_set_rw_flags (req, iocb->aio_rw_flags); +if (unlikely (ret)) +fput (req->ki_filp); +return ret; +} +static int aio_setup_rw (int rw,struct iocb *iocb,struct iovec **iovec,bool vectored,bool compat,struct iov_iter *iter) {
@@ -1449,7 +1470,7 @@ static int aio_setup_rw(int rw, struct iocb *iocb, struct iovec **iovec,return import_iovec (rw, buf, len,UIO_FASTIOV , iovec, iter); } -static inline ssize_t aio_ret (struct kiocb *req,ssize_t ret) +static inline ssize_t aio_rw_ret (struct kiocb *req,ssize_t ret) {switch (ret) {case -EIOCBQUEUED :
@@ -1465,7 +1486,7 @@ static inline ssize_t aio_ret(struct kiocb *req, ssize_t ret) ret = -EINTR ;/*FALLTHRU*/ default : -aio_complete (req, ret,0 ); +aio_complete_rw (req, ret,0 );return 0 ; } }
@@ -1473,56 +1494,78 @@ static inline ssize_t aio_ret(struct kiocb *req, ssize_t ret)static ssize_t aio_read (struct kiocb *req,struct iocb *iocb,bool vectored,bool compat) { -struct file *file = req->ki_filp;struct iovec inline_vecs[UIO_FASTIOV ], *iovec = inline_vecs;struct iov_iter iter; +struct file *file;ssize_t ret; + ret =aio_prep_rw (req, iocb); +if (ret) +return ret; + file = req->ki_filp; + + ret = -EBADF ;if (unlikely (!(file->f_mode &FMODE_READ ))) -return -EBADF ; + goto out_fput; + ret = -EINVAL ;if (unlikely (!file->f_op->read_iter)) -return -EINVAL ; + goto out_fput; ret =aio_setup_rw (READ , iocb, &iovec, vectored, compat, &iter);if (ret) -return ret; + goto out_fput; ret =rw_verify_area (READ , file, &req->ki_pos,iov_iter_count (&iter));if (!ret) - ret =aio_ret (req,call_read_iter (file, req, &iter)); + ret =aio_rw_ret (req,call_read_iter (file, req, &iter));kfree (iovec); +out_fput: +if (unlikely (ret && ret != -EIOCBQUEUED )) +fput (file);return ret; }static ssize_t aio_write (struct kiocb *req,struct iocb *iocb,bool vectored,bool compat) { -struct file *file = req->ki_filp;struct iovec inline_vecs[UIO_FASTIOV ], *iovec = inline_vecs;struct iov_iter iter; +struct file *file;ssize_t ret; + ret =aio_prep_rw (req, iocb); +if (ret) +return ret; + file = req->ki_filp; + + ret = -EBADF ;if (unlikely (!(file->f_mode &FMODE_WRITE ))) -return -EBADF ; + goto out_fput; + ret = -EINVAL ;if (unlikely (!file->f_op->write_iter)) -return -EINVAL ; + goto out_fput; ret =aio_setup_rw (WRITE , iocb, &iovec, vectored, compat, &iter);if (ret) -return ret; + goto out_fput; ret =rw_verify_area (WRITE , file, &req->ki_pos,iov_iter_count (&iter));if (!ret) { +struct inode *inode =file_inode (file); + req->ki_flags |=IOCB_WRITE ;file_start_write (file); - ret =aio_ret (req,call_write_iter (file, req, &iter)); + ret =aio_rw_ret (req,call_write_iter (file, req, &iter));/* -* We release freeze protection in aio_complete(). Fool lockdep -* by telling it the lock got released so that it doesn't -* complain about held lock when we return to userspace. +* We release freeze protection in aio_complete_rw(). Fool +* lockdep by telling it the lock got released so that it +* doesn't complain about held lock when we return to userspace. */ -if (S_ISREG (file_inode (file)->i_mode)) -__sb_writers_release (file_inode (file)->i_sb,SB_FREEZE_WRITE ); +if (S_ISREG (inode->i_mode)) +__sb_writers_release (inode->i_sb,SB_FREEZE_WRITE ); }kfree (iovec); +out_fput: +if (unlikely (ret && ret != -EIOCBQUEUED )) +fput (file);return ret; }
@@ -1530,7 +1573,6 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, struct iocb *iocb, bool compat) {struct aio_kiocb *req; -struct file *file;ssize_t ret;/* enforce forwards compatibility on users */
@@ -1553,16 +1595,6 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,if (unlikely (!req))return -EAGAIN ; - req->common.ki_filp = file =fget (iocb->aio_fildes); -if (unlikely (!req->common.ki_filp)) { - ret = -EBADF ; - goto out_put_req; - } - req->common.ki_pos = iocb->aio_offset; - req->common.ki_complete = aio_complete; - req->common.ki_flags =iocb_flags (req->common.ki_filp); - req->common.ki_hint =file_write_hint (file); -if (iocb->aio_flags &IOCB_FLAG_RESFD ) {/* * If the IOCB_FLAG_RESFD flag of aio_flags is set, get an
@@ -1576,14 +1608,6 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, req->ki_eventfd =NULL ; goto out_put_req; } - - req->common.ki_flags |=IOCB_EVENTFD ; - } - - ret =kiocb_set_rw_flags (&req->common, iocb->aio_rw_flags); -if (unlikely (ret)) { -pr_debug ("EINVAL: aio_rw_flags\n" ); - goto out_put_req; } ret =put_user (KIOCB_KEY , &user_iocb->aio_key);
@@ -1595,26 +1619,24 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, req->ki_user_iocb = user_iocb; req->ki_user_data = iocb->aio_data; -get_file (file);switch (iocb->aio_lio_opcode) {case IOCB_CMD_PREAD : - ret =aio_read (&req->common, iocb, false, compat); + ret =aio_read (&req->rw, iocb, false, compat);break ;case IOCB_CMD_PWRITE : - ret =aio_write (&req->common, iocb, false, compat); + ret =aio_write (&req->rw, iocb, false, compat);break ;case IOCB_CMD_PREADV : - ret =aio_read (&req->common, iocb, true, compat); + ret =aio_read (&req->rw, iocb, true, compat);break ;case IOCB_CMD_PWRITEV : - ret =aio_write (&req->common, iocb, true, compat); + ret =aio_write (&req->rw, iocb, true, compat);break ;default :pr_debug ("invalid aio operation %d\n" , iocb->aio_lio_opcode); ret = -EINVAL ;break ; } -fput (file);if (ret && ret != -EIOCBQUEUED ) goto out_put_req;
@@ -1622,7 +1644,9 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, out_put_req:put_reqs_available (ctx,1 );percpu_ref_put (&ctx->reqs); -kiocb_free (req); +if (req->ki_eventfd) +eventfd_ctx_put (req->ki_eventfd); +kmem_cache_free (kiocb_cachep, req);return ret; }
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 27/32 aio: sanitize ki_list handling
In reply to Christoph HellwigInstead of handcoded non-null checks always initialize ki_list to an empty list and use list_empty / list_empty_careful on it. While we're at it also error out on a double call to kiocb_set_cancel_fn instead of ignoring it.
--- fs/aio.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
fs/aio.c +6 -7
@@ -555,13 +555,12 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)struct kioctx *ctx = req->ki_ctx;unsigned long flags; -spin_lock_irqsave (&ctx->ctx_lock, flags); - -if (!req->ki_list.next) -list_add (&req->ki_list, &ctx->active_reqs); +if (WARN_ON_ONCE (!list_empty (&req->ki_list))) +return ; +spin_lock_irqsave (&ctx->ctx_lock, flags); +list_add_tail (&req->ki_list, &ctx->active_reqs); req->ki_cancel = cancel; -spin_unlock_irqrestore (&ctx->ctx_lock, flags); }EXPORT_SYMBOL (kiocb_set_cancel_fn);
@@ -1034,7 +1033,7 @@ static inline struct aio_kiocb *aio_get_req(struct kioctx *ctx) goto out_put;percpu_ref_get (&ctx->reqs); - +INIT_LIST_HEAD (&req->ki_list); req->ki_ctx = ctx;return req; out_put:
@@ -1080,7 +1079,7 @@ static void aio_complete(struct aio_kiocb *iocb, long res, long res2)unsigned tail, pos, head;unsigned long flags; -if (iocb->ki_list.next) { +if (!list_empty_careful (iocb->ki_list.next)) {unsigned long flags;spin_lock_irqsave (&ctx->ctx_lock, flags);
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 28/32 aio: simplify cancellation
In reply to Christoph HellwigWith the current aio code there is no need for the magic KIOCB_CANCELLED value, as a cancelation just kicks the driver to queue the completion ASAP, with all actual completion handling done in another thread. Given that both the completion path and cancelation take the context lock there is no need for magic cmpxchg loops either.
--- fs/aio.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-)
fs/aio.c +9 -28
@@ -156,19 +156,6 @@ struct kioctx {unsigned id; }; -/* -* We use ki_cancel == KIOCB_CANCELLED to indicate that a kiocb has been either -* cancelled or completed (this makes a certain amount of sense because -* successful cancellation - io_cancel() - does deliver the completion to -* userspace). -* -* And since most things don't implement kiocb cancellation and we'd really like -* kiocb completion to be lockless when possible, we use ki_cancel to -* synchronize cancellation and completion - we only set it to KIOCB_CANCELLED -* with xchg() or cmpxchg(), see batch_complete_aio() and kiocb_cancel(). -*/ -#define KIOCB_CANCELLED ((void *) (~0ULL)) - struct aio_kiocb { union { struct kiocb rw;
@@ -565,24 +552,18 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel) }EXPORT_SYMBOL (kiocb_set_cancel_fn); +/* +* Only cancel if there ws a ki_cancel function to start with, and we +* are the one how managed to clear it (to protect against simulatinious +* cancel calls). +*/ static int kiocb_cancel (struct aio_kiocb *kiocb) { -kiocb_cancel_fn *old, *cancel; - -/* -* Don't want to set kiocb->ki_cancel = KIOCB_CANCELLED unless it -* actually has a cancel function, hence the cmpxchg() -*/ - - cancel =READ_ONCE (kiocb->ki_cancel); -do { -if (!cancel || cancel ==KIOCB_CANCELLED ) -return -EINVAL ; - - old = cancel; - cancel =cmpxchg (&kiocb->ki_cancel, old,KIOCB_CANCELLED ); - }while (cancel != old); +kiocb_cancel_fn *cancel = kiocb->ki_cancel; +if (!cancel) +return -EINVAL ; + kiocb->ki_cancel =NULL ;return cancel (&kiocb->rw); }
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 29/32 aio: delete iocbs from the active_reqs list in kiocb_cancel
In reply to Christoph HellwigOne we cancel an iocb there is no reason to keep it on the active_reqs list, given that the list is only used to look for cancelation candidates.
--- fs/aio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/aio.c +2 -2
@@ -561,6 +561,8 @@ static int kiocb_cancel(struct aio_kiocb *kiocb) {kiocb_cancel_fn *cancel = kiocb->ki_cancel; +list_del_init (&kiocb->ki_list); +if (!cancel)return -EINVAL ; kiocb->ki_cancel =NULL ;
@@ -607,8 +609,6 @@ static void free_ioctx_users(struct percpu_ref *ref)while (!list_empty (&ctx->active_reqs)) { req =list_first_entry (&ctx->active_reqs, struct aio_kiocb, ki_list); - -list_del_init (&req->ki_list);kiocb_cancel (req); }
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 30/32 aio: add delayed cancel support
In reply to Christoph HellwigThe upcoming aio poll support would like to be able to complete the iocb inline from the cancellation context, but that would cause a lock order reversal. Add support for optionally moving the cancelation outside the context lock to avoid this reversal.
--- fs/aio.c | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-)
fs/aio.c +38 -11
@@ -170,6 +170,10 @@ struct aio_kiocb {struct list_head ki_list;/* the aio core uses this * for cancellation */ +unsigned int flags;/* protected by ctx->ctx_lock */ +#define AIO_IOCB_DELAYED_CANCEL (1 << 0) +#define AIO_IOCB_CANCELLED (1 << 1) +/* * If the aio_resfd field of the userspace iocb is not zero, * this is the underlying eventfd context to deliver events to.
@@ -536,9 +540,9 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)#define AIO_EVENTS_FIRST_PAGE ((PAGE_SIZE - sizeof(struct aio_ring)) / sizeof(struct io_event))#define AIO_EVENTS_OFFSET (AIO_EVENTS_PER_PAGE - AIO_EVENTS_FIRST_PAGE) -void kiocb_set_cancel_fn (struct kiocb *iocb,kiocb_cancel_fn *cancel) +static void __kiocb_set_cancel_fn (struct aio_kiocb *req, +kiocb_cancel_fn *cancel,unsigned int iocb_flags) { - struct aio_kiocb *req = container_of(iocb, struct aio_kiocb, rw);struct kioctx *ctx = req->ki_ctx;unsigned long flags;
@@ -548,8 +552,15 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)spin_lock_irqsave (&ctx->ctx_lock, flags);list_add_tail (&req->ki_list, &ctx->active_reqs); req->ki_cancel = cancel; + req->flags |= iocb_flags;spin_unlock_irqrestore (&ctx->ctx_lock, flags); } + +void kiocb_set_cancel_fn (struct kiocb *iocb,kiocb_cancel_fn *cancel) +{ + return __kiocb_set_cancel_fn(container_of(iocb, struct aio_kiocb, rw), + cancel,0 ); +}EXPORT_SYMBOL (kiocb_set_cancel_fn);/*
@@ -603,17 +614,27 @@ static void free_ioctx_users(struct percpu_ref *ref) { struct kioctx *ctx = container_of(ref, struct kioctx, users);struct aio_kiocb *req; +LIST_HEAD (list);spin_lock_irq (&ctx->ctx_lock); -while (!list_empty (&ctx->active_reqs)) { req =list_first_entry (&ctx->active_reqs, struct aio_kiocb, ki_list); -kiocb_cancel (req); - } +if (req->flags &AIO_IOCB_DELAYED_CANCEL ) { + req->flags |=AIO_IOCB_CANCELLED ; +list_move_tail (&req->ki_list, &list); + }else { +kiocb_cancel (req); + } + }spin_unlock_irq (&ctx->ctx_lock); +while (!list_empty (&list)) { + req = list_first_entry(&list, struct aio_kiocb, ki_list); +kiocb_cancel (req); + } +percpu_ref_kill (&ctx->reqs);percpu_ref_put (&ctx->reqs); }
@@ -1786,15 +1807,22 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,if (unlikely (!ctx))return -EINVAL ; -spin_lock_irq (&ctx->ctx_lock); + ret = -EINVAL ; +spin_lock_irq (&ctx->ctx_lock); kiocb =lookup_kiocb (ctx, iocb, key); +if (kiocb) { +if (kiocb->flags &AIO_IOCB_DELAYED_CANCEL ) { + kiocb->flags |=AIO_IOCB_CANCELLED ; + }else { + ret =kiocb_cancel (kiocb); + kiocb =NULL ; + } + } +spin_unlock_irq (&ctx->ctx_lock); +if (kiocb) ret =kiocb_cancel (kiocb); -else - ret = -EINVAL ; - -spin_unlock_irq (&ctx->ctx_lock);if (!ret) {/*
@@ -1806,7 +1834,6 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb, }percpu_ref_put (&ctx->users); -return ret; }
Signature · 7 lines
2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
PATCH 31/32 aio: implement IOCB_CMD_POLL
In reply to Christoph HellwigSimple one-shot poll through the io_submit() interface. To poll for a file descriptor the application should submit an iocb of type IOCB_CMD_POLL. It will poll the fd for the events specified in the the first 32 bits of the aio_buf field of the iocb.
Unlike poll or epoll without EPOLLONESHOT this interface always works in one shot mode, that is once the iocb is completed, it will have to be resubmitted.
--- fs/aio.c | 103 +++++++++++++++++++++++++++++++++++++++++++ include/uapi/linux/aio_abi.h | 6 +-- 2 files changed, 105 insertions(+), 4 deletions(-)
fs/aio.c +103 -0
@@ -156,9 +156,17 @@ struct kioctx {unsigned id; }; +struct poll_iocb { +struct file *file; +__poll_t events; +struct wait_queue_head *head; +struct wait_queue_entry wait; +}; +struct aio_kiocb {union {struct kiocb rw; +struct poll_iocb poll; };struct kioctx *ki_ctx;
@@ -1570,6 +1578,98 @@ static ssize_t aio_write(struct kiocb *req, struct iocb *iocb, bool vectored,return ret; } +static void __aio_complete_poll (struct poll_iocb *req,__poll_t mask) +{ +fput (req->file); + aio_complete(container_of(req, struct aio_kiocb, poll), + mangle_poll(mask), 0); +} + +static void aio_complete_poll (struct poll_iocb *req,__poll_t mask) +{ + struct aio_kiocb *iocb = container_of(req, struct aio_kiocb, poll); + +if (!(iocb->flags &AIO_IOCB_CANCELLED )) +__aio_complete_poll (req, mask); +} + +static int aio_poll_cancel (struct kiocb *rw) +{ + struct aio_kiocb *iocb = container_of(rw, struct aio_kiocb, rw); + +remove_wait_queue (iocb->poll.head, &iocb->poll.wait); +__aio_complete_poll (&iocb->poll,0 );/* no events to report */ +return 0 ; +} + +static int aio_poll_wake (struct wait_queue_entry *wait,unsigned mode,int sync, +void *key) +{ + struct poll_iocb *req = container_of(wait, struct poll_iocb, wait); +struct file *file = req->file; +__poll_t mask =key_to_poll (key); + +assert_spin_locked (&req->head->lock); + +/* for instances that support it check for an event match first: */ +if (mask && !(mask & req->events)) +return 0 ; + + mask =vfs_poll_mask (file, req->events); +if (!mask) +return 0 ; + +__remove_wait_queue (req->head, &req->wait); +aio_complete_poll (req, mask); +return 1 ; +} + +static ssize_t aio_poll (struct aio_kiocb *aiocb,struct iocb *iocb) +{ +struct poll_iocb *req = &aiocb->poll; +struct file *file; +unsigned long flags; +__poll_t mask; +int ret; + +/* reject any unknown events outside the normal event mask. */ +if (unlikely ((u16 )iocb->aio_buf != iocb->aio_buf)) +return -EINVAL ; +/* reject fields that are not defined for poll */ +if (iocb->aio_offset || iocb->aio_nbytes || iocb->aio_rw_flags) +return -EINVAL ; + + req->events =demangle_poll (iocb->aio_buf) |POLLERR |POLLHUP ; + req->file = file =fget (iocb->aio_fildes); +if (unlikely (!req->file)) +return -EBADF ; + + ret = -EOPNOTSUPP ; +if (unlikely (!file->f_op->get_poll_head || !file->f_op->poll_mask)) + goto out_fput; + req->head = file->f_op->get_poll_head (file, req->events); +if (!req->head) + goto out_fput; + +init_waitqueue_func_entry (&req->wait, aio_poll_wake); + +spin_lock_irqsave (&req->head->lock, flags); + mask =vfs_poll_mask (file, req->events); +if (!mask) { +__kiocb_set_cancel_fn (aiocb, aio_poll_cancel, +AIO_IOCB_DELAYED_CANCEL ); +__add_wait_queue (req->head, &req->wait); + } +spin_unlock_irqrestore (&req->head->lock, flags); + +if (mask) +aio_complete_poll (req, mask); +return -EIOCBQUEUED ; +out_fput: +fput (file); +return ret; +} +static int io_submit_one (struct kioctx *ctx,struct iocb __user *user_iocb,struct iocb *iocb,bool compat) {
@@ -1633,6 +1733,9 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,case IOCB_CMD_PWRITEV : ret =aio_write (&req->rw, iocb, true, compat);break ; +case IOCB_CMD_POLL : + ret =aio_poll (req, iocb); +break ;default :pr_debug ("invalid aio operation %d\n" , iocb->aio_lio_opcode); ret = -EINVAL ;
include/uapi/linux/aio_abi.h +2 -4
@@ -38,10 +38,8 @@ enum {IOCB_CMD_PWRITE =1 ,IOCB_CMD_FSYNC =2 ,IOCB_CMD_FDSYNC =3 , -/* These two are experimental. -* IOCB_CMD_PREADX = 4, -* IOCB_CMD_POLL = 5, -*/ +/* 4 was the experimental IOCB_CMD_PREADX */ +IOCB_CMD_POLL =5 ,IOCB_CMD_NOOP =6 ,IOCB_CMD_PREADV =7 , IOCB_CMD_PWRITEV = 8,
Signature · 1 line
2.14.2
PATCH 32/32 aio: implement io_pgetevents
In reply to Christoph HellwigThis is the io_getevents equivalent of ppoll/pselect and allows to properly mix signals and aio completions (especially with IOCB_CMD_POLL) and atomically executes the following sequence:
sigset_t origmask; pthread_sigmask(SIG_SETMASK, &sigmask, &origmask); ret = io_getevents(ctx, min_nr, nr, events, timeout); pthread_sigmask(SIG_SETMASK, &origmask, NULL);
Note that unlike many other signal related calls we do not pass a sigmask size, as that would get us to 7 arguments, which aren't easily supported by the syscall infrastructure. It seems a lot less painful to just add a new syscall variant in the unlikely case we're going to increase the sigset size.
--- arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + fs/aio.c | 96 ++++++++++++++++++++++++++++++---- include/linux/compat.h | 6 +++ include/linux/syscalls.h | 6 +++ include/uapi/asm-generic/unistd.h | 4 +- kernel/sys_ni.c | 2 + 7 files changed, 105 insertions(+), 11 deletions(-)
arch/x86/entry/syscalls/syscall_32.tbl +1 -0
@@ -391,3 +391,4 @@ 382 i386 pkey_free sys_pkey_free 383 i386 statx sys_statx 384 i386 arch_prctl sys_arch_prctl compat_sys_arch_prctl +385 i386 io_pgetevents sys_io_pgetevents compat_sys_io_pgetevents
arch/x86/entry/syscalls/syscall_64.tbl +1 -0
@@ -339,6 +339,7 @@ 330 common pkey_alloc sys_pkey_alloc 331 common pkey_free sys_pkey_free 332 common statx sys_statx +333 common io_pgetevents sys_io_pgetevents # # x32-specific system call numbers start at 512 to avoid cache impact
fs/aio.c +86 -10
122 lines not on this page · raw message
include/linux/compat.h +6 -0
@@ -536,6 +536,12 @@ asmlinkage long compat_sys_io_getevents(compat_aio_context_t ctx_id,compat_long_t nr, struct io_event __user *events, struct compat_timespec __user *timeout); +asmlinkage long compat_sys_io_pgetevents (compat_aio_context_t ctx_id, +compat_long_t min_nr, +compat_long_t nr, +struct io_event __user *events, +struct compat_timespec __user *timeout, +const compat_sigset_t __user *sigmask);asmlinkage long compat_sys_io_submit (compat_aio_context_t ctx_id,int nr,u32 __user *iocb); asmlinkage long compat_sys_mount(const char __user *dev_name,
include/linux/syscalls.h +6 -0
@@ -539,6 +539,12 @@ asmlinkage long sys_io_getevents(aio_context_t ctx_id,long nr, struct io_event __user *events, struct timespec __user *timeout); +asmlinkage long sys_io_pgetevents (aio_context_t ctx_id, +long min_nr, +long nr, +struct io_event __user *events, +struct timespec __user *timeout, +const sigset_t __user *sigmask);asmlinkage long sys_io_submit (aio_context_t ,long ,struct iocb __user *__user *); asmlinkage long sys_io_cancel(aio_context_t ctx_id, struct iocb __user *iocb,
include/uapi/asm-generic/unistd.h +3 -1
@@ -732,9 +732,11 @@ __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) __SYSCALL(__NR_pkey_free, sys_pkey_free)#define __NR_statx 291 __SYSCALL(__NR_statx, sys_statx) +#define __NR_io_pgetevents 292 +__SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)#undef __NR_syscalls -#define __NR_syscalls 292 +#define __NR_syscalls 293/* * All syscalls below here should go away really,
kernel/sys_ni.c +2 -0
@@ -151,9 +151,11 @@ cond_syscall(sys_io_destroy);cond_syscall (sys_io_submit);cond_syscall (sys_io_cancel);cond_syscall (sys_io_getevents); +cond_syscall (sys_io_pgetevents);cond_syscall (compat_sys_io_setup);cond_syscall (compat_sys_io_submit);cond_syscall (compat_sys_io_getevents); +cond_syscall (compat_sys_io_pgetevents);cond_syscall (sys_sysfs);cond_syscall (sys_syslog);cond_syscall (sys_process_vm_readv);
Signature · 1 line
2.14.2
RE: [PATCH 13/32] net/tipc: convert to ->poll_mask
In reply to Christoph HellwigAcked.
///jon
Quoted 78 lines
-----Original Message-----
From: [email protected] [mailto:netdev- [email protected]] On Behalf Of Christoph Hellwig
Sent: Wednesday, January 10, 2018 10:59
To: [email protected]
Cc: Avi Kivity <[email protected]>; [email protected]; linux- [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: [PATCH 13/32] net/tipc: convert to ->poll_maskSigned-off-by Christoph Hellwig <[email protected]>--- net/tipc/socket.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)net/tipc/socket.c index renamed from net/tipc/socket.c +0
-0
fcbd6489a8b5..527d113c38b0100644net/tipc/socket.c +2
-6@@ -693,10 +693,9 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr, }/** -* tipc_poll - read and possibly block on pollmask +* tipc_poll - read pollmask * @file: file structure associated with the socket * @sock: socket for which to calculate the poll bits -* @wait: ??? * * Returns pollmask value * @@ -710,16 +709,13 @@ static int tipc_getname(struct socket *sock, structsockaddr *uaddr, * imply that the operation will succeed, merely that it should be performed * and will not block. */ -static __poll_t tipc_poll (struct file *file,struct socket *sock, -poll_table *wait) +static __poll_t tipc_poll_mask (struct socket *sock,__poll_t events) {struct sock *sk = sock->sk;struct tipc_sock *tsk =tipc_sk (sk);struct tipc_group *grp = tsk->group;__poll_t revents =0 ; -sock_poll_wait (file,sk_sleep (sk), wait); -if (sk->sk_shutdown &RCV_SHUTDOWN ) revents |=POLLRDHUP |POLLIN |POLLRDNORM ;net/tipc/socket.c +3
-4if (sk->sk_shutdown ==SHUTDOWN_MASK )@@ -3005,7 +3001,7 @@ static const struct proto_ops msg_ops = { .socketpair = tipc_socketpair, .accept = sock_no_accept, .getname = tipc_getname, - .poll = tipc_poll, + .poll_mask = tipc_poll_mask, .ioctl = tipc_ioctl, .listen = sock_no_listen, .shutdown = tipc_shutdown,@@ -3026,7 +3022,7 @@ static const struct proto_ops packet_ops = { .socketpair = tipc_socketpair, .accept = tipc_accept, .getname = tipc_getname, - .poll = tipc_poll, + .poll_mask = tipc_poll_mask, .ioctl = tipc_ioctl, .listen = tipc_listen, .shutdown = tipc_shutdown,@@ -3047,7 +3043,7 @@ static const struct proto_ops stream_ops = { .socketpair = tipc_socketpair, .accept = tipc_accept, .getname = tipc_getname, - .poll = tipc_poll, + .poll_mask = tipc_poll_mask, .ioctl = tipc_ioctl, .listen = tipc_listen, .shutdown = tipc_shutdown, --
Quoted 1 line
2.14.2
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Al Viro
maintainerRe: [PATCH 03/32] fs: introduce new ->get_poll_head and ->poll_mask methods
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
->get_poll_head returns the waitqueue that the poll operation is going to sleep on. Note that this means we can only use a single waitqueue for the poll, unlike some current drivers that use two waitqueues for different events. But now that we have keyed wakeups and heavily use those for poll there aren't that many good reason left to keep the multiple waitqueues, and if there are any ->poll is still around, the driver just won't support aio poll.
There's another problem with that - currently ->poll() may tell you "sod off, I've got nothing for you to sleep on, eat your POLLHUP|POLLERR|something and don't pester me again". With your API that's hard to express sanely.
Another piece of fun related to that is handling of disconnects in general -
static __poll_t proc_reg_poll(struct file *file, struct poll_table_struct *pts)
{
struct proc_dir_entry *pde = PDE(file_inode(file));
__poll_t rv = DEFAULT_POLLMASK;
__poll_t (*poll)(struct file *, struct poll_table_struct *);
if (use_pde(pde)) {
poll = pde->proc_fops->poll;
if (poll)
rv = poll(file, pts);
unuse_pde(pde);
}
return rv;
}and similar in sysfs.
Note, BTW, the places like wait->_qproc = NULL; in do_select() and its ilk. Some of them are "don't bother putting me on any queues, I won't be sleeping anyway". Some are "I'm already on all queues I care about, I'm going to sleep now and the query everything again once woken up". It would be nice to have the method splitup reflect that kind of logics...
What about af_alg_poll(), BTW? Looks like you've missed that one...
Another thing: IMO file_can_poll() should use FMODE_CAN_POLL - either as "true if set, otherwise check ->f_op and set accordingly" or set in do_dentry_open() and just check it in file_can_poll()...
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 26/32] aio: refactor read/write iocb setup
In reply to Christoph HellwigQuoted 6 lines · Christoph Hellwig
Don't reference the kiocb structure from the common aio code, and move any use of it into helper specific to the read/write path. This is in preparation for
aio_pollsupport that wants to use the space for different fields.Signed-off-by Christoph Hellwig <[email protected]>
I think this all looks okay (making sure everything was still cleaned up in the error cases was a bit of a chore). One nit below.
fs/aio.c SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx) · line 1442
Quoted 9 lines
fs/aio.c +9
-0+static int aio_prep_rw (struct kiocb *req,struct iocb *iocb) +{ +int ret; + + req->ki_filp =fget (iocb->aio_fildes); +if (unlikely (!req->ki_filp)) +return -EBADF ; + req->ki_complete = aio_complete_rw; + req->ki_flags =0 ;
The above assignment seems superfluous...
fs/aio.c SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx) · line 1444
Quoted 2 lines
fs/aio.c +2
-0+ req->ki_pos = iocb->aio_offset; + req->ki_flags =iocb_flags (req->ki_filp);
because of this.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 27/32] aio: sanitize ki_list handling
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
Instead of handcoded non-null checks always initialize
ki_listto an empty list and uselist_empty/list_empty_carefulon it.
Yeah, who knows why list_empty wasn't used from the beginning. In the past, tricks were played by overwriting list pointers with non-null, but that wasn't the case here.
Quoted 16 lines
While we're at it also error out on a double call to
kiocb_set_cancel_fninstead of ignoring it.Signed-off-by Christoph Hellwig <[email protected]>--- fs/aio.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)fs/aio.c +0
-0@@ -555,13 +555,12 @@ void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel)struct kioctx *ctx = req->ki_ctx;unsigned long flags;
fs/aio.c void kiocb_set_cancel_fn(struct kiocb *iocb, kiocb_cancel_fn *cancel) · line 563
Quoted 10 lines
fs/aio.c +4
-4-spin_lock_irqsave (&ctx->ctx_lock, flags); - -if (!req->ki_list.next) -list_add (&req->ki_list, &ctx->active_reqs); +if (WARN_ON_ONCE (!list_empty (&req->ki_list))) +return ; +spin_lock_irqsave (&ctx->ctx_lock, flags); +list_add_tail (&req->ki_list, &ctx->active_reqs); req->ki_cancel = cancel;
So, this changes behavior from quietly overwriting the prior cancel function to not doing it. I don't think it matters one bit, though. Callers shouldn't do that.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Hi Christoph,
Quoted 40 lines · Christoph Hellwig
Hi all,
this series adds support for the
IOCB_CMD_POLLoperation to poll for the readyness of file descriptors using the aio subsystem. The API is based on patches that existed in RHAS2.1 and RHEL3, which means it already is supported by libaio. To implement the poll support efficiently new methods to poll are introduced in structfile_operations:get_poll_headandpoll_mask. The first one returns await_queue_headto wait on (lifetime is bound by the file), and the second does a non-blocking check for the POLL* events. This allows aio poll to work without any additional context switches, unlike epoll.To make the interface fully useful a new
io_pgeteventssystem call is added, which atomically saves and restores the signal mask over theio_pgeteventssystem call. It it the logical equivalent to pselect and ppoll forio_pgetevents.The corresponding libaio changes for
io_pgeteventssupport and documentation, as well as a test case will be posted in a separate series.The changes were sponsored by Scylladb, and improve performance of the seastar framework up to 10%, while also removing the need for a privileged
SCHED_FIFOepoll listener thread.The patches are on top of Als
__poll_tannoations, so I've also prepared a git branch on top of those here:
git://git.infradead.org/users/hch/vfs.gitaio-pollGitweb:
http://git.infradead.org/users/hch/vfs.git/shortlog/refs/heads/aio-poll.2
Libaio changes:
http://git.infradead.org/users/hch/libaio.git/shortlog/refs/heads/aio-poll
Seastar changes:
Quoted 7 lines
https://github.com/avikivity/seastar/commits/aio
Changes since V1:
- handle the NULL ->poll case invfs_poll
- dropped the file argument to the ->poll_mask socket operation
- replace the ->pre_poll socket operation with ->get_poll_head as in the file operations
Are there some man pages patches already for these changes?
Thanks,
Michael
Signature · 9 lines
Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ Linux/UNIX System Programming Training: http://man7.org/training/ -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 28/32] aio: simplify cancellation
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
With the current aio code there is no need for the magic
KIOCB_CANCELLEDvalue, as a cancelation just kicks the driver to queue the completion ASAP, with all actual completion handling done in another thread. Given that both the completion path and cancelation take the context lock there is no need for magic cmpxchg loops either.
The cmpxchg was made unnecessary when the complementary xchg was removed in commit bec68faaf ("aio: io_cancel() no longer returns the io_event"). There was no longer a need to ensure only the completion path or the cancellation path delivered the completion event. Now, the completion is always delivered via aio_complete.
So yeah, we can get rid of this.
Re: [PATCH 29/32] aio: delete iocbs from the active_reqs list in kiocb_cancel
In reply to Christoph HellwigQuoted 4 lines · Christoph Hellwig
One we cancel an iocb there is no reason to keep it on the
active_reqslist, given that the list is only used to look for cancelation candidates.Signed-off-by Christoph Hellwig <[email protected]>
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 30/32] aio: add delayed cancel support
In reply to Christoph HellwigQuoted 6 lines · Christoph Hellwig
The upcoming aio poll support would like to be able to complete the iocb inline from the cancellation context, but that would cause a lock order reversal. Add support for optionally moving the cancelation outside the context lock to avoid this reversal.
Signed-off-by Christoph Hellwig <[email protected]>
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 30/32] aio: add delayed cancel support
Quoted 10 lines · Jeff Moyer
Quoted 6 lines · Christoph Hellwig
The upcoming aio poll support would like to be able to complete the iocb inline from the cancellation context, but that would cause a lock order reversal. Add support for optionally moving the cancelation outside the context lock to avoid this reversal.
Signed-off-by Christoph Hellwig <[email protected]>Acked-by Jeff Moyer <[email protected]>
Actually, let's move these two defines:
#define AIO_IOCB_DELAYED_CANCEL (1 << 0)
#define AIO_IOCB_CANCELLED (1 << 1)
to include/linux/aio.h so that drivers outside of fs/aio.c can make use of them.
-Jeff
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
"Michael Kerrisk (man-pages)" <[email protected]> writes:
Hi, Michael,
Quoted 1 line
Are there some man pages patches already for these changes?
https://patchwork.kernel.org/patch/10144129/
Cheers,
Jeff
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Al Viro
maintainerRe: [PATCH 03/32] fs: introduce new ->get_poll_head and ->poll_mask methods
In reply to Al ViroQuoted 37 lines · Al Viro
Quoted 7 lines · Christoph Hellwig
->get_poll_head returns the waitqueue that the poll operation is going to sleep on. Note that this means we can only use a single waitqueue for the poll, unlike some current drivers that use two waitqueues for different events. But now that we have keyed wakeups and heavily use those for poll there aren't that many good reason left to keep the multiple waitqueues, and if there are any ->poll is still around, the driver just won't support aio poll.
There's another problem with that - currently ->poll() may tell you "sod off, I've got nothing for you to sleep on, eat your POLLHUP|POLLERR|something and don't pester me again". With your API that's hard to express sanely.
Another piece of fun related to that is handling of disconnects in general -
static
__poll_tproc_reg_poll(struct file *file, struct poll_table_struct *pts){ struct proc_dir_entry *pde = PDE(file_inode(file)); __poll_t rv = DEFAULT_POLLMASK; __poll_t (*poll)(struct file *, struct poll_table_struct *); if (use_pde(pde)) { poll = pde->proc_fops->poll; if (poll) rv = poll(file, pts); unuse_pde(pde); } return rv; }and similar in sysfs.
Note, BTW, the places like
wait->_qproc= NULL; indo_select()and its ilk. Some of them are "don't bother putting me on any queues, I won't be sleeping anyway". Some are "I'm already on all queues I care about, I'm going to sleep now and the query everything again once woken up". It would be nice to have the method splitup reflect that kind of logics...
Quoted 5 lines
What about
af_alg_poll(), BTW? Looks like you've missed that one...Another thing: IMO
file_can_poll()should useFMODE_CAN_POLL- either as "true if set, otherwise check ->f_op and set accordingly" or set indo_dentry_open()and just check it infile_can_poll()...
Whee... The very first ->poll() instance in alphabetic order on pathnames:
in arch/cris/arch-v10/drivers/gpio.c
static __poll_t gpio_poll(struct file *file, poll_table *wait)
{
__poll_t mask = 0;
struct gpio_private *priv = file->private_data;
unsigned long data;
unsigned long flags;
spin_lock_irqsave(&gpio_lock, flags);
poll_wait(file, &priv->alarm_wq, wait);IOW, we are doing poll_wait() (== possible GFP_KERNEL __get_free_page()) under a spinlock...
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 03/32] fs: introduce new ->get_poll_head and ->poll_mask methods
Quoted 14 lines · Al Viro
Whee... The very first ->poll() instance in alphabetic order on pathnames:
inarch/cris/arch-v10/drivers/gpio.cstatic
__poll_tgpio_poll(struct file *file, poll_table *wait){ __poll_t mask = 0; struct gpio_private *priv = file->private_data; unsigned long data; unsigned long flags; spin_lock_irqsave(&gpio_lock, flags); poll_wait(file, &priv->alarm_wq, wait);
Quoted 2 lines
IOW, we are doing
poll_wait()(== possibleGFP_KERNEL__get_free_page()) under a spinlock...
Yes. Another god reason to separate poll_wait and the actual event check callback..
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 03/32] fs: introduce new ->get_poll_head and ->poll_mask methods
In reply to Al ViroFor other horrors that are even worse than any given ->poll instance take a look at scif_poll and friends..
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 03/32] fs: introduce new ->get_poll_head and ->poll_mask methods
In reply to Al ViroQuoted 3 lines · Al Viro
There's another problem with that - currently ->poll() may tell you "sod off, I've got nothing for you to sleep on, eat your POLLHUP|POLLERR|something and don't pester me again". With your API that's hard to express sanely.
And what exactly can currently tell 'sod off' right now? ->poll can only return the (E)POLL* mask. But what would probably be sane is to do the same thing in vfs_poll I already do in aio poll: call ->poll_mask a first time before calling poll_wait to clear any already pending events. That way any early error gets instantly propagated.
Quoted 16 lines
Another piece of fun related to that is handling of disconnects in general -
static
__poll_tproc_reg_poll(struct file *file, struct poll_table_struct *pts){ struct proc_dir_entry *pde = PDE(file_inode(file)); __poll_t rv = DEFAULT_POLLMASK; __poll_t (*poll)(struct file *, struct poll_table_struct *); if (use_pde(pde)) { poll = pde->proc_fops->poll; if (poll) rv = poll(file, pts); unuse_pde(pde); } return rv; }
Quoted 1 line
and similar in sysfs.
Can't find anything in sysfs, but debugfs has an amazingly bad variant of the above, including confidence ensuring commit description bits like:
In order not to pollute debugfs with wrapper definitions that aren't ever needed, I chose not to define a wrapper for every struct file_operations method possible. Instead, a wrapper is defined only for the subset of methods which are actually set by any debugfs users. Currently, these are:
->llseek()
->read()
->write()
->unlocked_ioctl()
->poll()
So anyone implementing say, read_iter/write_iter or compat_ioctl silently doesn't get the magic protection..
Either way - those two will need updating for the new scheme if we add proc/debugfs ops, so I better do them now and convert at least one example each.
Quoted 5 lines
Note, BTW, the places like
wait->_qproc= NULL; indo_select()and its ilk. Some of them are "don't bother putting me on any queues, I won't be sleeping anyway". Some are "I'm already on all queues I care about, I'm going to sleep now and the query everything again once woken up". It would be nice to have the method splitup reflect that kind of logics...
Hmm. ->poll_mask already is a simple 'are these events pending' method, and thuse should deal perfectly fine with both cases. What additional split do you think would be helpful?
Quoted 1 line
What about
af_alg_poll(), BTW? Looks like you've missed that one...
Converted for the next iteration.
Quoted 3 lines
Another thing: IMO
file_can_poll()should useFMODE_CAN_POLL- either as "true if set, otherwise check ->f_op and set accordingly" or set indo_dentry_open()and just check it infile_can_poll()...
I don't really see the point of wasting a fmode bit for it. But if really want that I cna do it.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 26/32] aio: refactor read/write iocb setup
In reply to Jeff MoyerQuoted 11 lines · Jeff Moyer
fs/aio.c SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx) · line 1442
Quoted 9 lines
fs/aio.c +9
-0+static int aio_prep_rw (struct kiocb *req,struct iocb *iocb) +{ +int ret; + + req->ki_filp =fget (iocb->aio_fildes); +if (unlikely (!req->ki_filp)) +return -EBADF ; + req->ki_complete = aio_complete_rw; + req->ki_flags =0 ;The above assignment seems superfluous...
Thanks, fixed.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 30/32] aio: add delayed cancel support
In reply to Jeff MoyerQuoted 9 lines · Jeff Moyer
Quoted 8 lines
Quoted 6 lines
The upcoming aio poll support would like to be able to complete the iocb inline from the cancellation context, but that would cause a lock order reversal. Add support for optionally moving the cancelation outside the context lock to avoid this reversal.
Signed-off-by Christoph Hellwig <[email protected]>Acked-by Jeff Moyer <[email protected]>
Quoted 7 lines
Actually, let's move these two defines:
#define
AIO_IOCB_DELAYED_CANCEL(1 << 0)
#defineAIO_IOCB_CANCELLED(1 << 1)to
include/linux/aio.hso that drivers outside offs/aio.ccan make use of them.
struct aio_kiocb is private to aio.c, so just exposing them won't do anything useful. If we really need these elsewhere we'll need to come up with a proper interface.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 30/32] aio: add delayed cancel support
Quoted 15 lines · Christoph Hellwig
Quoted 14 lines · Jeff Moyer
Quoted 8 lines
Quoted 6 lines
The upcoming aio poll support would like to be able to complete the iocb inline from the cancellation context, but that would cause a lock order reversal. Add support for optionally moving the cancelation outside the context lock to avoid this reversal.
Signed-off-by Christoph Hellwig <[email protected]>Acked-by Jeff Moyer <[email protected]>Actually, let's move these two defines:
#define
AIO_IOCB_DELAYED_CANCEL(1 << 0)
#defineAIO_IOCB_CANCELLED(1 << 1)
Quoted 6 lines
Quoted 2 lines
to
include/linux/aio.hso that drivers outside offs/aio.ccan make use of them.struct
aio_kiocbis private toaio.c, so just exposing them won't do anything useful. If we really need these elsewhere we'll need to come up with a proper interface.
Duh, good point. My main concern is that things like usb gadget will have to deal with races between cancellation and completion on their own. It would be nice if we had infrastructure for them to use. I'll have a look through that code to see if there's something we could or should be doing.
Cheers,
Jeff
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Al Viro
maintainerRe: [PATCH 03/32] fs: introduce new ->get_poll_head and ->poll_mask methods
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
Quoted 3 lines · Al Viro
There's another problem with that - currently ->poll() may tell you "sod off, I've got nothing for you to sleep on, eat your POLLHUP|POLLERR|something and don't pester me again". With your API that's hard to express sanely.
And what exactly can currently tell 'sod off' right now? ->poll can only return the (E)POLL* mask. But what would probably be sane is to do the same thing in
vfs_pollI already do in aio poll: call ->poll_mask a first time before callingpoll_waitto clear any already pending events. That way any early error gets instantly propagated.
static __poll_tcapi_poll(struct file *file, poll_table *wait)
{
struct capidev *cdev = file->private_data;
__poll_t mask = 0;
if (!cdev->ap.applid)
return POLLERR;
poll_wait(file, &(cdev->recvwait), wait);
mask = POLLOUT | POLLWRNORM;
if (!skb_queue_empty(&cdev->recvqueue))
mask |= POLLIN | POLLRDNORM;
return mask;
}and a bunch of similar beasts. FWIW, I'm going through that zoo, looking for existing patterns.
BTW, consider this:
static __poll_t sync_serial_poll(struct file *file, poll_table *wait)
{
int dev = iminor(file_inode(file));
__poll_t mask = 0;
struct sync_port *port;
DEBUGPOLL(
static __poll_t prev_mask;
);
port = &ports[dev];
if (!port->started)
sync_serial_start_port(port);
poll_wait(file, &port->out_wait_q, wait);
poll_wait(file, &port->in_wait_q, wait);
/* No active transfer, descriptors are available */
if (port->output && !port->tr_running)
mask |= POLLOUT | POLLWRNORM;
...
}Besides having two queues, note the one-time sync_serial_start_port() there. Where would you map such things? First ->poll_mask()?
Quoted 1 line
Can't find anything in sysfs,
Large chunk of sysfs is in fs/kernfs/*.c; it's there.
Quoted 9 lines
Quoted 5 lines
Note, BTW, the places like
wait->_qproc= NULL; indo_select()and its ilk. Some of them are "don't bother putting me on any queues, I won't be sleeping anyway". Some are "I'm already on all queues I care about, I'm going to sleep now and the query everything again once woken up". It would be nice to have the method splitup reflect that kind of logics...Hmm. ->poll_mask already is a simple 'are these events pending' method, and thuse should deal perfectly fine with both cases. What additional split do you think would be helpful?
What I mean is that it would be nice to have do_select() and friends aware of that. You are hiding the whole thing behind vfs_poll(); sure, we can't really exploit that while we have the mix of converted and unconverted instances, but it would be a nice payoff.
As for calling ->poll_mask() first... Three method calls per descriptor on the first pass? Overhead might get painful...
FWIW, the problem with "sod off early" ones is not the cost of poll_wait() - it's that sometimes we might not _have_ a queue to sleep on. Hell knows, I need to finish the walk through that zoo to see what's out there... Pox on drivers/media - that's where the bulk of instances is, and they are fairly convoluted...
wait_on_event_..._key() might be a good idea; we probably want comments from Peter on that one. An interesting testcase would be tty - the amount of threads sleeping on those queues is going to be large; can we combine ->read_wait and ->write_wait without serious PITA? Another issue is ldisc handling - the first thing tty_poll() is doing is
ld = tty_ldisc_ref_wait(tty);
and it really waits for ldisc changes in progress to settle. Hell knows whether anything relies on that, but I wouldn't be surprised if it did - tty handling is one of the areas where select(2)/poll(2) get non-trivial use...
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 03/32] fs: introduce new ->get_poll_head and ->poll_mask methods
Quoted 2 lines · Al Viro
Besides having two queues, note the one-time
sync_serial_start_port()there. Where would you map such things? First ->poll_mask()?
->get_poll_mask. These sorts of calls are the prime reason why the events argument is passed to it.
Quoted 4 lines
Quoted 2 lines
Can't find anything in sysfs,
Large chunk of sysfs is in
fs/kernfs/*.c; it's there.
Still can't find it - there is exactly one poll implementation in there, and it's not a forwarder.
Quoted 8 lines
Quoted 3 lines
Hmm. ->poll_mask already is a simple 'are these events pending' method, and thuse should deal perfectly fine with both cases. What additional split do you think would be helpful?
What I mean is that it would be nice to have
do_select()and friends aware of that. You are hiding the whole thing behindvfs_poll(); sure, we can't really exploit that while we have the mix of converted and unconverted instances, but it would be a nice payoff.
Yes. I think we can actually get rid of vfs_poll again rather soon, the prime reason for it was to isolate non-core callers. But most of them should use better primitives anyway, and even until then we can get rid of vfs_poll for the core to make things cleaner.
Quoted 2 lines
As for calling ->poll_mask() first... Three method calls per descriptor on the first pass? Overhead might get painful...
I would have said no until a about a week ago. But with branch prediction on indirect branches basically gone on x86 now it's not going to get better. That beeing said we already do three method calls for the aio poll case and it hasn't been an issue.
Quoted 5 lines
FWIW, the problem with "sod off early" ones is not the cost of
poll_wait()- it's that sometimes we might not _have_ a queue to sleep on. Hell knows, I need to finish the walk through that zoo to see what's out there... Pox ondrivers/media- that's where the bulk of instances is, and they are fairly convoluted...
I've seen a few instances that return errors before poll_wait, but most of them seemed buggy.
Quoted 10 lines
wait_on_event_..._key() might be a good idea; we probably want comments from Peter on that one. An interesting testcase would be tty - the amount of threads sleeping on those queues is going to be large; can we combine ->read_wait and ->write_wait without serious PITA? Another issue is ldisc handling - the first thing
tty_poll()is doing isld = tty_ldisc_ref_wait(tty);and it really waits for ldisc changes in progress to settle. Hell knows whether anything relies on that, but I wouldn't be surprised if it did - tty handling is one of the areas where select(2)/poll(2) get non-trivial use...
Yes. I'll look into it.
In the meantime I think that poll_mask semantics are a big improvement for the common case, and they enable doing aio poll. So I'd rather move ahead and fix any details of method signatures once we're down to just the hard cases instead of trying to do everything at once.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 32/32] aio: implement io_pgetevents
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
This is the
io_geteventsequivalent of ppoll/pselect and allows to properly mix signals and aio completions (especially withIOCB_CMD_POLL) and atomically executes the following sequence:sigset_t origmask; pthread_sigmask(SIG_SETMASK, &sigmask, &origmask); ret = io_getevents(ctx, min_nr, nr, events, timeout); pthread_sigmask(SIG_SETMASK, &origmask, NULL);
Quoted 5 lines
Note that unlike many other signal related calls we do not pass a sigmask size, as that would get us to 7 arguments, which aren't easily supported by the syscall infrastructure. It seems a lot less painful to just add a new syscall variant in the unlikely case we're going to increase the sigset size.
pselect, as an example, crams the sigmask and size together. Why not just do that? libaio can take care of setting that up.
Cheers,
Jeff
Quoted 229 lines
Signed-off-by Christoph Hellwig <[email protected]>--- arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + fs/aio.c | 96 ++++++++++++++++++++++++++++++---- include/linux/compat.h | 6 +++ include/linux/syscalls.h | 6 +++ include/uapi/asm-generic/unistd.h | 4 +- kernel/sys_ni.c | 2 + 7 files changed, 105 insertions(+), 11 deletions(-)arch/x86/entry/syscalls/syscall_32.tbl +1
-0@@ -391,3 +391,4 @@ 382 i386 pkey_free sys_pkey_free 383 i386 statx sys_statx 384 i386 arch_prctl sys_arch_prctl compat_sys_arch_prctl +385 i386 io_pgetevents sys_io_pgetevents compat_sys_io_pgeteventsarch/x86/entry/syscalls/syscall_64.tbl +1
-0@@ -339,6 +339,7 @@ 330 common pkey_alloc sys_pkey_alloc 331 common pkey_free sys_pkey_free 332 common statx sys_statx +333 common io_pgetevents sys_io_pgetevents # # x32-specific system call numbers start at 512 to avoid cache impactfs/aio.c +86
-10@@ -1299,10 +1299,6 @@ static long read_events(struct kioctx *ctx, long min_nr, long nr,wait_event_interruptible_hrtimeout (ctx->wait,aio_read_events (ctx, min_nr, nr, event, &ret), until); - -if (!ret &&signal_pending (current)) - ret = -EINTR ; -return ret; }@@ -1978,13 +1974,54 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id, struct timespec __user *, timeout) {struct timespec64 ts; +int ret; + +if (timeout &&unlikely (get_timespec64 (&ts, timeout))) +return -EFAULT ; -if (timeout) { -if (unlikely (get_timespec64 (&ts, timeout))) + ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &ts :NULL ); +if (!ret &&signal_pending (current)) + ret = -EINTR ; +return ret; +} + +SYSCALL_DEFINE6 (io_pgetevents, + aio_context_t, ctx_id, + long, min_nr, + long, nr, + struct io_event __user *, events, + struct timespec __user *, timeout, + const sigset_t __user *, sigmask) +{ +sigset_t ksigmask, sigsaved; +struct timespec64 ts; +int ret; + +if (timeout &&unlikely (get_timespec64 (&ts, timeout))) +return -EFAULT ; + +if (sigmask) { +if (copy_from_user (&ksigmask, sigmask,sizeof (ksigmask)))return -EFAULT ; +sigdelsetmask (&ksigmask,sigmask (SIGKILL ) |sigmask (SIGSTOP )); +sigprocmask (SIG_SETMASK , &ksigmask, &sigsaved); } -return do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &ts :NULL ); + ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &ts :NULL ); +if (signal_pending (current)) { +if (sigmask) { + current->saved_sigmask = sigsaved; +set_restore_sigmask (); + } + +if (!ret) + ret = -ERESTARTNOHAND ; + }else { +if (sigmask) +sigprocmask (SIG_SETMASK , &sigsaved,NULL ); + } + +return ret; }#ifdef CONFIG_COMPAT @@ -1995,13 +2032,52 @@ COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id, struct compat_timespec __user *, timeout) {struct timespec64 t; +int ret; + +if (timeout &&compat_get_timespec64 (&t, timeout)) +return -EFAULT ; + + ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &t :NULL ); +if (!ret &&signal_pending (current)) + ret = -EINTR ; +return ret; +} + +COMPAT_SYSCALL_DEFINE6 (io_pgetevents, + compat_aio_context_t, ctx_id, + compat_long_t, min_nr, + compat_long_t, nr, + struct io_event __user *, events, + struct compat_timespec __user *, timeout, + const compat_sigset_t __user *, sigmask) +{ +sigset_t ksigmask, sigsaved; +struct timespec64 t; +int ret; -if (timeout) { -if (compat_get_timespec64 (&t, timeout)) +if (timeout &&compat_get_timespec64 (&t, timeout)) +return -EFAULT ; + +if (sigmask) { +if (get_compat_sigset (&ksigmask, sigmask))return -EFAULT ; +sigdelsetmask (&ksigmask,sigmask (SIGKILL ) |sigmask (SIGSTOP )); +sigprocmask (SIG_SETMASK , &ksigmask, &sigsaved); + } + ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &t :NULL ); +if (signal_pending (current)) { +if (sigmask) { + current->saved_sigmask = sigsaved; +set_restore_sigmask (); + } +if (!ret) + ret = -ERESTARTNOHAND ; + }else { +if (sigmask) +sigprocmask (SIG_SETMASK , &sigsaved,NULL ); } -return do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &t :NULL ); +return ret; }#endif include/linux/compat.h +6
-0@@ -536,6 +536,12 @@ asmlinkage long compat_sys_io_getevents(compat_aio_context_t ctx_id,compat_long_t nr, struct io_event __user *events, struct compat_timespec __user *timeout); +asmlinkage long compat_sys_io_pgetevents (compat_aio_context_t ctx_id, +compat_long_t min_nr, +compat_long_t nr, +struct io_event __user *events, +struct compat_timespec __user *timeout, +const compat_sigset_t __user *sigmask);asmlinkage long compat_sys_io_submit (compat_aio_context_t ctx_id,int nr,u32 __user *iocb); asmlinkage long compat_sys_mount(const char __user *dev_name,include/linux/syscalls.h +6
-0@@ -539,6 +539,12 @@ asmlinkage long sys_io_getevents(aio_context_t ctx_id,long nr, struct io_event __user *events, struct timespec __user *timeout); +asmlinkage long sys_io_pgetevents (aio_context_t ctx_id, +long min_nr, +long nr, +struct io_event __user *events, +struct timespec __user *timeout, +const sigset_t __user *sigmask);asmlinkage long sys_io_submit (aio_context_t ,long ,struct iocb __user *__user *); asmlinkage long sys_io_cancel(aio_context_t ctx_id, struct iocb __user *iocb,include/uapi/asm-generic/unistd.h +3
-1@@ -732,9 +732,11 @@ __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) __SYSCALL(__NR_pkey_free, sys_pkey_free)#define __NR_statx 291 __SYSCALL(__NR_statx, sys_statx) +#define __NR_io_pgetevents 292 +__SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)#undef __NR_syscalls -#define __NR_syscalls 292 +#define __NR_syscalls 293/* * All syscalls below here should go away really, kernel/sys_ni.c +2
-0@@ -151,9 +151,11 @@ cond_syscall(sys_io_destroy);cond_syscall (sys_io_submit);cond_syscall (sys_io_cancel);cond_syscall (sys_io_getevents); +cond_syscall (sys_io_pgetevents);cond_syscall (compat_sys_io_setup);cond_syscall (compat_sys_io_submit);cond_syscall (compat_sys_io_getevents); +cond_syscall (compat_sys_io_pgetevents);cond_syscall (sys_sysfs);cond_syscall (sys_syslog);cond_syscall (sys_process_vm_readv);
Re: [PATCH 32/32] aio: implement io_pgetevents
Quoted 12 lines · Jeff Moyer
Quoted 10 lines · Christoph Hellwig
This is the
io_geteventsequivalent of ppoll/pselect and allows to properly mix signals and aio completions (especially withIOCB_CMD_POLL) and atomically executes the following sequence:sigset_t origmask; pthread_sigmask(SIG_SETMASK, &sigmask, &origmask); ret = io_getevents(ctx, min_nr, nr, events, timeout); pthread_sigmask(SIG_SETMASK, &origmask, NULL);
Quoted 8 lines
Quoted 5 lines
Note that unlike many other signal related calls we do not pass a sigmask size, as that would get us to 7 arguments, which aren't easily supported by the syscall infrastructure. It seems a lot less painful to just add a new syscall variant in the unlikely case we're going to increase the sigset size.
pselect, as an example, crams the sigmask and size together. Why not just do that? libaio can take care of setting that up.
Yes, I could try that. It's just another double indirection for no good reason.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 30/32] aio: add delayed cancel support
In reply to Jeff MoyerQuoted 5 lines · Jeff Moyer
Duh, good point. My main concern is that things like usb gadget will have to deal with races between cancellation and completion on their own. It would be nice if we had infrastructure for them to use. I'll have a look through that code to see if there's something we could or should be doing.
The current cancel interface is a bit of a mess, as it assumes the kiocb is embedded into an aio_kiocb. I think it would need a major rework in general, but I'll need to fix a couple other aio issues first.
Re: [PATCH 32/32] aio: implement io_pgetevents
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
Quoted 2 lines
pselect, as an example, crams the sigmask and size together. Why not just do that? libaio can take care of setting that up.
Yes, I could try that. It's just another double indirection for no good reason.
I cna't get this to work - for some reason I always end up with a NULL sigmask in the kernel. Nevermind that it leads to really crap code generation. I guess for select the latter doesn't matter too much as everyone sane uses ppoll anyway.
Re: [PATCH 32/32] aio: implement io_pgetevents
Hi, Christoph,
Quoted 11 lines · Christoph Hellwig
Quoted 5 lines · Christoph Hellwig
Quoted 2 lines
pselect, as an example, crams the sigmask and size together. Why not just do that? libaio can take care of setting that up.
Yes, I could try that. It's just another double indirection for no good reason.
I cna't get this to work - for some reason I always end up with a NULL sigmask in the kernel. Nevermind that it leads to really crap code generation. I guess for select the latter doesn't matter too much as everyone sane uses ppoll anyway.
I'd be willing to bet the issue is in your io_syscall6 implementation. You pass in arg5 where arg6 should be used. Don't feel bad, it took me the better part of today to figure that out. :)
Here's an incremental diff on top of what you've posted. Feel free to fold it into your patch (and format however you like). You can find the libaio changes in my 'aio-poll' branch:
https://pagure.io/libaio/commits/aio-poll
These changes were run through the libaio test harness, 64 bit and 32 bit, so the compat system call was tested.
Cheers,
Jeff
fs/aio.c +29 -5
@@ -1991,9 +1991,11 @@ static long do_io_getevents(aio_context_t ctx_id, long, nr, struct io_event __user *, events, struct timespec __user *, timeout, - const sigset_t __user *, sigmask) + void __user *, sigmask) { sigset_t ksigmask, sigsaved; +size_t sigsetsize =0 ; +sigset_t __user *up =NULL ;struct timespec64 ts;int ret;
@@ -2001,8 +2003,18 @@ static long do_io_getevents(aio_context_t ctx_id,return -EFAULT ;if (sigmask) { -if (copy_from_user (&ksigmask, sigmask,sizeof (ksigmask))) +if (!access_ok (VERIFY_READ , sigmask, +sizeof (void *) +sizeof (size_t )) || +__get_user (up, (sigset_t __user *__user *)sigmask) || +__get_user (sigsetsize, + (size_t __user *)(sigmask +sizeof (void *))))return -EFAULT ; + +if (sigsetsize !=sizeof (sigset_t)) +return -EINVAL ; +if (copy_from_user (&ksigmask, up,sizeof (ksigmask))) +return -EFAULT ; +sigdelsetmask (&ksigmask,sigmask (SIGKILL ) |sigmask (SIGSTOP ));sigprocmask (SIG_SETMASK , &ksigmask, &sigsaved); }
@@ -2049,8 +2061,11 @@ static long do_io_getevents(aio_context_t ctx_id, compat_long_t, nr, struct io_event __user *, events, struct compat_timespec __user *, timeout, - const compat_sigset_t __user *, sigmask) + void __user *, sig) { +compat_size_t sigsetsize =0 ; +compat_sigset_t __user *sigmask; +compat_uptr_t up =0 ;sigset_t ksigmask, sigsaved;struct timespec64 t;int ret;
@@ -2058,8 +2073,17 @@ static long do_io_getevents(aio_context_t ctx_id,if (timeout &&compat_get_timespec64 (&t, timeout))return -EFAULT ; -if (sigmask) { -if (get_compat_sigset (&ksigmask, sigmask)) +if (sig) { +if (!access_ok (VERIFY_READ , sig, +sizeof (compat_uptr_t) +sizeof (compat_size_t)) || +__get_user (up, (compat_uptr_t __user *)sig) || +__get_user (sigsetsize, + (compat_size_t __user *)(sig +sizeof (up)))) +return -EFAULT ; + +if (sigsetsize !=sizeof (compat_sigset_t)) +return -EINVAL ; +if (get_compat_sigset (&ksigmask,compat_ptr (up)))return -EFAULT ;sigdelsetmask (&ksigmask,sigmask (SIGKILL ) |sigmask (SIGSTOP ));sigprocmask (SIG_SETMASK , &ksigmask, &sigsaved);
include/linux/compat.h +1 -1
@@ -541,7 +541,7 @@ asmlinkage long compat_sys_io_pgetevents(compat_aio_context_t ctx_id,compat_long_t nr, struct io_event __user *events, struct compat_timespec __user *timeout, - const compat_sigset_t __user *sigmask); + void __user *sigmask);asmlinkage long compat_sys_io_submit (compat_aio_context_t ctx_id,int nr,u32 __user *iocb); asmlinkage long compat_sys_mount(const char __user *dev_name,
include/linux/syscalls.h +1 -1
@@ -544,7 +544,7 @@ asmlinkage long sys_io_pgetevents(aio_context_t ctx_id,long nr, struct io_event __user *events, struct timespec __user *timeout, - const sigset_t __user *sigmask); + void __user *sigmask);asmlinkage long sys_io_submit (aio_context_t ,long ,struct iocb __user *__user *); asmlinkage long sys_io_cancel(aio_context_t ctx_id, struct iocb __user *iocb,
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Al Viro
maintainerRe: [PATCH 32/32] aio: implement io_pgetevents
fs/aio.c static long do_io_getevents(aio_context_t ctx_id, · line 2011
Quoted 8 lines · Jeff Moyer
fs/aio.c +5
-1if (sigmask) { -if (copy_from_user (&ksigmask, sigmask,sizeof (ksigmask))) +if (!access_ok (VERIFY_READ , sigmask, +sizeof (void *) +sizeof (size_t )) || +__get_user (up, (sigset_t __user *__user *)sigmask) || +__get_user (sigsetsize, + (size_t __user *)(sigmask +sizeof (void *))))return -EFAULT ;
How about copy_from_user() on a struct? Making eyes bleed is fun, but people tend to get annoyed when you do it to them...
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 32/32] aio: implement io_pgetevents
Quoted 12 lines · Al Viro
fs/aio.c static long do_io_getevents(aio_context_t ctx_id, · line 2011
Quoted 8 lines · Jeff Moyer
fs/aio.c +5
-1if (sigmask) { -if (copy_from_user (&ksigmask, sigmask,sizeof (ksigmask))) +if (!access_ok (VERIFY_READ , sigmask, +sizeof (void *) +sizeof (size_t )) || +__get_user (up, (sigset_t __user *__user *)sigmask) || +__get_user (sigsetsize, + (size_t __user *)(sigmask +sizeof (void *))))return -EFAULT ;How about
copy_from_user()on a struct? Making eyes bleed is fun, but people tend to get annoyed when you do it to them...
Above is the copy & paste version from pselect. I've got both copy_from_user and that horrible version in my tree, and if we really need this awfull calling convention copy_from_user certainly is much better. pselect also should be switched to explicit struct + copy_from_user while we're at it. In fact glibc defines a struct for the userland version to start with.
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 32/32] aio: implement io_pgetevents
In reply to Jeff MoyerQuoted 11 lines · Jeff Moyer
I'd be willing to bet the issue is in your
io_syscall6implementation. You pass in arg5 where arg6 should be used. Don't feel bad, it took me the better part of today to figure that out. :)Here's an incremental diff on top of what you've posted. Feel free to fold it into your patch (and format however you like). You can find the libaio changes in my 'aio-poll' branch:
https://pagure.io/libaio/commits/aio-pollThese changes were run through the libaio test harness, 64 bit and 32 bit, so the compat system call was tested.
Oops, yes. Although I prefer the copy_from_user version, this is what I had:
fs/aio.c +28 -10
@@ -1984,8 +1984,9 @@ SYSCALL_DEFINE6(io_pgetevents, long, nr, struct io_event __user *, events, struct timespec __user *, timeout, - const sigset_t __user *, sigmask) + const struct __aio_sigset __user *, usig) { + struct __aio_sigset ksig = { NULL, };sigset_t ksigmask, sigsaved;struct timespec64 ts;int ret;
@@ -1993,8 +1994,13 @@ SYSCALL_DEFINE6(io_pgetevents,if (timeout &&unlikely (get_timespec64 (&ts, timeout)))return -EFAULT ; -if (sigmask) { -if (copy_from_user (&ksigmask, sigmask,sizeof (ksigmask))) +if (usig &©_from_user (&ksig, usig,sizeof (ksig))) +return -EFAULT ; + +if (ksig.sigmask) { +if (ksig.sigsetsize !=sizeof (sigset_t)) +return -EINVAL ; +if (copy_from_user (&ksigmask, ksig.sigmask,sizeof (ksigmask)))return -EFAULT ;sigdelsetmask (&ksigmask,sigmask (SIGKILL ) |sigmask (SIGSTOP ));sigprocmask (SIG_SETMASK , &ksigmask, &sigsaved);
@@ -2002,7 +2008,7 @@ SYSCALL_DEFINE6(io_pgetevents, ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &ts :NULL );if (signal_pending (current)) { -if (sigmask) { +if (ksig.sigmask) { current->saved_sigmask = sigsaved;set_restore_sigmask (); }
@@ -2010,7 +2016,7 @@ SYSCALL_DEFINE6(io_pgetevents,if (!ret) ret = -ERESTARTNOHAND ; }else { -if (sigmask) +if (ksig.sigmask)sigprocmask (SIG_SETMASK , &sigsaved,NULL ); }
@@ -2036,14 +2042,21 @@ COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id,return ret; } + +struct __compat_aio_sigset { +compat_sigset_t __user *sigmask; +compat_size_t sigsetsize; +}; +COMPAT_SYSCALL_DEFINE6 (io_pgetevents, compat_aio_context_t, ctx_id, compat_long_t, min_nr, compat_long_t, nr, struct io_event __user *, events, struct compat_timespec __user *, timeout, - const compat_sigset_t __user *, sigmask) + const struct __compat_aio_sigset __user *, usig) { +struct __compat_aio_sigset ksig = {NULL , };sigset_t ksigmask, sigsaved;struct timespec64 t;int ret;
@@ -2051,8 +2064,13 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,if (timeout &&compat_get_timespec64 (&t, timeout))return -EFAULT ; -if (sigmask) { -if (get_compat_sigset (&ksigmask, sigmask)) +if (usig &©_from_user (&ksig, usig,sizeof (ksig))) +return -EFAULT ; + +if (ksig.sigmask) { +if (ksig.sigsetsize !=sizeof (compat_sigset_t)) +return -EINVAL ; +if (get_compat_sigset (&ksigmask, ksig.sigmask))return -EFAULT ;sigdelsetmask (&ksigmask,sigmask (SIGKILL ) |sigmask (SIGSTOP ));sigprocmask (SIG_SETMASK , &ksigmask, &sigsaved);
@@ -2060,14 +2078,14 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents, ret =do_io_getevents (ctx_id, min_nr, nr, events, timeout ? &t :NULL );if (signal_pending (current)) { -if (sigmask) { +if (ksig.sigmask) { current->saved_sigmask = sigsaved;set_restore_sigmask (); }if (!ret) ret = -ERESTARTNOHAND ; }else { -if (sigmask) +if (ksig.sigmask)sigprocmask (SIG_SETMASK , &sigsaved,NULL ); }
include/linux/compat.h +2 -1
@@ -205,6 +205,7 @@ extern int put_compat_rusage(const struct rusage *, struct compat_rusage __user *);struct compat_siginfo ; +struct __compat_aio_sigset ; extern asmlinkage long compat_sys_waitid(int, compat_pid_t, struct compat_siginfo __user *, int,
@@ -541,7 +542,7 @@ asmlinkage long compat_sys_io_pgetevents(compat_aio_context_t ctx_id,compat_long_t nr, struct io_event __user *events, struct compat_timespec __user *timeout, - const compat_sigset_t __user *sigmask); + const struct __compat_aio_sigset __user *usig);asmlinkage long compat_sys_io_submit (compat_aio_context_t ctx_id,int nr,u32 __user *iocb); asmlinkage long compat_sys_mount(const char __user *dev_name,
include/linux/syscalls.h +1 -1
@@ -544,7 +544,7 @@ asmlinkage long sys_io_pgetevents(aio_context_t ctx_id,long nr, struct io_event __user *events, struct timespec __user *timeout, - const sigset_t __user *sigmask); + const struct __aio_sigset *sig);asmlinkage long sys_io_submit (aio_context_t ,long ,struct iocb __user *__user *); asmlinkage long sys_io_cancel(aio_context_t ctx_id, struct iocb __user *iocb,
include/uapi/linux/aio_abi.h +6 -0
@@ -29,6 +29,7 @@#include <linux/types.h> #include <linux/fs.h> +#include <linux/signal.h> #include <asm/byteorder.h> typedef __kernel_ulong_t aio_context_t ;
@@ -106,5 +107,10 @@ struct iocb {#undef IFBIG#undef IFLITTLE +struct __aio_sigset { +sigset_t __user *sigmask; +size_t sigsetsize; +}; +#endif /* __LINUX__AIO_ABI_H */
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 32/32] aio: implement io_pgetevents
In reply to Christoph HellwigQuoted 14 lines · Christoph Hellwig
Quoted 12 lines · Al Viro
fs/aio.c static long do_io_getevents(aio_context_t ctx_id, · line 2011
Quoted 8 lines · Jeff Moyer
fs/aio.c +5
-1if (sigmask) { -if (copy_from_user (&ksigmask, sigmask,sizeof (ksigmask))) +if (!access_ok (VERIFY_READ , sigmask, +sizeof (void *) +sizeof (size_t )) || +__get_user (up, (sigset_t __user *__user *)sigmask) || +__get_user (sigsetsize, + (size_t __user *)(sigmask +sizeof (void *))))return -EFAULT ;How about
copy_from_user()on a struct? Making eyes bleed is fun, but people tend to get annoyed when you do it to them...
Quoted 6 lines
Above is the copy & paste version from pselect. I've got both
copy_from_userand that horrible version in my tree, and if we really need this awfull calling conventioncopy_from_usercertainly is much better. pselect also should be switched to explicit struct +copy_from_userwhile we're at it. In fact glibc defines a struct for the userland version to start with.
Yeah, I did both, but stuck with this variant as that's what pselect did. I'm fine with switching to the struct variant.
-Jeff
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 32/32] aio: implement io_pgetevents
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
Quoted 9 lines · Jeff Moyer
I'd be willing to bet the issue is in your
io_syscall6implementation. You pass in arg5 where arg6 should be used. Don't feel bad, it took me the better part of today to figure that out. :)Here's an incremental diff on top of what you've posted. Feel free to fold it into your patch (and format however you like). You can find the libaio changes in my 'aio-poll' branch:
https://pagure.io/libaio/commits/aio-poll
Quoted 5 lines
Quoted 2 lines
These changes were run through the libaio test harness, 64 bit and 32 bit, so the compat system call was tested.
Oops, yes. Although I prefer the
copy_from_userversion, this is what I had:
Much cleaner.
Thanks!
Jeff
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
Re: [PATCH 03/32] fs: introduce new ->get_poll_head and ->poll_mask methods
In reply to Al ViroQuoted 4 lines · Al Viro
What I mean is that it would be nice to have
do_select()and friends aware of that. You are hiding the whole thing behindvfs_poll(); sure, we can't really exploit that while we have the mix of converted and unconverted instances, but it would be a nice payoff.
I have tried to move it out, but I don't think it makes sense yet, given that we rely on passing the poll_table_struct everywhere.
Btw, another issue: the procs and debugfs forwarders are in fact already broken right now for epoll and in-kernel callers. ->poll returning does not mean it is safe to release the module - it may still have an active wait_queue_entry on the waitqueue.
For now I think I'll drop the support for the proc/debugfs forwarders, because they will need a real fix independent of this series.