From: Al Viro <viro@ZenIV.linux.org.uk>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: [call for review] netdev-related stuff in vfs.git
Date: Sat, 11 Apr 2015 22:17:42 +0100 [thread overview]
Message-ID: <20150411211742.GJ889@ZenIV.linux.org.uk> (raw)
There are several commits sitting in vfs.git that probably ought to go in
via net-next.git. First of all, there's merge with vfs.git#iocb - that's
Christoph's aio rework, which has triggered conflicts with the ->sendmsg()
and ->recvmsg() patches a while ago. It's not so much Christoph's stuff
that ought to be in net-next, as (pretty simple) conflict resolution on merge.
The next chunk is switch to {compat_,}import_iovec/import_single_range - new
safer primitives for initializing iov_iter. The primitives themselves come
from vfs/git#iov_iter (and they are used quite a lot in vfs part of queue),
conversion of net/socket.c syscalls belongs in net-next, IMO. Next there's
afs and rxrpc stuff from dhowells. And then there's sanitizing kernel_sendmsg
et.al. + missing inlined helper for "how much data is left in msg->msg_iter" -
this stuff is used in e.g. cifs stuff, but it belongs in net-next.
That pile is pullable from
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-davem
I'll post the individual patches in there in followups; could you take a look
and tell if everything in there is OK with you?
Shortlog:
Al Viro (9):
saner iov_iter initialization primitives
Merge branch 'iocb' into for-davem
Merge branch 'iov_iter' into for-davem
net: switch sendto() and recvfrom() to import_single_range()
net: switch importing msghdr from userland to {compat_,}import_iovec()
switch kernel_sendmsg() and kernel_recvmsg() to iov_iter_kvec()
get rid of the size argument of sock_sendmsg()
Merge remote-tracking branch 'dh/afs' into for-davem
new helper: msg_data_left()
Christoph Hellwig (5):
fs: remove ki_nbytes
fuse: handle synchronous iocbs internally
fs: don't allow to complete sync iocbs through aio_complete
fs: split generic and aio kiocb
fs: move struct kiocb to fs.h
David Howells (5):
RxRPC: Fix the conversion to iov_iter
RxRPC: Don't call skb_add_data() if there's no data to copy
RxRPC: Use iov_iter_count() in rxrpc_send_data() instead of the len argument
AFS: afs_send_empty_reply() doesn't require an iovec array
RxRPC: Handle VERSION Rx protocol packets
Nathaniel Wesley Filardo (1):
kafs: Add more "unified AFS" error codes
Diffstat without #iocb part:
crypto/algif_hash.c | 4 +-
crypto/algif_skcipher.c | 4 +-
drivers/vhost/net.c | 4 +-
fs/afs/misc.c | 16 +++++++-
fs/afs/rxrpc.c | 5 +--
include/linux/net.h | 2 +-
include/linux/socket.h | 5 +++
include/linux/uio.h | 14 +++++++
include/net/compat.h | 2 +-
include/rxrpc/packet.h | 3 +-
lib/iov_iter.c | 57 ++++++++++++++++++++++++++++
net/compat.c | 18 ++++-----
net/core/datagram.c | 2 +-
net/ipv4/tcp.c | 8 ++--
net/rxrpc/ar-input.c | 23 +++++++++++-
net/rxrpc/ar-internal.h | 2 +
net/rxrpc/ar-local.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
net/rxrpc/ar-output.c | 53 +++++++++++++-------------
net/socket.c | 96 +++++++++++++++++-------------------------------
net/sunrpc/svcsock.c | 2 +-
20 files changed, 296 insertions(+), 122 deletions(-)
Full diffstat:
arch/s390/hypfs/inode.c | 2 +-
crypto/algif_hash.c | 4 +-
crypto/algif_skcipher.c | 6 +-
drivers/char/mem.c | 2 +-
drivers/char/tile-srom.c | 1 -
drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 -
drivers/infiniband/hw/qib/qib_file_ops.c | 1 -
drivers/misc/mei/amthif.c | 1 -
drivers/misc/mei/main.c | 1 -
drivers/misc/mei/pci-me.c | 1 -
drivers/scsi/sg.c | 2 +-
drivers/staging/unisys/include/timskmod.h | 1 -
drivers/usb/gadget/function/f_fs.c | 6 +-
drivers/usb/gadget/legacy/inode.c | 6 +-
drivers/vhost/net.c | 4 +-
fs/9p/vfs_addr.c | 2 +-
fs/affs/file.c | 2 +-
fs/afs/misc.c | 16 ++-
fs/afs/rxrpc.c | 5 +-
fs/afs/write.c | 1 -
fs/aio.c | 150 +++++++++++++++------------
fs/bfs/inode.c | 1 +
fs/block_dev.c | 1 -
fs/btrfs/file.c | 2 +-
fs/btrfs/inode.c | 2 +-
fs/ceph/file.c | 3 +-
fs/direct-io.c | 5 +-
fs/ecryptfs/file.c | 7 --
fs/ext2/inode.c | 2 +-
fs/ext3/inode.c | 2 +-
fs/ext4/file.c | 2 +-
fs/ext4/indirect.c | 2 +-
fs/ext4/inode.c | 1 -
fs/ext4/page-io.c | 1 -
fs/f2fs/data.c | 2 +-
fs/fat/inode.c | 1 -
fs/fuse/cuse.c | 2 +-
fs/fuse/dev.c | 1 -
fs/fuse/file.c | 55 ++++++----
fs/fuse/fuse_i.h | 1 +
fs/gfs2/aops.c | 2 +-
fs/gfs2/file.c | 1 -
fs/hfs/inode.c | 2 +-
fs/hfsplus/inode.c | 2 +-
fs/jfs/inode.c | 2 +-
fs/nfs/direct.c | 4 +-
fs/nfs/file.c | 1 -
fs/nilfs2/inode.c | 2 +-
fs/ntfs/file.c | 1 -
fs/ntfs/inode.c | 1 -
fs/ocfs2/aops.c | 1 +
fs/ocfs2/aops.h | 2 +-
fs/ocfs2/file.c | 8 +-
fs/pipe.c | 1 -
fs/read_write.c | 35 ++-----
fs/reiserfs/inode.c | 2 +-
fs/splice.c | 1 -
fs/ubifs/file.c | 1 -
fs/udf/file.c | 4 +-
fs/udf/inode.c | 2 +-
fs/xfs/xfs_aops.c | 1 -
fs/xfs/xfs_file.c | 1 -
include/linux/aio.h | 70 +------------
include/linux/fs.h | 22 ++++
include/linux/net.h | 2 +-
include/linux/socket.h | 5 +
include/linux/uio.h | 14 +++
include/net/compat.h | 2 +-
include/net/sock.h | 1 -
include/rxrpc/packet.h | 3 +-
kernel/printk/printk.c | 4 +-
kernel/sysctl.c | 1 +
lib/iov_iter.c | 57 ++++++++++
mm/filemap.c | 1 -
mm/page_io.c | 3 +-
mm/shmem.c | 2 +-
net/compat.c | 18 ++--
net/core/datagram.c | 2 +-
net/ipv4/raw.c | 1 -
net/ipv4/tcp.c | 8 +-
net/rxrpc/ar-input.c | 23 +++-
net/rxrpc/ar-internal.h | 2 +
net/rxrpc/ar-local.c | 98 +++++++++++++++++
net/rxrpc/ar-output.c | 53 +++++-----
net/socket.c | 100 +++++++-----------
net/sunrpc/svcsock.c | 2 +-
sound/core/pcm_native.c | 2 +-
87 files changed, 494 insertions(+), 387 deletions(-)
next reply other threads:[~2015-04-11 21:17 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-11 21:17 Al Viro [this message]
2015-04-11 21:18 ` [PATCH 01/17] fs: remove ki_nbytes Al Viro
2015-04-11 21:18 ` [PATCH 02/17] fuse: handle synchronous iocbs internally Al Viro
2015-04-11 21:18 ` [PATCH 03/17] fs: don't allow to complete sync iocbs through aio_complete Al Viro
2015-04-14 18:00 ` Tadeusz Struk
2015-04-14 18:26 ` Al Viro
2015-04-14 18:37 ` Tadeusz Struk
2015-04-14 19:22 ` Al Viro
2015-04-11 21:18 ` [PATCH 04/17] fs: split generic and aio kiocb Al Viro
2015-04-11 21:18 ` [PATCH 05/17] fs: move struct kiocb to fs.h Al Viro
2015-04-11 21:18 ` [PATCH 06/17] saner iov_iter initialization primitives Al Viro
2015-04-11 21:18 ` [PATCH 07/17] RxRPC: Fix the conversion to iov_iter Al Viro
2015-04-11 21:18 ` [PATCH 08/17] RxRPC: Don't call skb_add_data() if there's no data to copy Al Viro
2015-04-11 21:18 ` [PATCH 09/17] RxRPC: Use iov_iter_count() in rxrpc_send_data() instead of the len argument Al Viro
2015-04-11 21:18 ` [PATCH 10/17] AFS: afs_send_empty_reply() doesn't require an iovec array Al Viro
2015-04-11 21:18 ` [PATCH 11/17] RxRPC: Handle VERSION Rx protocol packets Al Viro
2015-04-11 21:18 ` [PATCH 12/17] kafs: Add more "unified AFS" error codes Al Viro
2015-04-11 21:18 ` [PATCH 13/17] net: switch sendto() and recvfrom() to import_single_range() Al Viro
2015-04-11 21:18 ` [PATCH 14/17] net: switch importing msghdr from userland to {compat_,}import_iovec() Al Viro
2015-04-11 21:18 ` [PATCH 15/17] switch kernel_sendmsg() and kernel_recvmsg() to iov_iter_kvec() Al Viro
2015-04-14 16:21 ` David Laight
2015-04-14 16:34 ` Al Viro
2015-04-14 16:36 ` David Laight
2015-04-14 16:59 ` Al Viro
2015-04-15 9:08 ` David Laight
2015-04-15 9:36 ` Daniel Borkmann
2015-04-15 9:53 ` David Laight
2015-04-11 21:18 ` [PATCH 16/17] get rid of the size argument of sock_sendmsg() Al Viro
2015-04-14 16:25 ` David Laight
2015-04-14 16:35 ` Al Viro
2015-04-14 16:44 ` Al Viro
2015-04-14 17:55 ` David Miller
2015-04-15 8:37 ` David Laight
2015-04-15 10:15 ` Eric Dumazet
2015-04-15 16:06 ` David Miller
2015-04-11 21:18 ` [PATCH 17/17] new helper: msg_data_left() Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150411211742.GJ889@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).