| Message ID | 20150316161514.16418.67336.stgit@tstruk-mobl1 (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
On Mon, Mar 16, 2015 at 09:15:14AM -0700, Tadeusz Struk wrote: > Add support for async operations. NAK. For the same reason as the last time - > +static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, > + unsigned long nr_segs, loff_t loff); > +static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov, > + unsigned long nr_segs, loff_t loff); > + is completely pointless. Just have sock_read_iter() and sock_write_iter() check if your new methods are present and use those if those are. What's more, I'm not at all sure that you want to pass iocb that way - kernel-side msghdr isn't tied to userland one anymore, so we might as well stash a pointer to iocb into it. Voila - no new methods needed at all. -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03/19/2015 09:20 AM, Al Viro wrote: > is completely pointless. Just have sock_read_iter() and sock_write_iter() > check if your new methods are present and use those if those are. > Ok, that will work for me too. > What's more, I'm not at all sure that you want to pass iocb that way - > kernel-side msghdr isn't tied to userland one anymore, so we might as well > stash a pointer to iocb into it. Voila - no new methods needed at all. Good point, so what do you prefer - to add iocd to msghdr or to call the new methods from sock_read_iter() and sock_write_iter()? Either way is good for me. -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Mar 19, 2015 at 10:43:16AM -0700, Tadeusz Struk wrote: > On 03/19/2015 09:20 AM, Al Viro wrote: > > is completely pointless. Just have sock_read_iter() and sock_write_iter() > > check if your new methods are present and use those if those are. > > > > Ok, that will work for me too. > > > What's more, I'm not at all sure that you want to pass iocb that way - > > kernel-side msghdr isn't tied to userland one anymore, so we might as well > > stash a pointer to iocb into it. Voila - no new methods needed at all. > > Good point, so what do you prefer - to add iocd to msghdr or to call the new > methods from sock_read_iter() and sock_write_iter()? > Either way is good for me. I'd probably add msg_iocb to the end of struct msghdr and explicitly zero it in copy_msghdr_from_user() and get_compat_msghdr(), but you are asking the wrong guy - that sort of choices in net/* falls on davem, not me. -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/net.h b/include/linux/net.h index e74114b..e9180bf 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -25,6 +25,7 @@ #include <linux/kmemcheck.h> #include <linux/rcupdate.h> #include <linux/jump_label.h> +#include <linux/aio.h> #include <uapi/linux/net.h> struct poll_table_struct; @@ -173,6 +174,10 @@ struct proto_ops { */ int (*recvmsg) (struct socket *sock, struct msghdr *m, size_t total_len, int flags); + int (*aio_sendmsg)(struct kiocb *iocb, struct socket *sock, + struct msghdr *m); + int (*aio_recvmsg)(struct kiocb *iocb, struct socket *sock, + struct msghdr *m, int flags); int (*mmap) (struct file *file, struct socket *sock, struct vm_area_struct * vma); ssize_t (*sendpage) (struct socket *sock, struct page *page, diff --git a/net/socket.c b/net/socket.c index 95d3085..1364dfb 100644 --- a/net/socket.c +++ b/net/socket.c @@ -132,6 +132,11 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); +static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t loff); +static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t loff); + /* * Socket files have a set of 'special' operations as well as the generic file ones. These don't appear * in the operation structures but are done directly via the socketcall() multiplexor. @@ -144,6 +149,8 @@ static const struct file_operations socket_file_ops = { .write = new_sync_write, .read_iter = sock_read_iter, .write_iter = sock_write_iter, + .aio_read = sock_aio_read, + .aio_write = sock_aio_write, .poll = sock_poll, .unlocked_ioctl = sock_ioctl, #ifdef CONFIG_COMPAT @@ -836,6 +843,62 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from) return res; } +static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t loff) +{ + struct file *file = iocb->ki_filp; + struct socket *sock = file->private_data; + struct iov_iter iter; + struct msghdr msg = {0}; + ssize_t res; + + if (file->f_flags & O_NONBLOCK) + msg.msg_flags = MSG_DONTWAIT; + + if (iocb->ki_pos != 0) + return -ESPIPE; + + if (iocb->ki_nbytes == 0) + return 0; + + if (sock->ops->aio_recvmsg) { + iov_iter_init(&iter, READ, iov, nr_segs, iocb->ki_nbytes); + msg.msg_iter = iter; + res = sock->ops->aio_recvmsg(iocb, sock, &msg, msg.msg_flags); + } else { + res = -EOPNOTSUPP; + } + return res; +} + +static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t loff) +{ + struct file *file = iocb->ki_filp; + struct socket *sock = file->private_data; + struct iov_iter iter; + struct msghdr msg = {0}; + ssize_t res; + + if (iocb->ki_pos != 0) + return -ESPIPE; + + if (file->f_flags & O_NONBLOCK) + msg.msg_flags = MSG_DONTWAIT; + + if (sock->type == SOCK_SEQPACKET) + msg.msg_flags |= MSG_EOR; + + if (sock->ops->aio_sendmsg) { + iov_iter_init(&iter, WRITE, iov, nr_segs, iocb->ki_nbytes); + msg.msg_iter = iter; + res = sock->ops->aio_sendmsg(iocb, sock, &msg); + } else { + res = -EOPNOTSUPP; + } + return res; +} + /* * Atomic setting of ioctl hooks to avoid race * with module unload.
Add support for async operations. Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> --- include/linux/net.h | 5 ++++ net/socket.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html